alex/headquarter
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: fix SSH key mounting with multi-key support and unique filenames

Browse Source 
SSH key mounting was broken because:
1. Each selected key was mounted to a separate source dir but all targeted
   the same ~/.ssh path in the container, causing Docker Compose's
   last-mount-wins behavior
2. All keys were named id_ed25519, so they'd overwrite each other

Changes:
- ssh_keys.py: add key_filename param to prepare_ssh_key_files for unique
  key names; add write_ssh_config for combined multi-key config
- tool_instances.py: collect all selected keys into a single ~/.ssh mount
  with sanitized unique filenames (id_ed25519_<name>); generate combined
  SSH config with all IdentityFile entries
- tests: add os.makedirs mock for SSH permission tests

Quality gates: pytest (19 passed, 1 skipped)
This commit is contained in:
Alex Blank
2026-06-02 15:03:26 +02:00
parent c754984df8
commit c6b804bf0a
4 changed files with 217 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/tests/unit/test_tool_instances_legacy.py
+28 -26
View File
@@ -837,23 +837,24 @@ class TestStartInstanceSshPermissions:
mock_session.get.side_effect = _get
with patch("os.path.exists", return_value=True):
with patch(
"src.api.tool_instances._prepare_manifest_instance"
) as mock_prepare:
mock_prepare.return_value = (
"headquarter/test:latest",
"services:\n app:\n image: test",
{"name": "test-manifest", "user": {"name": "user"}},
"/home/user",
)
result = await start_instance(
project_id=fake_project_id,
repo_id=fake_repo_id,
instance_id=fake_instance_id,
data=None,
user_id=fake_user_id,
session=mock_session,
)
with patch("os.makedirs"):
with patch(
"src.api.tool_instances._prepare_manifest_instance"
) as mock_prepare:
mock_prepare.return_value = (
"headquarter/test:latest",
"services:\n app:\n image: test",
{"name": "test-manifest", "user": {"name": "user"}},
"/home/user",
)
result = await start_instance(
project_id=fake_project_id,
repo_id=fake_repo_id,
instance_id=fake_instance_id,
data=None,
user_id=fake_user_id,
session=mock_session,
)
assert result["status"] == "running"
mock_apply_ssh.assert_called_once_with("abc123", "/home/user/.ssh", "user")
@@ -960,15 +961,16 @@ class TestStartInstanceSshPermissions:
mock_session.get.side_effect = _get
with patch("os.path.exists", return_value=True):
with patch("src.api.tool_instances._modify_compose_file"):
result = await start_instance(
project_id=fake_project_id,
repo_id=fake_repo_id,
instance_id=fake_instance_id,
data=None,
user_id=fake_user_id,
session=mock_session,
)
with patch("os.makedirs"):
with patch("src.api.tool_instances._modify_compose_file"):
result = await start_instance(
project_id=fake_project_id,
repo_id=fake_repo_id,
instance_id=fake_instance_id,
data=None,
user_id=fake_user_id,
session=mock_session,
)
assert result["status"] == "running"
mock_apply_ssh.assert_called_once_with("abc123", "/root/.ssh", "root")