Fixed bad update payload in firewall rule unit test, removed inet46 gateway condition from firewall rule endpoints

Author: jaredhendrickson13

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

@@ -195,7 +195,7 @@ class APIFirewallRuleCreate extends APIModel {
                 $this->errors[] = APIResponse\get(4043);
             }
             # Check if the gateway IP protocol matches our rule's IP protocol
-            elseif ($gw_protocol !== "inet46" and $gw_protocol !== $this->validated_data["ipprotocol"]) {
+            elseif ($gw_protocol !== $this->validated_data["ipprotocol"]) {
                 $this->errors[] = APIResponse\get(4109);
             }
             # Otherwise, the gateway is valid

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

@@ -218,7 +218,7 @@ class APIFirewallRuleUpdate extends APIModel {
                 $this->errors[] = APIResponse\get(4043);
             }
             # Check if the gateway IP protocol matches our rule's IP protocol
-            elseif ($gw_protocol !== "inet46" and $gw_protocol !== $this->validated_data["ipprotocol"]) {
+            elseif ($gw_protocol !== $this->validated_data["ipprotocol"]) {
                 $this->errors[] = APIResponse\get(4109);
             }
             # Otherwise, the gateway is valid

tests/test_api_v1_firewall_rule.py

@@ -28,6 +28,7 @@ class APIUnitTestFirewallRule(unit_test_framework.APIUnitTest):
             "dst": "127.0.0.1",
             "dstport": "443",
             "descr": "Unit test",
+            "log": True,
             "top": True
         }
     ]
@@ -38,10 +39,12 @@ class APIUnitTestFirewallRule(unit_test_framework.APIUnitTest):
             "ipprotocol": "inet",
             "protocol": "tcp/udp",
             "src": "172.16.77.125",
-            "srcport": "HTTP",
+            "srcport": "8080-8081",
             "dst": "127.0.0.1",
-            "dstport": "HTTP",
+            "dstport": "2222-4444",
             "descr": "Updated Unit test",
+            "gateway": "WAN_DHCP",
+            "log": False,
             "top": True
         }
     ]