pfrest · jaredhendrickson13 · Dec 10, 2023 · Dec 4, 2023 · Dec 5, 2023 · Dec 5, 2023
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -53,11 +53,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - pfsense_version: pfSense-2.7.0-RELEASE
+          - pfsense_version: pfSense-2.7.1-RELEASE
             freebsd_id: freebsd14
-          - pfsense_version: pfSense-23.01-RELEASE
-            freebsd_id: freebsd14
-          - pfsense_version: pfSense-23.05-RELEASE
+          - pfsense_version: pfSense-2.7.2-RELEASE
             freebsd_id: freebsd14
 
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,9 +17,7 @@ jobs:
           - freebsd_version: FreeBSD-14.0-CURRENT
             pfsense_version: 2.7
           - freebsd_version: FreeBSD-14.0-CURRENT
-            pfsense_version: 23.05
-          - freebsd_version: FreeBSD-14.0-CURRENT
-            pfsense_version: 23.01
+            pfsense_version: 23.09
 
     steps:
       - uses: actions/checkout@v3

diff --git a/README.md b/README.md
@@ -18,11 +18,13 @@ are made preventing the need for a reboot. All this results in the fastest, safe
 <details>
     <summary>Supported pfSense Versions</summary>
 
-  - pfSense CE 2.7.0 (amd64)
-  - pfSense Plus 23.01 (amd64)
-  - pfSense Plus 23.05 (amd64)
+  - pfSense CE 2.7.1 (amd64)
+  - pfSense CE 2.7.2 (amd64)
   - pfSense Plus 23.09 (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.
+
   _This package is not supported on other architectures such as arm64 and aarch64. However, the package should still
   install and operate on these systems. Compatibility on unsupported systems is not guaranteed and is at your own risk._
 

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
   "require": {
-    "firebase/php-jwt": "v6.9.*"
+    "firebase/php-jwt": "v6.10.*"
   }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/docs/SECURITY.md b/docs/SECURITY.md
@@ -6,9 +6,9 @@ Below are versions that are currently supported and will receive security update
 
 | Version | Supported          |
 |---------| ------------------ |
+| 1.7.x   | :white_check_mark: |
 | 1.6.x   | :white_check_mark: |
-| 1.5.x   | :white_check_mark: |
-| <=1.3.x | :x:                |
+| <=1.5.x | :x:                |
 
 ## Reporting a Vulnerability
 

diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundMappingCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundMappingCreate.inc
@@ -135,28 +135,29 @@ class APIFirewallNATOutboundMappingCreate extends APIModel {
         if (isset($this->initial_data['target'])) {
             # Require the target to be a valid IPv4 subnet, address, alias or empty string for iface address
             if (APITools\is_ip_subnet_or_alias($this->initial_data['target']) === "ipv4_subnet") {
-                $this->validated_data["target"] = "other-subnet";
-                $this->validated_data['targetip'] = explode("/", $this->initial_data["target"])[0];
-                $this->validated_data['targetip_subnet'] = explode("/", $this->initial_data["target"])[1];
-            } elseif (APITools\is_ip_subnet_or_alias($this->initial_data['target']) === "ipv4_addr") {
-                $this->validated_data["target"] = "other-subnet";
-                $this->validated_data["targetip"] = $this->initial_data['target'];
-                $this->validated_data['targetip_subnet'] = 32;
-            } elseif (APITools\is_ip_subnet_or_alias($this->initial_data['target']) === "alias") {
+                $this->validated_data['target'] = explode("/", $this->initial_data["target"])[0];
+                $this->validated_data['target_subnet'] = explode("/", $this->initial_data["target"])[1];
+            } 
+            elseif (APITools\is_ip_subnet_or_alias($this->initial_data['target']) === "ipv4_addr") {
+                $this->validated_data["target"] = $this->initial_data['target'];
+                $this->validated_data['target_subnet'] = 32;
+            } 
+            elseif (APITools\is_ip_subnet_or_alias($this->initial_data['target']) === "alias") {
                 # Only allow an alias if round-robin is chosen as the pool option
                 if (in_array($this->validated_data["poolopts"], ["round-robin", "round-robin sticky-address"])) {
                     $this->validated_data["target"] = $this->initial_data['target'];
                 } else {
                     $this->errors[] = APIResponse\get(4096);
                 }
-            } elseif ($this->initial_data["target"] === "") {
-                $this->validated_data["target"] = "";
-                $this->validated_data['targetip'] = "";
-                $this->validated_data['targetip_subnet'] = "";
-            } else {
+            } 
+            elseif ($this->initial_data["target"] === "" or $this->initial_data["target"] === $this->validated_data["interface"]."ip") {
+                $this->validated_data["target"] = $this->validated_data["interface"]."ip";
+            } 
+            else {
                 $this->errors[] = APIResponse\get(4095);
             }
-        } else {
+        } 
+        else {
             $this->errors[] = APIResponse\get(4094);
         }
     }

diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundMappingUpdate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundMappingUpdate.inc
@@ -151,28 +151,25 @@ class APIFirewallNATOutboundMappingUpdate extends APIModel {
         if (isset($this->initial_data['target'])) {
             # Require the target to be a valid IPv4 subnet, address, alias or empty string for iface address
             if (APITools\is_ip_subnet_or_alias($this->initial_data['target']) === "ipv4_subnet") {
-                $this->validated_data["target"] = "other-subnet";
-                $this->validated_data['targetip'] = explode("/", $this->initial_data["target"])[0];
-                $this->validated_data['targetip_subnet'] = explode("/", $this->initial_data["target"])[1];
-            } elseif (APITools\is_ip_subnet_or_alias($this->initial_data['target']) === "ipv4_addr") {
-                $this->validated_data["target"] = "other-subnet";
-                $this->validated_data["targetip"] = $this->initial_data['target'];
-                $this->validated_data['targetip_subnet'] = 32;
-            } elseif (APITools\is_ip_subnet_or_alias($this->initial_data['target']) === "alias") {
-                # Only allow an alias if default or round-robin is chosen as the pool option
-                if (in_array($this->validated_data["poolopts"], ["", "round-robin", "round-robin sticky-address"])) {
-                    # Remove existing target IPs/subnets and add our alias as the target
-                    unset($this->validated_data["targetip"]);
-                    unset($this->validated_data["targetip_subnet"]);
+                $this->validated_data['target'] = explode("/", $this->initial_data["target"])[0];
+                $this->validated_data['target_subnet'] = explode("/", $this->initial_data["target"])[1];
+            }
+            elseif (APITools\is_ip_subnet_or_alias($this->initial_data['target']) === "ipv4_addr") {
+                $this->validated_data["target"] = $this->initial_data['target'];
+                $this->validated_data['target_subnet'] = 32;
+            }
+            elseif (APITools\is_ip_subnet_or_alias($this->initial_data['target']) === "alias") {
+                # Only allow an alias if round-robin is chosen as the pool option
+                if (in_array($this->validated_data["poolopts"], ["round-robin", "round-robin sticky-address"])) {
                     $this->validated_data["target"] = $this->initial_data['target'];
                 } else {
                     $this->errors[] = APIResponse\get(4096);
                 }
-            } elseif ($this->initial_data["target"] === "") {
-                $this->validated_data["target"] = "";
-                $this->validated_data['targetip'] = "";
-                $this->validated_data['targetip_subnet'] = "";
-            } else {
+            }
+            elseif ($this->initial_data["target"] === "" or $this->initial_data["target"] === $this->validated_data["interface"]."ip") {
+                $this->validated_data["target"] = $this->validated_data["interface"]."ip";
+            }
+            else {
                 $this->errors[] = APIResponse\get(4095);
             }
         }

diff --git a/pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceApplyCreate.inc b/pfSense-pkg-API/files/etc/inc/api/models/APIInterfaceApplyCreate.inc
@@ -91,13 +91,10 @@ class APIInterfaceApplyCreate extends APIModel {
                 else {
                     # Bring down the existing interface on the system if it exists
                     interface_bring_down($if_to_apply, true, $if_conf);
-
-                    # Restart DHCP services to remove DHCP server(s) on this interface
-                    if (APIModel::is_config_enabled("dhcpd/{$if_to_apply}") or APIModel::is_config_enabled("dhcpdv6/{$if_to_apply}")) {
-                        services_dhcpd_configure();
-                    }
                 }
 
+                restart_interface_services($if_to_apply, array_get_path($if_conf, 'ifcfg/ipaddrv6'));
+
                 # Interfaces with sub-interfaces (e.g. VLANs) need their MTU reconfigured if changed
                 if (interface_has_clones(get_real_interface($if_to_apply))) {
                     # When static MTU is set
@@ -126,7 +123,6 @@ class APIInterfaceApplyCreate extends APIModel {
         }
 
         # Restart associated/dependent services
-        services_snmpd_configure();
         setup_gateways_monitor();
         clear_subsystem_dirty('interfaces');
         filter_configure();
@@ -137,14 +133,11 @@ class APIInterfaceApplyCreate extends APIModel {
             clear_subsystem_dirty('staticroutes');
         }
 
-        # Initialize syslog configuration and restart the syslog service
-        if (APIModel::is_config_enabled("syslog") and $if_to_apply == APIModel::get_config("syslog/sourceip")) {
-            system_syslogd_start();
-        }
-
         # After all is said and done, clear the interface subsystem status and remove the pending interface change file
         clear_subsystem_dirty('interfaces');
         @unlink($g['tmp_path']."/.interfaces.apply");
+
+        send_event("service reload packages");
     }
 
     # Apply interfaces asynchronously

diff --git a/tests/test_api_v1_interface.py b/tests/test_api_v1_interface.py
@@ -608,7 +608,7 @@ class APIE2ETestInterface(e2e_test_framework.APIE2ETest):
         {
             "name": "Disable interface",
             "resp_time": 5,
-            "post_test_callable": "is_if_disabled",
+            "post_test_callable": "is_if_disabled", 
             "req_data": {
                 "id": VLAN_IF,
                 "descr": "IF_DISABLED_TEST",
@@ -804,7 +804,7 @@ def is_if_disabled(self):
 
         # Loop through each line and check if em2.2 is now disabled
         for line in ifconfig_lines:
-            if line.startswith(f"{VLAN_IF}:") and "UP" in line:
+            if line.startswith(f"{VLAN_IF}:") and "<UP" in line:
                 raise AssertionError(f"Expected {VLAN_IF} to be disabled and not UP")
 
 

diff --git a/tests/test_api_v1_services_service_watchdog.py b/tests/test_api_v1_services_service_watchdog.py
@@ -34,7 +34,7 @@ class APIE2ETestServicesServiceWatchdog(e2e_test_framework.APIE2ETest):
             "name": "Install pfSense-pkg-Service_Watchdog so we can test further",
             "method": "POST",
             "uri": "/api/v1/system/package",
-            "resp_time": 30,
+            "resp_time": 60,
             "resp_data_empty": True,
             "req_data": {
                 "name": "pfSense-pkg-Service_Watchdog"

diff --git a/tests/test_api_v1_system_package.py b/tests/test_api_v1_system_package.py
@@ -17,7 +17,7 @@ class APIE2ETestSystemPackage(e2e_test_framework.APIE2ETest):
     post_tests = [
         {
             "name": "Check install of pfSense repo package",
-            "resp_time": 30,
+            "resp_time": 60,
             "resp_data_empty": True,
             "post_test_callable": "is_package_installed",
             "req_data": {
@@ -33,7 +33,7 @@ class APIE2ETestSystemPackage(e2e_test_framework.APIE2ETest):
             "name": "Check inability to install already installed package",
             "status": 400,
             "return": 1076,
-            "resp_time": 30,
+            "resp_time": 60,
             "req_data": {
                 "name": INSTALL_PKG_NAME
             }
@@ -52,7 +52,7 @@ class APIE2ETestSystemPackage(e2e_test_framework.APIE2ETest):
     delete_tests = [
             {
                 "name": "Test deletion of installed package",
-                "resp_time": 30,
+                "resp_time": 60,
                 "resp_data_empty": True,
                 "post_test_callable": "is_package_deleted",
                 "req_data": {