Keep Bitwarden unlock password off argv (#1311)

This commit is contained in:
Vykos
2026-06-02 19:13:51 +02:00
committed by GitHub
parent 34918d9921
commit e73545f64f
3 changed files with 27 additions and 19 deletions

View File

@@ -4,8 +4,8 @@
``asyncio.create_subprocess_exec(bw_path, *args)`` — every element of ``args``
becomes a process argument, which is world-readable through ``ps`` /
``/proc/<pid>/cmdline``. The master password therefore must be handed to ``bw``
via the environment (``--passwordenv BW_PASSWORD``), exactly like the existing
``BW_SESSION`` env passing, and never as a positional argv element.
out-of-band (stdin or ``--passwordenv BW_PASSWORD``), and never as a positional
argv element.
The /unlock route previously did ``_run_bw(["unlock", req.master_password,
"--raw"])`` — leaking the Bitwarden master password (which decrypts the whole
@@ -68,7 +68,7 @@ def _patch_exec(monkeypatch):
@pytest.mark.asyncio
async def test_run_bw_password_goes_to_env_not_argv(monkeypatch):
async def test_run_bw_passwordenv_does_not_put_password_in_argv(monkeypatch):
captured = _patch_exec(monkeypatch)
secret = "correct horse battery staple"
await vr._run_bw(["unlock", "--passwordenv", "BW_PASSWORD", "--raw"],
@@ -87,18 +87,26 @@ async def test_run_bw_without_password_does_not_set_env(monkeypatch):
assert "BW_PASSWORD" not in captured["env"]
def test_unlock_handler_uses_passwordenv_not_argv():
def test_unlock_handler_feeds_password_on_stdin_not_argv():
"""Source-level guard: the /unlock route must feed the master password via
--passwordenv / bw_password=, never as a bare positional argv element."""
stdin, never as a bare positional argv element."""
src = vr.__file__
with open(src, encoding="utf-8") as fh:
text = fh.read()
# The old, vulnerable call shape must be gone.
assert 'req.master_password, "--raw"' not in text
assert "[\"unlock\", req.master_password" not in text
# And the secure shape must be present.
assert "--passwordenv" in text
assert re.search(r"bw_password\s*=\s*req\.master_password", text)
# And the safer stdin shape must be present.
assert "[\"unlock\", \"--raw\"]" in text
assert re.search(r'input_text\s*=\s*req\.master_password\s*\+\s*"\\n"', text)
def test_tool_vault_unlock_feeds_password_on_stdin_not_argv():
text = open("src/tool_implementations.py", encoding="utf-8").read()
assert '["unlock", master_password, "--raw"]' not in text
assert '_run_bw(["unlock", master_password' not in text
assert re.search(r'input_text\s*=\s*master_password\s*\+\s*"\\n"', text)
def test_load_config_ignores_non_object_json(tmp_path, monkeypatch):