Fixed bug in NAT endpoints that attempt to write configuration before the config array was initialized

Author: Jared Hendrickson

pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundMappingCreate.inc

@@ -37,6 +37,7 @@ class APIFirewallNATOutboundMappingCreate extends APIModel {
 
     public function action() {
         # Add our new configuration
+        $this->__init_config();
         $this->config["nat"]["outbound"]["rule"][$this->id] = $this->validated_data;
         APITools\sort_nat_rules($this->initial_data["top"], $this->id, "outbound");
         $this->write_config();
@@ -285,6 +286,12 @@ class APIFirewallNATOutboundMappingCreate extends APIModel {
         $this->validated_data["updated"] = $this->validated_data["created"];
     }
 
+    private function __init_config() {
+        $this->config["nat"] = (is_array($this->config["nat"])) ? $this->config["nat"] : [];
+        $this->config["nat"]["outbound"] = (is_array($this->config["nat"]["outbound"])) ? $this->config["nat"]["outbound"] : [];
+        $this->config["nat"]["outbound"]["rule"] = (is_array($this->config["nat"]["outbound"]["rule"])) ? $this->config["nat"]["outbound"]["rule"] : [];
+    }
+
     public function apply() {
         # Mark the NAT subsystem as changed, clear if applied
         mark_subsystem_dirty('natconf');

pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATOutboundUpdate.inc

@@ -25,8 +25,6 @@ class APIFirewallNATOutboundUpdate extends APIModel {
         parent::__construct();
         $this->privileges = ["page-all", "page-firewall-nat-outbound"];
         $this->modes = ["automatic", "hybrid", "advanced", "disabled"];
-        var_dump($this->initial_data);
-
     }
 
     public function action() {
@@ -107,7 +105,15 @@ class APIFirewallNATOutboundUpdate extends APIModel {
         return false;
     }
 
+    # Ensures we have our configuration array formatted for outbound NAT configurations
+    private function __init_config() {
+        $this->config["nat"] = (is_array($this->config["nat"])) ? $this->config["nat"] : [];
+        $this->config["nat"]["outbound"] = (is_array($this->config["nat"]["outbound"])) ? $this->config["nat"]["outbound"] : [];
+        $this->config["nat"]["outbound"]["rule"] = (is_array($this->config["nat"]["outbound"]["rule"])) ? $this->config["nat"]["outbound"]["rule"] : [];
+    }
+
     public function validate_payload() {
+        $this->__init_config();
         $this->__get_default();
         $this->__validate_mode();
     }