Did Hogjects#184, forgot to say it, plus fixed some bugs.

Author: R-Larocque

src/lufus/browse_freely.py

@@ -18,17 +18,23 @@ def open_url_non_root(url: str) -> None:
     if os.geteuid() == 0:
         target_user = None
         target_uid = None
+        home_dir = None
 
-        if pkexec_uid:
-            target_uid = pkexec_uid
-            try:
-                import pwd
+        try:
+            import pwd
 
-                target_user = pwd.getpwuid(int(pkexec_uid)).pw_name
-            except Exception:
-                pass
-        elif sudo_user and sudo_user != "root":
-            target_user = sudo_user
+            if pkexec_uid:
+                pw = pwd.getpwuid(int(pkexec_uid))
+                target_user = pw.pw_name
+                target_uid = pkexec_uid
+                home_dir = pw.pw_dir
+            elif sudo_user and sudo_user != "root":
+                pw = pwd.getpwnam(sudo_user)
+                target_user = sudo_user
+                target_uid = str(pw.pw_uid)
+                home_dir = pw.pw_dir
+        except Exception as e:
+            log.warning(f"Could not resolve target user info: {e}")
 
         if target_user:
             try:
@@ -44,6 +50,8 @@ def open_url_non_root(url: str) -> None:
                     ),
                     "WAYLAND_DISPLAY": os.environ.get("WAYLAND_DISPLAY", ""),
                     "PATH": "/usr/local/bin:/usr/bin:/bin",
+                    # Ensure HOME is set so GUI apps use the target user's profile and config
+                    "HOME": home_dir or os.environ.get("HOME", ""),
                 }
 
                 # Filter out empty values

src/lufus/gui/gui.py

@@ -119,19 +119,6 @@ def __init__(self, usb_devices=None, scale: Scale = None):
         self.current_language = state.language
         self._T = load_translations(self.current_language)
 
-        # restore theme from env when relaunched as root via pkexec :3
-        env_theme = os.environ.get("LUFUS_THEME", "")
-        if env_theme:
-            state.theme = env_theme
-
-        # load persisted theme from config when not set via env :3
-        if not getattr(state, "theme", ""):
-            try:
-                _theme_cfg = Path(user_config_dir("Lufus")) / "active_theme"
-                state.theme = _theme_cfg.read_text(encoding="utf-8").strip()
-            except Exception:
-                pass
-
         self.setWindowTitle(self._T.get("window_title", "lufus"))
 
         # calculate window size based on screen dimensions

src/lufus/gui/start_gui.py

@@ -12,8 +12,14 @@
 
 
 def _load_initial_theme():
+    # Check environment variable first (passed during elevation)
+    env_theme = os.environ.get("LUFUS_THEME")
+    if env_theme:
+        state.theme = env_theme
+        return
+
     # Load theme before elevation so it can be passed via env
-    if getattr(state, "theme", ""):
+    if getattr(state, "theme", "") and state.theme != "default":
         return
     try:
         _theme_cfg = Path(user_config_dir("Lufus")) / "active_theme"
@@ -24,6 +30,12 @@ def _load_initial_theme():
 
 
 def _load_initial_language():
+    # If already set via environment (e.g. during elevation), prioritize it
+    env_lang = os.environ.get("LUFUS_LANGUAGE")
+    if env_lang:
+        state.language = env_lang
+        return
+
     # Load persisted language preference; fall back to system locale detection
     try:
         _lang_cfg = Path(user_config_dir("Lufus")) / "active_language"
@@ -84,7 +96,11 @@ def launch_gui_with_usb_data() -> None:
         _show_root_warning()
         sys.exit(1)
 
-    _load_initial_language()
+    # If we are root (either from start or after elevation), load/restore settings
+    if os.geteuid() == 0:
+        _load_initial_theme()
+        _load_initial_language()
+
     usb_devices = find_usb()
     log.info("Launching GUI with USB devices: %s", usb_devices)
 

src/lufus/utils.py

@@ -26,6 +26,9 @@ def elevate_privileges() -> None:
                 theme_val,
             )
 
+    if state.language:
+        env["LUFUS_LANGUAGE"] = str(state.language)
+
     # Preserve DISPLAY and XAUTHORITY for GUI apps under pkexec/sudo
     # Now also takes the detected XDG_DOWNLOAD_DIR of /src/lufus/user_paths.py to put it into LUFUS_DOWNLOAD_DIR
     env_vars = [
@@ -35,6 +38,7 @@ def elevate_privileges() -> None:
         "WAYLAND_DISPLAY",
         "PYTHONPATH",
         "LUFUS_THEME",
+        "LUFUS_LANGUAGE",
         "LUFUS_DOWNLOAD_DIR",
     ]
 

