From f59d2c87193ee9cce81ff5c6a8f445eccf6df695 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 5 Jan 2016 18:01:33 +0100
Subject: [PATCH] (diagnostics) move acl and menu content for ndp to
 diagnostics

---
 .../app/models/OPNsense/Base/Menu/Menu.xml    |  1 -
 .../OPNsense/Core/ACL_Legacy_Page_Map.json    |  7 ------
 .../models/OPNsense/Diagnostics/ACL/ACL.xml   | 22 +++++++++++++------
 .../models/OPNsense/Diagnostics/Menu/Menu.xml |  3 ++-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index 9692f0556..a289330b4 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -134,7 +134,6 @@
         </Wireless>
         <Diagnostics order="940" cssClass="fa fa-medkit">
             <DNSLookup order="20" VisibleName="DNS Lookup" url="/diag_dns.php"/>
-            <NDPTable order="30" VisibleName="NDP Table" url="/diag_ndp.php"/>
             <PacketCapture order="40" VisibleName="Packet Capture" url="/diag_packet_capture.php"/>
             <Ping order="50" url="/diag_ping.php"/>
             <TestPort order="60" VisibleName="Test Port" url="/diag_testport.php"/>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
index 981404aaf..036e43519 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
@@ -186,13 +186,6 @@
             "diag_nanobsd.php*"
         ]
     },
-    "page-diagnostics-ndptable": {
-        "name": "Webcfg - Diagnostics: NDP Table page",
-        "descr": "Allow access to the 'Diagnostics: NDP Table' page.",
-        "match": [
-            "diag_ndp.php*"
-        ]
-    },
     "page-diagnostics-packetcapture": {
         "name": "WebCfg - Diagnostics: Packet Capture page",
         "descr": "Allow access to the 'Diagnostics: Packet Capture' page.",
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/ACL/ACL.xml
index 77c852687..dfe4d1da4 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/ACL/ACL.xml
@@ -5,15 +5,23 @@
         <description>Allow access to the 'Diagnostics: ARP Table' page.</description>
         <patterns>
             <pattern>ui/diagnostics/interface/arp/*</pattern>
-            <pattern>api/diagnostics/interface/arp/*</pattern>
+            <pattern>api/diagnostics/interface/getArp*</pattern>
         </patterns>
     </page-diagnostics-arptable>
+    <page-diagnostics-ndptable>
+        <name>Webcfg - Diagnostics: NDP Table page</name>
+        <description>Allow access to the 'Diagnostics: NDP Table' page.</description>
+        <patterns>
+            <pattern>ui/diagnostics/interface/ndp/*</pattern>
+            <pattern>api/diagnostics/interface/getNdp*</pattern>
+        </patterns>
+    </page-diagnostics-ndptable>
     <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>
+        <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>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
index 7d8d07c6d..dfa736d72 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Menu/Menu.xml
@@ -7,7 +7,8 @@
     </System>
     <Interfaces>
         <Diagnostics>
-          <ARPTable order="10" VisibleName="ARP Table" url="/ui/diagnostics/interface/arp/"/>
+            <ARPTable order="10" VisibleName="ARP Table" url="/ui/diagnostics/interface/arp/"/>
+            <NDPTable order="30" VisibleName="NDP Table" url="/ui/diagnostics/interface/ndp/"/>
         </Diagnostics>
     </Interfaces>
 </menu>