From 8d2c3d23ac834c203784802f9a5a0ea6af4fea15 Mon Sep 17 00:00:00 2001
From: Monviech <gitacc@pischem.com>
Date: Mon, 11 Nov 2024 17:28:14 +0000
Subject: [PATCH 1/6] net/ndproxy: Add os-ndproxy plugin

---
 net/ndproxy/Makefile                          |  7 ++
 net/ndproxy/pkg-descr                         |  8 ++
 net/ndproxy/src/inc/plugins.inc.d/ndproxy.inc | 64 +++++++++++++
 .../Ndproxy/Api/GeneralController.php         | 40 ++++++++
 .../Ndproxy/Api/ServiceController.php         | 41 ++++++++
 .../OPNsense/Ndproxy/GeneralController.php    | 42 ++++++++
 .../Ndproxy/forms/Api/GeneralController.php   | 40 ++++++++
 .../Ndproxy/forms/Api/ServiceController.php   | 41 ++++++++
 .../Ndproxy/forms/GeneralController.php       | 42 ++++++++
 .../OPNsense/Ndproxy/forms/general.xml        | 39 ++++++++
 .../app/models/OPNsense/Ndproxy/ACL/ACL.xml   | 10 ++
 .../app/models/OPNsense/Ndproxy/Menu/Menu.xml |  5 +
 .../app/models/OPNsense/Ndproxy/Ndproxy.php   | 66 +++++++++++++
 .../app/models/OPNsense/Ndproxy/Ndproxy.xml   | 27 ++++++
 .../app/views/OPNsense/Ndproxy/general.volt   | 95 +++++++++++++++++++
 .../conf/actions.d/actions_ndproxy.conf       | 24 +++++
 .../templates/OPNsense/Ndproxy/+TARGETS       |  1 +
 .../OPNsense/Ndproxy/rc.conf.d/ndproxy        | 19 ++++
 18 files changed, 611 insertions(+)
 create mode 100644 net/ndproxy/Makefile
 create mode 100644 net/ndproxy/pkg-descr
 create mode 100644 net/ndproxy/src/inc/plugins.inc.d/ndproxy.inc
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/Api/GeneralController.php
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/Api/ServiceController.php
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/GeneralController.php
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/Api/GeneralController.php
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/Api/ServiceController.php
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/GeneralController.php
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/general.xml
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/ACL/ACL.xml
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Menu/Menu.xml
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.php
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.xml
 create mode 100644 net/ndproxy/src/opnsense/mvc/app/views/OPNsense/Ndproxy/general.volt
 create mode 100644 net/ndproxy/src/opnsense/service/conf/actions.d/actions_ndproxy.conf
 create mode 100644 net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/+TARGETS
 create mode 100644 net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/rc.conf.d/ndproxy

