Compare commits
No commits in common. "6761089be9b5d01685369981627906d8723662b7" and "6092c432fef41810609c2da7ba0529242541ad8c" have entirely different histories.
6761089be9
...
6092c432fe
2 changed files with 11 additions and 45 deletions
17
app.py
17
app.py
|
|
@ -1571,19 +1571,11 @@ async def ansible_run(request: Request, _=Depends(_verify)):
|
|||
if not hostname:
|
||||
return JSONResponse({"error": "limit/hostname required"}, status_code=400)
|
||||
action = body.get("action", "setup")
|
||||
if action not in {"setup", "tune", "pvetune", "nfs"}:
|
||||
return JSONResponse({"error": "action must be setup, tune, pvetune or nfs"}, status_code=400)
|
||||
if action not in {"setup", "tune", "pvetune"}:
|
||||
return JSONResponse({"error": "action must be setup, tune or pvetune"}, status_code=400)
|
||||
if not re.fullmatch(r"[a-zA-Z0-9_.:-]+", hostname):
|
||||
return JSONResponse({"error": "invalid hostname/limit"}, status_code=400)
|
||||
if action in {"tune", "pvetune", "nfs"}:
|
||||
if action == "nfs":
|
||||
approved_files = (
|
||||
"roles/nfs_stability/tasks/main.yml",
|
||||
"nfs-stability.yml",
|
||||
"pfannkuchen.sh",
|
||||
)
|
||||
prepare = "mkdir -p roles/nfs_stability/tasks && "
|
||||
else:
|
||||
if action in {"tune", "pvetune"}:
|
||||
approved_files = (
|
||||
"roles/sysctl/defaults/main.yml",
|
||||
"roles/sysctl/tasks/main.yml",
|
||||
|
|
@ -1591,14 +1583,13 @@ async def ansible_run(request: Request, _=Depends(_verify)):
|
|||
"sysctl-proxmox.yaml",
|
||||
"roles/sysctl_proxmox/tasks/main.yml",
|
||||
)
|
||||
prepare = ""
|
||||
file_sync = " && ".join(
|
||||
f"git show origin/master:{path} > {path}" for path in approved_files
|
||||
)
|
||||
command = (
|
||||
"cd /app-config/ansible && "
|
||||
"git fetch origin master && "
|
||||
f"{prepare}{file_sync} && "
|
||||
f"{file_sync} && "
|
||||
f"bash pfannkuchen.sh {action} {hostname}"
|
||||
)
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -235,31 +235,6 @@ def test_ansible_run_supports_safe_tune_action_and_syncs_approved_files(monkeypa
|
|||
assert len(calls) == 1
|
||||
|
||||
|
||||
def test_ansible_run_supports_scoped_nfs_action(monkeypatch):
|
||||
calls = []
|
||||
|
||||
def fake_ssh(host, command, timeout=600):
|
||||
calls.append((host, command, timeout))
|
||||
return 0, "changed=1 failed=0", ""
|
||||
|
||||
monkeypatch.setattr(app, "_ssh", fake_ssh)
|
||||
with TestClient(app.app) as client:
|
||||
response = client.post(
|
||||
"/ansible/run",
|
||||
headers={"Authorization": "Bearer test-token"},
|
||||
json={"hostname": "arrapps", "action": "nfs"},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert response.json()["action"] == "nfs"
|
||||
command = calls[0][1]
|
||||
assert "mkdir -p roles/nfs_stability/tasks" in command
|
||||
assert "git show origin/master:roles/nfs_stability/tasks/main.yml" in command
|
||||
assert "git show origin/master:nfs-stability.yml" in command
|
||||
assert "bash pfannkuchen.sh nfs arrapps" in command
|
||||
assert "git pull --ff-only" not in command
|
||||
assert len(calls) == 1
|
||||
|
||||
|
||||
def test_ansible_run_rejects_unknown_action_and_shell_metacharacters(monkeypatch):
|
||||
monkeypatch.setattr(app, "_ssh", lambda *_args, **_kwargs: (_ for _ in ()).throw(AssertionError("must not SSH")))
|
||||
with TestClient(app.app) as client:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue