From f2bfba6946797abc74b948c4992b1533cbf77b1a Mon Sep 17 00:00:00 2001 From: sekhara-madduru <123759301+sekhara-madduru@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:25:49 +0530 Subject: [PATCH 1/5] DTECSCSAO-4805 GHAS integration: Code scanning & Dependency review --- .github/workflows/security.code-scanning.yml | 12 ++++++++++++ .github/workflows/security.dependency-review.yml | 10 ++++++++++ 2 files changed, 22 insertions(+) create mode 100644 .github/workflows/security.code-scanning.yml create mode 100644 .github/workflows/security.dependency-review.yml diff --git a/.github/workflows/security.code-scanning.yml b/.github/workflows/security.code-scanning.yml new file mode 100644 index 0000000..b9cab3f --- /dev/null +++ b/.github/workflows/security.code-scanning.yml @@ -0,0 +1,12 @@ +name: CodeQL + +on: + pull_request: + branches: [ main ] + push: + branches: [ main ] + workflow_dispatch: + +jobs: + codeql-python: + uses: chargehound/security-workflows/.github/workflows/codeql-python.yml@main \ No newline at end of file diff --git a/.github/workflows/security.dependency-review.yml b/.github/workflows/security.dependency-review.yml new file mode 100644 index 0000000..70192da --- /dev/null +++ b/.github/workflows/security.dependency-review.yml @@ -0,0 +1,10 @@ +name: Dependency Review + +on: + pull_request: + branches: [ main ] + workflow_dispatch: + +jobs: + dependency-review: + uses: chargehound/security-workflows/.github/workflows/dependency-review.yml@main \ No newline at end of file From 6f7a82e73036277fe75f719908492cfcc15a9a92 Mon Sep 17 00:00:00 2001 From: sekhara-madduru <123759301+sekhara-madduru@users.noreply.github.com> Date: Wed, 5 Feb 2025 21:11:23 +0530 Subject: [PATCH 2/5] enable only codeql --- .github/workflows/security.code-scanning.yml | 100 ++++++++++++++++-- .../workflows/security.dependency-review.yml | 10 -- 2 files changed, 93 insertions(+), 17 deletions(-) delete mode 100644 .github/workflows/security.dependency-review.yml diff --git a/.github/workflows/security.code-scanning.yml b/.github/workflows/security.code-scanning.yml index b9cab3f..5517ce3 100644 --- a/.github/workflows/security.code-scanning.yml +++ b/.github/workflows/security.code-scanning.yml @@ -1,12 +1,98 @@ -name: CodeQL +# 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: - pull_request: - branches: [ main ] push: - branches: [ main ] - workflow_dispatch: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + schedule: + - cron: '18 14 * * 5' jobs: - codeql-python: - uses: chargehound/security-workflows/.github/workflows/codeql-python.yml@main \ No newline at end of file + 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' }} + 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 + + strategy: + fail-fast: false + matrix: + include: + - language: python + build-mode: none + # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', '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 + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # 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 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + 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. + + # 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 + - 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@v3 + with: + category: "/language:${{matrix.language}}" diff --git a/.github/workflows/security.dependency-review.yml b/.github/workflows/security.dependency-review.yml deleted file mode 100644 index 70192da..0000000 --- a/.github/workflows/security.dependency-review.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Dependency Review - -on: - pull_request: - branches: [ main ] - workflow_dispatch: - -jobs: - dependency-review: - uses: chargehound/security-workflows/.github/workflows/dependency-review.yml@main \ No newline at end of file From b5642a135919f54c2cbb7cbed993ab4279d3f0e4 Mon Sep 17 00:00:00 2001 From: sekhara-madduru <123759301+sekhara-madduru@users.noreply.github.com> Date: Thu, 13 Feb 2025 10:41:00 +0530 Subject: [PATCH 3/5] using re-usable flows --- .github/workflows/security.code-scanning.yml | 102 ++---------------- .../workflows/security.dependency-review.yml | 10 ++ 2 files changed, 19 insertions(+), 93 deletions(-) create mode 100644 .github/workflows/security.dependency-review.yml diff --git a/.github/workflows/security.code-scanning.yml b/.github/workflows/security.code-scanning.yml index 5517ce3..d9db1d8 100644 --- a/.github/workflows/security.code-scanning.yml +++ b/.github/workflows/security.code-scanning.yml @@ -1,98 +1,14 @@ -# 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" +name: CodeQL on: - push: - branches: [ "main" ] pull_request: - branches: [ "main" ] - schedule: - - cron: '18 14 * * 5' + branches: [ main ] + push: + branches: [ main ] + workflow_dispatch: 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' }} - 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 - - strategy: - fail-fast: false - matrix: - include: - - language: python - build-mode: none - # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', '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 - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # 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 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - 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. - - # 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 - - 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@v3 - with: - category: "/language:${{matrix.language}}" + codeql-python: + uses: chargehound/security-workflows-public/.github/workflows/codeql-python.yml@main + codeql-javascript: + uses: chargehound/security-workflows-public/.github/workflows/codeql-javascript.yml@main \ No newline at end of file diff --git a/.github/workflows/security.dependency-review.yml b/.github/workflows/security.dependency-review.yml new file mode 100644 index 0000000..05e828e --- /dev/null +++ b/.github/workflows/security.dependency-review.yml @@ -0,0 +1,10 @@ +name: Dependency Review + +on: + pull_request: + branches: [ main ] + workflow_dispatch: + +jobs: + dependency-review: + uses: chargehound/security-workflows-public/.github/workflows/dependency-review.yml@main \ No newline at end of file From c851cf97d363e6ccd5fddd9ab0dd623c15d50041 Mon Sep 17 00:00:00 2001 From: sekhara-madduru <123759301+sekhara-madduru@users.noreply.github.com> Date: Thu, 13 Feb 2025 10:41:53 +0530 Subject: [PATCH 4/5] updated using shared flows --- .github/workflows/security.code-scanning.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/security.code-scanning.yml b/.github/workflows/security.code-scanning.yml index d9db1d8..b3a34e9 100644 --- a/.github/workflows/security.code-scanning.yml +++ b/.github/workflows/security.code-scanning.yml @@ -9,6 +9,4 @@ on: jobs: codeql-python: - uses: chargehound/security-workflows-public/.github/workflows/codeql-python.yml@main - codeql-javascript: - uses: chargehound/security-workflows-public/.github/workflows/codeql-javascript.yml@main \ No newline at end of file + uses: chargehound/security-workflows-public/.github/workflows/codeql-python.yml@main \ No newline at end of file From 4ef0e4f9481cbd048c4b3b7ded0b150b46bcd539 Mon Sep 17 00:00:00 2001 From: sekhara-madduru <123759301+sekhara-madduru@users.noreply.github.com> Date: Thu, 15 May 2025 12:20:05 +0530 Subject: [PATCH 5/5] dd integrate --- .github/workflows/security.code-scanning.yml | 4 +++- .github/workflows/security.dependency-review.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/security.code-scanning.yml b/.github/workflows/security.code-scanning.yml index b3a34e9..554e09a 100644 --- a/.github/workflows/security.code-scanning.yml +++ b/.github/workflows/security.code-scanning.yml @@ -9,4 +9,6 @@ on: jobs: codeql-python: - uses: chargehound/security-workflows-public/.github/workflows/codeql-python.yml@main \ No newline at end of file + uses: chargehound/security-workflows-public/.github/workflows/codeql-python.yml@main + secrets: + DATADOG_API_KEY: ${{ secrets.DATADOG_PAYPAL_QA_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/security.dependency-review.yml b/.github/workflows/security.dependency-review.yml index 05e828e..5f2806a 100644 --- a/.github/workflows/security.dependency-review.yml +++ b/.github/workflows/security.dependency-review.yml @@ -7,4 +7,6 @@ on: jobs: dependency-review: - uses: chargehound/security-workflows-public/.github/workflows/dependency-review.yml@main \ No newline at end of file + uses: chargehound/security-workflows-public/.github/workflows/dependency-review.yml@main + secrets: + DATADOG_API_KEY: ${{ secrets.DATADOG_PAYPAL_QA_TOKEN }} \ No newline at end of file