Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge: master->3.8.x #2658

Merged
merged 82 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
62c31c2
feat: 【高危语句规则】新增高危语句规则管理功能的API,给上层SaaS使用 #2383
liuliaozhong Sep 26, 2023
6b0325f
feat: 【高危语句规则】新增高危语句规则管理功能的API,给上层SaaS使用 #2383
liuliaozhong Sep 26, 2023
653eb1f
feat: 【高危语句规则】新增高危语句规则管理功能的API,给上层SaaS使用 #2383
liuliaozhong Sep 27, 2023
47ff3e5
Merge branch 'master' into master_issue_2383
liuliaozhong Oct 7, 2023
2b911c4
feat:【高危语句规则】新增高危语句规则管理功能的API,给上层SaaS使用 #2383
liuliaozhong Oct 10, 2023
465e998
Merge remote-tracking branch 'origin/master_issue_2383' into master_i…
liuliaozhong Oct 10, 2023
cc322ee
perf: 优化ESB接口业务与资源的映射 #2516
liuliaozhong Oct 23, 2023
59fceda
Merge branch 'master' into master_issue_2516
liuliaozhong Oct 23, 2023
b491dca
perf: 优化ESB接口业务与资源的映射 #2516
liuliaozhong Oct 23, 2023
34e2e2a
Merge remote-tracking branch 'origin/master_issue_2516' into master_i…
liuliaozhong Oct 23, 2023
dbf357c
【高危语句规则】新增高危语句规则管理功能的API,给上层SaaS使用 #2383
liuliaozhong Nov 3, 2023
1b26dd2
【高危语句规则】新增高危语句规则管理功能的API,给上层SaaS使用 #2383
liuliaozhong Nov 3, 2023
8771ae9
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 7, 2023
1561485
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 7, 2023
05118d6
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 8, 2023
21eba26
Merge branch 'master' of https://github.com/Tencent/bk-job into issue…
wangyu096 Nov 8, 2023
dc42393
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 13, 2023
beaca08
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 13, 2023
16e58cc
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 13, 2023
7b32524
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 13, 2023
2ff67bd
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 13, 2023
0f56b31
Merge branch 'master' of https://github.com/Tencent/bk-job into issue…
wangyu096 Nov 13, 2023
6301f8d
Merge branch 'master' into master_issue_2516
liuliaozhong Nov 15, 2023
c682e49
Merge branch 'master' into master_issue_2383
liuliaozhong Nov 15, 2023
4a042d0
Merge pull request #2485 from liuliaozhong/master_issue_2383
wangyu096 Nov 15, 2023
ce61d2a
Merge pull request #2581 from liuliaozhong/master_issue_2383_auto_test1
wangyu096 Nov 15, 2023
1447cdd
Merge branch 'master' into master_issue_2516
liuliaozhong Nov 15, 2023
e71675f
Merge pull request #2539 from liuliaozhong/master_issue_2516
wangyu096 Nov 15, 2023
0d6a17b
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 15, 2023
2b7db51
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 15, 2023
0b1a386
【高危语句规则】新增高危语句规则管理功能的API,给上层SaaS使用 #2383
liuliaozhong Nov 15, 2023
aec81cc
Merge pull request #2618 from liuliaozhong/master_issue_2383_3
wangyu096 Nov 16, 2023
3dfc279
perf: 优化ESB接口业务与资源的映射 #2516
liuliaozhong Nov 16, 2023
07698bd
Merge pull request #2619 from liuliaozhong/master_issue_2516_1
wangyu096 Nov 16, 2023
1efdacd
fix: 查看定时任务审计事件记录异常 #2620
wangyu096 Nov 16, 2023
2f06bfb
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 16, 2023
9acbffc
Merge pull request #2621 from wangyu096/issue_2620
wangyu096 Nov 16, 2023
e8ceec6
feature: ESB 网关认证参数标准化 #2590
wangyu096 Nov 17, 2023
8f223fe
Merge pull request #2617 from wangyu096/issue_2590
wangyu096 Nov 17, 2023
fcc0349
perf: API 请求客户端支持定制JSON数据序列化属性 #2622
wangyu096 Nov 17, 2023
51c57a7
Merge pull request #2623 from wangyu096/issue_2622
jsonwan Nov 17, 2023
ea08311
fix: 执行结果详情页的表格表头交互体验问题 #2593
hLinx Nov 20, 2023
35fdf86
feature: IP选择器接口支持对标准化云区域IP字符串的解析 #2625
jsonwan Nov 21, 2023
43dad67
feature: IP选择器接口支持对标准化云区域IP字符串的解析 #2625
jsonwan Nov 21, 2023
5320085
Merge pull request #2626 from jsonwan/github_feature/ipv6
wangyu096 Nov 22, 2023
03b1b6e
perf: IP选择器的“手动输入”支持新格式 #2594
hLinx Nov 22, 2023
db8e5af
Merge pull request #2627 from hLinx/hotfix_master
hLinx Nov 22, 2023
dba8e43
fix: 无业务权限用户进入JOB时没有选中业务导致申请业务权限报错400 #2629
jsonwan Nov 23, 2023
bcc7945
fix: 脚本被引用筛选数据不存在时,应当显示"搜索结果为空" #2632
hLinx Nov 23, 2023
f93763e
fix: “被引用”的上线下线都显示灰底 #2633
hLinx Nov 23, 2023
6c93026
fix: 提示出现高危语句点击弹框外后,执行按钮一直加载中 #2634
hLinx Nov 24, 2023
fb5b611
fix: 详情页横向滚动条无法使用,表格横向内容还有很多但是横向滚动条已经到底了 #2635
hLinx Nov 24, 2023
f7030bf
Merge pull request #2636 from hLinx/hotfix_master
hLinx Nov 24, 2023
9c62aa1
fix: 无业务权限用户进入JOB时没有选中业务导致申请业务权限报错400 #2629
jsonwan Nov 24, 2023
2193bea
doc: 3.8.5 版本日志 #2638
wangyu096 Nov 24, 2023
88a59d8
Merge pull request #2639 from wangyu096/issue_2638
wangyu096 Nov 24, 2023
20afd54
fix: 无业务权限用户进入JOB时没有选中业务导致申请业务权限报错400 #2629
jsonwan Nov 24, 2023
270c682
fix: 详情页横向滚动条无法使用,表格横向内容还有很多但是横向滚动条已经到底了 #2635
hLinx Nov 24, 2023
fefe2e2
Merge pull request #2640 from hLinx/hotfix_master
hLinx Nov 24, 2023
6c62eb4
fix: 提示出现高危语句点击弹框外后,执行按钮一直加载中 #2634
hLinx Nov 24, 2023
75a781b
Merge pull request #2641 from hLinx/hotfix_master
hLinx Nov 24, 2023
11ce157
Merge pull request #2630 from jsonwan/github_fix/iam_url
wangyu096 Nov 24, 2023
156bf23
fix: 提示出现高危语句点击弹框外后,执行按钮一直加载中 #2634
hLinx Nov 24, 2023
37e71e8
perf: 定时任务触发延迟优化 #2073
jsonwan Nov 25, 2023
92cf7d6
Merge pull request #2642 from hLinx/hotfix_master
hLinx Nov 27, 2023
4dd9eec
fix: 无业务权限用户进入JOB时没有选中业务导致申请业务权限报错400 #2629
jsonwan Nov 27, 2023
e6359bc
Merge pull request #2645 from jsonwan/github_fix/iam_url
wangyu096 Nov 27, 2023
01f0d02
Merge pull request #2644 from jsonwan/github_perf/crontab
wangyu096 Nov 27, 2023
8a288b2
perf: 定时任务触发延迟优化 #2073
jsonwan Nov 28, 2023
7bbbf76
Merge pull request #2646 from jsonwan/github_perf/crontab
wangyu096 Nov 28, 2023
4d0435e
perf: 定时任务触发延迟优化 #2073
jsonwan Nov 30, 2023
90cdd93
Merge pull request #2647 from jsonwan/github_perf/crontab
wangyu096 Dec 1, 2023
47ff95b
【高危语句规则】新增高危语句规则管理功能的API,给上层SaaS使用 #2383
liuliaozhong Dec 1, 2023
2c78acf
docs: 更新版本日志 #336
jsonwan Dec 1, 2023
c7e67a1
Merge pull request #2649 from jsonwan/github_docs/versionlog
jsonwan Dec 1, 2023
756fc3c
Merge pull request #2648 from liuliaozhong/master_issue_2383_4
wangyu096 Dec 1, 2023
6594816
perf: 定时任务触发延迟优化 #2073
jsonwan Dec 1, 2023
78148a5
Merge pull request #2650 from jsonwan/github_perf/crontab
jsonwan Dec 1, 2023
357af6b
perf: GSE分发文件请求file_name字段添加默认值空字符串 #2652
jsonwan Dec 5, 2023
fd31e06
Merge pull request #2653 from jsonwan/github_master
jsonwan Dec 5, 2023
b46d279
perf: GSE分发文件请求file_name字段添加默认值空字符串 #2652
jsonwan Dec 5, 2023
6c1c388
Merge pull request #2654 from jsonwan/github_master
jsonwan Dec 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions docs/apidoc/esb/jobv3-confapis/apidocs/en/check_script.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
### Function Description

