Merge pull request #1336 from HXSecurity/develop

feat: add beta、develop
HXSecurity · Mar 15, 2023 · 1af9e5b · 1af9e5b
2 parents 1cf5d79 + 9a1f8eb
commit 1af9e5b
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 10 deletions.
diff --git a/.github/workflows/deploy-dev.yaml b/.github/workflows/deploy-dev.yaml
@@ -5,7 +5,15 @@ on:
     branches:
       - main
       - beta
+      - develop
   workflow_dispatch:
+    inputs:
+      agent_version:
+        required: true
+        type: string
+      server_version:
+        required: true
+        type: string
 
 jobs:
   Deploy-to-dev:
@@ -17,7 +25,13 @@ jobs:
         python-version: [3.7]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Checkout
+        if: ${{ inputs.server_version }}
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.server_version }}
 
       - name: Get the release version
         id: version
@@ -48,11 +62,18 @@ jobs:
           access-key-id: ${{ secrets.CHART_OSS_ACCESS_KEY_ID }}
           access-key-secret: ${{ secrets.CHART_OSS_ACCESS_KEY_SECRET }}
 
-      - name: Download Agent
+      - name: Download Agent dev
+        if: ${{ steps.version.outputs.GITHUB_REF }} == develop || ${{ steps.version.outputs.GITHUB_REF }} == beta || ${{ steps.version.outputs.GITHUB_REF }} == main
         run: |
-          ossutil cp oss://dongtai-helm-charts/agent_test/java/latest/ ./ --include "*.jar" -r
-          ossutil cp oss://dongtai-helm-charts/agent_test/python/ ./  --include "*.tar.gz" -r
-          
+          if [ ${{ steps.version.outputs.GITHUB_REF }} = develop ] ; then ossutil cp oss://dongtai-helm-charts/agent_test/java/latest/ ./ --include "*.jar" -r
+          else  ossutil cp oss://dongtai-helm-charts/agent_${{ steps.version.outputs.GITHUB_REF }}/java/latest/ ./ --include "*.jar" -r
+          fi
+
+      - name: Download Agent  ${{ inputs.agent_version }}
+        if: ${{ inputs.agent_version }}
+        run: |
+          ossutil cp oss://dongtai/agent/java/${{ inputs.agent_version }}/ ./ --include "*.jar" -r
+
       - name: Generate version file
         run: |
           echo "REPLACE INTO project_version_control (version, component_name, component_version_hash) VALUES('${{ github.run_number }}.0.0', '${{ github.event.repository.name }}', '${GITHUB_SHA}');" >> ./deploy/docker/version.sql
@@ -75,6 +96,8 @@ jobs:
           KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_TEST_DATA }}
         with:
           args: |
-            if [ ${{ steps.version.outputs.GITHUB_REF }} = main ] ; then echo not equal;else find .github/deploy/deploy-dongtai-server-test.yml -type f -exec sed -i 's/iast-test/iast-beta/g' {} \; ;fi
+            if [ ${{ steps.version.outputs.GITHUB_REF }} = beta ] ; then find .github/deploy/deploy-dongtai-server-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 .github/deploy/deploy-dongtai-server-test.yml -type f -exec sed -i 's/iast-test/iast-main/g' {} \; ;fi
             find .github/deploy/deploy-dongtai-server-test.yml -type f -exec sed -i 's/VERSION/1.0.${{github.run_number}}-${{ steps.version.outputs.GITHUB_REF }}/g' {} \;
             ls .github/deploy/deploy-dongtai-server-test.yml | xargs -I {} kubectl apply -f {}
diff --git a/.github/workflows/teststate.yml b/.github/workflows/teststate.yml
@@ -8,7 +8,7 @@ on:
       - '*'
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main]
+    branches: [main, develop]
   schedule:
     - cron: '0 0 * * *'
 

diff --git a/dongtai_protocol/views/agent_download.py b/dongtai_protocol/views/agent_download.py
@@ -123,7 +123,9 @@ def create_config(self, base_url, agent_token, auth_token, project_name, **kwarg
                 shutil.copyfile(self.original_agent_file, f"{user_file}.bak")
 
             agent_file = tarfile.open(user_file)
-            agent_file.extractall(path=self.target_path)
+            agent_file.extractall(
+                path=self.target_path, members=lambda memberz: memberz
+            )  # trust upstream package until upstream provide file list to validate.
             names = agent_file.getnames()
             self.target_source_path = f"{self.target_path}/{names[0]}"
             config_path = ""
@@ -192,7 +194,9 @@ def create_config(self, base_url, agent_token, auth_token, project_name, **kwarg
                 shutil.copyfile(self.original_agent_file, f"{user_file}.bak")
 
             agent_file = tarfile.open(user_file)
-            agent_file.extractall(path=self.target_path)
+            agent_file.extractall(
+                path=self.target_path, members=lambda memberz: memberz
+            )  # trust upstream package until upstream provide file list to validate.
             agent_file.close()
 
             config_lines = []
@@ -280,7 +284,9 @@ def is_tar_file(file):
         tmp_path = f"/tmp/.dongtai_agent_test/{time.time_ns()}"
         try:
             agent_file = tarfile.open(file)
-            agent_file.extractall(path=tmp_path)
+            agent_file.extractall(
+                path=tmp_path, members=lambda memberz: memberz
+            )  # trust upstream package until upstream provide file list to validate.
         except tarfile.ReadError:
             return False
         except Exception as e: