From 91247f48e0b0029920e78c31c25f6a6015e07db7 Mon Sep 17 00:00:00 2001
From: Thomas Vincent <thomasvincent@gmail.com>
Date: Mon, 12 Oct 2026 21:47:50 -0700
Subject: [PATCH] ci: pin fixtures and install locked shared test dependencies

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>
---
 .github/workflows/codeql.yml             |  2 +
 .github/workflows/plugin-ci-workflow.yml | 59 +++++++++++++-----------
 CHANGELOG.md                             |  1 +
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f2edbcb..c342b89 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -47,6 +47,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
       - name: Initialize CodeQL
         uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
         with:
diff --git a/.github/workflows/plugin-ci-workflow.yml b/.github/workflows/plugin-ci-workflow.yml
index e0777e0..937db3d 100644
--- a/.github/workflows/plugin-ci-workflow.yml
+++ b/.github/workflows/plugin-ci-workflow.yml
@@ -31,11 +31,20 @@ on:
       - main
       - develop
 
+permissions:
+  contents: read
+
 env:
   CACTI: 1.2.x
+  CACTI_REF: d6d230f712c0af1a0391646f65364950ebf131af # 1.2.x fixture
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   integration-test:
+    timeout-minutes: 45
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -46,7 +55,7 @@ jobs:
 
     services:
       mariadb:
-        image: mariadb:11.8
+        image: mariadb:11.8@sha256:6422478cb8e159f080fb1d8ccf65101e26fe51385787fde7d16c3b165a331f15
         env:
           MYSQL_ROOT_PASSWORD: cactiroot
           MYSQL_DATABASE: cacti
@@ -66,13 +75,15 @@ jobs:
     - name: Checkout Cacti
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
+        persist-credentials: false
         repository: Cacti/cacti
-        ref: ${{ env.CACTI }}
+        ref: ${{ env.CACTI_REF }}
         path: cacti
 
     - name: Checkout quicktree Plugin
       uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       with:
+        persist-credentials: false
         path: cacti/plugins/quicktree
         # patch-coverage.php diffs against the base branch below.
         fetch-depth: 0
@@ -81,6 +92,7 @@ jobs:
       uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
       with:
         php-version: ${{ matrix.php }}
+        tools: composer:2.10.3
         coverage: xdebug
         extensions: intl, mysql, gd, ldap, gmp, xml, curl, json, mbstring, snmp
         ini-values: "post_max_size=256M, max_execution_time=60, date.timezone=America/New_York"
@@ -125,29 +137,24 @@ jobs:
         mysql "$MYSQL_AUTH_USR" cacti < ${{ github.workspace }}/cacti/cacti.sql
         mysql "$MYSQL_AUTH_USR" -e "INSERT INTO settings (name, value) VALUES ('path_php_binary', '/usr/bin/php')" cacti
 
-    - name: Validate composer files
-      run: |
-        cd ${{ github.workspace }}/cacti
-        if [ -f composer.json ]; then
-          composer validate --strict || true
-        fi
-
-    - name: Install Composer Dependencies
-      run: |
-        cd ${{ github.workspace }}/cacti
-        if [ -f composer.json ]; then
-          sudo composer config --no-plugins allow-plugins.pestphp/pest-plugin true
-          sudo composer require --no-progress --no-interaction "pestphp/pest: ^3" "pestphp/pest-plugin-drift: ^3.0"
-          sudo rm -f composer.lock
-          sudo composer install --dev --no-progress
-        fi
-
-    - name: Restore vendor ownership for Pest
-      run: |
-        cd ${{ github.workspace }}/cacti
-        if [ -d include/vendor ]; then
-          sudo chown -R runner:runner include/vendor composer.lock
-        fi
+    # Core's release archives exclude .github and tests. Fetch these paths
+    # through Git at the immutable helper revision instead of an Action archive.
+    - name: Checkout shared CI tooling
+      uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      with:
+        repository: Cacti/cacti
+        ref: b1d8dd6a03a3c756a2b22dfe3a0c744b1f11116c
+        persist-credentials: false
+        path: ci-tools
+        sparse-checkout: |
+          .github/actions/setup-plugin-dependencies
+          tests/tools/plugin-harness
+
+    - name: Install locked Cacti and plugin test dependencies
+      uses: ./ci-tools/.github/actions/setup-plugin-dependencies
+      with:
+        cacti-directory: cacti
+        install-core-dev: 'false'
 
     - name: Create Cacti config.php
       run: |
@@ -188,7 +195,7 @@ jobs:
     - name: Run Pest Unit Tests
       run: |
         cd ${{ github.workspace }}/cacti
-        include/vendor/bin/pest --configuration=plugins/quicktree/phpunit.xml \
+        "$CACTI_PEST_BIN" --configuration=plugins/quicktree/phpunit.xml \
           --coverage-clover=plugins/quicktree/coverage/clover.xml
 
     # Whole-file coverage is meaningless here: most of the plugin only runs
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c65bf20..c650fbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # ChangeLog
 
 --- develop ---
+* security: Pin CI fixtures and shared test dependencies, disable persisted checkout credentials, and limit workflow permissions and runtime
 
 * feature: Shorten the graph 'Add to QuickTree' action icon's title to "Add to Quicktree" so it reads cleanly as a label in the Cacti graph drilldown action menu
 * bug: Pass a boolean (not the integer 1) to api_plugin_register_hook()'s $enable argument so the hook registration stays type-correct under Cacti 1.3's strict bool type-hint (the int only coerces while the file lacks declare(strict_types=1))