Merge pull request #386 from PerimeterX/release/v6.13.0

Release/v6.13.0 --> master
PerimeterX · Mar 27, 2024 · c48c451 · c48c451
2 parents 5d7d180 + 4d27af6
commit c48c451
Show file tree

Hide file tree

Showing 12 changed files with 178 additions and 220 deletions.
diff --git a/.github/workflows/fuzzer.yaml b/.github/workflows/fuzzer.yaml
@@ -0,0 +1,152 @@
+name: Fuzzing Test
+
+on:
+  pull_request
+
+jobs:
+
+  extract_version:
+    runs-on: ubuntu-latest
+    name: Extract release version
+    outputs:
+      supported-features: ${{ steps.version.outputs.value }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'latest'
+      - name: Get package version
+        id: version
+        run: echo "value=$(node -p -e "require('./px_metadata.json').version")" >> "$GITHUB_OUTPUT"
+
+
+  Fuzzing:
+    name: "Fuzzing Test"
+    env:
+      MOCK_COLLECTOR_IMAGE_TAG: 1.3.6
+      FUZZER_TAG: 1.0.3
+      SAMPLE_SITE_IMAGE_TAG: 1.0.0
+      ENFORCER_TAG: ${{ needs.extract_version.outputs.version }}
+
+    strategy:
+      matrix:
+        mode: [ "url", "first_party", "headers", "cookies", "user_agent" ]
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    needs:
+      - extract_version
+
+    steps:
+
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build local cluster
+        run: ./ci_files/build_cluster.sh
+
+      - name: Build Enforcer Docker image
+        run: |
+          docker build . -t localhost:5001/java-enforcer-sample-site:$SAMPLE_SITE_IMAGE_TAG && \
+          docker push localhost:5001/java-enforcer-sample-site:$SAMPLE_SITE_IMAGE_TAG
+
+      - uses: azure/setup-helm@v3
+        with:
+          version: '3.14.2'
+
+      - name: Clone helm charts repo - mock-collector
+        uses: actions/checkout@v4
+        with:
+          repository: PerimeterX/connect-helm-charts
+          token: ${{ secrets.CONNECT_PULL_TOKEN }}
+          ref: mock-collector-0.1.1
+          path: ./deploy_charts/mock-collector
+
+      - name: Clone helm charts repo - fuzzer
+        uses: actions/checkout@v4
+        with:
+          repository: PerimeterX/connect-helm-charts
+          token: ${{ secrets.CONNECT_PULL_TOKEN }}
+          ref: fuzzer-0.2.0
+          path: ./deploy_charts/fuzzer
+
+      - name: Clone helm charts repo - sample-site
+        uses: actions/checkout@v4
+        with:
+          repository: PerimeterX/connect-helm-charts
+          token: ${{ secrets.CONNECT_PULL_TOKEN }}
+          ref: sample-site-0.5.0
+          path: ./deploy_charts/sample-site
+
+      - name: Set up Google Cloud SDK
+        id: 'auth'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          credentials_json: '${{ secrets.GCR_SA_KEY }}'
+
+      - name: Configure Docker credentials
+        run: |
+          gcloud auth configure-docker gcr.io
+
+      - name: pull mock collector image
+        run: |
+          docker pull gcr.io/px-docker-repo/connecteam/mock-collector:$MOCK_COLLECTOR_IMAGE_TAG && \
+          docker tag gcr.io/px-docker-repo/connecteam/mock-collector:$MOCK_COLLECTOR_IMAGE_TAG localhost:5001/mock-collector:$MOCK_COLLECTOR_IMAGE_TAG && \
+          docker push localhost:5001/mock-collector:$MOCK_COLLECTOR_IMAGE_TAG
+
+      - name: deploy mock collector
+        run: |
+          helm install mock-collector ./deploy_charts/mock-collector/charts/mock-collector \
+            --set image.repository=localhost:5001/mock-collector \
+            --set image.tag=$MOCK_COLLECTOR_IMAGE_TAG \
+            --set imagePullPolicy=Always --wait
+
+      - name: set secrets in enforcer config
+        run: |
+          cat ./ci_files/enforcer-config.json |\
+          jq '.px_app_id="${{ secrets.PX_APP_ID }}"' |\
+          jq '.px_cookie_secret="${{ secrets.TEST_COOKIE_SECRET }}"' |\
+          jq '.px_auth_token="${{ secrets.PX_AUTH_TOKEN }}"' > /tmp/enforcer-config.json
+
+      - name: log enforcer config
+        run: cat /tmp/enforcer-config.json
+
+      - name: deploy java enforcer
+        run: |
+          helm install java-enforcer ./deploy_charts/sample-site/charts/sample-site \
+          -f ./ci_files/enforcer-values.yaml \
+          --set image.name=localhost:5001/java-enforcer-sample-site \
+          --set image.tag=$SAMPLE_SITE_IMAGE_TAG \
+          --set-file enforcerConfig.content=/tmp/enforcer-config.json \
+          --wait
+
+      - name: pull fuzzer image
+        run: |
+          docker pull gcr.io/px-docker-repo/connecteam/connect-enforcer-fuzzer:$FUZZER_TAG && \
+          docker tag gcr.io/px-docker-repo/connecteam/connect-enforcer-fuzzer:$FUZZER_TAG localhost:5001/connect-enforcer-fuzzer:$FUZZER_TAG && \
+          docker push localhost:5001/connect-enforcer-fuzzer:$FUZZER_TAG
+
+      - name: run fuzzer
+        run: |
+          helm install fuzzer ./deploy_charts/fuzzer/charts/fuzzer \
+            --set image.repository=localhost:5001/connect-enforcer-fuzzer \
+            --set image.tag=$FUZZER_TAG \
+            --set appId=$PX_APP_ID \
+            --set mode=$FUZZ_MODE \
+            --set siteURL=$SITE_URL \
+            --wait \
+            --timeout 60m0s \
+            --wait-for-jobs
+        env:
+          FUZZ_MODE: ${{ matrix.mode }}
+          PX_APP_ID: ${{ secrets.PX_APP_ID }}
+          SITE_URL: "http://java-enforcer-sample-site:3000"
+
+      - name: get tests results
+        if: ${{ always() }}
+        run: kubectl logs job/fuzzer-enforcer-fuzzer
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## [v6.13.0](https://github.com/PerimeterX/perimeterx-java-sdk/compare/6.13.0...HEAD) (2024-04-27)
+- Added vid Validation for _pxvid extraction
+- Added Enforcer Fuzzer as part of the CI process
+- Updated log4j artifact version
+- Removed `/examples` directory 
+
 ## [v6.12.0](https://github.com/PerimeterX/perimeterx-java-sdk/compare/6.12.0...HEAD) (2024-02-25)
 - Added Dockerfile for web application example. 
 - Bugfix - Sensitive headers are now case-insensitive.

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 # [PerimeterX](http://www.perimeterx.com) Java SDK
 
-> Latest stable version: [v6.12.0](https://search.maven.org/#artifactdetails%7Ccom.perimeterx%7Cperimeterx-sdk%7C6.12.0%7Cjar)
+> Latest stable version: [v6.13.0](https://search.maven.org/#artifactdetails%7Ccom.perimeterx%7Cperimeterx-sdk%7C6.13.0%7Cjar)
 
 ## Table of Contents
 

diff --git a/examples/pom.xml b/examples/pom.xml
diff --git a/examples/src/main/java/Application.java b/examples/src/main/java/Application.java
diff --git a/examples/src/main/java/controllers/ExampleController.java b/examples/src/main/java/controllers/ExampleController.java
diff --git a/examples/src/main/java/filters/PXFilter.java b/examples/src/main/java/filters/PXFilter.java
diff --git a/examples/src/main/java/px/CustomBlockHandler.java b/examples/src/main/java/px/CustomBlockHandler.java
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <name>PerimeterX JAVA SDK</name>
     <groupId>com.perimeterx</groupId>
     <artifactId>perimeterx-sdk</artifactId>
-    <version>6.12.0</version>
+    <version>6.13.0</version>
 
     <packaging>jar</packaging>
     <description>PerimeterX Java SDK</description>