diff --git a/README.md b/README.md index 6a421e8d2..9c8688859 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,6 @@ security/maltrail -- Malicious traffic detection system security/netbird -- Peer-to-peer VPN that seamlessly connects your devices (development only) security/openconnect -- OpenConnect Client security/openvpn-legacy -- OpenVPN legacy support -security/softether -- Cross-platform Multi-protocol VPN Program (development only) security/strongswan-legacy -- IPsec legacy support security/stunnel -- Stunnel TLS proxy security/tailscale -- VPN mesh securely connecting clients using WireGuard diff --git a/security/softether/Makefile b/security/softether/Makefile deleted file mode 100644 index e7cc86d2e..000000000 --- a/security/softether/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -PLUGIN_NAME= softether -PLUGIN_VERSION= 0.3 -PLUGIN_COMMENT= Cross-platform Multi-protocol VPN Program -PLUGIN_DEPENDS= softether -PLUGIN_MAINTAINER= m.muenz@gmail.com -PLUGIN_DEVEL= yes - -.include "../../Mk/plugins.mk" diff --git a/security/softether/pkg-descr b/security/softether/pkg-descr deleted file mode 100644 index e49e2da52..000000000 --- a/security/softether/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -SoftEther VPN ("SoftEther" means "Software Ethernet") is one of -the world's most powerful and easy-to-use multi-protocol VPN -software. It runs on Windows, Linux, Mac, FreeBSD and Solaris. - -SoftEther VPN is open source. You can use SoftEther for any -personal or commercial use for free charge. - -WWW: https://www.softether.org/ diff --git a/security/softether/src/etc/inc/plugins.inc.d/softether.inc b/security/softether/src/etc/inc/plugins.inc.d/softether.inc deleted file mode 100644 index e11d8b839..000000000 --- a/security/softether/src/etc/inc/plugins.inc.d/softether.inc +++ /dev/null @@ -1,67 +0,0 @@ - - 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 softether_enabled() -{ - $model = new \OPNsense\Softether\General(); - return (string)$model->enabled == '1'; -} - -function softether_carp_enabled() -{ - $model = new \OPNsense\Softether\General(); - return (string)$model->enabled == '1' && - (string)$model->enablecarp == '1'; -} - -function softether_carp_interfaces() -{ - $model = new \OPNsense\Softether\General(); - return (string)$model->carpinterfaces; -} - -function softether_services() -{ - $services = array(); - - if (!softether_enabled()) { - return $services; - } - - $services[] = array( - 'description' => gettext('SoftEther VPN'), - 'configd' => array( - 'restart' => array('softether restart'), - 'start' => array('softether start'), - 'stop' => array('softether stop'), - ), - 'name' => 'vpnserver' - ); - - return $services; -} diff --git a/security/softether/src/etc/rc.syshook.d/carp/50-softether b/security/softether/src/etc/rc.syshook.d/carp/50-softether deleted file mode 100755 index 71d3e58ae..000000000 --- a/security/softether/src/etc/rc.syshook.d/carp/50-softether +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/local/bin/php - - * Copyright (C) 2004 Scott Ullrich - * 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. - */ - -require_once('config.inc'); -require_once('util.inc'); -require_once('interfaces.inc'); -require_once('plugins.inc.d/softether.inc'); - -if (softether_carp_enabled()) { - // XXX: carp enable/disable mode - $subsystem = !empty($argv[1]) ? $argv[1] : ''; - $type = !empty($argv[2]) ? $argv[2] : ''; - - if ($type != 'MASTER' && $type != 'BACKUP') { - log_msg("Carp '$type' event unknown from source '{$subsystem}'"); - exit(1); - } - - if (!strstr($subsystem, '@')) { - log_msg("Carp '$type' event triggered from wrong source '{$subsystem}'"); - exit(1); - } - - list ($vhid, $iface) = explode('@', $subsystem); - $friendly = convert_real_interface_to_friendly_interface_name($iface); - - if (!(strpos(softether_carp_interfaces(),$friendly) !== false)) { - exit(0); - } - - switch ($type) { - case 'MASTER': - touch('/var/run/softether/CARP_MASTER'); - shell_exec('/usr/local/etc/rc.d/softether_server start'); - break; - case 'BACKUP': - if (file_exists('/var/run/softether/CARP_MASTER')) { - unlink('/var/run/softether/CARP_MASTER'); - } - shell_exec('/usr/local/etc/rc.d/softether_server stop'); - break; - } -} diff --git a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/GeneralController.php b/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/GeneralController.php deleted file mode 100644 index 5844a2075..000000000 --- a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/GeneralController.php +++ /dev/null @@ -1,39 +0,0 @@ - - * - * 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\Softether\Api; - -use OPNsense\Base\ApiMutableModelControllerBase; - -class GeneralController extends ApiMutableModelControllerBase -{ - protected static $internalModelClass = '\OPNsense\Softether\General'; - protected static $internalModelName = 'general'; -} diff --git a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/ServiceController.php b/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/ServiceController.php deleted file mode 100644 index ac6b37084..000000000 --- a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/Api/ServiceController.php +++ /dev/null @@ -1,47 +0,0 @@ - - * - * 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\Softether\Api; - -use OPNsense\Base\ApiMutableServiceControllerBase; -use OPNsense\Core\Backend; -use OPNsense\Softether\General; - -/** - * Class ServiceController - * @package OPNsense\Softether - */ -class ServiceController extends ApiMutableServiceControllerBase -{ - protected static $internalServiceClass = '\OPNsense\Softether\General'; - protected static $internalServiceTemplate = 'OPNsense/Softether'; - protected static $internalServiceEnabled = 'enabled'; - protected static $internalServiceName = 'softether'; -} diff --git a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/GeneralController.php b/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/GeneralController.php deleted file mode 100644 index 7d83f2871..000000000 --- a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/GeneralController.php +++ /dev/null @@ -1,38 +0,0 @@ - - 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\Softether; - -class GeneralController extends \OPNsense\Base\IndexController -{ - public function indexAction() - { - $this->view->generalForm = $this->getForm("general"); - $this->view->pick('OPNsense/Softether/general'); - } -} diff --git a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/forms/general.xml b/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/forms/general.xml deleted file mode 100644 index 8e738f5d4..000000000 --- a/security/softether/src/opnsense/mvc/app/controllers/OPNsense/Softether/forms/general.xml +++ /dev/null @@ -1,21 +0,0 @@ -
- - general.enabled - - checkbox - This will activate SoftEther vpnserver process. - - - general.enablecarp - - checkbox - This will activate the vpnserver service only on the master device. - - - general.carpinterfaces - - select_multiple - - Type or select interface. - -
diff --git a/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/ACL/ACL.xml b/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/ACL/ACL.xml deleted file mode 100644 index d7a964e55..000000000 --- a/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/ACL/ACL.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - VPN: SoftEther - - ui/softether/* - api/softether/* - - - diff --git a/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/General.php b/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/General.php deleted file mode 100644 index 20ffb40cf..000000000 --- a/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/General.php +++ /dev/null @@ -1,35 +0,0 @@ - - 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\Softether; - -use OPNsense\Base\BaseModel; - -class General extends BaseModel -{ -} diff --git a/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/General.xml b/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/General.xml deleted file mode 100644 index 57d0c9182..000000000 --- a/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/General.xml +++ /dev/null @@ -1,24 +0,0 @@ - - //OPNsense/softether/general - Softether configuration - 0.0.1 - - - 0 - Y - - - 0 - Y - - - N - Y - - Y - - /^(?!0).*$/ - - - - diff --git a/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/Menu/Menu.xml b/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/Menu/Menu.xml deleted file mode 100644 index 6bebfff37..000000000 --- a/security/softether/src/opnsense/mvc/app/models/OPNsense/Softether/Menu/Menu.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/security/softether/src/opnsense/mvc/app/views/OPNsense/Softether/general.volt b/security/softether/src/opnsense/mvc/app/views/OPNsense/Softether/general.volt deleted file mode 100644 index 7ddc14d6b..000000000 --- a/security/softether/src/opnsense/mvc/app/views/OPNsense/Softether/general.volt +++ /dev/null @@ -1,68 +0,0 @@ -{# - -OPNsense® is Copyright © 2014 – 2018 by Deciso B.V. -This file is Copyright © 2018 by Michael Muenz -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. - -#} - - - - -
-
-
- {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}} -
-
- -
-
-
-
- - diff --git a/security/softether/src/opnsense/scripts/OPNsense/Softether/setup.sh b/security/softether/src/opnsense/scripts/OPNsense/Softether/setup.sh deleted file mode 100755 index f83ff509c..000000000 --- a/security/softether/src/opnsense/scripts/OPNsense/Softether/setup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -mkdir -p /var/db/softether -mkdir -p /var/log/softether diff --git a/security/softether/src/opnsense/service/conf/actions.d/actions_softether.conf b/security/softether/src/opnsense/service/conf/actions.d/actions_softether.conf deleted file mode 100644 index 6e840fd06..000000000 --- a/security/softether/src/opnsense/service/conf/actions.d/actions_softether.conf +++ /dev/null @@ -1,23 +0,0 @@ -[start] -command:/usr/local/etc/rc.d/softether_server start -parameters: -type:script -message:starting softether - -[stop] -command:/usr/local/etc/rc.d/softether_server stop -parameters: -type:script -message:stopping softether - -[restart] -command:/usr/local/etc/rc.d/softether_server restart -parameters: -type:script -message:restarting softether - -[status] -command:/usr/local/etc/rc.d/softether_server status; exit 0 -parameters: -type:script_output -message:softether status diff --git a/security/softether/src/opnsense/service/templates/OPNsense/Softether/+TARGETS b/security/softether/src/opnsense/service/templates/OPNsense/Softether/+TARGETS deleted file mode 100644 index 04e32a977..000000000 --- a/security/softether/src/opnsense/service/templates/OPNsense/Softether/+TARGETS +++ /dev/null @@ -1 +0,0 @@ -softether_server:/etc/rc.conf.d/softether_server diff --git a/security/softether/src/opnsense/service/templates/OPNsense/Softether/softether_server b/security/softether/src/opnsense/service/templates/OPNsense/Softether/softether_server deleted file mode 100644 index be34375d5..000000000 --- a/security/softether/src/opnsense/service/templates/OPNsense/Softether/softether_server +++ /dev/null @@ -1,9 +0,0 @@ -{% if helpers.exists('OPNsense.softether.general.enabled') and OPNsense.softether.general.enabled == '1' %} -softether_server_setup="/usr/local/opnsense/scripts/OPNsense/Softether/setup.sh" -softether_server_enable="YES" -{% if helpers.exists('OPNsense.softether.general.enablecarp') and OPNsense.softether.general.enablecarp == '1' %} -required_files="/var/run/softether/CARP_MASTER" -{% endif %} -{% else %} -softether_server_enable="NO" -{% endif %}