From b53f922bbf180d67961a7123d1d28e54cc250ffd Mon Sep 17 00:00:00 2001 From: Michael Mainer <8527305+MIchaelMainer@users.noreply.github.com> Date: Thu, 5 Oct 2023 14:07:16 -0700 Subject: [PATCH] chore: update branch protection rules, add codeql (#2792) * chore: remove jit config, not applicable to GHEC * chore: enable codeql * chore: update branch protection rules * set restrictsPushes to false --- .github/policies/jit.yml | 12 --- ...ft-graph-explorer-v4-branch-protection.yml | 5 +- .github/workflows/codeql.yml | 82 +++++++++++++++++++ 3 files changed, 85 insertions(+), 14 deletions(-) delete mode 100644 .github/policies/jit.yml create mode 100644 .github/workflows/codeql.yml diff --git a/.github/policies/jit.yml b/.github/policies/jit.yml deleted file mode 100644 index 1e9b51adb..000000000 --- a/.github/policies/jit.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: JIT_Access -description: Policy for admin JIT for microsoft-graph-explorer-v4 repo - -resource: repository - -configuration: - jitAccess: - enabled: true - maxHours: 2 - approvers: - requestors: - role: write \ No newline at end of file diff --git a/.github/policies/microsoft-graph-explorer-v4-branch-protection.yml b/.github/policies/microsoft-graph-explorer-v4-branch-protection.yml index ba9dc7074..e80103652 100644 --- a/.github/policies/microsoft-graph-explorer-v4-branch-protection.yml +++ b/.github/policies/microsoft-graph-explorer-v4-branch-protection.yml @@ -44,6 +44,7 @@ configuration: - Test (5) - Test (6) - Lint + - CodeQL # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean requiresStrictStatusChecks: true # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush. @@ -72,7 +73,7 @@ configuration: # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines. requiresCommitSignatures: false # Are conversations required to be resolved before merging? boolean - requiresConversationResolution: false + requiresConversationResolution: true # Are merge commits prohibited from being pushed to this branch. boolean requiresLinearHistory: false # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status @@ -80,7 +81,7 @@ configuration: # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean requiresStrictStatusChecks: true # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush. - restrictsPushes: true + restrictsPushes: false # Restrict who can dismiss pull request reviews. boolean restrictsReviewDismissals: false diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 000000000..8400ed1f8 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,82 @@ +# 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" + +on: + push: + branches: [ "dev", "master" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "dev" ] + schedule: + - cron: '1 * * * 1' # At minute 0 on Monday + +jobs: + analyze: + name: Analyze + # 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 + # Consider using larger runners for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'javascript' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ] + # Use only 'java' to analyze code written in Java, Kotlin or both + # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # 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 + + + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹī¸ 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 the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:${{matrix.language}}"