tests/test_browse_freely.py

@@ -20,26 +20,27 @@ def test_open_url_non_root_as_regular_user(self, mock_webbrowser, mock_geteuid):
         mock_webbrowser.assert_called_once_with(self.url)
 
     @patch("os.geteuid")
-    @patch("os.environ.get")
     @patch("subprocess.Popen")
     @patch("pwd.getpwuid")
-    def test_open_url_as_root_via_pkexec(self, mock_getpwuid, mock_popen, mock_env_get, mock_geteuid):
+    def test_open_url_as_root_via_pkexec(self, mock_getpwuid, mock_popen, mock_geteuid):
         # Simulate root (UID 0)
         mock_geteuid.return_value = 0
 
         # Mock environment variables
-        def side_effect(key, default=None):
-            env = {"PKEXEC_UID": "1000", "DISPLAY": ":0", "XDG_RUNTIME_DIR": "/run/user/1000"}
-            return env.get(key, default)
-
-        mock_env_get.side_effect = side_effect
+        env_overrides = {
+            "PKEXEC_UID": "1000",
+            "DISPLAY": ":0",
+            "XDG_RUNTIME_DIR": "/run/user/1000",
+        }
 
         # Mock pwd info
         mock_user = MagicMock()
         mock_user.pw_name = "raphael"
+        mock_user.pw_dir = "/home/raphael"
         mock_getpwuid.return_value = mock_user
 
-        open_url_non_root(self.url)
+        with patch.dict(os.environ, env_overrides, clear=False):
+            open_url_non_root(self.url)
 
         # Verify subprocess.Popen was called with runuser
         args, kwargs = mock_popen.call_args
@@ -53,30 +54,45 @@ def side_effect(key, default=None):
         env = kwargs.get("env", {})
         self.assertEqual(env.get("DISPLAY"), ":0")
         self.assertEqual(env.get("XDG_RUNTIME_DIR"), "/run/user/1000")
+        self.assertEqual(env.get("HOME"), "/home/raphael")
 
     @patch("os.geteuid")
-    @patch("os.environ.get")
     @patch("subprocess.Popen")
-    def test_open_url_as_root_via_sudo(self, mock_popen, mock_env_get, mock_geteuid):
+    @patch("pwd.getpwnam")
+    def test_open_url_as_root_via_sudo(self, mock_getpwnam, mock_popen, mock_geteuid):
         # Simulate root (UID 0)
         mock_geteuid.return_value = 0
 
         # Mock environment variables (no PKEXEC_UID, but SUDO_USER)
-        def side_effect(key, default=None):
-            env = {"SUDO_USER": "raphael", "DISPLAY": ":0"}
-            return env.get(key, default)
-
-        mock_env_get.side_effect = side_effect
-
-        open_url_non_root(self.url)
+        env_overrides = {
+            "SUDO_USER": "raphael",
+            "DISPLAY": ":0",
+        }
+        # Ensure PKEXEC_UID is not in env if it was there
+        with patch.dict(os.environ, env_overrides, clear=False):
+            if "PKEXEC_UID" in os.environ:
+                del os.environ["PKEXEC_UID"]
+
+            # Mock pwd info
+            mock_user = MagicMock()
+            mock_user.pw_uid = 1000
+            mock_user.pw_dir = "/home/raphael"
+            mock_getpwnam.return_value = mock_user
+
+            open_url_non_root(self.url)
 
         # Verify subprocess.Popen was called with runuser
-        args, _ = mock_popen.call_args
+        args, kwargs = mock_popen.call_args
         cmd = args[0]
         self.assertEqual(cmd[0], "runuser")
         self.assertEqual(cmd[2], "raphael")
         self.assertIn(self.url, cmd)
 
+        # Verify env passing (XDG_RUNTIME_DIR should be derived from UID 1000)
+        env = kwargs.get("env", {})
+        self.assertEqual(env.get("XDG_RUNTIME_DIR"), "/run/user/1000")
+        self.assertEqual(env.get("HOME"), "/home/raphael")
+
 
 if __name__ == "__main__":
     unittest.main()