From b47d836c4c28479055bcc9a86655dc27d06ca46a Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Sun, 24 May 2026 15:16:54 +0200 Subject: [PATCH] ci: adapt codeql.yml and remove duplicate job from security.yml codeql.yml (GitHub's Advanced Setup template) adapted for this repo: - Pin action SHAs (checkout v6.0.2, codeql-action v4.36.0) - Drop python from the language matrix (no Python in this repo) - Add conditional libpcap install for the Go matrix entry (gopacket requires libpcap-dev; autobuild fails without it) - Wire in .github/codeql-config.yml for Go (path filters, query selection); other languages get an empty config-file value - Remove boilerplate template comments and the unused manual-build step - Fix runner expression (no swift, so the macos-latest conditional is unnecessary; always ubuntu-latest) security.yml: - Remove codeql-analysis job (now handled by codeql.yml) - Drop codeql-analysis from security-summary needs, summary echo, and fail condition Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/codeql.yml | 101 ++++++++------------------------- .github/workflows/security.yml | 39 +------------ 2 files changed, 25 insertions(+), 115 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e1b43c6..e73e3c6 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -1,14 +1,3 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# name: "CodeQL Advanced" on: @@ -22,20 +11,10 @@ on: jobs: analyze: name: Analyze (${{ matrix.language }}) - # Runner size impacts CodeQL analysis time. To learn more, please see: - # - https://gh.io/recommended-hardware-resources-for-running-codeql - # - https://gh.io/supported-runners-and-hardware-resources - # - https://gh.io/using-larger-runners (GitHub.com only) - # Consider using larger runners or machines with greater resources for possible analysis time improvements. - runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + runs-on: ubuntu-latest permissions: - # required for all workflows security-events: write - - # required to fetch internal or private CodeQL packs packages: read - - # only required for workflows in private repositories actions: read contents: read @@ -43,63 +22,29 @@ jobs: fail-fast: false matrix: include: - - language: actions - build-mode: none - - language: go - build-mode: autobuild - - language: javascript-typescript - build-mode: none - - language: python - build-mode: none - # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift' - # Use `c-cpp` to analyze code written in C, C++ or both - # Use 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, - # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. - # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how - # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + - language: actions + build-mode: none + - language: go + build-mode: autobuild + - language: javascript-typescript + build-mode: none + steps: - - name: Checkout repository - uses: actions/checkout@v4 + - name: Checkout repository + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - # Add any setup steps before running the `github/codeql-action/init` action. - # This includes steps like installing compilers or runtimes (`actions/setup-node` - # or others). This is typically only required for manual builds. - # - name: Setup runtime (example) - # uses: actions/setup-example@v1 + - name: Install libpcap (required for Go build) + if: matrix.language == 'go' + run: sudo apt-get install -y libpcap-dev - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v4 - with: - languages: ${{ matrix.language }} - build-mode: ${{ matrix.build-mode }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. + - name: Initialize CodeQL + uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + config-file: ${{ matrix.language == 'go' && './.github/codeql-config.yml' || '' }} - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - # If the analyze step fails for one of the languages you are analyzing with - # "We were unable to automatically build your code", modify the matrix above - # to set the build mode to "manual" for that language. Then modify this step - # to build your code. - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - name: Run manual build steps - if: matrix.build-mode == 'manual' - shell: bash - run: | - echo 'If you are using a "manual" build mode for one or more of the' \ - 'languages you are analyzing, replace this with the commands to build' \ - 'your code, for example:' - echo ' make bootstrap' - echo ' make release' - exit 1 - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4 - with: - category: "/language:${{matrix.language}}" + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0 + with: + category: "/language:${{ matrix.language }}" diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index 63b8be3..ac8e24f 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -83,35 +83,6 @@ jobs: sarif_file: semgrep.sarif continue-on-error: true - codeql-analysis: - name: CodeQL Analysis - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - - steps: - - name: Checkout code - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - - - name: Install libpcap - run: sudo apt-get install -y libpcap-dev - - - name: Initialize CodeQL - uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0 - with: - languages: go - config-file: ./.github/codeql-config.yml - - - name: Autobuild - uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0 - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0 - with: - category: "/language:go" - dependency-review: name: Dependency Review runs-on: ubuntu-latest @@ -133,7 +104,7 @@ jobs: security-summary: name: Security Summary runs-on: ubuntu-latest - needs: [vulnerability-scan, static-analysis, codeql-analysis] + needs: [vulnerability-scan, static-analysis] if: always() permissions: contents: read @@ -156,17 +127,11 @@ jobs: echo "❌ **Static Analysis**: FAILED" >> $GITHUB_STEP_SUMMARY fi - if [[ "${{ needs.codeql-analysis.result }}" == "success" ]]; then - echo "✅ **CodeQL Analysis**: PASSED" >> $GITHUB_STEP_SUMMARY - else - echo "❌ **CodeQL Analysis**: FAILED" >> $GITHUB_STEP_SUMMARY - fi - echo "" >> $GITHUB_STEP_SUMMARY echo "For detailed results, check the individual job logs above." >> $GITHUB_STEP_SUMMARY - name: Fail on security issues - if: needs.vulnerability-scan.result == 'failure' || needs.static-analysis.result == 'failure' || needs.codeql-analysis.result == 'failure' + if: needs.vulnerability-scan.result == 'failure' || needs.static-analysis.result == 'failure' run: | echo "Security scan detected issues. Please review the results above." exit 1