High risk script detection

### Request Parameters

{{ common_args_desc }}

#### Interface parameters

| Fields | Type | Required | Description |
| --------------- | ------ | -------- | ------------------------------------------------------------ |
| script_language | int | yes | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql |
| content | string | yes | Script content, requiring Base64 encoding |


### Example of request

```json
{
"bk_app_code": "esb_test",
"bk_app_secret": "xxx",
"bk_token": "xxx",
"script_language": 1,
"content": "cm0gLXJmIC8="
}
```

### Example of responses

```json
{
"code": 0,
"result": true,
"data": [
{
"line": 1,
"line_content": "rm /tmp",
"match_content": "rm /tmp",
"level": 1,
"description": "The first line of the script does not define a valid script type, for example: #!/bin/bash"
},
{
"line": 1,
"line_content": "rm /tmp",
"match_content": "rm",
"level": 3,
"description": "dangerous!!!"
}
]
}
```

### Response Description

#### response

| Fields | Type | Description |
| ---------- | ------ | ------------------------------------------------------------ |
| result | bool | Whether the request succeeded or not. True: request succeeded;False: request failed |
| code | int | Error code. 0 indicates success, >0 indicates failure |
| message | string | Error message |
| data | object | Data returned by request |
| permission | object | Permission information |

#### data

