Merge branch 'master' into next_minor

Author: jaredhendrickson13

package-lock.json

@@ -25,10 +25,10 @@ class PrivilegesCache extends Cache {
             $privs += $endpoint_object->generate_pfsense_privs();
         }
 
-        # Obtain privileges for each Endpoint class
-        foreach (get_classes_from_namespace('\\RESTAPI\\Forms\\') as $endpoint_class) {
-            $endpoint_object = new $endpoint_class();
-            $privs += $endpoint_object->generate_pfsense_privs();
+        # Obtain privileges for each Form class
+        foreach (get_classes_from_namespace('\\RESTAPI\\Forms\\') as $form_class) {
+            $form_object = new $form_class();
+            $privs += $form_object->generate_pfsense_privs();
         }
 
         return $privs;

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Caches/PrivilegesCache.inc

@@ -165,7 +165,17 @@ class Form {
     private function generate_verbose_name(): string {
         # Separate the class name's words with spaces, allow consecutive capital characters like 'DNS'
         $form_name = $this->get_class_shortname();
-        return preg_replace('/(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])/', ': ', $form_name);
+        $verbose_name = preg_replace('/(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])/', ' ', $form_name);
+
+        # Add a colon after the first word if the class name is more than one word
+        if (str_contains($verbose_name, ' ')) {
+            $verbose_name = explode(' ', $verbose_name);
+            $verbose_name[0] .= ': ';
+            $verbose_name = implode(' ', $verbose_name);
+        }
+
+        # Return the verbose name with the 'Form' suffix removed
+        return str_replace(' Form', '', $verbose_name);
     }
 
     /**
@@ -513,6 +523,7 @@ class Form {
             $this->get_priv_name() => [
                 'name' => 'WebCfg - ' . $this->verbose_name,
                 'descr' => "Allow access to the $this->url page.",
+                'match' => [substr($this->url, 1)],
             ],
         ];
     }

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Core/Form.inc

@@ -40,7 +40,7 @@ class IPsecChildSAStatus extends Model {
 
     public function __construct(mixed $id = null, mixed $parent_id = null, mixed $data = [], ...$options) {
         # Set model attributes
-        $this->internal_callable = 'get_ipsec_child SA_statuses';
+        $this->internal_callable = 'get_ipsec_sa_statuses';
         $this->parent_model_class = 'IPsecSAStatus';
         $this->verbose_name = 'IPsec Child SA Status';
         $this->many = true;

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Models/IPsecChildSAStatus.inc

@@ -1248,4 +1248,23 @@ class APICoreModelTestCase extends RESTAPI\Core\TestCase {
         $dhcp_server->staticmap->value = [];
         $dhcp_server->update(apply: true);
     }
+
+    /**
+     * Checks that all Model classes with an internal_callable assigned have an existing callable assigned.
+     */
+    public function test_model_internal_callables_exist(): void {
+        # Loop through all Model classes
+        foreach (Model::get_all_model_classes() as $model_class) {
+            # Create a new instance of the Model class
+            $model_obj = new $model_class(skip_init: true);
+
+            # Skip models that don't have an internal callable assigned
+            if (!$model_obj->internal_callable) {
+                continue;
+            }
+
+            # Ensure the internal callable exists
+            $this->assert_is_true(method_exists($model_obj, $model_obj->internal_callable));
+        }
+    }
 }