Merge pull request #361 from HXSecurity/develop

beta

.env

@@ -2,6 +2,8 @@
 # base api
 VUE_APP_BASE_API = '/api/v1'
 VUE_APP_BASE_API_V2 = '/api/v2'
+VUE_APP_BASE_SCA_V2 = '/api/sca/v2'
+VUE_APP_BASE_SCA_V1 = '/api/sca/v1'
 VUE_APP_UPLOAD = '/upload'
 VUE_APP_OPEN_API = '/openapi'
 VUE_APP_ATOM_API = '/atom-webapi'

.github/workflows/deploy-to-test.yml → .github/workflows/deploy-dev.yml

@@ -71,22 +71,27 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            registry.cn-hongkong.aliyuncs.com/huoxian_pub/dongtai-web-test:1.0.${{github.run_number}}-${{ steps.version.outputs.GITHUB_REF }}
-            registry.cn-hongkong.aliyuncs.com/huoxian_pub/dongtai-web-test:latest-${{ steps.version.outputs.GITHUB_REF }}
+            registry.cn-hongkong.aliyuncs.com/secnium/dongtai-web:${{ steps.version.outputs.GITHUB_REF }}-latest
+            registry.cn-hongkong.aliyuncs.com/secnium/dongtai-web:${{ steps.version.outputs.GITHUB_REF }}-1.0.${{github.run_number}}
+
+      - name: Set the value
+        id: release
+        run: |
+          if [ ${{ steps.version.outputs.GITHUB_REF }} = develop ] ; then echo "helm_ns=test" >> $GITHUB_ENV; echo "helm_mysql=test" >> $GITHUB_ENV 
+          elif [ ${{ steps.version.outputs.GITHUB_REF }} = beta ] ; then echo "helm_ns=beta" >> $GITHUB_ENV; echo "helm_mysql=beta" >> $GITHUB_ENV 
+          else echo "helm_ns=main" >> $GITHUB_ENV ; echo "helm_mysql=temp" >> $GITHUB_ENV ;fi
 
-      - uses: actions/checkout@master
       - name: deploy to cluster
         uses: wahyd4/kubectl-helm-action@master
         env:
           KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_TEST_DATA }}
         with:
           args: |
-            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' {} \; 
-            elif [ ${{ steps.version.outputs.GITHUB_REF }} = develop ] ; then echo 'testing !!!'
-            else find deploy/deploy-eks-iast-saas-web-test.yml -type f -exec sed -i 's/iast-test/iast-main/g' {} \; ;fi
-            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' {} \;
-            ls deploy/deploy-eks-iast-saas-web-test.yml | xargs -I {} kubectl apply -f {}
-      
+            git clone https://github.com/HXSecurity/DongTai.git
+            helm upgrade --install huoxian --create-namespace -n iast-${{ env.helm_ns }} ./DongTai/deploy/kubernetes/helm/ \
+            --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 \
+            --set tag=${{ steps.version.outputs.GITHUB_REF }}-latest --set build.web_number=iast${{github.run_number}} --values https://charts.dongtai.io/devops.yaml
+
       - name: finish build
         uses: joelwmale/webhook-action@master
         with:

src/config/lang/en.ts

@@ -101,6 +101,7 @@ export default {
     scaList: 'Component management list',
     scaDetail: 'Component management details',
     scanDetail: 'Scan vulnerability details',
+    scalistDetail: 'Scan details',
     changeLogo: 'Site Identity',
     setting: 'Settings',
     agentManage: 'Agent',

src/config/lang/zh_cn.ts

@@ -95,9 +95,10 @@ export default {
     vulnDetail: '应用漏洞详情',
     sca: '组件',
     scaList: '组件管理列表',
+    scalistDetail: '组件详情',
     scaDetail: '组件管理详情',
     scanDetail: '扫描漏洞详情',
-    setting: '系统配置',
+    setting: '系统设置',
     changeLogo: '品牌配置',
     agentManage: 'Agent',
     sensitive: '敏感信息',

src/router/routes.ts

@@ -190,6 +190,15 @@ const routes: Array<RouteConfig> = [
         },
         component: () => import('@/views/sca/ScaList.vue'),
       },
+      {
+        path: 'scalistDetail/:page/:id',
+        name: 'scalistDetail/:page/:id',
+        meta: {
+          i18n: 'menu.scalistDetail',
+          name: i18n.t('menu.vulnDetail'),
+        },
+        component: () => import('@/views/sca/ScaDialog.vue'),
+      },
     ],
   },
   {
@@ -561,6 +570,15 @@ const adminRoutes: Array<RouteConfig> = [
         },
         component: () => import('@/views/sca/ScaList.vue'),
       },