| Fields | Type | Description |
| ------------- | ------ | --------------------------------------------------- |
| line | int | Number of rows where the error occurred |
| line_content | string | The content of the line where the script is located |
| match_content | string | Matching Content |
| level | int | Error level: 1- Warning, 2- Error, 3- Fatal |
| description | string | Description |
79 changes: 79 additions & 0 deletions docs/apidoc/esb/jobv3-confapis/apidocs/en/create_dangerous_rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
### Function Description

Create dangerous rule

### Request Parameters

{{ common_args_desc }}

#### Interface parameters

| Fields | Type | Required | Description |
| -------------------- | ------ | -------- | ------------------------------------------------------------ |
| expression | string | yes | Expression |
| script_language_list | array | yes | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql |
| description | string | yes | Rule description |
| action | int | yes | Processing actions: 1- Scan, 2- Intercept |


### Example of request

```json
{
"bk_app_code": "esb_test",
"bk_app_secret": "xxx",
"bk_token": "xxx",
"expression": "rm -rf",
"script_language_list": [1],
"description": "drangerous!!!",
"action": 2
}
```

### Example of responses

```json
{
"code": 0,
"result": true,
"data": {
"id": 1,
"expression": "rm -rf",
"script_language_list": [1],
"description": "drangerous!!!",
"action": 2,
"status": 0,
"creator": "admin",
"create_time": 1695193968000,
"last_modify_user": "admin",
"last_modify_time": 1695193968000
}
}
```

### Response Description

#### response

