Merge branch 'refs/heads/main' into feat/async-environment-clone

# Conflicts:
#	api/environments/serializers.py

.github/actions/trivy-scan-image/action.yml

@@ -0,0 +1,77 @@
+# Required permissions:
+#   contents: read
+#   security-events: write
+
+name: Run Trivy vulnerability scanner
+description: Run Trivy vulnerability scanner on an image and upload the results
+
+inputs:
+  image-tag:
+    description: Full image ref (e.g. `ghcr.io/flagsmith/flagsmith:main`).
+    required: true
+  category:
+    description: CodeQL category (usually image name, e.g. `flagsmith-api`).
+    required: true
+  query:
+    description: CodeQL query (used for report URLs).
+    required: false
+  trivy-username:
+    description: TRIVY_USERNAME value.
+    required: false
+  trivy-password:
+    description: TRIVY_PASSWORD value.
+    required: false
+  trivy-db-repository:
+    description: TRIVY_DB_REPOSITORY value.
+    required: false
+  trivy-java-db-repository:
+    description: TRIVY_JAVA_DB_REPOSITORY value.
+    required: false
+
+outputs:
+  scan-results-url:
+    description: URL to scan results in Github Security tab
+    value: ${{ steps.scan-results-url.outputs.scan-results-url }}
+  scan-outcome:
+    description: Scan outcome
+    value: ${{ steps.trivy.outcome }}
+
+runs:
+  using: composite
+
+  steps:
+    - name: Checkout trivy.yaml
+      uses: actions/checkout@v4
+      with:
+        sparse-checkout: |
+          trivy.yaml
+          .github*
+        sparse-checkout-cone-mode: false
+
+    - name: Run Trivy on ${{ inputs.image-tag }}
+      id: trivy
+      uses: aquasecurity/trivy-action@master
+      with:
+        image-ref: ${{ inputs.image-tag }}
+        format: sarif
+        output: trivy-results.sarif
+      env:
+        TRIVY_USERNAME: ${{ inputs.trivy-username }}
+        TRIVY_PASSWORD: ${{ inputs.trivy-password }}
+        TRIVY_DB_REPOSITORY: ${{ inputs.trivy-db-repository }}
+        TRIVY_JAVA_DB_REPOSITORY: ${{ inputs.trivy-java-db-repository }}
+
+    - name: Upload Trivy scan results to GitHub Security tab
+      uses: github/codeql-action/upload-sarif@v3
+      if: success() || failure()
+      with:
+        category: ${{ inputs.category }}
+        sarif_file: trivy-results.sarif
+
+    - name: Render scan results URL
+      if: success() || failure()
+      id: scan-results-url
+      run: >
+        echo scan-results-url=${{ format('{0}/{1}/security/code-scanning?query=is:open+tool:Trivy+{2}',
+        github.server_url, github.repository, inputs.query) }} >> $GITHUB_OUTPUT
+      shell: bash

.github/workflows/.reusable-docker-build.yml

@@ -50,6 +50,15 @@ on:
         description: Whether to update the build status in a PR comment
         required: false
         default: false
+      trivy-db-repository:
+        type: string
+        description: Trivy Database OCI specifier
+        required: false
+        default: ghcr.io/flagsmith/trivy-db:latest
+      trivy-java-db-repository:
+        type: string
+        description: Trivy Java Database OCI specifier
+        default: ghcr.io/flagsmith/trivy-java-db:latest
     outputs:
       image:
         description: Resulting image specifier
@@ -137,32 +146,21 @@ jobs:
           build-status: 'Finished :white_check_mark:'
           security-report-status: 'Skipped'
 
-      - name: Run Trivy vulnerability scanner
+      - name: Scan ${{ steps.image-tag.outputs.image-tag }} image
         id: trivy
+        uses: ./.github/actions/trivy-scan-image
         if: inputs.scan
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: ${{ steps.image-tag.outputs.image-tag }}
-          format: sarif
-          output: trivy-results.sarif
-        env:
-          TRIVY_USERNAME: ${{ inputs.ephemeral && 'x-token' || github.actor }}
-          TRIVY_PASSWORD: ${{ inputs.ephemeral && steps.depot-token.outputs.depot-token || secrets.GITHUB_TOKEN }}
-
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v2
-        if: inputs.scan && (success() || failure())
         with:
+          image-tag: ${{ steps.image-tag.outputs.image-tag }}
           category: ${{ inputs.image-name }}
-          sarif_file: trivy-results.sarif
-
-      - name: Render scan results URL
-        id: scan-results-url
-        if: inputs.scan
-        run: >
-          echo scan-results-url=${{ format('{0}/{1}/security/code-scanning?query=pr%3A{2}+path%3Aflagsmith%2F{3}',
-          github.server_url, github.repository, github.event.pull_request.number, inputs.image-name) }} >>
-          $GITHUB_OUTPUT
+          # `query` value contained path:{image_name} before but not all Trivy findings
+          # conform to that. There's no category filter at the moment; for the time being,
+          # produce a shared report URL for all images.
+          query: ${{ format('pr:{0}', github.event.pull_request.number) }}
+          trivy-username: ${{ inputs.ephemeral && 'x-token' || github.actor }}
+          trivy-password: ${{ inputs.ephemeral && steps.depot-token.outputs.depot-token || secrets.GITHUB_TOKEN }}
+          trivy-db-repository: ${{ inputs.trivy-db-repository }}
+          trivy-java-db-repository: ${{ inputs.trivy-java-db-repository }}
 
       - name: Report scan results URL
         uses: ./.github/actions/docker-build-report-to-pr
