From 11764a1dc451dd949bf7e4140164c15d9c9ee757 Mon Sep 17 00:00:00 2001
From: Sam Sheridan <sheridans@users.noreply.github.com>
Date: Tue, 24 Feb 2026 14:25:50 +0000
Subject: [PATCH] security/tailscale: Set auth key to optional in UI (#5065)

---
 security/tailscale/Makefile                                   | 2 +-
 security/tailscale/pkg-descr                                  | 4 ++++
 .../controllers/OPNsense/Tailscale/forms/authentication.xml   | 3 ++-
 .../mvc/app/models/OPNsense/Tailscale/Authentication.xml      | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/security/tailscale/Makefile b/security/tailscale/Makefile
index 6c95b7cd0..67a3f4be5 100644
--- a/security/tailscale/Makefile
+++ b/security/tailscale/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		tailscale
-PLUGIN_VERSION=		1.3
+PLUGIN_VERSION=		1.4
 PLUGIN_COMMENT=		VPN mesh securely connecting clients using WireGuard
 PLUGIN_DEPENDS=		tailscale
 PLUGIN_MAINTAINER=	sam@sheridan.uk
diff --git a/security/tailscale/pkg-descr b/security/tailscale/pkg-descr
index b2066fa79..2676046f4 100644
--- a/security/tailscale/pkg-descr
+++ b/security/tailscale/pkg-descr
@@ -6,6 +6,10 @@ https://tailscale.com/
 Plugin Changelog
 ================
 
+1.4
+
+* set pre-auth key field in UI to optional, enables registration via pre-auth key or AuthURL from status page
+
 1.3
 
 * modify RC script to prevent re-using auth key if already authenticated
diff --git a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/authentication.xml b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/authentication.xml
index b2bcae8b3..2a0c126e5 100644
--- a/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/authentication.xml
+++ b/security/tailscale/src/opnsense/mvc/app/controllers/OPNsense/Tailscale/forms/authentication.xml
@@ -9,6 +9,7 @@
         <id>authentication.preAuthKey</id>
         <label>Pre-authentication Key</label>
         <type>text</type>
-        <help>Use a non-reusable auth key and disable expiration</help>
+        <help>Use a non-reusable auth key and disable expiration (optional). If not specified use AuthURL from Status page</help>
+        <advanced>true</advanced>
     </field>
 </form>
diff --git a/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Authentication.xml b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Authentication.xml
index b1b404f48..dce55a679 100644
--- a/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Authentication.xml
+++ b/security/tailscale/src/opnsense/mvc/app/models/OPNsense/Tailscale/Authentication.xml
@@ -8,7 +8,7 @@
             <ValidationMessage>Please enter a valid URL</ValidationMessage>
         </loginServer>
         <preAuthKey type="TextField">
-            <Required>Y</Required>
+            <Required>N</Required>
         </preAuthKey>
     </items>
 </model>