diff --git a/net/ndproxy/Makefile b/net/ndproxy/Makefile
new file mode 100644
index 0000000000..17d6902560
--- /dev/null
+++ b/net/ndproxy/Makefile
@@ -0,0 +1,7 @@
+PLUGIN_NAME=		ndproxy
+PLUGIN_VERSION=		1.0
+PLUGIN_DEPENDS=		ndproxy
+PLUGIN_COMMENT=		Neighbor Discovery Proxy
+PLUGIN_MAINTAINER=	cedrik@pischem.com
+
+.include "../../Mk/plugins.mk"
diff --git a/net/ndproxy/pkg-descr b/net/ndproxy/pkg-descr
new file mode 100644
index 0000000000..ee59b68dd7
--- /dev/null
+++ b/net/ndproxy/pkg-descr
@@ -0,0 +1,8 @@
+Ndproxy is a kernel module that implements IPv6 Neighbor Discovery proxying over Ethernet-like access networks.
+
+Plugin Changelog
+================
+
+1.0
+
+* Initial Release
diff --git a/net/ndproxy/src/inc/plugins.inc.d/ndproxy.inc b/net/ndproxy/src/inc/plugins.inc.d/ndproxy.inc
new file mode 100644
index 0000000000..1e9981b5bd
--- /dev/null
+++ b/net/ndproxy/src/inc/plugins.inc.d/ndproxy.inc
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * Copyright (C) 2024 Cedrik Pischem
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+function ndproxy_services()
+{
+    global $config;
+
+    $services = [];
+
+    if (isset($config['OPNsense']['ndproxy']['general']['enabled']) &&
+        $config['OPNsense']['ndproxy']['general']['enabled'] == 1) {
+        $services[] = [
+            'description' => gettext('Ndproxy'),
+            'configd' => [
+                'start' => ['ndproxy start'],
+                'restart' => ['ndproxy restart'],
+                'stop' => ['ndproxy stop'],
+            ],
+            'nocheck' => true, // No daemon to check
+            'name' => 'ndproxy'
+        ];
+    }
+
+    return $services;
+}
+
+function ndproxy_xmlrpc_sync()
+{
+    $result = array();
+
+    $result[] = array(
+        'description' => gettext('Ndproxy'),
+        'section' => 'OPNsense.ndproxy',
+        'id' => 'ndproxy',
+        'services' => ["ndproxy"],
+    );
+
+    return $result;
+}
\ No newline at end of file
diff --git a/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/Api/GeneralController.php b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/Api/GeneralController.php
new file mode 100644
index 0000000000..3fe747dc6c
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/Api/GeneralController.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Cedrik Pischem
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace OPNsense\Ndproxy\Api;
+
+use OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Core\Config;
+
+class GeneralController extends ApiMutableModelControllerBase
+{
+    protected static $internalModelName = 'ndproxy';
+    protected static $internalModelClass = 'OPNsense\Ndproxy\Ndproxy';
+}
diff --git a/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/Api/ServiceController.php b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/Api/ServiceController.php
new file mode 100644
index 0000000000..55d3983dc9
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/Api/ServiceController.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Cedrik Pischem
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace OPNsense\Ndproxy\Api;
+
+use OPNsense\Base\ApiMutableServiceControllerBase;
+
+class ServiceController extends ApiMutableServiceControllerBase
+{
+    protected static $internalServiceClass = '\OPNsense\Ndproxy\Ndproxy';
+    protected static $internalServiceTemplate = 'OPNsense/Ndproxy';
+    protected static $internalServiceEnabled = 'general.enabled';
+    protected static $internalServiceName = 'ndproxy';
+}
diff --git a/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/GeneralController.php b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/GeneralController.php
new file mode 100644
index 0000000000..d97a29a228
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/GeneralController.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Cedrik Pischem
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace OPNsense\Ndproxy;
+
+use OPNsense\Base\IndexController;
+
+class GeneralController extends IndexController
+{
+    public function indexAction()
+    {
+        $this->view->pick('OPNsense/Ndproxy/general');
+        $this->view->generalForm = $this->getForm("general");
+    }
+}
diff --git a/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/Api/GeneralController.php b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/Api/GeneralController.php
new file mode 100644
index 0000000000..3fe747dc6c
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/Api/GeneralController.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Cedrik Pischem
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace OPNsense\Ndproxy\Api;
+
+use OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Core\Config;
+
+class GeneralController extends ApiMutableModelControllerBase
+{
+    protected static $internalModelName = 'ndproxy';
+    protected static $internalModelClass = 'OPNsense\Ndproxy\Ndproxy';
+}
diff --git a/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/Api/ServiceController.php b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/Api/ServiceController.php
new file mode 100644
index 0000000000..55d3983dc9
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/Api/ServiceController.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Cedrik Pischem
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace OPNsense\Ndproxy\Api;
+
+use OPNsense\Base\ApiMutableServiceControllerBase;
+
+class ServiceController extends ApiMutableServiceControllerBase
+{
+    protected static $internalServiceClass = '\OPNsense\Ndproxy\Ndproxy';
+    protected static $internalServiceTemplate = 'OPNsense/Ndproxy';
+    protected static $internalServiceEnabled = 'general.enabled';
+    protected static $internalServiceName = 'ndproxy';
+}
diff --git a/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/GeneralController.php b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/GeneralController.php
new file mode 100644
index 0000000000..d97a29a228
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/GeneralController.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Cedrik Pischem
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace OPNsense\Ndproxy;
+
+use OPNsense\Base\IndexController;
+
+class GeneralController extends IndexController
+{
+    public function indexAction()
+    {
+        $this->view->pick('OPNsense/Ndproxy/general');
+        $this->view->generalForm = $this->getForm("general");
+    }
+}
diff --git a/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/general.xml b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/general.xml
new file mode 100644
index 0000000000..7bad085b1e
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/general.xml
@@ -0,0 +1,39 @@
+<form>
+    <tab id="general-settings" description="Settings">
+        <field>
+            <id>ndproxy.general.enabled</id>
+            <label>Enable</label>
+            <type>checkbox</type>
+            <help><![CDATA[Enable or disable ndproxy.]]></help>
+        </field>
+        <field>
+            <id>ndproxy.general.ndproxy_uplink_interface</id>
+            <label>Uplink Interface</label>
+            <type>dropdown</type>
+            <help><![CDATA[Choose the uplink interface which receives the external IPv6 prefix from the ISP. Usually, this is the WAN interface.]]></help>
+        </field>
+        <field>
+            <id>ndproxy.general.ndproxy_downlink_mac_address</id>
+            <label>Downlink MAC Address</label>
+            <type>text</type>
+            <help><![CDATA[Enter the MAC address of the downlink interface that will distribute the external IPv6 prefix of the upstream interface. Usually, this is the LAN interface.]]></help>
+        </field>
+        <field>
+            <id>ndproxy.general.ndproxy_uplink_ipv6_addresses</id>
+            <label>Uplink IPv6 Addresses</label>
+            <type>select_multiple</type>
+            <style>tokenize</style>
+            <allownew>true</allownew>
+            <help><![CDATA[Define IPv6 addresses of the Provider Edge (PE) router(s). These addresses represent the sources from which ndproxy will handle and respond to NDP traffic. Defining these addresses ensures that ndproxy only proxies traffic from trusted upstream routers.]]></help>
+        </field>
+        <field>
+            <id>ndproxy.general.ndproxy_exception_ipv6_addresses</id>
+            <label>Exception IPv6 Addresses</label>
+            <type>select_multiple</type>
+            <style>tokenize</style>
+            <allownew>true</allownew>
+            <help><![CDATA[Define IPv6 addresses that should be excepted from proxying. This is to prevent ndproxy from handling NDP requests for specific addresses on the network that should be managed by other devices. Can be left empty for simple networks.]]></help>
+        </field>
+    </tab>
+    <activetab>general-settings</activetab>
+</form>
diff --git a/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/ACL/ACL.xml b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/ACL/ACL.xml
new file mode 100644
index 0000000000..a2aa1cba51
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/ACL/ACL.xml
@@ -0,0 +1,10 @@
+<acl>
+    <page-ndproxy-general>
+        <name>Services: Ndproxy: General Settings</name>
+        <description>Allow access to Ndproxy General Settings</description>
+        <patterns>
+            <pattern>ui/ndproxy/general/*</pattern>
+            <pattern>api/ndproxy/general/*</pattern>
+        </patterns>
+    </page-ndproxy-general>
+</acl>
diff --git a/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Menu/Menu.xml b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Menu/Menu.xml
new file mode 100644
index 0000000000..d33be76cc5
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Menu/Menu.xml
@@ -0,0 +1,5 @@
+<menu>
+    <Services>
+        <General VisibleName="Ndproxy" cssClass="fa fa-bullseye fa-fw" url="/ui/ndproxy/general"/>
+    </Services>
+</menu>
diff --git a/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.php b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.php
new file mode 100644
index 0000000000..2d04bbcb53
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ *    Copyright (C) 2024 Cedrik Pischem
+ *
+ *    All rights reserved.
+ *
+ *    Redistribution and use in source and binary forms, with or without
+ *    modification, are permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ *    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ *    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ *    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ *    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ *    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *    POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+namespace OPNsense\Ndproxy;
+
+use OPNsense\Base\BaseModel;
+use OPNsense\Base\Messages\Message;
+
+class Ndproxy extends BaseModel
+{
+    private function checkConfiguration($messages)
+    {
+        if ((string)$this->general->enabled === '1') {
+            $requiredFields = [
+                'ndproxy_uplink_interface',
+                'ndproxy_downlink_mac_address',
+                'ndproxy_uplink_ipv6_addresses'
+            ];
+
+            foreach ($requiredFields as $field) {
+                if (empty((string)$this->general->$field)) {
+                    $messages->appendMessage(new Message(
+                        gettext('Field is required to enable Ndproxy.'),
+                        "general." . $field
+                    ));
+                }
+            }
+        }
+    }
+
+    public function performValidation($validateFullModel = false)
+    {
+        $messages = parent::performValidation($validateFullModel);
+
+        $this->checkConfiguration($messages);
+
+        return $messages;
+    }
+}
\ No newline at end of file
diff --git a/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.xml b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.xml
new file mode 100644
index 0000000000..1076dd8111
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.xml
@@ -0,0 +1,27 @@
+<model>
+    <mount>//OPNsense/ndproxy</mount>
+    <description>ndproxy configuration model</description>
+    <version>1.0</version>
+    <items>
+        <general>
+            <enabled type="BooleanField">
+                <Default>0</Default>
+                <Required>Y</Required>
+            </enabled>
+            <ndproxy_uplink_interface type="InterfaceField"/>
+            <ndproxy_downlink_mac_address type="MacAddressField"/>
+            <ndproxy_exception_ipv6_addresses type="NetworkField">
+                <AddressFamily>ipv6</AddressFamily>
+                <FieldSeparator>,</FieldSeparator>
+                <AsList>Y</AsList>
+                <ValidationMessage>Please enter one or multiple valid IPv6 addresses.</ValidationMessage>
+            </ndproxy_exception_ipv6_addresses>
+            <ndproxy_uplink_ipv6_addresses type="NetworkField">
+                <AddressFamily>ipv6</AddressFamily>
+                <FieldSeparator>,</FieldSeparator>
+                <AsList>Y</AsList>
+                <ValidationMessage>Please enter one or multiple valid IPv6 addresses.</ValidationMessage>
+            </ndproxy_uplink_ipv6_addresses>
+        </general>
+    </items>
+</model>
diff --git a/net/ndproxy/src/opnsense/mvc/app/views/OPNsense/Ndproxy/general.volt b/net/ndproxy/src/opnsense/mvc/app/views/OPNsense/Ndproxy/general.volt
new file mode 100644
index 0000000000..64a784d6df
--- /dev/null
+++ b/net/ndproxy/src/opnsense/mvc/app/views/OPNsense/Ndproxy/general.volt
@@ -0,0 +1,95 @@
+{#
+ # Copyright (c) 2024 Cedrik Pischem
+ # All rights reserved.
+ #
+ # Redistribution and use in source and binary forms, with or without modification,
+ # are permitted provided that the following conditions are met:
+ #
+ # 1. Redistributions of source code must retain the above copyright notice,
+ #    this list of conditions and the following disclaimer.
+ #
+ # 2. Redistributions in binary form must reproduce the above copyright notice,
+ #    this list of conditions and the following disclaimer in the documentation
+ #    and/or other materials provided with the distribution.
+ #
+ # THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ # AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ # AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ # OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ # POSSIBILITY OF SUCH DAMAGE.
+ #}
+
+<script>
+    $(document).ready(function() {
+        mapDataToFormUI({'frm_general': "/api/ndproxy/general/get"}).done(function() {
+            formatTokenizersUI();
+            $('.selectpicker').selectpicker('refresh');
+            updateServiceControlUI('ndproxy');
+        });
+
+        /**
+         * Displays an alert message to the user.
+         * @param {string} message - The message to display.
+         * @param {string} [type="error"] - The type of alert (error or success).
+         */
+        function showAlert(message, type = "error") {
+            const alertClass = type === "error" ? "alert-danger" : "alert-success";
+            const messageArea = $("#messageArea");
+            messageArea.stop(true, true).hide();
+            messageArea.removeClass("alert-success alert-danger").addClass(alertClass).html(message);
+            messageArea.fadeIn(500).delay(15000).fadeOut(500, function() {
+                $(this).html('');
+            });
+        }
+
+        /**
+         * Reconfigures the service.
+         * @param {string} generalId - The ID of the general form (used for controlling the spinner).
+         */
+        function reconfigureService(generalId) {
+            $("#" + generalId + "_progress").removeClass("fa fa-spinner fa-pulse");
+            ajaxCall("/api/ndproxy/service/reconfigure", {}, function(data, status) {
+                if (status !== "success" || data.status !== 'ok') {
+                    showAlert(`{{ lang._('Error applying configuration: ') }} ${JSON.stringify(data)}`, "error");
+                } else {
+                    showAlert("{{ lang._('Configuration applied successfully.') }}", "success");
+                    updateServiceControlUI('ndproxy');
+                }
+                $("#" + generalId + "_progress").removeClass("fa fa-spinner fa-pulse");
+            }).fail(function() {
+                showAlert("{{ lang._('Reconfiguration request failed.') }}", "error");
+                $("#" + generalId + "_progress").removeClass("fa fa-spinner fa-pulse");
+            });
+        }
+
+        // Event binding for saving forms
+        $('[id*="save_general-"]').on('click', function() {
+            const generalId = this.form.id;
+            $("#" + generalId + "_progress").addClass("fa fa-spinner fa-pulse");
+            saveFormToEndpoint("/api/ndproxy/general/set", generalId, function() {
+                reconfigureService(generalId);
+            }, true, function(errorData) {
+                showAlert(errorData.message || "{{ lang._('Error saving configuration.') }}", "error");
+                $("#" + generalId + "_progress").removeClass("fa fa-spinner fa-pulse");
+            });
+        });
+    });
+</script>
+
+<!-- General Tab -->
+<ul id="generalTabsHeader" class="nav nav-tabs" role="tablist">
+    {{ partial("layout_partials/base_tabs_header", ['formData': generalForm]) }}
+</ul>
+
+<div id="generalTabsContent" class="content-box tab-content">
+    {{ partial("layout_partials/base_tabs_content", ['formData': generalForm]) }}
+    <!-- Message Area for error/success messages -->
+    <div style="max-width: 98%; margin: 10px auto;">
+        <div id="messageArea" class="alert alert-info" style="display: none;"></div>
+    </div>
+</div>
diff --git a/net/ndproxy/src/opnsense/service/conf/actions.d/actions_ndproxy.conf b/net/ndproxy/src/opnsense/service/conf/actions.d/actions_ndproxy.conf
new file mode 100644
index 0000000000..9974e52870
--- /dev/null
+++ b/net/ndproxy/src/opnsense/service/conf/actions.d/actions_ndproxy.conf
@@ -0,0 +1,24 @@
+[start]
+command:service ndproxy start
+parameters:
+type:script
+message:Starting ndproxy service
+
+[stop]
+command:service ndproxy stop
+parameters:
+type:script
+message:Stopping ndproxy service
+
+[restart]
+command:service ndproxy restart
+parameters:
+type:script
+message:Restarting ndproxy service
+description:Restart ndproxy service
+
+[status]
+command:/usr/local/sbin/pluginctl -s ndproxy status
+parameters:
+type:script_output
+message:Request ndproxy status
\ No newline at end of file
diff --git a/net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/+TARGETS b/net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/+TARGETS
new file mode 100644
index 0000000000..181513c0d1
--- /dev/null
+++ b/net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/+TARGETS
@@ -0,0 +1 @@
+rc.conf.d/ndproxy:/etc/rc.conf.d/ndproxy
diff --git a/net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/rc.conf.d/ndproxy b/net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/rc.conf.d/ndproxy
new file mode 100644
index 0000000000..41b52efb4d
--- /dev/null
+++ b/net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/rc.conf.d/ndproxy
@@ -0,0 +1,19 @@
+# DO NOT EDIT THIS FILE -- OPNsense auto-generated file
+{% set generalSettings = helpers.getNodeByTag('OPNsense.ndproxy.general') %}
+{% if generalSettings.enabled|default("0") == "1" %}
+ndproxy_enable="YES"
+{%     if generalSettings.ndproxy_uplink_interface %}
+ndproxy_uplink_interface="{{ helpers.physical_interface(generalSettings.ndproxyconf_uplink_interface) }}"
+{%     endif %}
+{%     if generalSettings.ndproxy_downlink_mac_address %}
+ndproxy_downlink_mac_address="{{ generalSettings.ndproxyconf_downlink_mac_address }}"
+{%     endif %}
+{%     if generalSettings.ndproxy_exception_ipv6_addresses %}
+ndproxy_exception_ipv6_addresses="{{ generalSettings.ndproxyconf_exception_ipv6_addresses | replace(',', ';') }}"
+{%     endif %}
+{%     if generalSettings.ndproxy_uplink_ipv6_addresses %}
+ndproxy_uplink_ipv6_addresses="{{ generalSettings.ndproxyconf_uplink_ipv6_addresses | replace(',', ';') }}"
+{%     endif %}
+{% else %}
+ndproxy_enable="NO"
+{% endif %}

From 81bf45183784871c46f09ec036ab5000774d695a Mon Sep 17 00:00:00 2001
From: Monviech <gitacc@pischem.com>
Date: Mon, 11 Nov 2024 18:21:59 +0000
Subject: [PATCH 2/6] net/ndproxy: Fix a few small errors.

---
 .../src/etc/inc/plugins.inc.d/ndproxy.inc     | 64 +++++++++++++++++++
 .../app/models/OPNsense/Ndproxy/Menu/Menu.xml |  2 +-
 .../OPNsense/Ndproxy/rc.conf.d/ndproxy        |  8 +--
 3 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc

diff --git a/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc b/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
new file mode 100644
index 0000000000..1e9981b5bd
--- /dev/null
+++ b/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * Copyright (C) 2024 Cedrik Pischem
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+function ndproxy_services()
+{
+    global $config;
+
+    $services = [];
+
+    if (isset($config['OPNsense']['ndproxy']['general']['enabled']) &&
+        $config['OPNsense']['ndproxy']['general']['enabled'] == 1) {
+        $services[] = [
+            'description' => gettext('Ndproxy'),
+            'configd' => [
+                'start' => ['ndproxy start'],
+                'restart' => ['ndproxy restart'],
+                'stop' => ['ndproxy stop'],
+            ],
+            'nocheck' => true, // No daemon to check
+            'name' => 'ndproxy'
+        ];
+    }
+
+    return $services;
+}
+
+function ndproxy_xmlrpc_sync()
+{
+    $result = array();
+
+    $result[] = array(
+        'description' => gettext('Ndproxy'),
+        'section' => 'OPNsense.ndproxy',
+        'id' => 'ndproxy',
+        'services' => ["ndproxy"],
+    );
+
+    return $result;
+}
\ No newline at end of file
diff --git a/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Menu/Menu.xml b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Menu/Menu.xml
index d33be76cc5..32ba653a7e 100644
--- a/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Menu/Menu.xml
+++ b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Menu/Menu.xml
@@ -1,5 +1,5 @@
 <menu>
     <Services>
