Merge pull request 'clan-cli: Better env jailing in temporary_home' (#1659) from Qubasa/clan-core:Qubasa-main into main

2024-06-25 10:06:55 +00:00 · 2024-06-25 10:06:55 +00:00 · 39ec23bd31
commit 39ec23bd31
parent 5ae8ccbbdd 62839b6fa0
1 changed files with 22 additions and 20 deletions
--- a/pkgs/clan-cli/tests/temporary_dir.py
+++ b/pkgs/clan-cli/tests/temporary_dir.py
@ -11,26 +11,28 @@ log = logging.getLogger(__name__)

@pytest.fixture
 def temporary_home(monkeypatch: pytest.MonkeyPatch) -> Iterator[Path]:
-    env_dir = os.getenv("TEST_TEMPORARY_DIR")
-    if env_dir is not None:
-        path = Path(env_dir).resolve()
-        log.debug("Temp HOME directory: %s", str(path))
-        monkeypatch.setenv("HOME", str(path))
-        monkeypatch.setenv("XDG_CONFIG_HOME", str(path / ".config"))
-        runtime_dir = path / "xdg-runtime-dir"
+    with tempfile.TemporaryDirectory(prefix="pytest-") as dirpath:
+        xdg_runtime_dir = os.getenv("XDG_RUNTIME_DIR")
+        monkeypatch.setenv("HOME", str(dirpath))
+        monkeypatch.setenv("XDG_CONFIG_HOME", str(Path(dirpath) / ".config"))
+
+        runtime_dir = Path(dirpath) / "xdg-runtime-dir"
        runtime_dir.mkdir()
        runtime_dir.chmod(0o700)
+
+        gpgdir = runtime_dir / "gpgagent"
+        gpgdir.mkdir()
+        gpgdir.chmod(0o700)
+        monkeypatch.setenv("GPG_AGENT_INFO", str(gpgdir))
+
+        # Iterate over all environment variables
+        for key, value in os.environ.items():
+            if xdg_runtime_dir and value.startswith(xdg_runtime_dir):
+                monkeypatch.setenv(
+                    key, value.replace(xdg_runtime_dir, str(runtime_dir))
+                )
+
        monkeypatch.setenv("XDG_RUNTIME_DIR", str(runtime_dir))
-        monkeypatch.chdir(str(path))
-        yield path
-    else:
-        with tempfile.TemporaryDirectory(prefix="pytest-") as dirpath:
-            monkeypatch.setenv("HOME", str(dirpath))
-            monkeypatch.setenv("XDG_CONFIG_HOME", str(Path(dirpath) / ".config"))
-            runtime_dir = Path(dirpath) / "xdg-runtime-dir"
-            runtime_dir.mkdir()
-            runtime_dir.chmod(0o700)
-            monkeypatch.setenv("XDG_RUNTIME_DIR", str(runtime_dir))
-            monkeypatch.chdir(str(dirpath))
-            log.debug("Temp HOME directory: %s", str(dirpath))
-            yield Path(dirpath)
+        monkeypatch.chdir(str(dirpath))
+        log.debug("Temp HOME directory: %s", str(dirpath))
+        yield Path(dirpath)