acl: clean up and fix a few issues

(cherry picked from commit b21a4f1d)

src/opnsense/mvc/app/models/OPNsense/CaptivePortal/ACL/ACL.xml

@@ -2,7 +2,7 @@
     <!-- unique acl key, must be globally unique for all acl's  -->
     <page-services-captiveportal>
         <name>WebCfg - Services: Captive Portal</name>
-        <description>Allow access to the 'Services: Captive Portal' page'</description>
+        <description>Allow access to the 'Services: Captive Portal' page.</description>
         <patterns>
             <pattern>ui/captiveportal/*</pattern>
             <pattern>api/captiveportal/*</pattern>

src/opnsense/mvc/app/models/OPNsense/Core/ACL.php

@@ -114,7 +114,7 @@ class ACL
                             $aclPayload['name'] = (string)$ACLnode->name;
                             if (isset($ACLnode->description)) {
                                 // rename internal tag for backward compat.
-                                $aclPayload['desc'] = (string)$ACLnode->description;
+                                $aclPayload['descr'] = (string)$ACLnode->description;
                             }
                             if (isset($ACLnode->patterns->pattern)) {
                                 // rename pattern to match for internal usage, old code did use match and

src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json

@@ -51,7 +51,7 @@
         ]
     },
     "page-diagnostics-crash-reporter": {
-        "name": "WebCfg - Crash reporter",
+        "name": "WebCfg - System: Crash Reporter",
         "descr": "Uploads crash reports to the developers.",
         "match": [
             "crash_reporter.php*"
@@ -181,13 +181,6 @@
             "diag_logs_l2tp.php*"
         ]
     },
-    "page-diagnostics-nanobsd": {
-        "name": "WebCfg - Diagnostics: NanoBSD",
-        "descr": "Allow access to the 'Diagnostics: NanoBSD' page.",
-        "match": [
-            "diag_nanobsd.php*"
-        ]
-    },
     "page-diagnostics-packetcapture": {
         "name": "WebCfg - Diagnostics: Packet Capture page",
         "descr": "Allow access to the 'Diagnostics: Packet Capture' page.",
@@ -195,13 +188,6 @@
             "diag_packet_capture.php*"
         ]
     },
-    "page-diagnostics-patters": {
-        "name": "WebCfg - Diagnostics: Patterns page",
-        "descr": "Allow access to the 'Diagnostics: Patterns' page.",
-        "match": [
-            "patterns.php*"
-        ]
-    },
     "page-diagnostics-tables": {
         "name": "WebCfg - Diagnostics: PF Table IP addresses",
         "descr": "Allow access to the 'Diagnostics: Tables' page.",
@@ -244,13 +230,6 @@
             "diag_resetstate.php*"
         ]
     },
-    "page-diagnostics-restore-full-backup": {
-        "name": "WebCfg - Diagnostics: Restore full backup",
-        "descr": "Allow access to the 'Diagnostics: Restore Full Backup' page.",
-        "match": [
-            "system_firmware_restorefullbackup.php"
-        ]
-    },
     "page-diagnostics-routingtables": {
         "name": "WebCfg - Diagnostics: Routing tables page",
         "descr": "Allow access to the 'Diagnostics: Routing tables' page.",
@@ -1154,21 +1133,8 @@
         "name": "WebCfg - System: Firmware: Manual Update page",
         "descr": "Allow access to the 'System: Firmware: Manual Update' page.",
         "match": [
-            "system_firmware.php*"
-        ]
-    },
-    "page-upload_progress": {
-        "name": "WebCfg - System: Firmware: Manual Update page (progress bar)",
-        "descr": "Allow access to the 'System: Firmware: Manual Update: Progress bar' page.",
-        "match": [
-            "upload_progress*"
-        ]
-    },
-    "page-system-firmware-settings": {
-        "name": "WebCfg - System: Firmware: Settings page",
-        "descr": "Allow access to the 'System: Firmware: Settings' page.",
-        "match": [
-            "system_firmware_settings.php*"
+            "ui/core/firmware/*",
+            "api/core/firmware/*"
         ]
     },
     "page-system-gatewaygroups": {

src/opnsense/mvc/app/models/OPNsense/IDS/ACL/ACL.xml

@@ -2,7 +2,7 @@
     <!-- unique acl key, must be globally unique for all acl's  -->
     <page-services-ids>
         <name>WebCfg - Services: Intrusion Detection page</name>
-        <description>Allow access to the 'Services: Intrusion Detection' page'</description>
+        <description>Allow access to the 'Services: Intrusion Detection' page.</description>
         <patterns>
             <pattern>ui/ids/*</pattern>
             <pattern>api/ids/*</pattern>