-        <General VisibleName="Ndproxy" cssClass="fa fa-bullseye fa-fw" url="/ui/ndproxy/general"/>
+        <Ndproxy VisibleName="Ndproxy" cssClass="fa fa-bullseye fa-fw" url="/ui/ndproxy/general"/>
     </Services>
 </menu>
diff --git a/net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/rc.conf.d/ndproxy b/net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/rc.conf.d/ndproxy
index 41b52efb4d..f907ee0329 100644
--- a/net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/rc.conf.d/ndproxy
+++ b/net/ndproxy/src/opnsense/service/templates/OPNsense/Ndproxy/rc.conf.d/ndproxy
@@ -3,16 +3,16 @@
 {% if generalSettings.enabled|default("0") == "1" %}
 ndproxy_enable="YES"
 {%     if generalSettings.ndproxy_uplink_interface %}
-ndproxy_uplink_interface="{{ helpers.physical_interface(generalSettings.ndproxyconf_uplink_interface) }}"
+ndproxy_uplink_interface="{{ helpers.physical_interface(generalSettings.ndproxy_uplink_interface) }}"
 {%     endif %}
 {%     if generalSettings.ndproxy_downlink_mac_address %}
-ndproxy_downlink_mac_address="{{ generalSettings.ndproxyconf_downlink_mac_address }}"
+ndproxy_downlink_mac_address="{{ generalSettings.ndproxy_downlink_mac_address }}"
 {%     endif %}
 {%     if generalSettings.ndproxy_exception_ipv6_addresses %}
