feat: 【高危语句规则】新增高危语句规则管理功能的API，给上层SaaS使用 #2383 #2485

liuliaozhong · 2023-09-26T08:00:51Z

No description provided.

wangyu096 · 2023-09-26T09:23:45Z

docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/check_script.md

+    "bk_app_code": "esb_test",
+    "bk_app_secret": "xxx",
+    "bk_token": "xxx",
+    "script_language": [1],


一次只检查一种脚本，这里不应该是 array

wangyu096 · 2023-09-26T09:24:31Z

docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/check_script.md

+            "level": 1,
+            "action": null,
+            "code": "103701001",
+            "description": "脚本首行没有定义合法的脚本类型，例如： #!/bin/bash"


demo 尽量用英文，方便在中英文文档之间共享

wangyu096 · 2023-09-26T09:25:13Z

docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/check_script.md

+            "lineContent": "rm /tmp",
+            "matchContent": "rm /tmp",
+            "level": 1,
+            "action": null,


这里的 action 为啥是 null？

内置高危语句检测没有action属性

wangyu096 · 2023-09-26T09:27:34Z

docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/check_script.md

+            "line_content": "rm /tmp",
+            "matchContent": "rm",
+            "level": 3,
+            "action": 2,


脚本检测API 似乎不应该返回 action 字段，因为只是检测，并不会进行拦截等操作

wangyu096 · 2023-09-26T09:28:53Z

docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/check_script.md

@@ -0,0 +1,80 @@
+### 功能描述
+
+脚本检测。


脚本检测 -> 高危脚本检测

wangyu096 · 2023-09-26T09:30:07Z

docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/check_script.md

+            "matchContent": "rm",
+            "level": 3,
+            "action": 2,
+            "code": null,


错误代码并非高危语句检测需要的字段，可以不返回

wangyu096 · 2023-09-26T09:35:28Z

docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/update_dangerous_rule.md

+        "expression": "rm",
+        "script_language_list": [1],
+        "description": "drangerous!!!",
+        "order": 1,


暂时隐藏 order 优先级参数，无需返回

wangyu096 · 2023-09-26T09:36:50Z

docs/apidoc/esb/jobv3-confapis/job.yaml

+  dest_path: /api/job/v3/job-manage/delete_dangerous_rule/
+  dest_http_method: DELETE
+
+- path: /v2/jobv3/get_dangerous_rule_list/


待确认。需要咨询下 ESB 是否支持用 GET 传 RequestBody

wangyu096 · 2023-10-08T02:19:04Z

...backend/commons/common-i18n/src/main/resources/i18n/validation/ValidationMessages.properties

@@ -26,6 +26,7 @@ validation.constraints.InvalidBkCloudId.message=管控区域 ID 非法
 validation.constraints.InvalidIp.message=IP 非法
 validation.constraints.InvalidJobTimeout_empty.message=作业超时时间不能为空
 validation.constraints.InvalidJobTimeout_outOfRange.message=作业超时时间必须在{min}-{max}之间
+validation.constraints.InvalidJobHighRiskGrammarId_empty.message=语法检测ID不能为空


语法检测ID不能为空有点奇怪，改成“高危语句规则 ID"可能更加合理

wangyu096 · 2023-10-09T06:31:02Z

docs/apidoc/esb/jobv3-confapis/apidocs/en/check_script.md

