From a86d5e279d29e470b1e82e8090b66667c8828fd4 Mon Sep 17 00:00:00 2001
From: vybe <vybe@jtmorris.net>
Date: Wed, 20 May 2026 10:08:59 +0000
Subject: [PATCH 1/8] feat: add validateClipboardCmd with whitelist-based input
 validation

Prevents shell injection by only allowing known-safe clipboard commands
(dms cl copy, wl-copy, clipmanctl copy, none).
---
 tailscalectl/lib.js |  8 +++++++-
 test/lib.test.js    | 24 +++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/tailscalectl/lib.js b/tailscalectl/lib.js
index f4cd31e..bd45288 100644
--- a/tailscalectl/lib.js
+++ b/tailscalectl/lib.js
@@ -26,6 +26,12 @@ function findActiveExitNode(peerMap) {
     return ""
 }
 
+var safeClipboardCmds = ["dms cl copy", "wl-copy", "clipmanctl copy", "none"]
+
+function validateClipboardCmd(cmd) {
+    return typeof cmd === "string" && safeClipboardCmds.includes(cmd)
+}
+
 function errorMessage(cmd) {
     var messages = {
         "up": "Failed to connect to Tailscale",
@@ -40,5 +46,5 @@ function errorMessage(cmd) {
 
 // CommonJS export for Node.js tests (ignored by QML)
 if (typeof module !== "undefined" && module.exports) {
-    module.exports = { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage }
+    module.exports = { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd }
 }
diff --git a/test/lib.test.js b/test/lib.test.js
index ce9897b..1adbf28 100644
--- a/test/lib.test.js
+++ b/test/lib.test.js
@@ -1,7 +1,7 @@
 import { test } from "node:test"
 import assert from "node:assert"
 import lib from "../tailscalectl/lib.js"
-const { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage } = lib
+const { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd } = lib
 
 test("parsePeers extracts exitNode from ExitNodeOption", () => {
     const peerMap = {
@@ -74,3 +74,25 @@ test("errorMessage returns generic message for unknown command", () => {
     const msg = errorMessage("unknown", 1)
     assert.strictEqual(msg, "Tailscale command failed")
 })
+
+// --- validateClipboardCmd ---
+
+test("validateClipboardCmd accepts whitelisted values", () => {
+    assert.strictEqual(validateClipboardCmd("dms cl copy"), true)
+    assert.strictEqual(validateClipboardCmd("wl-copy"), true)
+    assert.strictEqual(validateClipboardCmd("clipmanctl copy"), true)
+    assert.strictEqual(validateClipboardCmd("none"), true)
+})
+
+test("validateClipboardCmd rejects malicious inputs", () => {
+    assert.strictEqual(validateClipboardCmd("rm -rf /"), false)
+    assert.strictEqual(validateClipboardCmd("echo hi; malicious"), false)
+    assert.strictEqual(validateClipboardCmd("$(whoami)"), false)
+    assert.strictEqual(validateClipboardCmd("wl-copy || rm -rf /"), false)
+})
+
+test("validateClipboardCmd rejects empty and falsy inputs", () => {
+    assert.strictEqual(validateClipboardCmd(""), false)
+    assert.strictEqual(validateClipboardCmd(null), false)
+    assert.strictEqual(validateClipboardCmd(undefined), false)
+})

From 3c31209ff1a94bb81844c882020cf138568864ff Mon Sep 17 00:00:00 2001
From: vybe <vybe@jtmorris.net>
Date: Wed, 20 May 2026 10:11:57 +0000
Subject: [PATCH 2/8] feat: add buildCopyCommand for safe clipboard command
 construction

Uses validateClipboardCmd to reject untrusted input and properly escapes
single quotes in text to prevent shell injection.
---
 tailscalectl/lib.js |  8 +++++++-
 test/lib.test.js    | 22 +++++++++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/tailscalectl/lib.js b/tailscalectl/lib.js
index bd45288..da35592 100644
--- a/tailscalectl/lib.js
+++ b/tailscalectl/lib.js
@@ -32,6 +32,12 @@ function validateClipboardCmd(cmd) {
     return typeof cmd === "string" && safeClipboardCmds.includes(cmd)
 }
 
+function buildCopyCommand(text, clipboardCmd) {
+    if (!validateClipboardCmd(clipboardCmd)) return null
+    var escaped = text.replace(/'/g, "'\\''")
+    return ["sh", "-c", "printf '%s' '" + escaped + "' | " + clipboardCmd]
+}
+
 function errorMessage(cmd) {
     var messages = {
         "up": "Failed to connect to Tailscale",
@@ -46,5 +52,5 @@ function errorMessage(cmd) {
 
 // CommonJS export for Node.js tests (ignored by QML)
 if (typeof module !== "undefined" && module.exports) {
-    module.exports = { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd }
+    module.exports = { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand }
 }
diff --git a/test/lib.test.js b/test/lib.test.js
index 1adbf28..598b1f5 100644
--- a/test/lib.test.js
+++ b/test/lib.test.js
@@ -1,7 +1,7 @@
 import { test } from "node:test"
 import assert from "node:assert"
 import lib from "../tailscalectl/lib.js"
-const { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd } = lib
+const { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand } = lib
 
 test("parsePeers extracts exitNode from ExitNodeOption", () => {
     const peerMap = {
@@ -96,3 +96,23 @@ test("validateClipboardCmd rejects empty and falsy inputs", () => {
     assert.strictEqual(validateClipboardCmd(null), false)
     assert.strictEqual(validateClipboardCmd(undefined), false)
 })
+
+// --- buildCopyCommand ---
+
+test("buildCopyCommand returns safe command for whitelisted clipboard tool", () => {
+    const cmd = buildCopyCommand("hello", "wl-copy")
+    assert.ok(Array.isArray(cmd))
+    assert.strictEqual(cmd[0], "sh")
+    assert.strictEqual(cmd[1], "-c")
+})
+
+test("buildCopyCommand returns null for invalid clipboard command", () => {
+    assert.strictEqual(buildCopyCommand("hello", "rm -rf /"), null)
+    assert.strictEqual(buildCopyCommand("hello", ""), null)
+    assert.strictEqual(buildCopyCommand("hello", null), null)
+})
+
+test("buildCopyCommand safely handles text with special characters", () => {
+    const cmd = buildCopyCommand("it's a 'test' with \"quotes\" and\nnewlines", "wl-copy")
+    assert.ok(Array.isArray(cmd))
+})

From dddd9218f6c2871a1e466c2beef926aa90f1e1b2 Mon Sep 17 00:00:00 2001
From: vybe <vybe@jtmorris.net>
Date: Wed, 20 May 2026 10:16:02 +0000
Subject: [PATCH 3/8] feat: add parseClipboardDetection for safe clipboard tool
 parsing

Trims output and validates against whitelist, falling back to 'none'
for empty, multi-line, or unexpected values.
---
 tailscalectl/lib.js |  7 ++++++-
 test/lib.test.js    | 29 ++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/tailscalectl/lib.js b/tailscalectl/lib.js
index da35592..2c3eda4 100644
--- a/tailscalectl/lib.js
+++ b/tailscalectl/lib.js
@@ -38,6 +38,11 @@ function buildCopyCommand(text, clipboardCmd) {
     return ["sh", "-c", "printf '%s' '" + escaped + "' | " + clipboardCmd]
 }
 
+function parseClipboardDetection(stdout) {
+    var trimmed = typeof stdout === "string" ? stdout.trim() : ""
+    return validateClipboardCmd(trimmed) ? trimmed : "none"
+}
+
 function errorMessage(cmd) {
     var messages = {
         "up": "Failed to connect to Tailscale",
@@ -52,5 +57,5 @@ function errorMessage(cmd) {
 
 // CommonJS export for Node.js tests (ignored by QML)
 if (typeof module !== "undefined" && module.exports) {
-    module.exports = { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand }
+    module.exports = { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand, parseClipboardDetection }
 }
diff --git a/test/lib.test.js b/test/lib.test.js
index 598b1f5..edc92a9 100644
--- a/test/lib.test.js
+++ b/test/lib.test.js
@@ -1,7 +1,7 @@
 import { test } from "node:test"
 import assert from "node:assert"
 import lib from "../tailscalectl/lib.js"
-const { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand } = lib
+const { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand, parseClipboardDetection } = lib
 
 test("parsePeers extracts exitNode from ExitNodeOption", () => {
     const peerMap = {
@@ -116,3 +116,30 @@ test("buildCopyCommand safely handles text with special characters", () => {
     const cmd = buildCopyCommand("it's a 'test' with \"quotes\" and\nnewlines", "wl-copy")
     assert.ok(Array.isArray(cmd))
 })
+
+// --- parseClipboardDetection ---
+
+test("parseClipboardDetection passes through expected output strings", () => {
+    assert.strictEqual(parseClipboardDetection("dms cl copy"), "dms cl copy")
+    assert.strictEqual(parseClipboardDetection("wl-copy"), "wl-copy")
+    assert.strictEqual(parseClipboardDetection("clipmanctl copy"), "clipmanctl copy")
+    assert.strictEqual(parseClipboardDetection("none"), "none")
+})
+
+test("parseClipboardDetection trims extra whitespace", () => {
+    assert.strictEqual(parseClipboardDetection("  wl-copy  \n"), "wl-copy")
+})
+
+test("parseClipboardDetection falls back to none for multi-line output", () => {
+    assert.strictEqual(parseClipboardDetection("wl-copy\nrm -rf /"), "none")
+})
+
+test("parseClipboardDetection falls back to empty output", () => {
+    assert.strictEqual(parseClipboardDetection(""), "none")
+    assert.strictEqual(parseClipboardDetection("   "), "none")
+})
+
+test("parseClipboardDetection falls back to none for unexpected strings", () => {
+    assert.strictEqual(parseClipboardDetection("xclip -selection clipboard"), "none")
+    assert.strictEqual(parseClipboardDetection("custom-tool"), "none")
+})

From ce8707c6181a127ba615a990798cc62112e82dd6 Mon Sep 17 00:00:00 2001
From: vybe <vybe@jtmorris.net>
Date: Wed, 20 May 2026 19:21:17 +0000
Subject: [PATCH 4/8] feat: add buildToggleCommand for safe toggle command
 construction

Replaces inline ternary in QML with a pure function that returns
the correct tailscale up/down command based on connection state.
---
 tailscalectl/lib.js |  6 +++++-
 test/lib.test.js    | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/tailscalectl/lib.js b/tailscalectl/lib.js
index 2c3eda4..563de83 100644
--- a/tailscalectl/lib.js
+++ b/tailscalectl/lib.js
@@ -38,6 +38,10 @@ function buildCopyCommand(text, clipboardCmd) {
     return ["sh", "-c", "printf '%s' '" + escaped + "' | " + clipboardCmd]
 }
 
+function buildToggleCommand(isConnected) {
+    return isConnected ? ["tailscale", "down"] : ["tailscale", "up"]
+}
+
 function parseClipboardDetection(stdout) {
     var trimmed = typeof stdout === "string" ? stdout.trim() : ""
     return validateClipboardCmd(trimmed) ? trimmed : "none"
@@ -57,5 +61,5 @@ function errorMessage(cmd) {
 
 // CommonJS export for Node.js tests (ignored by QML)
 if (typeof module !== "undefined" && module.exports) {
-    module.exports = { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand, parseClipboardDetection }
+    module.exports = { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand, parseClipboardDetection, buildToggleCommand }
 }
diff --git a/test/lib.test.js b/test/lib.test.js
index edc92a9..c5b5098 100644
--- a/test/lib.test.js
+++ b/test/lib.test.js
@@ -1,7 +1,7 @@
 import { test } from "node:test"
 import assert from "node:assert"
 import lib from "../tailscalectl/lib.js"
-const { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand, parseClipboardDetection } = lib
+const { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand, parseClipboardDetection, buildToggleCommand } = lib
 
 test("parsePeers extracts exitNode from ExitNodeOption", () => {
     const peerMap = {
@@ -143,3 +143,18 @@ test("parseClipboardDetection falls back to none for unexpected strings", () =>
     assert.strictEqual(parseClipboardDetection("xclip -selection clipboard"), "none")
     assert.strictEqual(parseClipboardDetection("custom-tool"), "none")
 })
+
+// --- buildToggleCommand ---
+
+test("buildToggleCommand returns down command when connected", () => {
+    assert.deepStrictEqual(buildToggleCommand(true), ["tailscale", "down"])
+})
+
+test("buildToggleCommand returns up command when disconnected", () => {
+    assert.deepStrictEqual(buildToggleCommand(false), ["tailscale", "up"])
+})
+
+test("buildToggleCommand treats null and undefined as disconnected", () => {
+    assert.deepStrictEqual(buildToggleCommand(null), ["tailscale", "up"])
+    assert.deepStrictEqual(buildToggleCommand(undefined), ["tailscale", "up"])
+})

From b521af3364cb6576ca5882614d9c4ee8e2287ff0 Mon Sep 17 00:00:00 2001
From: vybe <vybe@jtmorris.net>
Date: Wed, 20 May 2026 19:29:02 +0000
Subject: [PATCH 5/8] feat: add parseStatusResult for safe JSON parsing of
 tailscale status

Wraps JSON.parse in try/catch, returns safe defaults on failure,
and delegates to existing findActiveExitNode and parsePeers.
---
 tailscalectl/lib.js | 16 ++++++++++++++-
 test/lib.test.js    | 47 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/tailscalectl/lib.js b/tailscalectl/lib.js
index 563de83..6260d5b 100644
--- a/tailscalectl/lib.js
+++ b/tailscalectl/lib.js
@@ -38,6 +38,20 @@ function buildCopyCommand(text, clipboardCmd) {
     return ["sh", "-c", "printf '%s' '" + escaped + "' | " + clipboardCmd]
 }
 
+function parseStatusResult(jsonText) {
+    try {
+        const data = JSON.parse(jsonText)
+        return {
+            isConnected: data.BackendState === "Running",
+            tailscaleIP: (data.Self && data.Self.TailscaleIPs && data.Self.TailscaleIPs[0]) || "",
+            currentExitNode: findActiveExitNode(data.Peer || {}),
+            peers: parsePeers(data.Peer || {})
+        }
+    } catch (e) {
+        return { isConnected: false, tailscaleIP: "", currentExitNode: "", peers: [] }
+    }
+}
+
 function buildToggleCommand(isConnected) {
     return isConnected ? ["tailscale", "down"] : ["tailscale", "up"]
 }
@@ -61,5 +75,5 @@ function errorMessage(cmd) {
 
 // CommonJS export for Node.js tests (ignored by QML)
 if (typeof module !== "undefined" && module.exports) {
-    module.exports = { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand, parseClipboardDetection, buildToggleCommand }
+    module.exports = { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand, parseClipboardDetection, buildToggleCommand, parseStatusResult }
 }
diff --git a/test/lib.test.js b/test/lib.test.js
index c5b5098..c43d596 100644
--- a/test/lib.test.js
+++ b/test/lib.test.js
@@ -1,7 +1,7 @@
 import { test } from "node:test"
 import assert from "node:assert"
 import lib from "../tailscalectl/lib.js"
-const { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand, parseClipboardDetection, buildToggleCommand } = lib
+const { parsePeers, makeExitNodeCommand, findActiveExitNode, errorMessage, validateClipboardCmd, buildCopyCommand, parseClipboardDetection, buildToggleCommand, parseStatusResult } = lib
 
 test("parsePeers extracts exitNode from ExitNodeOption", () => {
     const peerMap = {
@@ -158,3 +158,48 @@ test("buildToggleCommand treats null and undefined as disconnected", () => {
     assert.deepStrictEqual(buildToggleCommand(null), ["tailscale", "up"])
     assert.deepStrictEqual(buildToggleCommand(undefined), ["tailscale", "up"])
 })
+
+// --- parseStatusResult ---
+
+test("parseStatusResult produces correct state from valid JSON", () => {
+    const json = JSON.stringify({
+        BackendState: "Running",
+        Self: { TailscaleIPs: ["100.64.0.5"] },
+        Peer: {
+            "key-1": { HostName: "router", TailscaleIPs: ["100.64.0.1"], Online: true, ExitNode: true, ExitNodeOption: true }
+        }
+    })
+    const state = parseStatusResult(json)
+    assert.strictEqual(state.isConnected, true)
+    assert.strictEqual(state.tailscaleIP, "100.64.0.5")
+    assert.strictEqual(state.currentExitNode, "router")
+    assert.strictEqual(state.peers.length, 1)
+})
+
+test("parseStatusResult returns safe defaults for invalid JSON", () => {
+    const state = parseStatusResult("not json at all")
+    assert.strictEqual(state.isConnected, false)
+    assert.strictEqual(state.tailscaleIP, "")
+    assert.strictEqual(state.currentExitNode, "")
+    assert.strictEqual(state.peers.length, 0)
+})
+
+test("parseStatusResult handles missing Self gracefully", () => {
+    const json = JSON.stringify({ BackendState: "Running", Peer: {} })
+    const state = parseStatusResult(json)
+    assert.strictEqual(state.isConnected, true)
+    assert.strictEqual(state.tailscaleIP, "")
+})
+
+test("parseStatusResult handles missing and empty Peer gracefully", () => {
+    const json = JSON.stringify({ BackendState: "Running", Self: { TailscaleIPs: ["100.64.0.5"] } })
+    const state = parseStatusResult(json)
+    assert.strictEqual(state.peers.length, 0)
+    assert.strictEqual(state.currentExitNode, "")
+})
+
+test("parseStatusResult sets isConnected false for non-Running BackendState", () => {
+    const json = JSON.stringify({ BackendState: "NeedsLogin", Self: { TailscaleIPs: ["100.64.0.5"] }, Peer: {} })
+    const state = parseStatusResult(json)
+    assert.strictEqual(state.isConnected, false)
+})

From 93b257ba5d6c0939274b77ce345379172245b857 Mon Sep 17 00:00:00 2001
From: vybe <vybe@jtmorris.net>
Date: Wed, 20 May 2026 19:37:08 +0000
Subject: [PATCH 6/8] refactor: delegate shell command construction to lib.js
 functions

Replace inline shell command building in QML with calls to
parseClipboardDetection, parseStatusResult, buildToggleCommand, and
buildCopyCommand. This centralizes sanitization logic and removes
duplicated try/catch and ternary blocks from the UI layer.
---
 tailscalectl/TailscaleWidget.qml | 33 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/tailscalectl/TailscaleWidget.qml b/tailscalectl/TailscaleWidget.qml
index 235ffc0..705070e 100644
--- a/tailscalectl/TailscaleWidget.qml
+++ b/tailscalectl/TailscaleWidget.qml
@@ -66,7 +66,7 @@ PluginComponent {
 
         stdout: StdioCollector {
             onStreamFinished: {
-                root.clipboardCmd = this.text.trim()
+                root.clipboardCmd = TailscaleLib.parseClipboardDetection(this.text)
             }
         }
 
@@ -82,19 +82,11 @@ PluginComponent {
 
         stdout: StdioCollector {
             onStreamFinished: {
-                try {
-                    const data = JSON.parse(this.text)
-                    root.isConnected = data.BackendState === "Running"
-                    root.tailscaleIP = (data.Self?.TailscaleIPs?.[0]) || ""
-                    root.currentExitNode = TailscaleLib.findActiveExitNode(data.Peer || {})
-                    root.peers = TailscaleLib.parsePeers(data.Peer || {})
-                } catch (e) {
-                    root.isConnected = false
-                    root.tailscaleIP = ""
-                    root.currentExitNode = ""
-                    root.peers = []
-                    ToastService.showError("tailscalectl", "Failed to parse Tailscale status")
-                }
+                const state = TailscaleLib.parseStatusResult(this.text)
+                root.isConnected = state.isConnected
+                root.tailscaleIP = state.tailscaleIP
+                root.currentExitNode = state.currentExitNode
+                root.peers = state.peers
             }
         }
 
@@ -119,11 +111,7 @@ PluginComponent {
             ToastService.showError("tailscalectl", "Tailscale not available")
             return
         }
-        if (root.isConnected) {
-            toggleProcess.command = ["tailscale", "down"]
-        } else {
-            toggleProcess.command = ["tailscale", "up"]
-        }
+        toggleProcess.command = TailscaleLib.buildToggleCommand(root.isConnected)
         toggleProcess.running = true
     }
 
@@ -141,7 +129,12 @@ PluginComponent {
             ToastService.showError("tailscalectl", "No clipboard tool found")
             return
         }
-        copyProcess.command = ["sh", "-c", "printf '%s' '" + text.replace(/'/g, "'\\''") + "' | " + root.clipboardCmd]
+        var cmd = TailscaleLib.buildCopyCommand(text, root.clipboardCmd)
+        if (!cmd) {
+            ToastService.showError("tailscalectl", "Invalid clipboard command")
+            return
+        }
+        copyProcess.command = cmd
         copyProcess.running = true
         ToastService.showInfo("Copied " + text + " to clipboard")
     }

From 6ef933211cce2843e4f5c005b6971cd44fbdaf23 Mon Sep 17 00:00:00 2001
From: vybe <vybe@jtmorris.net>
Date: Thu, 21 May 2026 02:29:13 +0000
Subject: [PATCH 7/8] fix: expand clipboard detection to xclip and xsel

Add xclip and xsel to the whitelist and detection script so users
on systems without wl-copy or clipmanctl can still copy peer info.
---
 tailscalectl/TailscaleWidget.qml | 2 +-
 tailscalectl/lib.js              | 2 +-
 test/lib.test.js                 | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tailscalectl/TailscaleWidget.qml b/tailscalectl/TailscaleWidget.qml
index 705070e..cb3fc82 100644
--- a/tailscalectl/TailscaleWidget.qml
+++ b/tailscalectl/TailscaleWidget.qml
@@ -62,7 +62,7 @@ PluginComponent {
     Process {
         id: detectClipboard
 
-        command: ["sh", "-c", "which dms >/dev/null 2>&1 && echo 'dms cl copy' || which wl-copy >/dev/null 2>&1 && echo 'wl-copy' || which clipmanctl >/dev/null 2>&1 && echo 'clipmanctl copy' || echo none"]
+        command: ["sh", "-c", "which dms >/dev/null 2>&1 && echo 'dms cl copy' || which wl-copy >/dev/null 2>&1 && echo 'wl-copy' || which clipmanctl >/dev/null 2>&1 && echo 'clipmanctl copy' || which xclip >/dev/null 2>&1 && echo 'xclip -selection clipboard' || which xsel >/dev/null 2>&1 && echo 'xsel --clipboard --input' || echo none"]
 
         stdout: StdioCollector {
             onStreamFinished: {
diff --git a/tailscalectl/lib.js b/tailscalectl/lib.js
index 6260d5b..dff4060 100644
--- a/tailscalectl/lib.js
+++ b/tailscalectl/lib.js
@@ -26,7 +26,7 @@ function findActiveExitNode(peerMap) {
     return ""
 }
 
-var safeClipboardCmds = ["dms cl copy", "wl-copy", "clipmanctl copy", "none"]
+var safeClipboardCmds = ["dms cl copy", "wl-copy", "clipmanctl copy", "xclip -selection clipboard", "xsel --clipboard --input", "none"]
 
 function validateClipboardCmd(cmd) {
     return typeof cmd === "string" && safeClipboardCmds.includes(cmd)
diff --git a/test/lib.test.js b/test/lib.test.js
index c43d596..e433e96 100644
--- a/test/lib.test.js
+++ b/test/lib.test.js
@@ -81,6 +81,8 @@ test("validateClipboardCmd accepts whitelisted values", () => {
     assert.strictEqual(validateClipboardCmd("dms cl copy"), true)
     assert.strictEqual(validateClipboardCmd("wl-copy"), true)
     assert.strictEqual(validateClipboardCmd("clipmanctl copy"), true)
+    assert.strictEqual(validateClipboardCmd("xclip -selection clipboard"), true)
+    assert.strictEqual(validateClipboardCmd("xsel --clipboard --input"), true)
     assert.strictEqual(validateClipboardCmd("none"), true)
 })
 
@@ -140,7 +142,7 @@ test("parseClipboardDetection falls back to empty output", () => {
 })
 
 test("parseClipboardDetection falls back to none for unexpected strings", () => {
-    assert.strictEqual(parseClipboardDetection("xclip -selection clipboard"), "none")
+    assert.strictEqual(parseClipboardDetection("pbpaste"), "none")
     assert.strictEqual(parseClipboardDetection("custom-tool"), "none")
 })
 

From 2ece3cc103b21115e59e80b730194464e138ab2d Mon Sep 17 00:00:00 2001
From: vybe <vybe@jtmorris.net>
Date: Thu, 21 May 2026 02:36:40 +0000
Subject: [PATCH 8/8] fix: use if/elif/else in clipboard detection script

The previous &&/|| chain evaluated all commands, producing multi-line
output when multiple tools were installed. parseClipboardDetection
correctly rejected this as invalid, falling back to 'none'. The
if/elif/else structure ensures only the first match is echoed.
---
 tailscalectl/TailscaleWidget.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tailscalectl/TailscaleWidget.qml b/tailscalectl/TailscaleWidget.qml
index cb3fc82..d1849de 100644
--- a/tailscalectl/TailscaleWidget.qml
+++ b/tailscalectl/TailscaleWidget.qml
@@ -62,7 +62,7 @@ PluginComponent {
     Process {
         id: detectClipboard
 
-        command: ["sh", "-c", "which dms >/dev/null 2>&1 && echo 'dms cl copy' || which wl-copy >/dev/null 2>&1 && echo 'wl-copy' || which clipmanctl >/dev/null 2>&1 && echo 'clipmanctl copy' || which xclip >/dev/null 2>&1 && echo 'xclip -selection clipboard' || which xsel >/dev/null 2>&1 && echo 'xsel --clipboard --input' || echo none"]
+        command: ["sh", "-c", "if which dms >/dev/null 2>&1; then echo 'dms cl copy'; elif which wl-copy >/dev/null 2>&1; then echo 'wl-copy'; elif which clipmanctl >/dev/null 2>&1; then echo 'clipmanctl copy'; elif which xclip >/dev/null 2>&1; then echo 'xclip -selection clipboard'; elif which xsel >/dev/null 2>&1; then echo 'xsel --clipboard --input'; else echo none; fi"]
 
         stdout: StdioCollector {
             onStreamFinished: {