-ndproxy_exception_ipv6_addresses="{{ generalSettings.ndproxyconf_exception_ipv6_addresses | replace(',', ';') }}"
+ndproxy_exception_ipv6_addresses="{{ generalSettings.ndproxy_exception_ipv6_addresses | replace(',', ';') }}"
 {%     endif %}
 {%     if generalSettings.ndproxy_uplink_ipv6_addresses %}
-ndproxy_uplink_ipv6_addresses="{{ generalSettings.ndproxyconf_uplink_ipv6_addresses | replace(',', ';') }}"
+ndproxy_uplink_ipv6_addresses="{{ generalSettings.ndproxy_uplink_ipv6_addresses | replace(',', ';') }}"
 {%     endif %}
 {% else %}
 ndproxy_enable="NO"

From 2ee0bc84005c05343e1b14c2ec6842af7bc573c2 Mon Sep 17 00:00:00 2001
From: Monviech <gitacc@pischem.com>
Date: Mon, 11 Nov 2024 18:36:42 +0000
Subject: [PATCH 3/6] net/ndproxy: Fix a few small errors.

---
 .../src/etc/inc/plugins.inc.d/ndproxy.inc     |  2 +-
 net/ndproxy/src/inc/plugins.inc.d/ndproxy.inc | 64 -------------------
 .../app/models/OPNsense/Ndproxy/Ndproxy.php   |  2 +-
 .../conf/actions.d/actions_ndproxy.conf       |  2 +-
 4 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 net/ndproxy/src/inc/plugins.inc.d/ndproxy.inc