+    "data": [
+        {
+            "line": 1,
+            "lineContent": "rm /tmp",


api 所有的字段格式都需要是下划线分隔的，而不是驼峰方式。 lineContent->line_content

dto是下划线格式，文档从别处copy的，没注意，已改

wangyu096 · 2023-10-09T06:31:12Z

docs/apidoc/esb/jobv3-confapis/apidocs/en/check_script.md

+        {
+            "line": 1,
+            "lineContent": "rm /tmp",
+            "matchContent": "rm /tmp",


api 所有的字段格式都需要是下划线分隔的，而不是驼峰方式

wangyu096 · 2023-10-09T06:31:25Z

docs/apidoc/esb/jobv3-confapis/apidocs/en/check_script.md

+        {
+            "line": 1,
+            "line_content": "rm /tmp",
+            "matchContent": "rm",


api 所有的字段格式都需要是下划线分隔的，而不是驼峰方式

wangyu096 · 2023-10-09T06:35:40Z

docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/check_script.md

+    "data": [
+        {
+            "line": 1,
+            "lineContent": "rm /tmp",


api 所有的字段格式都需要是下划线分隔的，而不是驼峰方式

wangyu096 · 2023-10-09T06:35:45Z

docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/check_script.md

+        {
+            "line": 1,
+            "lineContent": "rm /tmp",
+            "matchContent": "rm /tmp",


api 所有的字段格式都需要是下划线分隔的，而不是驼峰方式

wangyu096 · 2023-10-09T06:35:51Z

docs/apidoc/esb/jobv3-confapis/apidocs/zh_hans/check_script.md

+        {
+            "line": 1,
+            "line_content": "rm /tmp",
+            "matchContent": "rm",


api 所有的字段格式都需要是下划线分隔的，而不是驼峰方式

wangyu096 · 2023-10-10T02:18:18Z

.../src/main/java/com/tencent/bk/job/manage/api/esb/impl/v3/EsbDangerousRuleV3ResourceImpl.java

+        if (id > 0) {
+            return EsbResp.buildSuccessResp(null);
+        }
+        return EsbResp.buildCommonFailResp(ErrorCode.INTERNAL_ERROR);


这里可以重构下，如果删除报错，直接在 Service 里边处理，抛出异常，而不是用 id 来判断结果

已放在service处理

wangyu096 · 2023-10-10T02:20:55Z

...e-job-manage/src/main/java/com/tencent/bk/job/manage/dao/globalsetting/DangerousRuleDAO.java

@@ -49,4 +49,6 @@ public interface DangerousRuleDAO {
    int getMaxPriority();

    int getMinPriority();
+
+    int updateDangerousRuleStatus(String userName, Long id, Integer status);


status 参数直接使用枚举类型，方法会更加清晰

…ssue_2383

feat: 【高危语句规则】新增高危语句规则管理功能的API，给上层SaaS使用 TencentBlueKing#2383

62c31c2

wangyu096 requested changes Sep 26, 2023

View reviewed changes

liuliaozhong added 2 commits September 26, 2023 19:09

feat: 【高危语句规则】新增高危语句规则管理功能的API，给上层SaaS使用 TencentBlueKing#2383

6b0325f

feat: 【高危语句规则】新增高危语句规则管理功能的API，给上层SaaS使用 TencentBlueKing#2383

653eb1f

liuliaozhong force-pushed the master_issue_2383 branch from 6728cd4 to 653eb1f Compare September 27, 2023 10:27

Merge branch 'master' into master_issue_2383

47ff3e5

wangyu096 requested changes Oct 10, 2023

View reviewed changes

liuliaozhong added 3 commits October 10, 2023 16:20

feat:【高危语句规则】新增高危语句规则管理功能的API，给上层SaaS使用 TencentBlueKing#2383

2b911c4

Merge remote-tracking branch 'origin/master_issue_2383' into master_i…

465e998

…ssue_2383

Merge branch 'master' into master_issue_2383

c682e49

wangyu096 approved these changes Nov 15, 2023

View reviewed changes

wangyu096 merged commit 4a042d0 into TencentBlueKing:master Nov 15, 2023
4 checks passed

feat: 【高危语句规则】新增高危语句规则管理功能的API，给上层SaaS使用 #2383 #2485

feat: 【高危语句规则】新增高危语句规则管理功能的API，给上层SaaS使用 #2383 #2485

Conversation

liuliaozhong commented Sep 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment