Merge branch 'master' of github.com:jaredhendrickson13/pfsense-api into next_minor

jaredhendrickson13 · jaredhendrickson13 · commit b4c35a40e09a · 2026-01-04T16:21:54.000-07:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
           /usr/local/bin/VBoxManage controlvm ${{ matrix.FREEBSD_VERSION }} poweroff || true
           /usr/local/bin/VBoxManage snapshot ${{matrix.FREEBSD_VERSION}} restore initial
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
           path: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
@@ -63,7 +63,7 @@ jobs:
             FREEBSD_ID: freebsd15
     steps:
       - uses: actions/checkout@v6
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v7
         with:
           name: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
           path: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
@@ -96,7 +96,7 @@ jobs:
           /usr/local/bin/VBoxManage controlvm ${{ matrix.PFSENSE_VERSION }} poweroff || true
           /usr/local/bin/VBoxManage snapshot ${{ matrix.PFSENSE_VERSION }} restore initial
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: openapi-${{ matrix.PFSENSE_VERSION }}.json
           path: openapi-${{ matrix.PFSENSE_VERSION }}.json
@@ -113,7 +113,7 @@ jobs:
             FREEBSD_ID: freebsd15
     steps:
       - uses: actions/checkout@v6
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v7
         with:
           name: openapi-${{ matrix.PFSENSE_VERSION }}.json
           path: openapi-${{ matrix.PFSENSE_VERSION }}.json
@@ -144,7 +144,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v7
         with:
           name: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
           path: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -60,7 +60,7 @@ jobs:
           /usr/local/bin/VBoxManage controlvm ${{ matrix.FREEBSD_VERSION }} poweroff || true
           /usr/local/bin/VBoxManage snapshot ${{matrix.FREEBSD_VERSION}} restore initial
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         with:
           name: pfSense-${{ matrix.PFSENSE_VERSION }}-pkg-RESTAPI.pkg
           path: pfSense-${{ matrix.PFSENSE_VERSION }}-pkg-RESTAPI.pkg
@@ -76,7 +76,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v7
         with:
           name: pfSense-${{ env.DEFAULT_PFSENSE_VERSION }}-pkg-RESTAPI.pkg
           path: pfSense-${{ env.DEFAULT_PFSENSE_VERSION }}-pkg-RESTAPI.pkg
@@ -112,13 +112,13 @@ jobs:
           /usr/local/bin/VBoxManage snapshot pfSense-${{ env.DEFAULT_PFSENSE_VERSION }}-RELEASE restore initial
 
       - name: Upload OpenAPI schema
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: openapi.json
           path: openapi.json
 
       - name: Upload GraphQL schema
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: schema.graphql
           path: schema.graphql
@@ -151,13 +151,13 @@ jobs:
           mv ./site/* ./www/
 
       - name: Download OpenAPI schema
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: openapi.json
           path: openapi.json
 
       - name: Download GraphQL schema
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: schema.graphql
           path: schema.graphql
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "require": {
-    "firebase/php-jwt": "v6.11.*",
+    "firebase/php-jwt": "v7.0.*",
     "webonyx/graphql-php": "^15.13"
   }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "prettier": "^3.7.3",
+    "prettier": "^3.7.4",
     "@prettier/plugin-php": "^0.24.0",
     "@stoplight/spectral-cli": "^6.15.0"
   }
diff --git a/pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/ModelTraits/OpenVPNClientExportTraits.inc b/pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/ModelTraits/OpenVPNClientExportTraits.inc
@@ -193,6 +193,7 @@ trait OpenVPNClientExportTraits {
     public function validate_legacy(bool $legacy): bool {
         if ($legacy) {
             global $legacy_incompatible_ciphers;
+            $legacy_incompatible_ciphers = $legacy_incompatible_ciphers ?? [];
             $settings = get_openvpnserver_by_id($this->server->value);
             if (in_array($settings['data_ciphers_fallback'], $legacy_incompatible_ciphers)) {
                 throw new ConflictError(
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 jinja2~=3.1.6
 pylint~=4.0.4
-black~=25.11.0
+black~=25.12.0
 mkdocs~=1.6.1

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "firebase/php-jwt": "v6.11.*",`
	`3`	`+ "firebase/php-jwt": "v7.0.*",`
`4`	`4`	`"webonyx/graphql-php": "^15.13"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"devDependencies": {`
`3`		`- "prettier": "^3.7.3",`
	`3`	`+ "prettier": "^3.7.4",`
`4`	`4`	`"@prettier/plugin-php": "^0.24.0",`
`5`	`5`	`"@stoplight/spectral-cli": "^6.15.0"`
`6`	`6`	`}`