Skip to content

Commit bece18a

Browse files
tscuitetscuite
authored
Merge pull request #362 from HXSecurity/beta
Beta
2 parents 2bced61 + 6f61c42 commit bece18a

35 files changed

+1945
-680
lines changed

‎.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# base api
33
VUE_APP_BASE_API = '/api/v1'
44
VUE_APP_BASE_API_V2 = '/api/v2'
5+
VUE_APP_BASE_SCA_V2 = '/api/sca/v2'
6+
VUE_APP_BASE_SCA_V1 = '/api/sca/v1'
57
VUE_APP_UPLOAD = '/upload'
68
VUE_APP_OPEN_API = '/openapi'
79
VUE_APP_ATOM_API = '/atom-webapi'

‎.github/workflows/deploy-to-test.yml‎ renamed to ‎.github/workflows/deploy-dev.yml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,27 @@ jobs:
7171
platforms: linux/amd64,linux/arm64
7272
push: true
7373
tags: |
74-
registry.cn-hongkong.aliyuncs.com/huoxian_pub/dongtai-web-test:1.0.${{github.run_number}}-${{ steps.version.outputs.GITHUB_REF }}
75-
registry.cn-hongkong.aliyuncs.com/huoxian_pub/dongtai-web-test:latest-${{ steps.version.outputs.GITHUB_REF }}
74+
registry.cn-hongkong.aliyuncs.com/secnium/dongtai-web:${{ steps.version.outputs.GITHUB_REF }}-latest
75+
registry.cn-hongkong.aliyuncs.com/secnium/dongtai-web:${{ steps.version.outputs.GITHUB_REF }}-1.0.${{github.run_number}}
76+
77+
- name: Set the value
78+
id: release
79+
run: |
80+
if [ ${{ steps.version.outputs.GITHUB_REF }} = develop ] ; then echo "helm_ns=test" >> $GITHUB_ENV; echo "helm_mysql=test" >> $GITHUB_ENV
81+
elif [ ${{ steps.version.outputs.GITHUB_REF }} = beta ] ; then echo "helm_ns=beta" >> $GITHUB_ENV; echo "helm_mysql=beta" >> $GITHUB_ENV
82+
else echo "helm_ns=main" >> $GITHUB_ENV ; echo "helm_mysql=temp" >> $GITHUB_ENV ;fi
7683
77-
- uses: actions/checkout@master
7884
- name: deploy to cluster
7985
uses: wahyd4/kubectl-helm-action@master
8086
env:
8187
KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_TEST_DATA }}
8288
with:
8389
args: |
84-
if [ ${{ steps.version.outputs.GITHUB_REF }} = beta ] ; then find deploy/deploy-eks-iast-saas-web-test.yml -type f -exec sed -i 's/iast-test/iast-beta/g' {} \;
85-
elif [ ${{ steps.version.outputs.GITHUB_REF }} = develop ] ; then echo 'testing !!!'
86-
else find deploy/deploy-eks-iast-saas-web-test.yml -type f -exec sed -i 's/iast-test/iast-main/g' {} \; ;fi
87-
find deploy/deploy-eks-iast-saas-web-test.yml -type f -exec sed -i 's/VERSION/1.0.${{github.run_number}}-${{ steps.version.outputs.GITHUB_REF }}/g' {} \;
88-
ls deploy/deploy-eks-iast-saas-web-test.yml | xargs -I {} kubectl apply -f {}
89-
90+
git clone https://github.com/HXSecurity/DongTai.git
91+
helm upgrade --install huoxian --create-namespace -n iast-${{ env.helm_ns }} ./DongTai/deploy/kubernetes/helm/ \
92+
--set develop.agentZip=${{ env.helm_ns }} --set sca.sca_token=${{ secrets.TOKEN_SCA }} --set usb.usb_token=${{ secrets.TOKEN_SCA }} --set mysql.host=iast-mysql-${{ env.helm_mysql }}.huoxian.cn \
93+
--set tag=${{ steps.version.outputs.GITHUB_REF }}-latest --set build.web_number=iast${{github.run_number}} --values https://charts.dongtai.io/devops.yaml
94+
9095
- name: finish build
9196
uses: joelwmale/webhook-action@master
9297
with:

‎deploy/deploy-eks-iast-saas-web-dev.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎deploy/deploy-eks-iast-saas-web-prod.yml‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎deploy/deploy-eks-iast-saas-web-test.yml‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎src/config/lang/en.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ export default {
101101
scaList: 'Component management list',
102102
scaDetail: 'Component management details',
103103
scanDetail: 'Scan vulnerability details',
104+
scalistDetail: 'Scan details',
104105
changeLogo: 'Site Identity',
105106
setting: 'Settings',
106107
agentManage: 'Agent',

‎src/config/lang/zh_cn.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,10 @@ export default {
9595
vulnDetail: '应用漏洞详情',
9696
sca: '组件',
9797
scaList: '组件管理列表',
98+
scalistDetail: '组件详情',
9899
scaDetail: '组件管理详情',
99100
scanDetail: '扫描漏洞详情',
100-
setting: '系统配置',
101+
setting: '系统设置',
101102
changeLogo: '品牌配置',
102103
agentManage: 'Agent',
103104
sensitive: '敏感信息',

‎src/router/routes.ts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,15 @@ const routes: Array<RouteConfig> = [
190190
},
191191
component: () => import('@/views/sca/ScaList.vue'),
192192
},
193+
{
194+
path: 'scalistDetail/:page/:id',
195+
name: 'scalistDetail/:page/:id',
196+
meta: {
197+
i18n: 'menu.scalistDetail',
198+
name: i18n.t('menu.vulnDetail'),
199+
},
200+
component: () => import('@/views/sca/ScaDialog.vue'),
201+
},
193202
],
194203
},
195204
{
@@ -561,6 +570,15 @@ const adminRoutes: Array<RouteConfig> = [
561570
},
562571
component: () => import('@/views/sca/ScaList.vue'),
563572
},
573+
{
574+
path: 'scalistDetail/:page/:id',
575+
name: 'scalistDetail/:page/:id',
576+
meta: {
577+
i18n: 'menu.scalistDetail',
578+
name: i18n.t('menu.vulnDetail'),
579+
},
580+
component: () => import('@/views/sca/ScaDialog.vue'),
581+
},
564582
],
565583
},
566584
{
@@ -965,6 +983,15 @@ const userRoutes: Array<RouteConfig> = [
965983
},
966984
component: () => import('@/views/sca/ScaList.vue'),
967985
},
986+
{
987+
path: 'scalistDetail/:page/:id',
988+
name: 'scalistDetail/:page/:id',
989+
meta: {
990+
i18n: 'menu.scalistDetail',
991+
name: i18n.t('menu.scalistDetail'),
992+
},
993+
component: () => import('@/views/sca/ScaDialog.vue'),
994+
},
968995
],
969996
},
970997
{

‎src/services/project.ts‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@ interface ProjectListParams {
77
name: string
88
}
99

10-
interface ProjectAddParams {
11-
pid?: number | string
12-
name: string
13-
mode: string
14-
agent_ids: string
15-
scan_id: number
16-
}
17-
1810
export default () =>
1911
new (class {
2012
// 项目列表
@@ -43,7 +35,7 @@ export default () =>
4335
}
4436

4537
//新增项目 编辑
46-
projectAdd(params: ProjectAddParams): Promise<iResponse> {
38+
projectAdd(params: any): Promise<iResponse> {
4739
return request.post('/project/add', params)
4840
}
4941

‎src/services/sca.ts‎

Lines changed: 64 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,81 @@ export default () =>
2929
})
3030
}
3131

32-
assetVuls(aggr_id: any): Promise<iResponse> {
33-
return request.get('/asset_vuls/' + aggr_id, {
34-
baseURL: '/openapi/sca/v1',
35-
})
32+
assetVuls(row: any): Promise<iResponse> {
33+
return request.get(
34+
`/package_vuls/${row.language_id}/${row.package_name}/${row.package_version}?page=${row.page}&page_size=${row.page_size}`,
35+
{
36+
baseURL: '/api/sca/v2',
37+
}
38+
)
3639
}
3740

38-
assetProjects(aggr_id: any): Promise<iResponse> {
39-
return request.get('/asset_projects/' + aggr_id, {
40-
baseURL: '/openapi/sca/v1',
41+
assetProjects(row: any): Promise<iResponse> {
42+
if (row.project_id) {
43+
return request.get(
44+
`/package/${row.language_id}/${row.package_name}/${row.package_version}/relation_projects?page=${row.page}&page_size=${row.page_size}&project_id=${row.project_id}`,
45+
{
46+
baseURL: '/api/sca/v2',
47+
}
48+
)
49+
}
50+
return request.get(
51+
`/package/${row.language_id}/${row.package_name}/${row.package_version}/relation_projects?page=${row.page}&page_size=${row.page_size}`,
52+
{
53+
baseURL: '/api/sca/v2',
54+
}
55+
)
56+
}
57+
assetProjectId(row: any): Promise<iResponse> {
58+
return request.get(
59+
`/package/${row.language_id}/${row.package_name}/${row.package_version}/relation_project/${row.project_id}`,
60+
{
61+
baseURL: '/api/sca/v2',
62+
}
63+
)
64+
}
65+
vulPackId(row: any): Promise<iResponse> {
66+
return request.get(`/package_vul/${row.vul_id}`, {
67+
baseURL: '/api/sca/v2',
4168
})
4269
}
43-
// scaList
70+
// scaList /api/sca/v2/package
71+
// scaList(data: any): Promise<iResponse> {
72+
// return request.post('/scas', data)
73+
// }
4474
scaList(data: any): Promise<iResponse> {
45-
return request.post('/scas', data)
75+
return request.post('/package/', data, {
76+
baseURL: '/api/sca/v2',
77+
})
4678
}
4779

4880
// scaSummary
81+
// scaSummary(data: any): Promise<iResponse> {
82+
// return request.post('/sca/summary', data)
83+
// }
4984
scaSummary(data: any): Promise<iResponse> {
50-
return request.post('/sca/summary', data)
85+
if (data.project_id) {
86+
return request.get(
87+
`/package_summary?project_id=${data.project_id}&project_version_id=${data.version_id}&keyword=${data.keyword}`,
88+
{
89+
baseURL: '/api/sca/v2',
90+
// baseURL: '/openapi/sca/v2',
91+
}
92+
)
93+
}
94+
return request.get(`/package_summary?keyword=${data.keyword}`, {
95+
baseURL: '/api/sca/v2',
96+
// baseURL: '/openapi/sca/v2',
97+
})
5198
}
5299

53100
// getScaDetail
54-
getScaDetail(id: number): Promise<iResponse> {
55-
return request.get(`/sca/${id}`)
101+
getScaDetail(row: any): Promise<iResponse> {
102+
return request.get(
103+
`/package/${row.language_id}/${row.package_name}/${row.package_version}/detail`,
104+
{
105+
baseURL: '/api/sca/v2',
106+
}
107+
)
56108
}
57109
})()

0 commit comments

Comments
 (0)