Merge pull request #340 from HXSecurity/beta

Release-1.11.0
HXSecurity · May 17, 2023 · 2bced61 · 2bced61
2 parents c14c9ff + 0ca9da9
commit 2bced61
Show file tree

Hide file tree

Showing 11 changed files with 1,306 additions and 162 deletions.
diff --git a/.env b/.env
@@ -8,8 +8,8 @@ VUE_APP_ATOM_API = '/atom-webapi'
 
 # target host
 
-# VUE_TARGET_HOST = 'https://iast-test.huoxian.cn'
-VUE_TARGET_HOST = 'http://192.168.0.64:8000'
+VUE_TARGET_HOST = 'https://iast-test.huoxian.cn'
+# VUE_TARGET_HOST = 'http://192.168.0.64:8000'
 # VUE_TARGET_HOST = 'http://192.168.0.105:8000'
 # VUE_TARGET_HOST = 'http://52.81.92.214:30485'
 # VUE_TARGET_HOST = 'http://iast.huoxian.cn'

diff --git a/src/config/lang/en.ts b/src/config/lang/en.ts
@@ -461,7 +461,12 @@ export default {
       enterType: 'Entry Method Rules',
       searchDesc: 'Find rule details',
       ignoreInternal: 'Ignore Internal',
-      ignoreBlacklist: 'Ignore Blacklist'
+      ignoreBlacklist: 'Ignore Blacklist',
+      stainTag: 'Stain Tag',
+      stainUntag: 'Stain UnTag',
+      stainRange: 'Stain Range',
+      stackBlacklist: 'Stack Blacklist',
+      selectTag: 'Please choose a tag',
     },
     login: {
       title: 'User login',
@@ -932,6 +937,11 @@ export default {
       searchName: 'Enter the application name in the search field',
     },
     projectEdit: {
+      add: 'Add',
+      blacklist: 'BlackList',
+      whitelist: 'WhiteList',
+      prefix: 'prefix',
+      ruleInfoPlaceholder: 'Please enter the field prefix',
       token: 'Access Token',
       department: 'Department',
       departmentPlaceholder: 'Please select a department',

diff --git a/src/config/lang/zh_cn.ts b/src/config/lang/zh_cn.ts
@@ -464,7 +464,12 @@ export default {
       enterType: '入口方法规则',
       searchDesc: '查找规则详情',
       ignoreInternal: '忽略内部实现',
-      ignoreBlacklist: '白名单'
+      ignoreBlacklist: '白名单',
+      stainTag: '污点 tag',
+      stainUntag: '污点 untag',
+      stainRange: '污点 range',
+      stackBlacklist: '危险方法调用堆栈黑名单',
+      selectTag: '请选择标签',
     },
     login: {
       title: '用户登录',
@@ -933,6 +938,11 @@ export default {
       searchName: '请输入项目名称，然后回车或点击搜索图标进行搜索',
     },
     projectEdit: {
+      add: '新增',
+      blacklist: '黑名单',
+      whitelist: '白名单',
+      prefix: '前缀',
+      ruleInfoPlaceholder: '请输入字段前缀',
       token: '访问凭证',
       department: '部门',
       departmentPlaceholder: '请选择部门',

diff --git a/src/services/project.ts b/src/services/project.ts
@@ -88,4 +88,25 @@ export default () =>
     req_headers(params: any): Promise<iResponse> {
       return request.get(`/project/${params.id}/api_test/req_headers`)
     }
+    getRecognizeRule(data: any): Promise<iResponse> {
+      return request.get(
+        `/project/recognize_rule?page=${data.page}&page_size=${data.pageSize}&project_id=${data.project_id}&rule_type=${data.rule_type}`
+      )
+    }
+    postRecognizeRule(data: any): Promise<iResponse> {
+      return request.post(`/project/recognize_rule`, data)
+    }
+    deleteRecognizeRule(params: any): Promise<iResponse> {
+      return request.delete(`/project/recognize_rule`, { data: params })
+    }
+    getRecognizeRuleById(id: any): Promise<iResponse> {
+      return request.get(`/project/recognize_rule/${id}`)
+    }
+    putRecognizeRuleById(data: any): Promise<iResponse> {
+      return request.put(`/project/recognize_rule/${data.rule_id}`, {
+        rule_detail: data.rule_detail,
+        project_id: data.project_id,
+        rule_type: data.rule_type,
+      })
+    }
   })()
diff --git a/src/services/setting.ts b/src/services/setting.ts
@@ -243,7 +243,11 @@ export default () =>
       track: string
       language_id: number,
       ignore_blacklist?: boolean,
-      ignore_internal?: boolean
+      ignore_internal?: boolean,
+      tags?: any,
+      untags?: any,
+      command?: any,
+      stack_blacklist?: any
     }): Promise<iResponse> {
       return request.post('/engine/hook/rule/add', params)
     }
@@ -257,7 +261,11 @@ export default () =>
       track: string
       language_id: number,
       ignore_blacklist?: boolean,
-      ignore_internal?: boolean
+      ignore_internal?: boolean,
+      tags?: any,
+      untags?: any,
+      command?: any,
+      stack_blacklist?: any
     }): Promise<iResponse> {
       return request.post('/engine/hook/rule/modify', params)
     }
@@ -508,4 +516,7 @@ export default () =>
     delProjecttemplat(data: any): Promise<iResponse> {
       return request.delete(`/projecttemplate/` + data.id)
     }
+    getEnum(): Promise<iResponse> {
+      return request.get('/hook_rule/enum', { timeout: 1000 })
+    }
   })()