Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 37 additions & 29 deletions .github/workflows/plugin-ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,20 @@ on:
- main
- develop

permissions:
contents: read

env:
CACTI: 1.2.x
COMPOSER_ALLOW_SUPERUSER: 1
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:
Expand All @@ -47,7 +55,7 @@ jobs:

services:
mariadb:
image: mariadb:11.8
image: mariadb:11.8@sha256:6422478cb8e159f080fb1d8ccf65101e26fe51385787fde7d16c3b165a331f15
env:
MYSQL_ROOT_PASSWORD: cactiroot
MYSQL_DATABASE: cacti
Expand All @@ -67,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 Maint Plugin
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
persist-credentials: false
path: cacti/plugins/maint
# patch-coverage.php diffs against the base branch below.
fetch-depth: 0
Expand All @@ -82,6 +92,7 @@ jobs:
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2
with:
php-version: ${{ matrix.php }}
tools: composer:2.10.3
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"
coverage: xdebug
Expand Down Expand Up @@ -131,29 +142,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
sudo 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 [ -f composer.json ]; 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: |
Expand Down Expand Up @@ -194,7 +200,9 @@ jobs:
- name: Run Pest Unit Tests
run: |
cd ${{ github.workspace }}/cacti
include/vendor/bin/pest --configuration=plugins/maint/phpunit.xml \
CACTI_TEST_AUTOLOAD="$(dirname "$CACTI_PEST_BIN")/../autoload.php"
export CACTI_TEST_AUTOLOAD
"$CACTI_PEST_BIN" --configuration=plugins/maint/phpunit.xml \
--coverage-clover=plugins/maint/coverage/clover.xml

# Whole-file coverage is meaningless here: most of the plugin only runs
Expand Down Expand Up @@ -228,12 +236,12 @@ jobs:

- name: Run Linter on base code
if: ${{ env.CACTI != '1.2.x' }}
run: sudo composer run-script lint ${{ github.workspace }}/cacti/plugins/maint
run: composer run-script lint ${{ github.workspace }}/cacti/plugins/maint
working-directory: ${{ github.workspace }}/cacti

- name: Checking coding standards on base code
if: ${{ env.CACTI != '1.2.x' }}
run: sudo composer run-script phpcsfixer ${{ github.workspace }}/cacti/plugins/maint
run: composer run-script phpcsfixer ${{ github.workspace }}/cacti/plugins/maint
working-directory: ${{ github.workspace }}/cacti

- name: Run PHPStan at Level 6 on base code outside of Composer due to technical issues
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# ChangeLog

--- develop ---
* security: Pin CI fixtures and shared test dependencies, disable persisted checkout credentials, and limit workflow permissions and runtime

* security: Replace the confirmation pages' inline `onClick='cactiReturnTo()'` Cancel buttons with the CSP-safe `cactiReturnTo` class so the pages no longer trip Cacti's Content-Security-Policy script-src-attr directive; see the README for the one-time `applySkin()` snippet needed when running Cacti below 1.2.31 (1.2.31+ binds the class automatically)
* issue: Fix an uncaught `TypeError` from `html_nav_bar()` (the schedules, devices, webseer and servcheck lists passed the `page`/`rows`/`total_rows` request values as strings, which the typed core signature rejects under `declare(strict_types=1)`); the paging arguments are now cast to `int`
Expand Down
12 changes: 12 additions & 0 deletions tests/bootstrap-unit.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,18 @@
}

require_once $autoload;
// Isolated child tests need PHPUnit from the separate locked CI harness too.
// The ordinary core Composer toolchain already provides it through $autoload.
$test_autoload = getenv('CACTI_TEST_AUTOLOAD');

if ($test_autoload !== false && $test_autoload !== '') {
if (!is_readable($test_autoload)) {
throw new RuntimeException("Plugin test autoloader is not readable: $test_autoload");
}

require_once $test_autoload;
}

require_once __DIR__ . '/TestCase.php';

/*
Expand Down
Loading