@@ -171,4 +169,5 @@ jobs:
           image-tag: ${{ steps.image-tag.outputs.image-tag }}
           build-status: 'Finished :white_check_mark:'
           security-report-status:
-            "${{ format('[Results]({0}) :white_check_mark:', steps.scan-results-url.outputs.scan-results-url) }}"
+            "${{ format('[Results]({0}) {1}', steps.trivy.outputs.scan-results-url, steps.trivy.outputs.scan-outcome ==
+            'success' && ':white_check_mark:' || ':heavy_exclamation_mark:') }}"

.github/workflows/platform-docker-trivy-scan.yml

@@ -0,0 +1,112 @@
+name: Update Trivy Database and Scan
+
+on:
+  workflow_dispatch:
+    inputs:
+      registry-url:
+        type: string
+        description: Github Container Registry base URL
+        required: false
+        default: ghcr.io
+      trivy-db-repository-source:
+        type: string
+        description: Souce repository to pull Trivy database from
+        required: false
+        default: ghcr.io/aquasecurity/trivy-db:latest
+      trivy-java-db-repository-source:
+        type: string
+        description: Source repository to pull Trivy Java database from
+        required: false
+        default: ghcr.io/aquasecurity/trivy-java-db:1
+      trivy-db-repository:
+        type: string
+        description: Destination repository to store Trivy database in
+        required: false
+        default: ghcr.io/flagsmith/trivy-db:latest
+      trivy-java-db-repository:
+        type: string
+        description: Destination repository to store Trivy Java database in
+        default: ghcr.io/flagsmith/trivy-java-db:latest
+
+  schedule:
+    - cron: 11 */3 * * * # Runs at 11 minutes past the hour, every 3 hours
+
+# Inputs don't work for cron runs, define defaults as env
+env:
+  REGISTRY_URL: ${{ inputs.registry-url || 'ghcr.io' }}
+  TRIVY_DB_REPOSITORY_SOURCE:
+    ${{ github.event.inputs.trivy-db-repository-source || 'ghcr.io/aquasecurity/trivy-db:latest' }}
+  TRIVY_JAVA_DB_REPOSITORY_SOURCE:
+    ${{ github.event.inputs.trivy-java-db-repository-source || 'ghcr.io/aquasecurity/trivy-java-db:1' }}
+  TRIVY_DB_REPOSITORY: ${{ github.event.inputs.trivy-db-repository || 'ghcr.io/flagsmith/trivy-db:latest' }}
+  TRIVY_JAVA_DB_REPOSITORY:
+    ${{ github.event.inputs.trivy-java-db-repository || 'ghcr.io/flagsmith/trivy-java-db:latest' }}
+
+jobs:
+  pull-trivy-db:
+    name: Pull and republish Trivy databases
+    runs-on: ubuntu-latest
+
+    permissions:
+      packages: write
+
+    steps:
+      - name: Prepare oras CLI
+        uses: oras-project/setup-oras@v1
+
+      - name: Pull and republish Trivy databases
+        uses: nick-fields/retry@v3
+        with:
+          shell: bash
+          command: |
+            oras login -u ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} ${{ env.REGISTRY_URL }}
+            oras pull --no-tty $TRIVY_DB_REPOSITORY_SOURCE
+            oras pull --no-tty $TRIVY_JAVA_DB_REPOSITORY_SOURCE
+            oras push $TRIVY_DB_REPOSITORY db.tar.gz:$MIME_TYPE+gzip --artifact-type $MIME_TYPE+json
+            oras push $TRIVY_JAVA_DB_REPOSITORY javadb.tar.gz:$MIME_TYPE+gzip --artifact-type $MIME_TYPE+json
+          max_attempts: 5
+          retry_on: error
+          timeout_minutes: 20
+        env:
+          MIME_TYPE: application/vnd.aquasec.trivy.db.layer.v1.tar
+
+  scan-images:
+    name: Scan image
+    runs-on: ubuntu-latest
+    needs: pull-trivy-db
+
+    permissions:
+      contents: read
+      packages: read
+      security-events: write
+
+    strategy:
+      max-parallel: 5
+      matrix:
+        image-name:
+          - flagsmith
+          - flagsmith-api
+          - flagsmith-frontend
+          - flagsmith-private-cloud
+          - flagsmith-private-cloud-api
+
+    steps:
+      - name: Checkout trivy.yaml
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            trivy.yaml
+            .github*
+          sparse-checkout-cone-mode: false
+
+      - name: Scan ${{ matrix.image-name }}:main image
+        id: trivy
+        uses: ./.github/actions/trivy-scan-image
+        with:
+          image-tag: ${{ env.REGISTRY_URL }}/flagsmith/${{ matrix.image-name }}:main
+          category: ${{ matrix.image-name }}
+          query: branch:main
+          trivy-username: ${{ github.actor }}
+          trivy-password: ${{ secrets.GITHUB_TOKEN }}
+          trivy-db-repository: ${{ env.TRIVY_DB_REPOSITORY }}
+          trivy-java-db-repository: ${{ env.TRIVY_JAVA_DB_REPOSITORY }}

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.136.0"
+  ".": "2.149.0"
 }