From 8f36ad870fd6eae669f256a1446660bc5296a997 Mon Sep 17 00:00:00 2001
From: guyoron1 <guyoron1@users.noreply.github.com>
Date: Fri, 14 Aug 2026 21:59:14 +0300
Subject: [PATCH] fix(rewrite): never rewrite sudo-prefixed commands

'sudo <tool>' was rewritten to 'sudo rtk <tool>', inserting rtk into the
elevation: its SQLite history writes, tee files, config parsing and
telemetry ping all ran as root, and the target binary was resolved by rtk
inside the elevated process instead of by sudo's secure_path (#3412).

Commands with a sudo prefix are now passed through unrewritten. Plain
env-assignment and 'env' prefixes still rewrite as before.
---
 src/discover/registry.rs | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/discover/registry.rs b/src/discover/registry.rs
index 6469b178d8..1e574a908d 100644
--- a/src/discover/registry.rs
+++ b/src/discover/registry.rs
@@ -1311,6 +1311,13 @@ fn rewrite_segment_inner(
             );
             return None;
         }
+        // #3412: never insert rtk inside an elevated invocation. `sudo <tool>`
+        // elevates exactly one binary; rewriting to `sudo rtk <tool>` would run
+        // rtk's SQLite/tee/config/telemetry side effects as root and resolve
+        // the target binary outside sudo's secure_path. Pass through untouched.
+        if env_prefix.split_whitespace().any(|t| t == "sudo") {
+            return None;
+        }
         let rewritten = rewrite_segment_inner(
             rest_after_env,
             excluded,
@@ -4594,11 +4601,18 @@ mod tests {
 
     // --- sudo / env prefix + rewrite ---
 
+    // #3412: sudo-prefixed commands are never rewritten — inserting rtk into
+    // the elevation would run its database/tee/telemetry side effects as root.
+    #[test]
+    fn test_rewrite_sudo_docker_skipped() {
+        assert_eq!(rewrite_command_no_prefixes("sudo docker ps", &[]), None);
+    }
+
     #[test]
-    fn test_rewrite_sudo_docker() {
+    fn test_rewrite_sudo_with_env_assign_skipped() {
         assert_eq!(
-            rewrite_command_no_prefixes("sudo docker ps", &[]),
-            Some("sudo rtk docker ps".into())
+            rewrite_command_no_prefixes("env FOO=1 sudo iptables -L", &[]),
+            None
         );
     }
 
@@ -5147,9 +5161,16 @@ mod tests {
 
     #[test]
     fn test_env_prefix_composed_with_builtin() {
+        // #3412: the sudo prefix suppresses the rewrite even through a
+        // builtin transparent prefix like noglob.
         assert_eq!(
             rewrite_command_no_prefixes("sudo noglob git status", &[]),
-            Some("sudo noglob rtk git status".into())
+            None
+        );
+        // A plain env-assignment prefix still composes with builtins.
+        assert_eq!(
+            rewrite_command_no_prefixes("FOO=1 noglob git status", &[]),
+            Some("FOO=1 noglob rtk git status".into())
         );
     }