Skip to content

Commit

Permalink
Merge pull request #453 from jaredhendrickson13/next_patch
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredhendrickson13 authored Apr 28, 2024
2 parents f3eda7c + f98b153 commit 8570e61
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ updates:
target-branch: "master"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
include:
- freebsd_version: FreeBSD-14.0-CURRENT
freebsd_id: freebsd14
- freebsd_version: FreeBSD-15.0-CURRENT
freebsd_id: freebsd15

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
pfsense_version: 2.7
- freebsd_version: FreeBSD-14.0-CURRENT
pfsense_version: 23.09
- freebsd_version: FreeBSD-15.0-CURRENT
pfsense_version: 24.03

steps:
- uses: actions/checkout@v3
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ tests/e2e_test_framework/__pycache__/
venv/
vendor/
.vagrant
*.pkg
*.pkg
node_modules
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ are made preventing the need for a reboot. All this results in the fastest, safe
- pfSense CE 2.7.1 (amd64)
- pfSense CE 2.7.2 (amd64)
- pfSense Plus 23.09 (community supported)
- pfSense Plus 24.03 (community supported)

Don't see your version listed? Check the [releases page](https://github.com/jaredhendrickson13/pfsense-api/releases).
Older versions of this package may support older versions of pfSense.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1115,9 +1115,9 @@ class APIServicesOpenVPNServerUpdate extends APIModel {

private function __validate_disabled() {
# Check for our optional `disabled` payload value
if (($this->initial_data["disable"] === true) and (empty($this->validated_data["disable"]))) {
if ($this->initial_data["disable"] === true) {
$this->validated_data["disable"] = "";
} elseif (($this->initial_data["disable"] === false) and (!empty($this->validated_data["disable"]))) {
} elseif ($this->initial_data["disable"] === false) {
unset($this->validated_data["disable"]);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ class APISystemAPIVersionRead extends APIModel {

# Loop through each version and populate our version data
foreach ($releases as $release) {
# Skip this release if $release or $pkg_config are not arrays. This is a safety check to fix #438.
if (!is_array($release) or !is_array($pkg_config)) {
continue;
}

# Check if this release is a pre-release, if so, only include it if allow_pre_release is enabled
if ($release["prerelease"] === false or isset($pkg_config["allow_pre_release"])) {
# Loop through the assets of each release and check if our version of pfSense is supported
Expand Down

0 comments on commit 8570e61

Please sign in to comment.