From cdc65d1a69be1e115ec07c0724615664dcce08ee Mon Sep 17 00:00:00 2001 From: Dylan <dylanbthomas@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:28:34 -0400 Subject: [PATCH] Update fortify.yml Use new Fortify GitHub Action --- .github/workflows/fortify.yml | 49 ++++++++++------------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/.github/workflows/fortify.yml b/.github/workflows/fortify.yml index ae910d34..8c30ff71 100644 --- a/.github/workflows/fortify.yml +++ b/.github/workflows/fortify.yml @@ -41,39 +41,18 @@ jobs: java-version: 11 distribution: 'temurin' - # Prepare source+dependencies for upload. ScanCentral Client documentation is located at https://www.microfocus.com/documentation/fortify-software-security-center/ - - name: Download Fortify ScanCentral Client - uses: fortify/gha-setup-scancentral-client@v2 - - name: Package Code + Dependencies - run: scancentral package -oss -o package.zip - - # Start Fortify on Demand SAST scan and wait until results complete. For more information on FoDUploader commands, see https://github.com/fod-dev/fod-uploader-java - - name: Download Fortify on Demand Universal CI Tool - uses: fortify/gha-setup-fod-uploader@v1 - - name: Perform SAST Scan - run: java -jar $FOD_UPLOAD_JAR -z package.zip -aurl $FOD_API_URL -purl $FOD_URL -rid "$FOD_RELEASE_ID" -tc "$FOD_TENANT" -uc "$FOD_USER" "$FOD_PAT" $FOD_UPLOADER_OPTS -n "$FOD_UPLOADER_NOTES" - env: - FOD_URL: "https://ams.fortify.com/" - FOD_API_URL: "https://api.ams.fortify.com/" - FOD_TENANT: ${{ secrets.FOD_TENANT }} - FOD_USER: ${{ secrets.FOD_USER }} - FOD_PAT: ${{ secrets.FOD_PAT }} - FOD_RELEASE_ID: ${{ secrets.FOD_RELEASE_ID }} - FOD_UPLOADER_OPTS: "-ep 2 -pp 0 -I 1 -apf" - FOD_UPLOADER_NOTES: 'Triggered by GitHub Actions (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})' - - # Once scan completes, pull SAST issues from Fortify on Demand and generate SARIF output. - - name: Export results to GitHub-optimized SARIF - uses: fortify/gha-export-vulnerabilities@v1 + # Perform Fortify on Demand SAST + SCA scan and import SAST results into GitHub code scanning alerts + - name: Run FoD SAST Scan + uses: fortify/github-action@v1 with: - fod_base_url: "https://ams.fortify.com/" - fod_tenant: ${{ secrets.FOD_TENANT }} - fod_user: ${{ secrets.FOD_USER }} - fod_password: ${{ secrets.FOD_PAT }} - fod_release_id: ${{ secrets.FOD_RELEASE_ID }} - - # Import Fortify on Demand results to GitHub Security Code Scanning - - name: Import Results - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: ./gh-fortify-sast.sarif + sast-scan: true + env: + FOD_URL: https://ams.fortify.com + FOD_TENANT: ${{secrets.FOD_TENANT}} + FOD_USER: ${{secrets.FOD_USER}} + FOD_PASSWORD: ${{secrets.FOD_PAT}} + # EXTRA_FOD_LOGIN_OPTS: --socket-timeout=60s + FOD_RELEASE: ${{ secrets.FOD_RELEASE_ID }} + EXTRA_PACKAGE_OPTS: -oss + # DO_WAIT: true + DO_EXPORT: true