From 80ef9889898e0f0800b49d392fbc5b9ec646b629 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 6 Dec 2024 17:14:35 +0100 Subject: [PATCH] security/tailscale: style sweep --- LICENSE | 1 + README.md | 1 + .../tailscale/src/etc/inc/plugins.inc.d/tailscale.inc | 3 +-- .../Tailscale/Api/AuthenticationController.php | 1 - .../OPNsense/Tailscale/Api/ServiceController.php | 1 - .../OPNsense/Tailscale/Api/SettingsController.php | 4 ++-- .../OPNsense/Tailscale/Api/StatusController.php | 9 +++++---- .../mvc/app/views/OPNsense/Tailscale/status.volt | 10 +++++----- .../service/conf/actions.d/actions_tailscale.conf | 3 --- .../service/templates/OPNsense/Tailscale/rc.conf.d | 5 ++--- 10 files changed, 17 insertions(+), 21 deletions(-) diff --git a/LICENSE b/LICENSE index e7427a06b..10f2a5240 100644 --- a/LICENSE +++ b/LICENSE @@ -63,6 +63,7 @@ Copyright (c) 2022 Robbert Rijkse Copyright (c) 2023 sattamjh Copyright (c) 2004-2012 Scott Ullrich Copyright (c) 2010 Seth Mos +Copyright (c) 2024 Sheridan Computers Copyright (c) 2008 Shrew Soft Inc. Copyright (c) 2017-2019 Smart-Soft Copyright (c) 2013 Stanley P. Miller \ stan-qaz diff --git a/README.md b/README.md index 3da5813b9..fa75e2618 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,7 @@ security/maltrail -- Malicious traffic detection system security/openconnect -- OpenConnect Client security/softether -- Cross-platform Multi-protocol VPN Program (development only) security/stunnel -- Stunnel TLS proxy +security/tailscale -- Tailscale makes creating software-defined networks easy (development only) security/tinc -- Tinc VPN security/tor -- The Onion Router security/wazuh-agent -- Agent for the open source security platform Wazuh diff --git a/security/tailscale/src/etc/inc/plugins.inc.d/tailscale.inc b/security/tailscale/src/etc/inc/plugins.inc.d/tailscale.inc index dc1bf6b0b..a6d62352d 100644 --- a/security/tailscale/src/etc/inc/plugins.inc.d/tailscale.inc +++ b/security/tailscale/src/etc/inc/plugins.inc.d/tailscale.inc @@ -48,7 +48,7 @@ function tailscale_services() 'stop' => ['tailscale stop'], ], 'name' => 'tailscale', - ]; + ]; return $services; } @@ -62,4 +62,3 @@ function tailscale_devices() 'volatile' => true, ]]; } - diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/AuthenticationController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/AuthenticationController.php index 0161b75b6..272d4d470 100644 --- a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/AuthenticationController.php +++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/AuthenticationController.php @@ -36,4 +36,3 @@ class AuthenticationController extends ApiMutableModelControllerBase protected static $internalModelName = 'authentication'; protected static $internalModelClass = '\OPNsense\Tailscale\Authentication'; } - diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/ServiceController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/ServiceController.php index eece38360..464100425 100644 --- a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/ServiceController.php +++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/ServiceController.php @@ -42,4 +42,3 @@ class ServiceController extends ApiMutableServiceControllerBase protected static $internalServiceTemplate = 'OPNsense/Tailscale'; protected static $internalServiceName = 'tailscale'; } - diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/SettingsController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/SettingsController.php index 49f3b50b4..20954fbe9 100644 --- a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/SettingsController.php +++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/SettingsController.php @@ -62,8 +62,8 @@ class SettingsController extends ApiMutableModelControllerBase public function reloadAction() { $mdl = $this->getModel(); - $enabled = $mdl->enabled->__toString() === '1'; - $response = $this->toggleTailScaleService($enabled); + $enabled = $mdl->enabled->__toString() === '1'; + $response = $this->toggleTailScaleService($enabled); return ['result ' => $response]; } diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/StatusController.php b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/StatusController.php index f3688ac9c..9a40a1154 100644 --- a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/StatusController.php +++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/Api/StatusController.php @@ -42,22 +42,23 @@ class StatusController extends ApiMutableModelControllerBase if ($response !== null) { return $response; } - return ['error' => 'Unable to determine Tailscale status, is the service running?']; + return ['error' => 'Unable to determine Tailscale status, is the service running?']; } public function ipAction() { $response = trim((new Backend())->configdRun('tailscale tailscale-ip')); - return ['result' => $response]; + return ['result' => $response]; } public function netAction() { $response = trim((new Backend())->configdRun('tailscale tailscale-netcheck')); - return ['result' => $response]; + return ['result' => $response]; } - private function isJson($string) { + private function isJson($string) + { return is_string($string) && (is_object(json_decode($string)) || is_array(json_decode($string))); diff --git a/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/status.volt b/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/status.volt index b911f1393..b93d96844 100644 --- a/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/status.volt +++ b/security/tailscale/src/opnsense/mvc/app/views/OPNsense/Tailscale/status.volt @@ -29,10 +29,10 @@ $.each(peers, function(peer, data) { let tailscaleIp = ''; if (data.TailscaleIPs !== null && data.TailscaleIPs !== undefined) { - tailscaleIp = data.TailscaleIPs.join(', '); + tailscaleIp = data.TailscaleIPs.join(', '); console.log(tailscaleIp); - } + } let row = '' + data.HostName; row += '' + tailscaleIp; @@ -44,7 +44,7 @@ }); } - + function updateStatusInfo() { ajaxGet(url = "/api/tailscale/status/status/", sendData={}, callback = function (data, status) { @@ -56,9 +56,9 @@ let skipKeys = [ 'CertDomains', 'ClientVersion', - 'CurrentTailnet', + 'CurrentTailnet', 'Health', - 'Self', + 'Self', 'User' ]; diff --git a/security/tailscale/src/opnsense/service/conf/actions.d/actions_tailscale.conf b/security/tailscale/src/opnsense/service/conf/actions.d/actions_tailscale.conf index e5d6e3b3d..023ddf0fe 100644 --- a/security/tailscale/src/opnsense/service/conf/actions.d/actions_tailscale.conf +++ b/security/tailscale/src/opnsense/service/conf/actions.d/actions_tailscale.conf @@ -42,6 +42,3 @@ message: request tailscale version command:/usr/local/bin/tailscale netcheck; exit 0 type:script_output message: request tailscale netcheck - - - diff --git a/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d b/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d index 6713fa87e..704c9bbc8 100644 --- a/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d +++ b/security/tailscale/src/opnsense/service/templates/OPNsense/Tailscale/rc.conf.d @@ -3,8 +3,8 @@ # {% if not helpers.empty('OPNsense.tailscale.settings.enabled') %} tailscaled_enable="YES" -# Uncommenting the below breaks being able to access subnets -# see - https://github.com/tailscale/tailscale/issues/5573#issuecomment-1584695981 +# Uncommenting the below breaks being able to access subnets +# see - https://github.com/tailscale/tailscale/issues/5573#issuecomment-1584695981 # tailscaled_env="TS_DEBUG_NETSTACK_SUBNETS=0" {% if helpers.exists('OPNsense.tailscale.settings.listenPort') %} tailscaled_port="{{ OPNsense.tailscale.settings.listenPort }}" @@ -46,4 +46,3 @@ tailscaled_up_args="{{ up_args|join(' ') }}" {% else %} tailscaled_enable=NO {% endif %} -