Skip to content

Commit 8b1a33c

Browse files
Merge branch 'master' of github.com:jaredhendrickson13/pfsense-api into next_minor
2 parents 57a491d + bb6c154 commit 8b1a33c

9 files changed

Lines changed: 56 additions & 35 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
/usr/local/bin/VBoxManage controlvm ${{ matrix.FREEBSD_VERSION }} poweroff || true
4747
/usr/local/bin/VBoxManage snapshot ${{matrix.FREEBSD_VERSION}} restore initial
4848
49-
- uses: actions/upload-artifact@v6
49+
- uses: actions/upload-artifact@v7
5050
with:
5151
name: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
5252
path: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
@@ -63,7 +63,7 @@ jobs:
6363
FREEBSD_ID: freebsd15
6464
steps:
6565
- uses: actions/checkout@v6
66-
- uses: actions/download-artifact@v7
66+
- uses: actions/download-artifact@v8
6767
with:
6868
name: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
6969
path: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
@@ -96,7 +96,7 @@ jobs:
9696
/usr/local/bin/VBoxManage controlvm ${{ matrix.PFSENSE_VERSION }} poweroff || true
9797
/usr/local/bin/VBoxManage snapshot ${{ matrix.PFSENSE_VERSION }} restore initial
9898
99-
- uses: actions/upload-artifact@v6
99+
- uses: actions/upload-artifact@v7
100100
with:
101101
name: openapi-${{ matrix.PFSENSE_VERSION }}.json
102102
path: openapi-${{ matrix.PFSENSE_VERSION }}.json
@@ -113,7 +113,7 @@ jobs:
113113
FREEBSD_ID: freebsd15
114114
steps:
115115
- uses: actions/checkout@v6
116-
- uses: actions/download-artifact@v7
116+
- uses: actions/download-artifact@v8
117117
with:
118118
name: openapi-${{ matrix.PFSENSE_VERSION }}.json
119119
path: openapi-${{ matrix.PFSENSE_VERSION }}.json
@@ -144,7 +144,7 @@ jobs:
144144
steps:
145145
- uses: actions/checkout@v6
146146

147-
- uses: actions/download-artifact@v7
147+
- uses: actions/download-artifact@v8
148148
with:
149149
name: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg
150150
path: pfSense-pkg-RESTAPI-${{ env.BUILD_VERSION }}-${{ matrix.FREEBSD_ID }}.pkg

.github/workflows/release.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
PFSENSE_VERSION: "25.07.1"
3939
- FREEBSD_VERSION: FreeBSD-16.0-CURRENT
4040
PFSENSE_VERSION: "25.11"
41+
- FREEBSD_VERSION: FreeBSD-16.0-CURRENT
42+
PFSENSE_VERSION: "25.11.1"
4143

4244
steps:
4345
- uses: actions/checkout@v6
@@ -60,7 +62,7 @@ jobs:
6062
/usr/local/bin/VBoxManage controlvm ${{ matrix.FREEBSD_VERSION }} poweroff || true
6163
/usr/local/bin/VBoxManage snapshot ${{matrix.FREEBSD_VERSION}} restore initial
6264
63-
- uses: actions/upload-artifact@v6
65+
- uses: actions/upload-artifact@v7
6466
with:
6567
name: pfSense-${{ matrix.PFSENSE_VERSION }}-pkg-RESTAPI.pkg
6668
path: pfSense-${{ matrix.PFSENSE_VERSION }}-pkg-RESTAPI.pkg
@@ -76,7 +78,7 @@ jobs:
7678
steps:
7779
- uses: actions/checkout@v6
7880

79-
- uses: actions/download-artifact@v7
81+
- uses: actions/download-artifact@v8
8082
with:
8183
name: pfSense-${{ env.DEFAULT_PFSENSE_VERSION }}-pkg-RESTAPI.pkg
8284
path: pfSense-${{ env.DEFAULT_PFSENSE_VERSION }}-pkg-RESTAPI.pkg
@@ -112,13 +114,13 @@ jobs:
112114
/usr/local/bin/VBoxManage snapshot pfSense-${{ env.DEFAULT_PFSENSE_VERSION }}-RELEASE restore initial
113115
114116
- name: Upload OpenAPI schema
115-
uses: actions/upload-artifact@v6
117+
uses: actions/upload-artifact@v7
116118
with:
117119
name: openapi.json
118120
path: openapi.json
119121

120122
- name: Upload GraphQL schema
121-
uses: actions/upload-artifact@v6
123+
uses: actions/upload-artifact@v7
122124
with:
123125
name: schema.graphql
124126
path: schema.graphql
@@ -151,13 +153,13 @@ jobs:
151153
mv ./site/* ./www/
152154
153155
- name: Download OpenAPI schema
154-
uses: actions/download-artifact@v7
156+
uses: actions/download-artifact@v8
155157
with:
156158
name: openapi.json
157159
path: openapi.json
158160

159161
- name: Download GraphQL schema
160-
uses: actions/download-artifact@v7
162+
uses: actions/download-artifact@v8
161163
with:
162164
name: schema.graphql
163165
path: schema.graphql

composer.lock

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/INSTALL_AND_CONFIG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ run pfSense. It's recommended to follow Netgate's [minimum hardware requirements
2020
- pfSense Plus 25.07
2121
- pfSense Plus 25.07.1
2222
- pfSense Plus 25.11
23+
- pfSense Plus 25.11.1
2324

2425
!!! Warning
2526
Installation of the package on unsupported versions of pfSense may result in unexpected behavior and/or system instability.

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"prettier": "^3.7.4",
3+
"prettier": "^3.8.1",
44
"@prettier/plugin-php": "^0.24.0",
55
"@stoplight/spectral-cli": "^6.15.0"
66
}

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Models/FirewallRule.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ class FirewallRule extends Model {
7474
allow_interface_groups: true,
7575
allow_ipsec_interface: true,
7676
allow_openvpn_interface: true,
77+
allow_custom: ['any'],
7778
many: true,
7879
help_text: 'The interface where packets must originate to match this rule.',
7980
);

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Tests/APIModelsFirewallRuleTestCase.inc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -993,4 +993,21 @@ class APIModelsFirewallRuleTestCase extends TestCase {
993993
$this->assert_equals($rule->updated_by->value, "$client->username@$client->ip_address (API)");
994994
}
995995
}
996+
997+
/**
998+
* Checks that we can create a floating firewall rule with the 'any' interface
999+
*/
1000+
public function test_floating_rule_with_any_interface(): void {
1001+
# Create a firewall rule to test with
1002+
$rule = new FirewallRule(
1003+
type: 'pass',
1004+
interface: ['any'],
1005+
ipprotocol: 'inet',
1006+
protocol: 'tcp',
1007+
source: 'any',
1008+
destination: 'any',
1009+
floating: true,
1010+
);
1011+
$rule->validate();
1012+
}
9961013
}

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jinja2~=3.1.6
2-
pylint~=4.0.4
3-
black~=26.1.0
2+
pylint~=4.0.5
3+
black~=26.3.1
44
mkdocs~=1.6.1

0 commit comments

Comments
 (0)