Skip to content

Commit 2bced61

Browse files
authored
Merge pull request #340 from HXSecurity/beta
Release-1.11.0
2 parents c14c9ff + 0ca9da9 commit 2bced61

File tree

11 files changed

+1306
-162
lines changed

11 files changed

+1306
-162
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ VUE_APP_ATOM_API = '/atom-webapi'
88

99
# target host
1010

11-
# VUE_TARGET_HOST = 'https://iast-test.huoxian.cn'
12-
VUE_TARGET_HOST = 'http://192.168.0.64:8000'
11+
VUE_TARGET_HOST = 'https://iast-test.huoxian.cn'
12+
# VUE_TARGET_HOST = 'http://192.168.0.64:8000'
1313
# VUE_TARGET_HOST = 'http://192.168.0.105:8000'
1414
# VUE_TARGET_HOST = 'http://52.81.92.214:30485'
1515
# VUE_TARGET_HOST = 'http://iast.huoxian.cn'

src/config/lang/en.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,12 @@ export default {
461461
enterType: 'Entry Method Rules',
462462
searchDesc: 'Find rule details',
463463
ignoreInternal: 'Ignore Internal',
464-
ignoreBlacklist: 'Ignore Blacklist'
464+
ignoreBlacklist: 'Ignore Blacklist',
465+
stainTag: 'Stain Tag',
466+
stainUntag: 'Stain UnTag',
467+
stainRange: 'Stain Range',
468+
stackBlacklist: 'Stack Blacklist',
469+
selectTag: 'Please choose a tag',
465470
},
466471
login: {
467472
title: 'User login',
@@ -932,6 +937,11 @@ export default {
932937
searchName: 'Enter the application name in the search field',
933938
},
934939
projectEdit: {
940+
add: 'Add',
941+
blacklist: 'BlackList',
942+
whitelist: 'WhiteList',
943+
prefix: 'prefix',
944+
ruleInfoPlaceholder: 'Please enter the field prefix',
935945
token: 'Access Token',
936946
department: 'Department',
937947
departmentPlaceholder: 'Please select a department',

src/config/lang/zh_cn.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,12 @@ export default {
464464
enterType: '入口方法规则',
465465
searchDesc: '查找规则详情',
466466
ignoreInternal: '忽略内部实现',
467-
ignoreBlacklist: '白名单'
467+
ignoreBlacklist: '白名单',
468+
stainTag: '污点 tag',
469+
stainUntag: '污点 untag',
470+
stainRange: '污点 range',
471+
stackBlacklist: '危险方法调用堆栈黑名单',
472+
selectTag: '请选择标签',
468473
},
469474
login: {
470475
title: '用户登录',
@@ -933,6 +938,11 @@ export default {
933938
searchName: '请输入项目名称,然后回车或点击搜索图标进行搜索',
934939
},
935940
projectEdit: {
941+
add: '新增',
942+
blacklist: '黑名单',
943+
whitelist: '白名单',
944+
prefix: '前缀',
945+
ruleInfoPlaceholder: '请输入字段前缀',
936946
token: '访问凭证',
937947
department: '部门',
938948
departmentPlaceholder: '请选择部门',

src/services/project.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,25 @@ export default () =>
8888
req_headers(params: any): Promise<iResponse> {
8989
return request.get(`/project/${params.id}/api_test/req_headers`)
9090
}
91+
getRecognizeRule(data: any): Promise<iResponse> {
92+
return request.get(
93+
`/project/recognize_rule?page=${data.page}&page_size=${data.pageSize}&project_id=${data.project_id}&rule_type=${data.rule_type}`
94+
)
95+
}
96+
postRecognizeRule(data: any): Promise<iResponse> {
97+
return request.post(`/project/recognize_rule`, data)
98+
}
99+
deleteRecognizeRule(params: any): Promise<iResponse> {
100+
return request.delete(`/project/recognize_rule`, { data: params })
101+
}
102+
getRecognizeRuleById(id: any): Promise<iResponse> {
103+
return request.get(`/project/recognize_rule/${id}`)
104+
}
105+
putRecognizeRuleById(data: any): Promise<iResponse> {
106+
return request.put(`/project/recognize_rule/${data.rule_id}`, {
107+
rule_detail: data.rule_detail,
108+
project_id: data.project_id,
109+
rule_type: data.rule_type,
110+
})
111+
}
91112
})()

src/services/setting.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,11 @@ export default () =>
243243
track: string
244244
language_id: number,
245245
ignore_blacklist?: boolean,
246-
ignore_internal?: boolean
246+
ignore_internal?: boolean,
247+
tags?: any,
248+
untags?: any,
249+
command?: any,
250+
stack_blacklist?: any
247251
}): Promise<iResponse> {
248252
return request.post('/engine/hook/rule/add', params)
249253
}
@@ -257,7 +261,11 @@ export default () =>
257261
track: string
258262
language_id: number,
259263
ignore_blacklist?: boolean,
260-
ignore_internal?: boolean
264+
ignore_internal?: boolean,
265+
tags?: any,
266+
untags?: any,
267+
command?: any,
268+
stack_blacklist?: any
261269
}): Promise<iResponse> {
262270
return request.post('/engine/hook/rule/modify', params)
263271
}
@@ -508,4 +516,7 @@ export default () =>
508516
delProjecttemplat(data: any): Promise<iResponse> {
509517
return request.delete(`/projecttemplate/` + data.id)
510518
}
519+
getEnum(): Promise<iResponse> {
520+
return request.get('/hook_rule/enum', { timeout: 1000 })
521+
}
511522
})()

0 commit comments

Comments
 (0)