| Fields | Type | Description |
| ---------- | ------ | ------------------------------------------------------------ |
| result | bool | Whether the request succeeded or not. True: request succeeded;False: request failed |
| code | int | Error code. 0 indicates success, >0 indicates failure |
| message | string | Error message |
| data | object | Data returned by request |
| permission | object | Permission information |

#### data

| Fields | Type | Description |
| -------------------- | ------ | ------------------------------------------------------------ |
| id | long | Rule id |
| expression | string | expression |
| script_language_list | array | Script language:1 - shell, 2 - bat, 3 - perl, 4 - python, 5 - powershell, 6 - sql |
| description | string | Description |
| action | int | Processing actions: 1- Scan, 2- Intercept |
| status | int | Enabling status: 0- disabled, 1- enabled |
| creator | string | Creator |
| create_time | long | Created time, Unix timestamp |
| last_modify_user | string | Last modify user |
| last_modify_time | long | Last modified time, Unix timestamp |
50 changes: 50 additions & 0 deletions docs/apidoc/esb/jobv3-confapis/apidocs/en/delete_dangerous_rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
### Function Description

Delete dangerous rule

### Request Parameters

{{ common_args_desc }}

#### Interface parameters

| Fields | Type | Required | Description |
| ------ | ---- | -------- | ----------- |
| id | long | yes | Rule id |


### Example of request

```json
{
"bk_app_code": "esb_test",
"bk_app_secret": "xxx",
"bk_token": "xxx",
"id": 1
}
```

### Example of responses

```json
{
"code": 0,
"result": true
}
```

### Response Description

#### response

| Fields | Type | Description |
| ---------- | ------ | ------------------------------------------------------------ |
| result | bool | Whether the request succeeded or not. True: request succeeded;False: request failed |
| code | int | Error code. 0 indicates success, >0 indicates failure |
| message | string | Error message |
| data | object | Data returned by request |
| permission | object | Permission information |

#### data

null
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
### Function Description

Disable dangerous rule

### Request Parameters

{{ common_args_desc }}

#### Interface parameters

| Fields | Type | Required | Description |
| ------ | ---- | -------- | ----------- |
| id | long | yes | Rule id |


### Example of request

```json
{
"bk_app_code": "esb_test",
"bk_app_secret": "xxx",
"bk_token": "xxx",
"id": 1
}
```

### Example of responses

```json
{
"code": 0,
"result": true,
"data": {
"id": 1,
"status": 0
}
}
```

### Response Description

#### response

| Fields | Type | Description |
| ---------- | ------ | ------------------------------------------------------------ |
| result | bool | Whether the request succeeded or not. True: request succeeded;False: request failed |
| code | int | Error code. 0 indicates success, >0 indicates failure |
| message | string | Error message |
| data | object | Data returned by request |
| permission | object | Permission information |

#### data

| Fields | Type | Description |
| ------ | ---- | ---------------------------------------- |
| id | long | Rule id |
| status | int | Enabling status: 0- disabled, 1- enabled |
57 changes: 57 additions & 0 deletions docs/apidoc/esb/jobv3-confapis/apidocs/en/enable_dangerous_rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
### Function Description

Enable dangerous rule

### Request Parameters

{{ common_args_desc }}

#### Interface parameters

| Fields | Type | Required | Description |
| ------ | ---- | -------- | ----------- |
| id | long | yes | Rule id |


### Example of request

```json
{
"bk_app_code": "esb_test",
"bk_app_secret": "xxx",
"bk_token": "xxx",
"id": 1
}
```

### Example of responses

```json
{
"code": 0,
"result": true,
"data": {
"id": 1,
"status": 1
}
}
```

### Response Description

#### response

| Fields | Type | Description |
| ---------- | ------ | ------------------------------------------------------------ |
| result | bool | Whether the request succeeded or not. True: request succeeded;False: request failed |
| code | int | Error code. 0 indicates success, >0 indicates failure |
| message | string | Error message |
| data | object | Data returned by request |
| permission | object | Permission information |

#### data

| Fields | Type | Description |
| ------ | ---- | ---------------------------------------- |
| id | long | Rule id |
| status | int | Enabling status: 0- disabled, 1- enabled |
Loading
Loading