upnp: move menu and acl to separate files

(cherry picked from commit 8de4047e)

plist

@@ -448,6 +448,8 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/Migrations/M1_0_0.php
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/UPnP/ACL/ACL.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/UPnP/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/index.volt
 /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/vouchers.volt

src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml

@@ -278,12 +278,6 @@
             <Log order="50" VisibleName="Log File" url="/diag_logs_ntpd.php"/>
         </NTP>
         <SNMP url="/services_snmp.php" cssClass="fa fa-database fa-fw"/>
-        <UPnP VisibleName="Universal Plug and Play" cssClass="fa fa-plug fa-fw">
-            <Settings url="/services_upnp.php">
-                <Edit url="/services_upnp.php?*" visibility="hidden"/>
-            </Settings>
-            <Status url="/status_upnp.php"/>
-        </UPnP>
         <WoL VisibleName="Wake on LAN" url="/services_wol.php" cssClass="fa fa-power-off fa-fw">
             <WoLEdit url="/services_wol_edit.php*" visibility="hidden"/>
             <Wol url="/services_wol.php*" visibility="hidden"/>

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

@@ -966,20 +966,6 @@
             "status_graph.php*"
         ]
     },
-    "page-service-upnp": {
-        "name": "WebCfg - Service: Universal Plug and Play page",
-        "descr": "Allow access to the 'Service: Universal Plug and Play' page.",
-        "match": [
-            "services_upnp.php*"
-        ]
-    },
-    "page-status-upnpstatus": {
-        "name": "WebCfg - Status: Universal Plug and Play page",
-        "descr": "Allow access to the 'Status: Universal Plug and Play' page.",
-        "match": [
-            "status_upnp.php*"
-        ]
-    },
     "page-diagnostics-wirelessstatus": {
         "name": "WebCfg - Status: Wireless page",
         "descr": "Allow access to the 'Status: Wireless' page.",

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

+<acl>
+    <page-service-upnp>
+        <name>WebCfg - Service: Universal Plug and Play page</name>
+        <description>Allow access to the 'Service: Universal Plug and Play' page.</description>
+        <patterns>
+            <pattern>services_upnp.php*</pattern>
+        </patterns>
+    </page-service-upnp>
+    <page-status-upnpstatus>
+        <name>WebCfg - Status: Universal Plug and Play page</name>
+        <description>Allow access to the 'Status: Universal Plug and Play' page.</description>
+        <patterns>
+            <pattern>status_upnp.php*</pattern>
+        </patterns>
+    </page-status-upnpstatus>
+</acl>

src/opnsense/mvc/app/models/OPNsense/UPnP/Menu/Menu.xml

+<menu>
+    <Services>
+        <UPnP VisibleName="Universal Plug and Play" cssClass="fa fa-plug fa-fw">
+            <Settings url="/services_upnp.php">
+                <Edit url="/services_upnp.php?*" visibility="hidden"/>
+            </Settings>
+            <Status url="/status_upnp.php"/>
+        </UPnP>
+    </Services>
+</menu>