Fixed timeserver limit constraint in APIServicesNTPdTimeServerCreate.inc, changed APIServicesNTPdTimeServerDelete.inc to assign the default timeserver if all timeservers were removed, fixed interface assignment in APIServicesNTPdUpdate.inc, add nested timeservers call in APIServicesNTPdUpdate.inc to create timeservers using APIServicesNTPdTimeServerCreate.inc

Author: jaredhendrickson13

pfSense-pkg-API/files/etc/inc/api/endpoints/APIServicesNTPd.inc

@@ -23,4 +23,8 @@ class APIServicesNTPd extends APIEndpoint {
     protected function get() {
         return (new APIServicesNTPdRead())->call();
     }
+
+    protected function put() {
+        return (new APIServicesNTPdUpdate())->call();
+    }
 }

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

@@ -35,9 +35,10 @@ class APIServicesNTPdTimeServerCreate extends APIModel {
         $this->config["system"]["timeservers"] = implode(" ", $this->timeservers);
         $this->write_config();
 
-        # Reconfigure NTP to apply the changes. Since values are stored in two places, simply return the initial data.
+        # Reconfigure NTP to apply the changes then return the response
         system_ntp_configure();
-        return APIResponse\get(0, $this->initial_data);
+        $this->validated_data["timeservers"] = $this->timeservers;
+        return APIResponse\get(0, $this->validated_data);
     }
 
     public function validate_payload() {
@@ -50,7 +51,7 @@ class APIServicesNTPdTimeServerCreate extends APIModel {
 
     private function __validate_timeserver_limit() {
         # Before adding a new timeserver, ensure we are not already at our maximum limit
-        if (count($this->timeservers) > 10) {
+        if (count($this->timeservers) >= 10) {
             $this->errors[] = APIResponse\get(2050);
         }
     }

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

@@ -37,7 +37,8 @@ class APIServicesNTPdTimeServerDelete extends APIModel {
 
         # Reconfigure NTP to apply the changes. Since values are stored in two places, simply return the initial data.
         system_ntp_configure();
-        return APIResponse\get(0, $this->initial_data);
+        $this->validated_data["timeservers"] = $this->timeservers;
+        return APIResponse\get(0, $this->validated_data);
     }
 
     public function validate_payload() {
@@ -47,29 +48,35 @@ class APIServicesNTPdTimeServerDelete extends APIModel {
     private function __validate_timeserver() {
         # Before deleting the timeserver, ensure it exists
         if (in_array($this->initial_data["timeserver"], $this->timeservers)) {
-            # Remove the timeserver from our system timeservers
+            # Remove the timeserver from our system timeservers. Reindex the array afterwards.
             unset($this->timeservers[array_search($this->initial_data["timeserver"], $this->timeservers)]);
+            $this->timeservers = array_values($this->timeservers);
 
-            # Remove the timeserver from the ntpd ispool
+            # Remove the timeserver from the ntpd ispool if found
             $ispool_arr = explode(" ", $this->validated_data["ispool"]);
             if (in_array($this->initial_data["timeserver"], $ispool_arr)) {
                 unset($ispool_arr[array_search($this->initial_data["timeserver"], $ispool_arr)]);
                 $this->validated_data["ispool"] = implode(" ", $ispool_arr);
             }
 
-            # Remove the timeserver from the ntpd noselect
+            # Remove the timeserver from the ntpd noselect if found
             $noselect_arr = explode(" ", $this->validated_data["noselect"]);
             if (in_array($this->initial_data["timeserver"], $noselect_arr)) {
                 unset($noselect_arr[array_search($this->initial_data["timeserver"], $noselect_arr)]);
                 $this->validated_data["noselect"] = implode(" ", $noselect_arr);
             }
 
-            # Remove the timeserver from the ntpd prefer
+            # Remove the timeserver from the ntpd prefer if found
             $prefer_arr = explode(" ", $this->validated_data["prefer"]);
             if (in_array($this->initial_data["timeserver"], $prefer_arr)) {
                 unset($prefer_arr[array_search($this->initial_data["timeserver"], $prefer_arr)]);
                 $this->validated_data["prefer"] = implode(" ", $prefer_arr);
             }
+
+            # If the last timeserver was removed, assert the default to prevent killing the system time
+            if (empty($this->timeservers)) {
+                $this->timeservers[] = "pool.ntp.org";
+            }
         }
         # Otherwise, return error if the request name server does not exist
         else {

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

@@ -27,10 +27,14 @@ class APIServicesNTPdUpdate extends APIModel {
     }
 
     public function action() {
-        # Save our updated configuration and apply the changes
+        # Save our updated configuration
         $this->config["ntpd"] = $this->validated_data;
         $this->write_config();
+
+        # Apply our change and return the response. Include all configured timeservers from system > timeservers as it
+        # is need to provide the full context of the configuration
         system_ntp_configure();
+        $this->validated_data["timeservers"] = explode(" ", $this->config["system"]["timeservers"]);;
         return APIResponse\get(0, $this->validated_data);
     }
 
@@ -57,15 +61,34 @@ class APIServicesNTPdUpdate extends APIModel {
                 $if = (APITools\get_pfsense_if_id($if)) ? APITools\get_pfsense_if_id($if) : $if;
 
                 # Check that this interface exists
-                if (array_key_exists($if, $this->__get_interfaces())) {
+                if (in_array($if, $this->__get_interfaces())) {
                     $this->validated_data["interface"][] = $if;
                 } else {
                     $this->errors[] = APIResponse\get(2047);
                 }
             }
 
             # Convert value to internal XML value
-            $this->validated_data["allowed_interfaces"] = implode(",", $this->validated_data["allowed_interfaces"]);
+            $this->validated_data["interface"] = implode(",", $this->validated_data["interface"]);
+        }
+    }
+
+    private function __validate_timeservers() {
+        # Check for our optional 'timeservers' payload value
+        if (isset($this->initial_data["timeservers"])) {
+            # Loop through each requested timeserver and ensure it is valid
+            foreach ($this->initial_data["timeservers"] as $timeserver) {
+                # Use the APIServicesNTPdTimeServerCreate model to validate each requested time server. This essentially
+                # creates a nested/internal API call to validate/create NTPd timeservers
+                $cts = new APIServicesNTPdTimeServerCreate();
+                $cts->initial_data = $timeserver;
+                $cts->validate_payload();
+
+                # If errors were encountered while validating the payload, save those errors to this models error field
+                if (!empty($cts->errors)) {
+                    $this->errors = $this->errors + $cts->errors;
+                }
+            }
         }
     }
 
@@ -146,7 +169,7 @@ class APIServicesNTPdUpdate extends APIModel {
     private function __get_interfaces() {
         # Local variables
         $if_raw = get_configured_interface_with_descr();
-        $if_list = [];
+        $if_list = ["lo0"];
 
         # Loop through each configured interface but only capture interfaces with valid IP addresses
         foreach ($if_raw as $if => $if_descr) {