diff --git a/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc b/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
index 1e9981b5bd..17714582c0 100644
--- a/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
+++ b/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
@@ -61,4 +61,4 @@ function ndproxy_xmlrpc_sync()
     );
 
     return $result;
-}
\ No newline at end of file
+}
diff --git a/net/ndproxy/src/inc/plugins.inc.d/ndproxy.inc b/net/ndproxy/src/inc/plugins.inc.d/ndproxy.inc
deleted file mode 100644
index 1e9981b5bd..0000000000
--- a/net/ndproxy/src/inc/plugins.inc.d/ndproxy.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * Copyright (C) 2024 Cedrik Pischem
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-function ndproxy_services()
-{
-    global $config;
-
-    $services = [];
-
-    if (isset($config['OPNsense']['ndproxy']['general']['enabled']) &&
-        $config['OPNsense']['ndproxy']['general']['enabled'] == 1) {
-        $services[] = [
-            'description' => gettext('Ndproxy'),
-            'configd' => [
-                'start' => ['ndproxy start'],
-                'restart' => ['ndproxy restart'],
-                'stop' => ['ndproxy stop'],
-            ],
-            'nocheck' => true, // No daemon to check
-            'name' => 'ndproxy'
-        ];
-    }
-
-    return $services;
-}
-
-function ndproxy_xmlrpc_sync()
-{
-    $result = array();
-
-    $result[] = array(
-        'description' => gettext('Ndproxy'),
-        'section' => 'OPNsense.ndproxy',
-        'id' => 'ndproxy',
-        'services' => ["ndproxy"],
-    );
-
-    return $result;
-}
\ No newline at end of file
diff --git a/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.php b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.php
index 2d04bbcb53..1db32ccfc3 100644
--- a/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.php
+++ b/net/ndproxy/src/opnsense/mvc/app/models/OPNsense/Ndproxy/Ndproxy.php
@@ -63,4 +63,4 @@ public function performValidation($validateFullModel = false)
 
         return $messages;
     }
-}
\ No newline at end of file
+}
diff --git a/net/ndproxy/src/opnsense/service/conf/actions.d/actions_ndproxy.conf b/net/ndproxy/src/opnsense/service/conf/actions.d/actions_ndproxy.conf
index 9974e52870..eeb5174bbf 100644
--- a/net/ndproxy/src/opnsense/service/conf/actions.d/actions_ndproxy.conf
+++ b/net/ndproxy/src/opnsense/service/conf/actions.d/actions_ndproxy.conf
@@ -21,4 +21,4 @@ description:Restart ndproxy service
 command:/usr/local/sbin/pluginctl -s ndproxy status
 parameters:
 type:script_output
-message:Request ndproxy status
\ No newline at end of file
+message:Request ndproxy status

From d37d5392ebb48302f2591581fd2257d99a777305 Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Tue, 12 Nov 2024 08:28:11 +0100
Subject: [PATCH 4/6] Update net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc

Co-authored-by: Franco Fichtner <franco@lastsummer.de>
---
 net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc b/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
index 17714582c0..47452523ef 100644
--- a/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
+++ b/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
@@ -51,7 +51,7 @@ function ndproxy_services()
 
 function ndproxy_xmlrpc_sync()
 {
-    $result = array();
+    $result = [];
 
     $result[] = array(
         'description' => gettext('Ndproxy'),

From a06d8d46d49c74a16f3743575cd2dc6e216c0949 Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Tue, 12 Nov 2024 08:28:24 +0100
Subject: [PATCH 5/6] Update net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc

Co-authored-by: Franco Fichtner <franco@lastsummer.de>
---
 net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc b/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
index 47452523ef..aead8fa56c 100644
--- a/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
+++ b/net/ndproxy/src/etc/inc/plugins.inc.d/ndproxy.inc
@@ -41,8 +41,8 @@ function ndproxy_services()
                 'restart' => ['ndproxy restart'],
                 'stop' => ['ndproxy stop'],
             ],
-            'nocheck' => true, // No daemon to check
-            'name' => 'ndproxy'
+            'name' => 'ndproxy',
+            'nocheck' => true,
         ];
     }
 

