Merge pull request #150 from jaredhendrickson13/v124

[WIP] v1.2.4 Fixes

Author: jaredhendrickson13

README.md

@@ -996,6 +996,19 @@ URL: https://{{$hostname}}/api/v1/firewall/alias
 
 
 
+***Query params:***
+
+| Key | Value | Description |
+| --- | ------|-------------|
+| id | string | Name of existing alias to modify. Unlikely other endpoint, this field does NOT use the numeric pfSense ID to locate objects. |
+| name | string | Change name of alias (optional) |
+| type | string | Change type of alias. Alias type can only be changed when the targetted alias is not in use (optional) |
+| descr | string | Change alias description (optional) |
+| address | string or array | Overwrite existing alias addresses with new addresses. Multiple values may be passed in as array, singular values may be passed in as string (optional) |
+| detail | string or array | Overwrite existing alias address details with new details. Multiple values may be passed in as array, singular values may be passed in as string. Detail values must match index of alias addresses (optional) |
+
+
+
 ***Body:***
 
 ```js        

pfSense-pkg-API/files/etc/inc/api/framework/APIResponse.inc

@@ -2334,7 +2334,7 @@ function get($id, $data=[], $all=false) {
             "status" => "bad request",
             "code" => 400,
             "return" => $id,
-            "message" => "Firewall rule dnpipe and pdnpip queue and a virtual interface cannot be selected"
+            "message" => "Firewall rule dnpipe and pdnpipe queue and a virtual interface cannot be selected"
         ],
         4226 => [
             "status" => "bad request",

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

@@ -254,13 +254,13 @@ class APIFirewallRuleCreate extends APIModel {
                     if ($this->initial_data["pdnpipe"] !== $this->validated_data["dnpipe"]) {
                         # Determine pipe types
                         $dnpipe_type = $dnqueues[$this->validated_data['dnpipe']][0];
-                        $pdnpipe_type = $dnqueues[$_POST['pdnpipe']][0];
+                        $pdnpipe_type = $dnqueues[$this->initial_data['pdnpipe']][0];
 
-                        # Ensure the dnpipe and pdnpipe types do not match
+                        # Ensure the dnpipe and pdnpipe types match
                         if (($dnpipe_type === "?" and $pdnpipe_type !== "?") or ($pdnpipe_type === "?" and $dnpipe_type !== "?")) {
-                            $this->validated_data["pdnpipe"] = $this->initial_data["pdnpipe"];
-                        } else {
                             $this->errors[] = APIResponse\get(4225);
+                        } else {
+                            $this->validated_data["pdnpipe"] = $this->initial_data["pdnpipe"];
                         }
                     } else {
                         $this->errors[] = APIResponse\get(4224);

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

@@ -292,13 +292,13 @@ class APIFirewallRuleUpdate extends APIModel {
                         if ($this->initial_data["pdnpipe"] !== $this->validated_data["dnpipe"]) {
                             # Determine pipe types
                             $dnpipe_type = $dnqueues[$this->validated_data['dnpipe']][0];
-                            $pdnpipe_type = $dnqueues[$_POST['pdnpipe']][0];
+                            $pdnpipe_type = $dnqueues[$this->initial_data['pdnpipe']][0];
 
-                            # Ensure the dnpipe and pdnpipe types do not match
+                            # Ensure the dnpipe and pdnpipe types match
                             if (($dnpipe_type === "?" and $pdnpipe_type !== "?") or ($pdnpipe_type === "?" and $dnpipe_type !== "?")) {
-                                $this->validated_data["pdnpipe"] = $this->initial_data["pdnpipe"];
-                            } else {
                                 $this->errors[] = APIResponse\get(4225);
+                            } else {
+                                $this->validated_data["pdnpipe"] = $this->initial_data["pdnpipe"];
                             }
                         } else {
                             $this->errors[] = APIResponse\get(4224);