rails_template_18f 0.8.2 → 1.0.0

data/lib/generators/rails_template18f/circleci/templates/oscal/component-definitions/circleci/component-definition.json.tt

@@ -0,0 +1,310 @@
+{
+  "component-definition": {
+    "uuid": "1ae68b65-8cae-4ab6-9a2a-7aadedcf609c",
+    "metadata": {
+      "title": "CircleCI Component Definition.",
+      "last-modified": "2024-06-10T21:22:51.617878+00:00",
+      "version": "0.0.1",
+      "oscal-version": "1.1.2"
+    },
+    "components": [
+      {
+        "uuid": "9f6e6fd0-e8fb-497a-9aa6-d2049c9f1efb",
+        "type": "service",
+        "title": "CircleCI",
+        "description": "CircleCI CI/CD Pipeline",
+        "props": [
+          {
+            "name": "Rule_Id",
+            "value": "properly-configured",
+            "remarks": "rule-config"
+          },
+          {
+            "name": "Rule_Description",
+            "value": "System Owner has configured the system to properly utilize CI/CD for all tests, scans, and deployments",
+            "remarks": "rule-config"
+          },
+          {
+            "name": "Rule_Id",
+            "value": "branch-protections",
+            "remarks": "rule-branch"
+          },
+          {
+            "name": "Rule_Description",
+            "value": "System Owner has configured GitHub branch protections as described in control",
+            "remarks": "rule-branch"
+          }
+        ],
+        "control-implementations": [
+          {
+            "uuid": "3268f365-afcd-4f31-8cfc-79455b222fb4",
+            "source": "trestle://profiles/lato/profile.json",
+            "description": "",
+            "implemented-requirements": [
+              {
+                "uuid": "e2367b3a-dc67-4b1d-b3c0-db5fb976154b",
+                "control-id": "ca-7",
+                "description": "",
+                "statements": [
+                  {
+                    "statement-id": "ca-7_smt.a",
+                    "uuid": "9bcf27b2-134e-4fb9-bd7a-8c3a77b4fd03",
+                    "description": "* <%= app_name %> DevOps staff review OWASP and Dependency scans every build, or at least weekly.\n* <%= app_name %> DevOps staff and the GSA ISSO review Web Application vulnerability scans on a weekly basis.\n* <%= app_name %> Administrators and DevOps staff review changes for potential security impact and engage the <%= app_name %> ISSO and ISSM who will review or engage assessment staff as needed.",
+                    "props": [
+                      {
+                        "name": "Rule_Id",
+                        "value": "properly-configured"
+                      },
+                      {
+                        "name": "implementation-status",
+                        "value": "partial"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "uuid": "6d74a1a5-7139-4f05-b72a-5fd6fd1cb021",
+                "control-id": "cm-2.2",
+                "description": "The <%= app_name %> team develops, documents, and maintains a current baseline for the <%= app_name %> application\ncomponents under configuration control, managed via git and github.com, and orchestrated using CircleCI\nand the cloud.gov Cloud Foundry CLI.\n\nNote: All cloud.gov brokered services (including databases) are fully managed by the cloud.gov platform.\nDue to this, the configuration and security of these services are not included in the <%= app_name %> configuration baseline.",
+                "props": [
+                  {
+                    "name": "Rule_Id",
+                    "value": "properly-configured"
+                  },
+                  {
+                    "name": "implementation-status",
+                    "value": "implemented"
+                  }
+                ]
+              },
+              {
+                "uuid": "8f6cd10e-a40c-4a9e-ad6c-ab73fb41ab64",
+                "control-id": "cm-3.1",
+                "description": "",
+                "statements": [
+                  {
+                    "statement-id": "cm-3.1_smt.f",
+                    "uuid": "355f6e92-139e-4cc1-8497-63421731f265",
+                    "description": "CircleCI is used to execute proposed changes to the information system.\nAdministrators and Developers for <%= app_name %> are automatically notified of\nthe success or failure of the change execution via the CircleCI and GitHub notification systems.",
+                    "props": [
+                      {
+                        "name": "Rule_Id",
+                        "value": "properly-configured"
+                      },
+                      {
+                        "name": "implementation-status",
+                        "value": "implemented"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "uuid": "d989abdd-4e77-4d22-a0cd-a004e4bd0958",
+                "control-id": "ra-5",
+                "description": "",
+                "statements": [
+                  {
+                    "statement-id": "ra-5_smt.a",
+                    "uuid": "5801d27a-d3e7-469b-af64-cd8e03b20622",
+                    "description": "Any vulnerabilities in <%= app_name %> would have to be introduced at time of deployment because <%= app_name %>\nis a set of cloud.gov managed applications with SSH disabled in Production. <%= app_name %> monitors for\nvulnerabilities by ensuring that scans for vulnerabilities in the information system and hosted applications occur\ndaily and when new code is deployed.\n\nOWASP ZAP scans are built into the CircleCI CI/CD pipeline and runs a series of web vulnerability scans before\na successful deploy can be made to cloud.gov. Any issues or alerts caused by the scan are documented by <%= app_name %>\nOperations and cause the deployment to fail. Issues are tracked in GitHub. The issue posted will provide information\non which endpoints are vulnerable and the level of vulnerability, ranging from **False Positive** to **High**.\nThe issue also provides a detailed report formatted in html, json, and markdown.\n\nSystem Administrators are responsible for reporting any new vulnerabilities reported by the OWASP ZAP scan to the <%= app_name %> ISSO.",
+                    "props": [
+                      {
+                        "name": "Rule_Id",
+                        "value": "properly-configured"
+                      },
+                      {
+                        "name": "implementation-status",
+                        "value": "implemented"
+                      }
+                    ]
+                  },
+                  {
+                    "statement-id": "ra-5_smt.b",
+                    "uuid": "ec74b865-ec28-4557-911d-33e9ab8049cb",
+                    "description": "1. Alerts from each ZAP vulnerability scan are automatically reported in GitHub as an issue on the <%= app_name %> repository. This issue will enumerate each finding and detail the type and severity of the vulnerability. <%= app_name %> Developers and <%= app_name %> Administrators receive automated alerts via GitHub of the issues to remediate. Scan results are sent to the <%= app_name %> System Owner by <%= app_name %> Administrators. The vulnerabilities are analyzed and prioritized within GitHub based on input from the System Owner and ISSO.\n1. The ZAP report contains vulnerabilities grouped by type and by risk level. The report also provides a detailed report formatted in html, json, and markdown. The reported issues also include the CVE item associated with the vulnerability.\n1. Vulnerabilities are classified by ZAP under a level range from **False Positive** to **High**. The impact level is used to drive the priority of the effort to remediate.",
+                    "props": [
+                      {
+                        "name": "Rule_Id",
+                        "value": "properly-configured"
+                      },
+                      {
+                        "name": "implementation-status",
+                        "value": "implemented"
+                      }
+                    ]
+                  },
+                  {
+                    "statement-id": "ra-5_smt.c",
+                    "uuid": "d0cdbd01-5f63-43f5-9756-4dc423fa2e73",
+                    "description": "The ZAP vulnerability report contains information about how the attack was made and suggested solutions for each vulnerability found. Any static code analysis findings identified during automation as part of the GitHub pull request process must be reviewed, analyzed, and resolved by the <%= app_name %> Developer before the team can merge the pull request.",
+                    "props": [
+                      {
+                        "name": "Rule_Id",
+                        "value": "properly-configured"
+                      },
+                      {
+                        "name": "Rule_Id",
+                        "value": "branch-protections"
+                      },
+                      {
+                        "name": "implementation-status",
+                        "value": "planned"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "uuid": "5b755a7a-8032-47e9-8e12-e87de6c698e8",
+                "control-id": "sa-11.1",
+                "description": "The CI/CD pipeline utilizes multiple tools to perform static code analysis for security and privacy:\n\n* **Brakeman** is a static code scanner designed to find security issues in Ruby on Rails code. It can flag potential SQL injection,\nCommand Injection, open redirects, and other common vulnerabilities.\n* **bundle-audit** checks Ruby dependencies against a database of known CVE numbers.\n* **yarn audit** checks Javascript dependencies against a database of known CVE numbers.\n* **OWASP ZAP** is a dynamic security scanner that can simulate actual attacks on a running server.\n\nAn additional RAILS_ENV has been created called ci. It inherits from production to ensure that the system being tested is as close as possible to production while allowing for overrides such as bypassing authentication in a secure way.",
+                "props": [
+                  {
+                    "name": "Rule_Id",
+                    "value": "properly-configured"
+                  },
+                  {
+                    "name": "implementation-status",
+                    "value": "implemented"
+                  }
+                ]
+              },
+              {
+                "uuid": "e7f41388-bacd-4633-bf85-182de4349221",
+                "control-id": "sa-22",
+                "description": "",
+                "statements": [
+                  {
+                    "statement-id": "sa-22_smt.a",
+                    "uuid": "90bdb946-0a0f-43e3-a8c3-2eb7a9662409",
+                    "description": "The <%= app_name %> application is built and supported by the <%= app_name %> DevOps staff.\n\nThe application utilizes public open source Ruby and NodeJS components.\n\nThe application utilizes dependency scanning tools Bundle Audit and Yarn Audit to find vulnerable or insecure dependencies.\n\nIf a vulnerable or insecure dependency is found it will be upgraded or replaced. Additionally the <%= app_name %> team code review processes include a review of the health (up to date, supported, many individuals involved) of direct open source dependencies.",
+                    "props": [
+                      {
+                        "name": "Rule_Id",
+                        "value": "properly-configured"
+                      },
+                      {
+                        "name": "implementation-status",
+                        "value": "implemented"
+                      }
+                    ]
+                  },
+                  {
+                    "statement-id": "sa-22_smt.b",
+                    "uuid": "e23cb5e4-cf82-47b9-8abd-25ec772387bd",
+                    "description": "There are currently no unsupported system components within <%= app_name %>. In case an unsupported system component is required to maintain <%= app_name %>, the <%= app_name %> System Owner will be consulted to make a determination in coordination with the <%= app_name %> ISSO and ISSM.",
+                    "props": [
+                      {
+                        "name": "Rule_Id",
+                        "value": "properly-configured"
+                      },
+                      {
+                        "name": "implementation-status",
+                        "value": "implemented"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "uuid": "8e2a476b-299c-48d5-b4de-749393d74adf",
+                "control-id": "sc-28.1",
+                "description": "As an additional layer of protection, all PII data is encrypted using [Active Record Encryption — Ruby on Rails Guides](https://guides.rubyonrails.org/active_record_encryption.html).\nThis encryption is implemented in a using non-deterministic AES-256-GCM through Ruby's openssl library with a 256-bit key and a random initialization vector {rails crypto module}.\n\nThe Data Encryption Key is stored in the credentials.yml file in an encrypted format by Ruby's openssl library using the AES-128-GCM cipher,\nand is built into the application package.\n\nThe credentials.yml decryption key is stored in CircleCI and injected into the running application as an environmental variable. The application then uses this key\nto decrypt the credentials.yml file and obtain the Data Encryption Key.\n\nA backup of the key is stored by the Lead Developer and System Owner within a keepass database stored in Google Drive.",
+                "props": [
+                  {
+                    "name": "Rule_Id",
+                    "value": "properly-configured"
+                  },
+                  {
+                    "name": "implementation-status",
+                    "value": "partial"
+                  }
+                ]
+              },
+              {
+                "uuid": "731fe0af-a996-470d-916d-62f6aaa41823",
+                "control-id": "si-2",
+                "description": "",
+                "statements": [
+                  {
+                    "statement-id": "si-2_smt.a",
+                    "uuid": "1cbbaed9-503a-4b26-879b-805a4d44c898",
+                    "description": "Flaw and vulnerability checks are built into the <%= app_name %> CI/CD pipeline and automated to ensure compliance. Dynamic vulnerability scans are performed against <%= app_name %> before a successful deployment and reports issues after every scan.\n\nCompliance is documented in sections SA-11 and RA-5. The <%= app_name %> DevOps team uses GitHub as the Product Backlog to track and prioritize issues related to system flaws.\n\nThe responsibility of remediating flaws and vulnerabilities (once a remediation is available) falls on the <%= app_name %> Developer, who updates the <%= app_name %> code and deploys fixes as part of the normal development and CI/CD process.",
+                    "props": [
+                      {
+                        "name": "Rule_Id",
+                        "value": "properly-configured"
+                      },
+                      {
+                        "name": "Rule_Id",
+                        "value": "branch-protections"
+                      },
+                      {
+                        "name": "implementation-status",
+                        "value": "implemented"
+                      }
+                    ]
+                  },
+                  {
+                    "statement-id": "si-2_smt.b",
+                    "uuid": "85cad7f1-6c2b-43b2-b4f3-7acb6cd6ec09",
+                    "description": "Any flaws or vulnerabilities resolved in <%= app_name %> result in a GitHub issue for triage via the <%= app_name %> CM Configuration Control process described in CM-2(2). After resolving a vulnerability or flaw in <%= app_name %>, unit tests and integration tests are updated to prevent further inclusion of similar flaws.\n\n* All GitHub tickets have accompanying Acceptance Criteria that are used to create unit tests.\n* Unit tests are run on the Development environment when new code is pushed.\n* Integration tests are run on the Test environment when the remediation is deployed via the CI/CD process to ensure that the production environment does not suffer from any side effects of the vulnerability remediation.\n* Integration tests are run on the Prod environment when the remediation is deployed via the CI/CD process to validate the remediation and application functionality.\n* All findings that are not remediated immediately are tracked in the #{app_name} Plan of Action and Milestones (POAM) by <%= app_name %> Operations and the <%= app_name %> ISSO.",
+                    "props": [
+                      {
+                        "name": "Rule_Id",
+                        "value": "properly-configured"
+                      },
+                      {
+                        "name": "implementation-status",
+                        "value": "implemented"
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "uuid": "547c5134-5dd7-4310-8965-63da171cfa14",
+                "control-id": "si-10",
+                "description": "All inputs from the end user are parameterized prior to use to avoid potential sql injection.\n\nBrakeman scanner is impelmented within CircleCI which further identifies coding practices\nthat may lead to application vulnerabilities that are a result of improper input validation.",
+                "props": [
+                  {
+                    "name": "Rule_Id",
+                    "value": "properly-configured"
+                  },
+                  {
+                    "name": "implementation-status",
+                    "value": "partial"
+                  }
+                ]
+              },
+              {
+                "uuid": "907f1164-670a-4776-b931-16e28c91eb18",
+                "control-id": "sr-3",
+                "description": "",
+                "statements": [
+                  {
+                    "statement-id": "sr-3_smt.b",
+                    "uuid": "4be57dda-04ec-4387-80ef-d13a50193156",
+                    "description": "A complete Software Bill of Materials (SBOM) for all Ruby dependencies is automatically\ngenerated by CircleCI on each push to GitHub as well as on a nightly basis. These can be downloaded\nfrom the applicable artifact section for each CI job.",
+                    "props": [
+                      {
+                        "name": "Rule_Id",
+                        "value": "properly-configured"
+                      },
+                      {
+                        "name": "implementation-status",
+                        "value": "partial"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+}

data/lib/generators/rails_template18f/github_actions/github_actions_generator.rb

@@ -21,6 +21,11 @@ module RailsTemplate18f
           remove_file ".github/workflows/terraform-staging.yml"
           remove_file ".github/workflows/terraform-production.yml"
         end
+        if !oscal_dir_exists?
+          remove_file ".github/workflows/validate-ssp.yml"
+          remove_file ".github/workflows/assemble-ssp.yml"
+          remove_dir ".github/actions/trestle-cmd"
+        end
       end
 
       def update_readme
@@ -59,17 +64,8 @@ EOB
         EOB
       end
 
-      def update_terraform_readme
-        return unless terraform?
-        readme_filename = "terraform/README.md"
-        insert_into_file readme_filename, "  |- .force-action-apply\n", after: "- <env>/\n"
-        insert_into_file readme_filename, <<~EOM, after: /.*environment-specific modules:$/
-          \n- `.force-action-apply` is a file that can be updated to force GitHub Actions to run `terraform apply` during the deploy phase
-        EOM
-      end
-
       def update_oscal_docs
-        update_cicd_oscal_docs("GitHub Actions")
+        copy_oscal_component "github_actions"
       end
 
       no_tasks do
@@ -122,8 +118,7 @@ EOB
           <<~EOM
 
             1. Store variables that must be secret using [GitHub Environment Secrets](https://docs.github.com/en/actions/reference/encrypted-secrets#creating-encrypted-secrets-for-an-environment)
-            1. Add the secret to the `env:` block of the deploy action [as in this example](https://github.com/OHS-Hosting-Infrastructure/complaint-tracker/blob/a9e8d22aae2023a0afb631a6182251c04f597f7e/.github/workflows/deploy-stage.yml#L20)
-            1. Add the appropriate `--var` addition to the `push_arguments` line on the deploy action [as in this example](https://github.com/OHS-Hosting-Infrastructure/complaint-tracker/blob/a9e8d22aae2023a0afb631a6182251c04f597f7e/.github/workflows/deploy-stage.yml#L27)
+            1. Add the appropriate `--var` addition to the `cf_command` line on the deploy action like the existing `rails_master_key`
           EOM
         end
       end

data/lib/generators/rails_template18f/github_actions/templates/github/actions/setup-languages/action.yml.tt

@@ -11,7 +11,7 @@ runs:
         cache-version: 1
 
     - name: Set up node
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
         node-version: '<%= node_version %>'
         cache: 'yarn'

data/lib/generators/rails_template18f/github_actions/templates/github/actions/setup-project/action.yml.tt

@@ -28,6 +28,7 @@ runs:
     - name: Set up database
       env:
         RAILS_ENV: ${{ inputs.rails_env }}
+        SECRET_KEY_BASE: not-actually-secret
         DATABASE_URL: ${{ inputs.database_url }}
       shell: bash
       run: bundle exec rake db:schema:load

data/lib/generators/rails_template18f/github_actions/templates/github/actions/trestle-cmd/action.yml

@@ -0,0 +1,20 @@
+name: "Run a docker-trestle command"
+description: "Sets up workspace for running a single command in docker-trestle"
+inputs:
+  tag:
+    description: docker-trestle tag to use. Defaults to latest
+    required: false
+    default: latest
+  cmd:
+    description: Command to run within docker-trestle
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Enable writing to trestle directories
+      shell: bash
+      run: chmod -R a+w $GITHUB_WORKSPACE/doc/compliance/oscal
+
+    - name: Run cmd
+      shell: bash
+      run: docker run -v $GITHUB_WORKSPACE/doc/compliance/oscal:/app/docs:rw ghcr.io/gsa-tts/trestle:latest ${{ inputs.cmd }}

data/lib/generators/rails_template18f/github_actions/templates/github/workflows/assemble-ssp.yml.tt

@@ -0,0 +1,26 @@
+name: Assemble SSPP updates
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main ]
+    paths:
+      - "doc/compliance/oscal/**"
+
+jobs:
+  assemble_ssp:
+    name: Assemble SSPP updates and save artifact
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Assemble final SSPP
+        uses: ./.github/actions/trestle-cmd
+        with:
+          cmd: trestle assemble -n <%= app_name %> system-security-plan
+
+      - name: Save artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: <%= app_name %>_SSPP
+          path: doc/compliance/oscal/dist/system-security-plans/<%= app_name %>.json

data/lib/generators/rails_template18f/github_actions/templates/github/workflows/brakeman-analysis.yml

@@ -22,12 +22,16 @@ on:
     # this will run at noon UTC each Monday (7am EST / 8am EDT)
     - cron: '0 12 * * 1'
 
+permissions:
+  contents: read
+  security-events: write
+
 jobs:
   brakeman-scan:
     name: Brakeman Scan
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - uses: ./.github/actions/setup-languages
 
@@ -39,6 +43,6 @@ jobs:
 
     # Upload the SARIF file generated in the previous step
     - name: Upload SARIF
-      uses: github/codeql-action/upload-sarif@v1
+      uses: github/codeql-action/upload-sarif@v3
       with:
         sarif_file: output.sarif.json

data/lib/generators/rails_template18f/github_actions/templates/github/workflows/dependency-scans.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: ./.github/actions/setup-languages
 
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: ./.github/actions/setup-languages
 
@@ -43,14 +43,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-languages
       - name: Install cyclonedx
         run: gem install cyclonedx-ruby
       - name: Generate BOM
         run: cyclonedx-ruby -p . -o ruby_bom.xml
       - name: Save BOM
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ruby-bom
           path: ./ruby_bom.xml

data/lib/generators/rails_template18f/github_actions/templates/github/workflows/deploy-production.yml.tt

@@ -7,47 +7,36 @@ on:
       - 'doc/**'
       - 'README.md'
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   deploy:
     name: Deploy to production
     runs-on: ubuntu-latest
     environment: production
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 2
+      - uses: actions/checkout@v4
       <% if terraform? %>
-      - name: Check for changes to Terraform
-        id: changed-terraform-files
-        uses: tj-actions/changed-files@v1.1.2
-        with:
-          files: |
-            terraform/shared
-            terraform/production
-      - name: Terraform init
-        if: steps.changed-terraform-files.outputs.any_changed == 'true'
-        working-directory: terraform/production
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
-        run: terraform init
       - name: Terraform apply
-        if: steps.changed-terraform-files.outputs.any_changed == 'true'
-        working-directory: terraform/production
+        uses: dflook/terraform-apply@v1
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
           TF_VAR_cf_user: ${{ secrets.CF_USERNAME }}
           TF_VAR_cf_password: ${{ secrets.CF_PASSWORD }}
-        run: terraform apply -auto-approve -input=false
+        with:
+          path: terraform/production
+          backend_config: >
+            access_key=${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
+            secret_key=${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
       <% end %>
       - name: Deploy app
         uses: cloud-gov/cg-cli-tools@main
-        env:
-          RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
         with:
           cf_username: ${{ secrets.CF_USERNAME }}
           cf_password: ${{ secrets.CF_PASSWORD }}
           cf_org: <%= cloud_gov_organization %>
           cf_space: <%= cloud_gov_production_space %>
-          cf_command: push -vars-file config/deployment/production.yml --var rails_master_key=${{ env.RAILS_MASTER_KEY }} --strategy rolling
+          cf_command: push --vars-file config/deployment/production.yml --var rails_master_key="${{ secrets.RAILS_MASTER_KEY }}" --strategy rolling

data/lib/generators/rails_template18f/github_actions/templates/github/workflows/deploy-staging.yml.tt

@@ -7,47 +7,36 @@ on:
       - 'doc/**'
       - 'README.md'
 
+permissions:
+  contents: read
+  pull-requests: write
+
 jobs:
   deploy:
     name: Deploy to staging
     runs-on: ubuntu-latest
     environment: staging
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 2
+      - uses: actions/checkout@v4
       <% if terraform? %>
-      - name: Check for changes to Terraform
-        id: changed-terraform-files
-        uses: tj-actions/changed-files@v1.1.2
-        with:
-          files: |
-            terraform/shared
-            terraform/staging
-      - name: Terraform init
-        if: steps.changed-terraform-files.outputs.any_changed == 'true'
-        working-directory: terraform/staging
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
-        run: terraform init
       - name: Terraform apply
-        if: steps.changed-terraform-files.outputs.any_changed == 'true'
-        working-directory: terraform/staging
+        uses: dflook/terraform-apply@v1
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
           TF_VAR_cf_user: ${{ secrets.CF_USERNAME }}
           TF_VAR_cf_password: ${{ secrets.CF_PASSWORD }}
-        run: terraform apply -auto-approve -input=false
+        with:
+          path: terraform/staging
+          backend_config: >
+            access_key=${{ secrets.TERRAFORM_STATE_ACCESS_KEY }}
+            secret_key=${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }}
       <% end %>
       - name: Deploy app
         uses: cloud-gov/cg-cli-tools@main
-        env:
-          RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
         with:
           cf_username: ${{ secrets.CF_USERNAME }}
           cf_password: ${{ secrets.CF_PASSWORD }}
           cf_org: <%= cloud_gov_organization %>
           cf_space: <%= cloud_gov_staging_space %>
-          cf_command: push -vars-file config/deployment/staging.yml --var rails_master_key=${{ env.RAILS_MASTER_KEY }} --strategy rolling
+          cf_command: push --vars-file config/deployment/staging.yml --var rails_master_key="${{ secrets.RAILS_MASTER_KEY }}" --strategy rolling

data/lib/generators/rails_template18f/github_actions/templates/github/workflows/owasp-daily-scan.yml.tt

@@ -6,6 +6,10 @@ on:
     # this will run at noon UTC every day (7am EST / 8am EDT)
     - cron: '0 12 * * *'
 
+permissions:
+  contents: read
+  issues: write
+
 jobs:
   owasp-scan:
     name: OWASP ZAP Scan
@@ -25,7 +29,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - id: setup
         uses: ./.github/actions/setup-project
@@ -35,9 +39,10 @@ jobs:
           database_url: ${{ steps.setup.outputs.database_url }}
 
       - name: Run OWASP Full Scan
-        uses: zaproxy/action-full-scan@v0.3.0
+        uses: zaproxy/action-full-scan@v0.10.0
         with:
-          docker_name: 'owasp/zap2docker-weekly'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          docker_name: 'ghcr.io/zaproxy/zaproxy:weekly'
           target: 'http://localhost:3000/'
           fail_action: true
           rules_file_name: 'zap.conf'