+      {
+        path: 'scalistDetail/:page/:id',
+        name: 'scalistDetail/:page/:id',
+        meta: {
+          i18n: 'menu.scalistDetail',
+          name: i18n.t('menu.vulnDetail'),
+        },
+        component: () => import('@/views/sca/ScaDialog.vue'),
+      },
     ],
   },
   {
@@ -965,6 +983,15 @@ const userRoutes: Array<RouteConfig> = [
         },
         component: () => import('@/views/sca/ScaList.vue'),
       },
+      {
+        path: 'scalistDetail/:page/:id',
+        name: 'scalistDetail/:page/:id',
+        meta: {
+          i18n: 'menu.scalistDetail',
+          name: i18n.t('menu.scalistDetail'),
+        },
+        component: () => import('@/views/sca/ScaDialog.vue'),
+      },
     ],
   },
   {

src/services/project.ts

@@ -7,14 +7,6 @@ interface ProjectListParams {
   name: string
 }
 
-interface ProjectAddParams {
-  pid?: number | string
-  name: string
-  mode: string
-  agent_ids: string
-  scan_id: number
-}
-
 export default () =>
   new (class {
     // 项目列表
@@ -43,7 +35,7 @@ export default () =>
     }
 
     //新增项目 编辑
-    projectAdd(params: ProjectAddParams): Promise<iResponse> {
+    projectAdd(params: any): Promise<iResponse> {
       return request.post('/project/add', params)
     }
 

src/services/sca.ts

@@ -29,29 +29,81 @@ export default () =>
       })
     }
 
-    assetVuls(aggr_id: any): Promise<iResponse> {
-      return request.get('/asset_vuls/' + aggr_id, {
-        baseURL: '/openapi/sca/v1',
-      })
+    assetVuls(row: any): Promise<iResponse> {
+      return request.get(
+        `/package_vuls/${row.language_id}/${row.package_name}/${row.package_version}?page=${row.page}&page_size=${row.page_size}`,
+        {
+          baseURL: '/api/sca/v2',
+        }
+      )
     }
 
-    assetProjects(aggr_id: any): Promise<iResponse> {
-      return request.get('/asset_projects/' + aggr_id, {
-        baseURL: '/openapi/sca/v1',
+    assetProjects(row: any): Promise<iResponse> {
+      if (row.project_id) {
+        return request.get(
+          `/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}`,
+          {
+            baseURL: '/api/sca/v2',
+          }
+        )
+      }
+      return request.get(
+        `/package/${row.language_id}/${row.package_name}/${row.package_version}/relation_projects?page=${row.page}&page_size=${row.page_size}`,
+        {
+          baseURL: '/api/sca/v2',
+        }
+      )
+    }
+    assetProjectId(row: any): Promise<iResponse> {
+      return request.get(
+        `/package/${row.language_id}/${row.package_name}/${row.package_version}/relation_project/${row.project_id}`,
+        {
+          baseURL: '/api/sca/v2',
+        }
+      )
+    }
+    vulPackId(row: any): Promise<iResponse> {
+      return request.get(`/package_vul/${row.vul_id}`, {
+        baseURL: '/api/sca/v2',
       })
     }
-    // scaList
+    // scaList /api/sca/v2/package
+    // scaList(data: any): Promise<iResponse> {
+    //   return request.post('/scas', data)
+    // }
     scaList(data: any): Promise<iResponse> {
-      return request.post('/scas', data)
+      return request.post('/package/', data, {
+        baseURL: '/api/sca/v2',
+      })
     }
 
     // scaSummary
+    // scaSummary(data: any): Promise<iResponse> {
+    //   return request.post('/sca/summary', data)
+    // }
     scaSummary(data: any): Promise<iResponse> {
-      return request.post('/sca/summary', data)
+      if (data.project_id) {
+        return request.get(
+          `/package_summary?project_id=${data.project_id}&project_version_id=${data.version_id}&keyword=${data.keyword}`,
+          {
+            baseURL: '/api/sca/v2',
+            // baseURL: '/openapi/sca/v2',
+          }
+        )
+      }
+      return request.get(`/package_summary?keyword=${data.keyword}`, {
+        baseURL: '/api/sca/v2',
+        // baseURL: '/openapi/sca/v2',
+      })
     }
 
     // getScaDetail
-    getScaDetail(id: number): Promise<iResponse> {
-      return request.get(`/sca/${id}`)
+    getScaDetail(row: any): Promise<iResponse> {
+      return request.get(
+        `/package/${row.language_id}/${row.package_name}/${row.package_version}/detail`,
+        {
+          baseURL: '/api/sca/v2',
+        }
+      )
     }
   })()