(acl) move diagnostic acls to module

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

@@ -74,13 +74,6 @@
             "*.widget.php*"
         ]
     },
-    "page-diagnostics-arptable": {
-        "name": "WebCfg - Diagnostics: ARP Table page",
-        "descr": "Allow access to the 'Diagnostics: ARP Table' page.",
-        "match": [
-            "diag_arp.php*"
-        ]
-    },
     "page-diagnostics-authentication": {
         "name": "WebCfg - Diagnostics: Authentication page",
         "descr": "Allow access to the 'Diagnostics: Authentication' page.",
@@ -291,14 +284,6 @@
             "diag_states_summary.php*"
         ]
     },
-    "page-diagnostics-system-activity": {
-        "name": "WebCfg - Diagnostics: System Activity",
-        "descr": "Allows access to the 'Diagnostics: System Activity' page",
-        "match": [
-            "ui/diagnostics/activity/*",
-            "api/diagnostics/activity/*"
-        ]
-    },
     "page-diagnostics-testport": {
         "name": "Webcfg - Diagnostics: Test Port",
         "descr": "Allow access to the 'Diagnostics: Test Port' page.",

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

+<acl>
+    <!-- unique acl key, must be globally unique for all acl's  -->
+    <page-diagnostics-arptable>
+        <name>WebCfg - Diagnostics: ARP Table page</name>
+        <description>Allow access to the 'Diagnostics: ARP Table' page.</description>
+        <patterns>
+            <pattern>ui/diagnostics/interface/arp/*</pattern>
+            <pattern>api/diagnostics/interface/arp/*</pattern>
+        </patterns>
+    </page-diagnostics-arptable>
+    <page-diagnostics-system-activity>
+      <name>WebCfg - Diagnostics: System Activity</name>
+      <description>Allows access to the 'Diagnostics: System Activity' page</description>
+      <patterns>
+          <pattern>ui/diagnostics/activity/*</pattern>
+          <pattern>api/diagnostics/activity/*</pattern>
+      </patterns>
+    </page-diagnostics-system-activity>
+</acl>