From 114c3f0535eac4f99d646d3cba5992dc330a4fd3 Mon Sep 17 00:00:00 2001
From: Monviech <gitacc@pischem.com>
Date: Tue, 12 Nov 2024 11:50:29 +0000
Subject: [PATCH 6/6] net/ndproxy: Cleanup view to use base_form and
 SimpleActionButton

---
 .../OPNsense/Ndproxy/forms/general.xml        | 75 ++++++++--------
 .../app/views/OPNsense/Ndproxy/general.volt   | 90 +++++++------------
 2 files changed, 72 insertions(+), 93 deletions(-)

diff --git a/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/general.xml b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/general.xml
index 7bad085b1e..09f6ed144f 100644
--- a/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/general.xml
+++ b/net/ndproxy/src/opnsense/mvc/app/controllers/OPNsense/Ndproxy/forms/general.xml
@@ -1,39 +1,40 @@
 <form>
-    <tab id="general-settings" description="Settings">
-        <field>
-            <id>ndproxy.general.enabled</id>
-            <label>Enable</label>
-            <type>checkbox</type>
-            <help><![CDATA[Enable or disable ndproxy.]]></help>
-        </field>
-        <field>
-            <id>ndproxy.general.ndproxy_uplink_interface</id>
-            <label>Uplink Interface</label>
-            <type>dropdown</type>
-            <help><![CDATA[Choose the uplink interface which receives the external IPv6 prefix from the ISP. Usually, this is the WAN interface.]]></help>
-        </field>
-        <field>
-            <id>ndproxy.general.ndproxy_downlink_mac_address</id>
-            <label>Downlink MAC Address</label>
-            <type>text</type>
-            <help><![CDATA[Enter the MAC address of the downlink interface that will distribute the external IPv6 prefix of the upstream interface. Usually, this is the LAN interface.]]></help>
-        </field>
-        <field>
-            <id>ndproxy.general.ndproxy_uplink_ipv6_addresses</id>
-            <label>Uplink IPv6 Addresses</label>
-            <type>select_multiple</type>
-            <style>tokenize</style>
-            <allownew>true</allownew>
-            <help><![CDATA[Define IPv6 addresses of the Provider Edge (PE) router(s). These addresses represent the sources from which ndproxy will handle and respond to NDP traffic. Defining these addresses ensures that ndproxy only proxies traffic from trusted upstream routers.]]></help>
-        </field>
-        <field>
-            <id>ndproxy.general.ndproxy_exception_ipv6_addresses</id>
-            <label>Exception IPv6 Addresses</label>
-            <type>select_multiple</type>
-            <style>tokenize</style>
-            <allownew>true</allownew>
-            <help><![CDATA[Define IPv6 addresses that should be excepted from proxying. This is to prevent ndproxy from handling NDP requests for specific addresses on the network that should be managed by other devices. Can be left empty for simple networks.]]></help>
-        </field>
-    </tab>
-    <activetab>general-settings</activetab>
+    <field>
+        <type>header</type>
+        <label>General Settings</label>
+    </field>
+    <field>
+        <id>ndproxy.general.enabled</id>
+        <label>Enable</label>
+        <type>checkbox</type>
+        <help><![CDATA[Enable or disable ndproxy.]]></help>
+    </field>
+    <field>
+        <id>ndproxy.general.ndproxy_uplink_interface</id>
+        <label>Uplink Interface</label>
+        <type>dropdown</type>
+        <help><![CDATA[Choose the uplink interface which receives the external IPv6 prefix from the ISP. Usually, this is the WAN interface.]]></help>
+    </field>
+    <field>
+        <id>ndproxy.general.ndproxy_downlink_mac_address</id>
+        <label>Downlink MAC Address</label>
+        <type>text</type>
+        <help><![CDATA[Enter the MAC address of the downlink interface that will distribute the external IPv6 prefix of the upstream interface. Usually, this is the LAN interface.]]></help>
+    </field>
+    <field>
+        <id>ndproxy.general.ndproxy_uplink_ipv6_addresses</id>
+        <label>Uplink IPv6 Addresses</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
+        <help><![CDATA[Define IPv6 addresses of the Provider Edge (PE) router(s). These addresses represent the sources from which ndproxy will handle and respond to NDP traffic. Defining these addresses ensures that ndproxy only proxies traffic from trusted upstream routers.]]></help>
+    </field>
+    <field>
+        <id>ndproxy.general.ndproxy_exception_ipv6_addresses</id>
+        <label>Exception IPv6 Addresses</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
+        <help><![CDATA[Define IPv6 addresses that should be excepted from proxying. This is to prevent ndproxy from handling NDP requests for specific addresses on the network that should be managed by other devices. Can be left empty for simple networks.]]></help>
+    </field>
 </form>
