diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cadd6069a..84323e3bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -167,7 +167,7 @@ jobs: sudo apt-get install -y trivy - name: Run Trivy security scan - uses: aquasecurity/trivy-action@0.30.0 + uses: aquasecurity/trivy-action@0.35.0 with: scan-type: "fs" scan-ref: "build/distribution/extracted" @@ -184,7 +184,7 @@ jobs: sarif_file: "trivy-results.sarif" - name: Trivy security gate (block on HIGH/CRITICAL) - uses: aquasecurity/trivy-action@0.30.0 + uses: aquasecurity/trivy-action@0.35.0 with: scan-type: "fs" scan-ref: "build/distribution/extracted" @@ -194,7 +194,7 @@ jobs: skip-setup-trivy: true - name: Generate Trivy report (table format) - uses: aquasecurity/trivy-action@0.30.0 + uses: aquasecurity/trivy-action@0.35.0 if: always() with: scan-type: "fs" diff --git a/distribution/scripts/icp.bat b/distribution/scripts/icp.bat index 01f155f2d..22ce95396 100755 --- a/distribution/scripts/icp.bat +++ b/distribution/scripts/icp.bat @@ -41,14 +41,6 @@ if exist "!CONFIG_FILE!" ( ) ) -set WWW_CONFIG_FILE=!PARENT_DIR!\www\public\choreo.env.config.js -if exist "!WWW_CONFIG_FILE!" ( - powershell -Command "(Get-Content '!WWW_CONFIG_FILE!') -replace '\"SSO_ENABLED\": ''(true|false)''', '\"SSO_ENABLED\": ''!SSO_ENABLED!''' | Set-Content '!WWW_CONFIG_FILE!'" - echo SSO Configuration: Updated frontend config with SSO_ENABLED=!SSO_ENABLED! -) else ( - echo Warning: Frontend config file not found at !WWW_CONFIG_FILE! -) - if not exist "!CONFIG_FILE!" ( echo Warning: Configuration file not found at !CONFIG_FILE! echo Starting ICP Server without custom configuration... diff --git a/distribution/scripts/icp.sh b/distribution/scripts/icp.sh index cac207095..7fb301945 100755 --- a/distribution/scripts/icp.sh +++ b/distribution/scripts/icp.sh @@ -41,14 +41,6 @@ if [ -f "$CONFIG_FILE" ]; then fi fi -WWW_CONFIG_FILE="$PARENT_DIR/www/public/choreo.env.config.js" -if [ -f "$WWW_CONFIG_FILE" ]; then - sed -i.bak -E "s/\"SSO_ENABLED\": '(true|false)'/\"SSO_ENABLED\": '$SSO_ENABLED'/" "$WWW_CONFIG_FILE" - rm -f "$WWW_CONFIG_FILE.bak" # Remove backup file - echo "SSO Configuration: Updated frontend config with SSO_ENABLED=$SSO_ENABLED" -else - echo "Warning: Frontend config file not found at $WWW_CONFIG_FILE" -fi if [ ! -f "$CONFIG_FILE" ]; then echo "Warning: Configuration file not found at $CONFIG_FILE"