Added host override unique constraint tolerance for unchanged value updates

Author: Jared Hendrickson

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

@@ -709,28 +709,32 @@ function unbound_reload_config() {
 }
 
 // Check if a DNS Resolver (Unbound) host override already exists
-function unbound_host_override_exists($hostname, $domain) {
-    // Local variables
-    global $err_lib, $config;
-    $curr_hosts = array();
+function is_unbound_fqdn($hostname, $domain, $instance_id=null) {
+    # Local variables
+    global $config;
+    $curr_hosts = (array_key_exists("hosts", $config["unbound"])) ? $config["unbound"]["hosts"] : [];
     $host_exists = false;
-    // Check if host override already exists
-    if (array_key_exists("hosts", $config["unbound"])) {
-        $curr_hosts = $config["unbound"]["hosts"];
-    }
+    $index = 0;
+
+    # Loop through each host override and check if the FQDN already exists
     foreach ($curr_hosts as $host_ent) {
+        # Check the FQDN matches this entry
         if ($host_ent["host"] === $hostname and $host_ent["domain"] === $domain) {
-            $host_exists = true;
-            break;
+            # If we are working with an existing instance, allow existing FQDN if ID matches
+            if ($index !== $instance_id) {
+                return true;
+            }
         }
+
+        # Check FQDN within host override aliases as well
         if (is_array($host_ent["aliases"])) {
             foreach ($host_ent["aliases"]["item"] as $alias_ent) {
                 if ($alias_ent["host"] === $hostname and $alias_ent["domain"] === $domain) {
-                    $host_exists = true;
-                    break;
+                    return true;
                 }
             }
         }
+        $index++;
     }
     return $host_exists;
 }

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

@@ -73,7 +73,7 @@ class APIServicesUnboundHostOverrideAliasCreate extends APIModel {
         }
 
         # Ensure this hostname doesn't already exis
-        if (APITools\unbound_host_override_exists($this->validated_data["host"], $this->validated_data["domain"])) {
+        if (APITools\is_unbound_fqdn($this->validated_data["host"], $this->validated_data["domain"])) {
             $this->errors[] = APIResponse\get(2009);
         }
     }

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

@@ -51,7 +51,7 @@ class APIServicesUnboundHostOverrideCreate extends APIModel {
         # Check for our required 'domain' payload value
         if (isset($this->initial_data['domain'])) {
             $this->validated_data["domain"] = trim($this->initial_data['domain']);
-            if (APITools\unbound_host_override_exists($this->validated_data["host"], $this->validated_data["domain"])) {
+            if (APITools\is_unbound_fqdn($this->validated_data["host"], $this->validated_data["domain"])) {
                 $this->errors[] = APIResponse\get(2010);
             }
         } else {

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

@@ -75,7 +75,7 @@ class APIServicesUnboundHostOverrideUpdate extends APIModel {
 
         # If host or domain was updated, ensure this host override doesn't already exist
         if (isset($this->initial_data["host"]) or isset($this->initial_data["domain"])) {
-            if (APITools\unbound_host_override_exists($this->validated_data["host"], $this->validated_data["domain"])) {
+            if (APITools\is_unbound_fqdn($this->validated_data["host"], $this->validated_data["domain"], $this->id)) {
                 $this->errors[] = APIResponse\get(2010);
             }
         }