diff --git a/net/ndproxy/src/opnsense/mvc/app/views/OPNsense/Ndproxy/general.volt b/net/ndproxy/src/opnsense/mvc/app/views/OPNsense/Ndproxy/general.volt
index 64a784d6df..5e212445bd 100644
--- a/net/ndproxy/src/opnsense/mvc/app/views/OPNsense/Ndproxy/general.volt
+++ b/net/ndproxy/src/opnsense/mvc/app/views/OPNsense/Ndproxy/general.volt
@@ -26,70 +26,48 @@
 
 <script>
     $(document).ready(function() {
-        mapDataToFormUI({'frm_general': "/api/ndproxy/general/get"}).done(function() {
+        mapDataToFormUI({'frm_GeneralSettings': "/api/ndproxy/general/get"}).done(function() {
             formatTokenizersUI();
             $('.selectpicker').selectpicker('refresh');
             updateServiceControlUI('ndproxy');
         });
 
-        /**
-         * Displays an alert message to the user.
-         * @param {string} message - The message to display.
-         * @param {string} [type="error"] - The type of alert (error or success).
-         */
-        function showAlert(message, type = "error") {
-            const alertClass = type === "error" ? "alert-danger" : "alert-success";
-            const messageArea = $("#messageArea");
-            messageArea.stop(true, true).hide();
-            messageArea.removeClass("alert-success alert-danger").addClass(alertClass).html(message);
-            messageArea.fadeIn(500).delay(15000).fadeOut(500, function() {
-                $(this).html('');
-            });
-        }
-
-        /**
-         * Reconfigures the service.
-         * @param {string} generalId - The ID of the general form (used for controlling the spinner).
-         */
-        function reconfigureService(generalId) {
-            $("#" + generalId + "_progress").removeClass("fa fa-spinner fa-pulse");
-            ajaxCall("/api/ndproxy/service/reconfigure", {}, function(data, status) {
-                if (status !== "success" || data.status !== 'ok') {
-                    showAlert(`{{ lang._('Error applying configuration: ') }} ${JSON.stringify(data)}`, "error");
-                } else {
-                    showAlert("{{ lang._('Configuration applied successfully.') }}", "success");
-                    updateServiceControlUI('ndproxy');
+        $("#reconfigureAct").SimpleActionButton({
+            onPreAction: function() {
+                const dfObj = $.Deferred();
+                saveFormToEndpoint("/api/ndproxy/general/set", 'frm_GeneralSettings', dfObj.resolve, true, dfObj.reject);
+                return dfObj;
+            },
+            onAction: function(data, status) {
+                if (status === "success" && data.status === 'ok') {
+                    ajaxCall("/api/ndproxy/service/reconfigure", {}, function(reconfigData, reconfigStatus) {
+                        if (reconfigStatus === "success" && reconfigData.status === 'ok') {
+                            updateServiceControlUI('ndproxy');
+                        }
+                    });
                 }
-                $("#" + generalId + "_progress").removeClass("fa fa-spinner fa-pulse");
-            }).fail(function() {
-                showAlert("{{ lang._('Reconfiguration request failed.') }}", "error");
-                $("#" + generalId + "_progress").removeClass("fa fa-spinner fa-pulse");
-            });
-        }
-
-        // Event binding for saving forms
-        $('[id*="save_general-"]').on('click', function() {
-            const generalId = this.form.id;
-            $("#" + generalId + "_progress").addClass("fa fa-spinner fa-pulse");
-            saveFormToEndpoint("/api/ndproxy/general/set", generalId, function() {
-                reconfigureService(generalId);
-            }, true, function(errorData) {
-                showAlert(errorData.message || "{{ lang._('Error saving configuration.') }}", "error");
-                $("#" + generalId + "_progress").removeClass("fa fa-spinner fa-pulse");
-            });
+            }
         });
+
+        updateServiceControlUI('ndproxy');
     });
 </script>
 
-<!-- General Tab -->
-<ul id="generalTabsHeader" class="nav nav-tabs" role="tablist">
-    {{ partial("layout_partials/base_tabs_header", ['formData': generalForm]) }}
-</ul>
-
-<div id="generalTabsContent" class="content-box tab-content">
-    {{ partial("layout_partials/base_tabs_content", ['formData': generalForm]) }}
-    <!-- Message Area for error/success messages -->
-    <div style="max-width: 98%; margin: 10px auto;">
-        <div id="messageArea" class="alert alert-info" style="display: none;"></div>
+<section class="page-content-main">
+    <div class="content-box">
+        {{ partial("layout_partials/base_form", ['fields': generalForm, 'id': 'frm_GeneralSettings']) }}
+    </div>
+    <br/>
+    <div class="content-box">
+        <div class="col-md-12">
+            <br/>
+            <button class="btn btn-primary" id="reconfigureAct"
+                    data-endpoint="/api/ndproxy/service/reconfigure"
+                    data-label="{{ lang._('Apply') }}"
+                    type="button">
+                {{ lang._('Apply') }}
+            </button>
+            <br/><br/>
+        </div>
     </div>
-</div>
+</section>