From eb044ee8954d90f173501f40ce06839056291b5c Mon Sep 17 00:00:00 2001
From: Sam Sheridan <sheridans@users.noreply.github.com>
Date: Fri, 13 Dec 2024 19:30:42 +0000
Subject: [PATCH] enforce --auth-key param in template preventing prompt for
 auth on boot (#4395)

---
 security/tailscale/Makefile                                 | 1 +
 security/tailscale/pkg-descr                                | 5 +++++
 .../opnsense/mvc/app/views/OPNsense/Tailscale/status.volt   | 6 ++----
 .../opnsense/service/templates/OPNsense/Tailscale/rc.conf.d | 2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile
index b995e68c9..02fad9cd9 100644
--- a/security/tailscale/Makefile
+++ b/security/tailscale/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=       tailscale
 PLUGIN_VERSION=    1.0.d
+PLUGIN_REVISION=   1
 PLUGIN_DEVEL=      yes
 PLUGIN_COMMENT=    Tailscale makes creating software-defined networks easy
 PLUGIN_DEPENDS=    tailscale
diff --git a/security/tailscale/pkg-descr b/security/tailscale/pkg-descr
index 9befef3b6..41c6d5b04 100644
--- a/security/tailscale/pkg-descr
+++ b/security/tailscale/pkg-descr
@@ -9,3 +9,8 @@ Plugin Changelog
 1.0
 
 * initial development release
+
+1.0_1
+
+* fixes to template to prevent auth key prompt when empty
+
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 b93d96844..f42e3ce8d 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
@@ -8,7 +8,6 @@
             return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + breakTag + '$2');
         }
 
-
 	function updateNetInfo() {
             ajaxGet(url = "/api/tailscale/status/net/", sendData={},
                 callback = function (data, status) {
@@ -44,7 +43,6 @@
             });
         }
 
-
         function updateStatusInfo() {
             ajaxGet(url = "/api/tailscale/status/status/", sendData={},
                 callback = function (data, status) {
@@ -78,14 +76,14 @@
                     } else {
                         $('#statusList > tbody').append('<tr><td colspan=2>Unable to fetch status, is Tailscale running?</td></tr>');
                     }
+
+                    updateServiceControlUI('tailscale');
                 }
             );
         }
 
-
         updateNetInfo();
         updateStatusInfo();
-
     });
 </script>
 
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 704c9bbc8..500a34c52 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
@@ -30,6 +30,8 @@ tailscaled_port="{{ OPNsense.tailscale.settings.listenPort }}"
 {%    endif %}
 {%    if helpers.exists('OPNsense.tailscale.authentication.preAuthKey') %}
 {%      do up_args.append("--auth-key=" + OPNsense.tailscale.authentication.preAuthKey) %}
+{%    else %}
+{%      do up_args.append("--auth-key=non-specified") %}
 {%    endif %}
 {#  loop through subnets to build list #}
 {%    if helpers.exists('OPNsense.tailscale.settings.subnets.subnet4') %}