feat(furtka): web UI + HTTP API for app install/remove
Adds the management UI Daniel asked for end-of-session. Goes beyond
the original MVP scope (plan punted UI to v2) but the architecture
already supports it cleanly: stdlib http.server only, no new deps.
- furtka.api: minimal HTTP server. GET / serves a self-contained
HTML page (dark-mode card list, vanilla JS, no build step). GET
/api/apps + /api/bundled return JSON. POST /api/apps/{install,
remove} accept {"name": "..."} and call the same installer +
reconciler the CLI uses, so the placeholder-secret refusal and
per-app reconcile isolation flow through unchanged.
- furtka.cli: new `furtka serve` subcommand. Imports api lazily so
`furtka app list` / `reconcile` startup stays zero-cost.
- webinstaller: new furtka-api.service (Type=simple, restart on
failure, after reconcile). Caddyfile gets two new handle blocks
to reverse-proxy /api and /apps to localhost:7000. Landing page's
"App store coming soon" tile becomes a real "Manage installed apps
→" link to /apps.
- Bound to 127.0.0.1 by default; Caddy makes it LAN-reachable. The
UI shouts a "no auth, anyone on your LAN can install/remove" warning
at the top — Authentik integration is the proper fix later.
UX wrinkle worth noting: a placeholder-rejected install leaves the
app in /var/lib/furtka/apps/<name>/ (so the user can edit .env in
place). To re-trigger after editing, the Installed list now shows
both Reinstall and Remove buttons.
10 new tests: helper functions (list_installed, list_bundled with
hide-already-installed), install/remove endpoints with the no_docker
fixture, and two real-socket urllib smoke tests that boot the actual
HTTPServer on an ephemeral port and round-trip GET / + POST.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-15 10:23:46 +02:00
|
|
|
import json
|
|
|
|
|
import threading
|
|
|
|
|
import urllib.error
|
|
|
|
|
import urllib.request
|
|
|
|
|
|
|
|
|
|
import pytest
|
|
|
|
|
|
|
|
|
|
from furtka import api, dockerops
|
|
|
|
|
|
|
|
|
|
VALID_MANIFEST = {
|
|
|
|
|
"name": "fileshare",
|
|
|
|
|
"display_name": "Network Files",
|
|
|
|
|
"version": "0.1.0",
|
|
|
|
|
"description": "SMB share",
|
|
|
|
|
"volumes": ["files"],
|
|
|
|
|
"ports": [445],
|
|
|
|
|
"icon": "icon.svg",
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.fixture
|
|
|
|
|
def fake_dirs(tmp_path, monkeypatch):
|
|
|
|
|
apps = tmp_path / "apps"
|
|
|
|
|
bundled = tmp_path / "bundled"
|
|
|
|
|
apps.mkdir()
|
|
|
|
|
bundled.mkdir()
|
|
|
|
|
monkeypatch.setenv("FURTKA_APPS_DIR", str(apps))
|
|
|
|
|
monkeypatch.setenv("FURTKA_BUNDLED_APPS_DIR", str(bundled))
|
|
|
|
|
return apps, bundled
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.fixture
|
|
|
|
|
def no_docker(monkeypatch):
|
|
|
|
|
"""Stub docker calls so install/remove can run without a daemon."""
|
|
|
|
|
monkeypatch.setattr(dockerops, "ensure_volume", lambda name: True)
|
|
|
|
|
monkeypatch.setattr(dockerops, "compose_up", lambda app_dir, project: None)
|
|
|
|
|
monkeypatch.setattr(dockerops, "compose_down", lambda app_dir, project: None)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _write_bundled(bundled, name, manifest=None, env_example=None):
|
|
|
|
|
app = bundled / name
|
|
|
|
|
app.mkdir()
|
|
|
|
|
(app / "manifest.json").write_text(json.dumps(manifest or VALID_MANIFEST))
|
|
|
|
|
(app / "docker-compose.yaml").write_text("services: {}\n")
|
|
|
|
|
if env_example is not None:
|
|
|
|
|
(app / ".env.example").write_text(env_example)
|
|
|
|
|
return app
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_list_installed_empty(fake_dirs):
|
|
|
|
|
assert api._list_installed() == []
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_list_bundled_empty(fake_dirs):
|
|
|
|
|
assert api._list_bundled() == []
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_list_bundled_shows_uninstalled(fake_dirs):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare")
|
|
|
|
|
out = api._list_bundled()
|
|
|
|
|
assert len(out) == 1
|
|
|
|
|
assert out[0]["name"] == "fileshare"
|
|
|
|
|
assert "display_name" in out[0]
|
|
|
|
|
|
|
|
|
|
|
2026-04-16 12:23:41 +02:00
|
|
|
# --- Icon inlining ----------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
_SIMPLE_SVG = (
|
|
|
|
|
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M0 0h10v10H0z"/></svg>'
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _write_icon(app_dir, contents, name="icon.svg"):
|
|
|
|
|
(app_dir / name).write_text(contents)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_icon_svg_returns_content(tmp_path):
|
|
|
|
|
_write_icon(tmp_path, _SIMPLE_SVG)
|
|
|
|
|
assert api._read_icon_svg(tmp_path, "icon.svg") == _SIMPLE_SVG
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_icon_svg_strips_xml_declaration(tmp_path):
|
|
|
|
|
_write_icon(tmp_path, '<?xml version="1.0" encoding="UTF-8"?>\n' + _SIMPLE_SVG)
|
|
|
|
|
assert api._read_icon_svg(tmp_path, "icon.svg") == _SIMPLE_SVG
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_icon_svg_missing_file_returns_none(tmp_path):
|
|
|
|
|
assert api._read_icon_svg(tmp_path, "ghost.svg") is None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_icon_svg_no_name_returns_none(tmp_path):
|
|
|
|
|
assert api._read_icon_svg(tmp_path, None) is None
|
|
|
|
|
assert api._read_icon_svg(tmp_path, "") is None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_icon_svg_rejects_non_svg(tmp_path):
|
|
|
|
|
_write_icon(tmp_path, "<html><body>hi</body></html>")
|
|
|
|
|
assert api._read_icon_svg(tmp_path, "icon.svg") is None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_icon_svg_rejects_oversized(tmp_path):
|
|
|
|
|
_write_icon(tmp_path, "<svg>" + ("x" * (17 * 1024)) + "</svg>")
|
|
|
|
|
assert api._read_icon_svg(tmp_path, "icon.svg") is None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_icon_svg_rejects_script_tag(tmp_path):
|
|
|
|
|
_write_icon(tmp_path, "<svg><script>alert(1)</script></svg>")
|
|
|
|
|
assert api._read_icon_svg(tmp_path, "icon.svg") is None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_icon_svg_rejects_event_handler(tmp_path):
|
|
|
|
|
_write_icon(tmp_path, '<svg onload="alert(1)"><path/></svg>')
|
|
|
|
|
assert api._read_icon_svg(tmp_path, "icon.svg") is None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_read_icon_svg_rejects_javascript_url(tmp_path):
|
|
|
|
|
_write_icon(tmp_path, '<svg><a href="javascript:alert(1)"/></svg>')
|
|
|
|
|
assert api._read_icon_svg(tmp_path, "icon.svg") is None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_list_bundled_inlines_icon_svg(fake_dirs):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
app = _write_bundled(bundled, "fileshare")
|
|
|
|
|
_write_icon(app, _SIMPLE_SVG)
|
|
|
|
|
[entry] = api._list_bundled()
|
|
|
|
|
assert entry["icon_svg"] == _SIMPLE_SVG
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_list_installed_inlines_icon_svg(fake_dirs, no_docker):
|
|
|
|
|
apps, bundled = fake_dirs
|
|
|
|
|
app = _write_bundled(bundled, "fileshare", env_example="A=real")
|
|
|
|
|
_write_icon(app, _SIMPLE_SVG)
|
|
|
|
|
api._do_install("fileshare")
|
|
|
|
|
[entry] = api._list_installed()
|
|
|
|
|
assert entry["icon_svg"] == _SIMPLE_SVG
|
|
|
|
|
|
|
|
|
|
|
feat(furtka): web UI + HTTP API for app install/remove
Adds the management UI Daniel asked for end-of-session. Goes beyond
the original MVP scope (plan punted UI to v2) but the architecture
already supports it cleanly: stdlib http.server only, no new deps.
- furtka.api: minimal HTTP server. GET / serves a self-contained
HTML page (dark-mode card list, vanilla JS, no build step). GET
/api/apps + /api/bundled return JSON. POST /api/apps/{install,
remove} accept {"name": "..."} and call the same installer +
reconciler the CLI uses, so the placeholder-secret refusal and
per-app reconcile isolation flow through unchanged.
- furtka.cli: new `furtka serve` subcommand. Imports api lazily so
`furtka app list` / `reconcile` startup stays zero-cost.
- webinstaller: new furtka-api.service (Type=simple, restart on
failure, after reconcile). Caddyfile gets two new handle blocks
to reverse-proxy /api and /apps to localhost:7000. Landing page's
"App store coming soon" tile becomes a real "Manage installed apps
→" link to /apps.
- Bound to 127.0.0.1 by default; Caddy makes it LAN-reachable. The
UI shouts a "no auth, anyone on your LAN can install/remove" warning
at the top — Authentik integration is the proper fix later.
UX wrinkle worth noting: a placeholder-rejected install leaves the
app in /var/lib/furtka/apps/<name>/ (so the user can edit .env in
place). To re-trigger after editing, the Installed list now shows
both Reinstall and Remove buttons.
10 new tests: helper functions (list_installed, list_bundled with
hide-already-installed), install/remove endpoints with the no_docker
fixture, and two real-socket urllib smoke tests that boot the actual
HTTPServer on an ephemeral port and round-trip GET / + POST.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-15 10:23:46 +02:00
|
|
|
def test_list_bundled_hides_already_installed(fake_dirs, no_docker):
|
|
|
|
|
apps, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", env_example="A=real")
|
|
|
|
|
status, _ = api._do_install("fileshare")
|
|
|
|
|
assert status == 200
|
|
|
|
|
# Now bundled should NOT include fileshare anymore.
|
|
|
|
|
assert api._list_bundled() == []
|
|
|
|
|
# But installed list should.
|
|
|
|
|
installed = api._list_installed()
|
|
|
|
|
assert len(installed) == 1 and installed[0]["name"] == "fileshare"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_install_endpoint_rejects_placeholder(fake_dirs):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", env_example="SMB_PASSWORD=changeme")
|
|
|
|
|
status, body = api._do_install("fileshare")
|
|
|
|
|
assert status == 400
|
|
|
|
|
assert "placeholder" in body["error"]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_install_endpoint_rejects_unknown_app(fake_dirs):
|
|
|
|
|
status, body = api._do_install("does-not-exist")
|
|
|
|
|
assert status == 400
|
|
|
|
|
assert "not found" in body["error"]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_remove_endpoint_unknown(fake_dirs, no_docker):
|
|
|
|
|
status, body = api._do_remove("ghost")
|
|
|
|
|
assert status == 404
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_remove_endpoint_happy_path(fake_dirs, no_docker):
|
|
|
|
|
apps, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", env_example="A=real")
|
|
|
|
|
api._do_install("fileshare")
|
|
|
|
|
assert (apps / "fileshare").exists()
|
|
|
|
|
status, body = api._do_remove("fileshare")
|
|
|
|
|
assert status == 200
|
|
|
|
|
assert body["removed"] == "fileshare"
|
|
|
|
|
assert not (apps / "fileshare").exists()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_http_get_apps_route(fake_dirs, no_docker):
|
|
|
|
|
"""Smoke test the actual HTTP server with a real socket, urllib client."""
|
|
|
|
|
server = api.HTTPServer(("127.0.0.1", 0), api._Handler) # port 0 → ephemeral
|
|
|
|
|
port = server.server_address[1]
|
|
|
|
|
t = threading.Thread(target=server.serve_forever, daemon=True)
|
|
|
|
|
t.start()
|
|
|
|
|
try:
|
|
|
|
|
with urllib.request.urlopen(f"http://127.0.0.1:{port}/api/apps") as r:
|
|
|
|
|
assert r.status == 200
|
|
|
|
|
data = json.loads(r.read())
|
|
|
|
|
assert data == []
|
|
|
|
|
with urllib.request.urlopen(f"http://127.0.0.1:{port}/") as r:
|
|
|
|
|
assert r.status == 200
|
|
|
|
|
assert b"Furtka Apps" in r.read()
|
|
|
|
|
# Unknown route → 404 JSON.
|
|
|
|
|
try:
|
|
|
|
|
urllib.request.urlopen(f"http://127.0.0.1:{port}/api/nope")
|
|
|
|
|
raise AssertionError("expected 404")
|
|
|
|
|
except urllib.error.HTTPError as e:
|
|
|
|
|
assert e.code == 404
|
|
|
|
|
finally:
|
|
|
|
|
server.shutdown()
|
|
|
|
|
server.server_close()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_http_post_install_unknown_app(fake_dirs):
|
|
|
|
|
server = api.HTTPServer(("127.0.0.1", 0), api._Handler)
|
|
|
|
|
port = server.server_address[1]
|
|
|
|
|
t = threading.Thread(target=server.serve_forever, daemon=True)
|
|
|
|
|
t.start()
|
|
|
|
|
try:
|
|
|
|
|
req = urllib.request.Request(
|
|
|
|
|
f"http://127.0.0.1:{port}/api/apps/install",
|
|
|
|
|
data=json.dumps({"name": "ghost"}).encode(),
|
|
|
|
|
headers={"Content-Type": "application/json"},
|
|
|
|
|
method="POST",
|
|
|
|
|
)
|
|
|
|
|
try:
|
|
|
|
|
urllib.request.urlopen(req)
|
|
|
|
|
raise AssertionError("expected 400")
|
|
|
|
|
except urllib.error.HTTPError as e:
|
|
|
|
|
assert e.code == 400
|
|
|
|
|
body = json.loads(e.read())
|
|
|
|
|
assert "not found" in body["error"]
|
|
|
|
|
finally:
|
|
|
|
|
server.shutdown()
|
|
|
|
|
server.server_close()
|
feat(furtka): in-browser app settings + ISO recovery-path fixes
End-to-end VM test today (2026-04-15) validated the resource manager
golden path but exposed four things blocking "dein-Vater-tauglich":
no way to configure an app without SSH+editor, no openssh, no nano,
keyboard stuck on US, and a samba healthcheck that cried wolf.
Resource-manager side:
- Manifest schema gains optional `settings` list (name/label/
description/type/required/default) and `description_long`.
- Bundled-app install opens a form rendered from the manifest;
submit carries values to `POST /api/apps/install` which writes
them into the new app's `.env` before the placeholder check runs.
- Installed apps grow an "Einstellungen" button that merges a
partial settings dict into the existing `.env` (unsubmitted
password fields = keep current), then reconciles to restart.
- New endpoints: `GET/POST /api/apps/<name>/settings`. Passwords
are never returned to the client.
- Fileshare manifest declares its SMB_USER/SMB_PASSWORD settings
in German with help text.
ISO side (so the next build is actually usable on the TTY):
- Add `openssh` to the package list + `sshd` to enabled services.
`archinstall: true` in 4.x did not install openssh-server.
- Add `nano` — `vim` was the only editor pitched at users, which
is brutal for first-timers (and was missing anyway).
- Keyboard layout follows the installer language (`de→de`, `pl→pl`,
`en→us`) instead of hardcoded `us`. A German user couldn't type
`/` or `-` at the console, making even `sudo nano` painful.
- Disable the dperson/samba healthcheck in the compose override —
it timed out on every probe while the share itself worked fine.
19 new tests (manifest parsing + settings-merge + two new API
endpoints over live HTTP); 94 total, format + lint clean.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-15 13:00:02 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
# --- Settings endpoints ------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
SETTINGS_MANIFEST = dict(
|
|
|
|
|
VALID_MANIFEST,
|
|
|
|
|
description_long="Long help text.",
|
|
|
|
|
settings=[
|
|
|
|
|
{
|
|
|
|
|
"name": "SMB_USER",
|
|
|
|
|
"label": "User",
|
|
|
|
|
"type": "text",
|
|
|
|
|
"default": "furtka",
|
|
|
|
|
"required": True,
|
|
|
|
|
},
|
|
|
|
|
{"name": "SMB_PASSWORD", "label": "Pass", "type": "password", "required": True},
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_get_settings_bundled(fake_dirs):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(
|
|
|
|
|
bundled, "fileshare", manifest=SETTINGS_MANIFEST, env_example="SMB_USER=furtka\n"
|
|
|
|
|
)
|
|
|
|
|
status, body = api._do_get_settings("fileshare")
|
|
|
|
|
assert status == 200
|
|
|
|
|
assert body["installed"] is False
|
|
|
|
|
assert body["description_long"] == "Long help text."
|
|
|
|
|
names = [s["name"] for s in body["settings"]]
|
|
|
|
|
assert names == ["SMB_USER", "SMB_PASSWORD"]
|
|
|
|
|
# Password values never leak back.
|
|
|
|
|
pwd = next(s for s in body["settings"] if s["name"] == "SMB_PASSWORD")
|
|
|
|
|
assert pwd["value"] == ""
|
|
|
|
|
# Text value comes from .env.example.
|
|
|
|
|
user = next(s for s in body["settings"] if s["name"] == "SMB_USER")
|
|
|
|
|
assert user["value"] == "furtka"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_get_settings_not_found(fake_dirs):
|
|
|
|
|
status, _ = api._do_get_settings("ghost")
|
|
|
|
|
assert status == 404
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_install_with_settings_writes_env_via_api(fake_dirs, no_docker):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", manifest=SETTINGS_MANIFEST)
|
|
|
|
|
status, body = api._do_install(
|
|
|
|
|
"fileshare", settings={"SMB_USER": "alice", "SMB_PASSWORD": "s3cret"}
|
|
|
|
|
)
|
|
|
|
|
assert status == 200, body
|
|
|
|
|
apps, _ = fake_dirs
|
|
|
|
|
env = (apps / "fileshare" / ".env").read_text()
|
|
|
|
|
assert "SMB_USER=alice" in env
|
|
|
|
|
assert "SMB_PASSWORD=s3cret" in env
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_install_with_settings_rejects_empty_required_via_api(fake_dirs, no_docker):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", manifest=SETTINGS_MANIFEST)
|
|
|
|
|
status, body = api._do_install("fileshare", settings={"SMB_USER": "a", "SMB_PASSWORD": ""})
|
|
|
|
|
assert status == 400
|
|
|
|
|
assert "SMB_PASSWORD" in body["error"]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_update_settings_merges(fake_dirs, no_docker):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", manifest=SETTINGS_MANIFEST)
|
|
|
|
|
api._do_install("fileshare", settings={"SMB_USER": "alice", "SMB_PASSWORD": "original"})
|
|
|
|
|
# Edit flow: submit only the changed password.
|
|
|
|
|
status, body = api._do_update_settings("fileshare", {"SMB_PASSWORD": "newpass"})
|
|
|
|
|
assert status == 200, body
|
|
|
|
|
apps, _ = fake_dirs
|
|
|
|
|
env = (apps / "fileshare" / ".env").read_text()
|
|
|
|
|
assert "SMB_USER=alice" in env
|
|
|
|
|
assert "SMB_PASSWORD=newpass" in env
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_update_settings_unknown_app(fake_dirs):
|
|
|
|
|
status, _ = api._do_update_settings("ghost", {"SMB_USER": "x"})
|
|
|
|
|
assert status == 404
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_http_get_settings_route(fake_dirs, no_docker):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", manifest=SETTINGS_MANIFEST)
|
|
|
|
|
server = api.HTTPServer(("127.0.0.1", 0), api._Handler)
|
|
|
|
|
port = server.server_address[1]
|
|
|
|
|
t = threading.Thread(target=server.serve_forever, daemon=True)
|
|
|
|
|
t.start()
|
|
|
|
|
try:
|
|
|
|
|
with urllib.request.urlopen(f"http://127.0.0.1:{port}/api/apps/fileshare/settings") as r:
|
|
|
|
|
assert r.status == 200
|
|
|
|
|
data = json.loads(r.read())
|
|
|
|
|
assert data["name"] == "fileshare"
|
|
|
|
|
assert len(data["settings"]) == 2
|
|
|
|
|
finally:
|
|
|
|
|
server.shutdown()
|
|
|
|
|
server.server_close()
|
feat(furtka): per-app image updates via POST /api/apps/<name>/update
Phase 1 of updates. User clicks Update on an installed app row →
the resource manager runs `docker compose pull`, compares the
running container's image ID to the just-pulled local image ID
per service, and only runs `docker compose up -d` if something
actually changed. Response is {updated: bool, services: [{service,
from, to, tag}]} so the UI can tell the user what happened.
Deliberately small: no pinning, no background checks, no "update
all" button, no version/changelog display. The update flow doesn't
mutate the compose file — it just acts on what's already there.
Reinstall still serves as rollback.
New dockerops helpers: compose_pull, compose_image_tags (parses
`docker compose config --format json`), local_image_id (via
`docker image inspect`), running_container_image_id (via compose
ps --quiet + docker inspect). Six new tests cover the endpoint:
not installed, no changes, changes applied, service not running,
docker pull error, and the HTTP route end-to-end.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-16 12:45:47 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
# --- Update endpoint --------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.fixture
|
|
|
|
|
def update_docker_stubs(monkeypatch):
|
|
|
|
|
"""Stub the dockerops helpers _do_update touches. Tests tune the return
|
|
|
|
|
values of running_/local_image_id via `state` to steer the comparison."""
|
|
|
|
|
state = {
|
|
|
|
|
"tags": {"samba": "dperson/samba:latest"},
|
|
|
|
|
"running": {"samba": "sha256:OLD"},
|
|
|
|
|
"local": {"samba": "sha256:OLD"},
|
|
|
|
|
"pull_called": 0,
|
|
|
|
|
"up_called": 0,
|
|
|
|
|
"pull_raises": None,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
def _pull(app_dir, project):
|
|
|
|
|
state["pull_called"] += 1
|
|
|
|
|
if state["pull_raises"]:
|
|
|
|
|
raise state["pull_raises"]
|
|
|
|
|
|
|
|
|
|
def _up(app_dir, project):
|
|
|
|
|
state["up_called"] += 1
|
|
|
|
|
|
|
|
|
|
monkeypatch.setattr(api.dockerops, "compose_pull", _pull)
|
|
|
|
|
monkeypatch.setattr(api.dockerops, "compose_up", _up)
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
api.dockerops, "compose_image_tags", lambda app_dir, project: dict(state["tags"])
|
|
|
|
|
)
|
|
|
|
|
monkeypatch.setattr(
|
|
|
|
|
api.dockerops,
|
|
|
|
|
"running_container_image_id",
|
|
|
|
|
lambda app_dir, project, service: state["running"].get(service),
|
|
|
|
|
)
|
|
|
|
|
monkeypatch.setattr(api.dockerops, "local_image_id", lambda tag: state["local"].get("samba"))
|
|
|
|
|
return state
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_update_not_installed(fake_dirs):
|
|
|
|
|
status, body = api._do_update("ghost")
|
|
|
|
|
assert status == 404
|
|
|
|
|
assert "not installed" in body["error"]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_update_no_changes(fake_dirs, no_docker, update_docker_stubs):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", env_example="A=real")
|
|
|
|
|
api._do_install("fileshare")
|
|
|
|
|
update_docker_stubs["up_called"] = 0 # reset counter after install
|
|
|
|
|
status, body = api._do_update("fileshare")
|
|
|
|
|
assert status == 200
|
|
|
|
|
assert body["updated"] is False
|
|
|
|
|
assert body["services"] == []
|
|
|
|
|
assert update_docker_stubs["pull_called"] == 1
|
|
|
|
|
assert update_docker_stubs["up_called"] == 0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_update_changes_applied(fake_dirs, no_docker, update_docker_stubs):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", env_example="A=real")
|
|
|
|
|
api._do_install("fileshare")
|
|
|
|
|
update_docker_stubs["up_called"] = 0 # reset counter after install
|
|
|
|
|
# Simulate: pull advanced the local image.
|
|
|
|
|
update_docker_stubs["local"] = {"samba": "sha256:NEW"}
|
|
|
|
|
status, body = api._do_update("fileshare")
|
|
|
|
|
assert status == 200
|
|
|
|
|
assert body["updated"] is True
|
|
|
|
|
[change] = body["services"]
|
|
|
|
|
assert change == {
|
|
|
|
|
"service": "samba",
|
|
|
|
|
"from": "sha256:OLD",
|
|
|
|
|
"to": "sha256:NEW",
|
|
|
|
|
"tag": "dperson/samba:latest",
|
|
|
|
|
}
|
|
|
|
|
assert update_docker_stubs["up_called"] == 1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_update_skips_services_not_running(fake_dirs, no_docker, update_docker_stubs):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", env_example="A=real")
|
|
|
|
|
api._do_install("fileshare")
|
|
|
|
|
update_docker_stubs["up_called"] = 0 # reset counter after install
|
|
|
|
|
# Container not up at all: running_container_image_id returns None.
|
|
|
|
|
update_docker_stubs["running"] = {}
|
|
|
|
|
update_docker_stubs["local"] = {"samba": "sha256:NEW"}
|
|
|
|
|
status, body = api._do_update("fileshare")
|
|
|
|
|
assert status == 200
|
|
|
|
|
assert body["updated"] is False
|
|
|
|
|
assert update_docker_stubs["up_called"] == 0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_update_returns_502_on_pull_error(fake_dirs, no_docker, update_docker_stubs):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", env_example="A=real")
|
|
|
|
|
api._do_install("fileshare")
|
|
|
|
|
update_docker_stubs["up_called"] = 0 # reset counter after install
|
|
|
|
|
update_docker_stubs["pull_raises"] = api.dockerops.DockerError("no network")
|
|
|
|
|
status, body = api._do_update("fileshare")
|
|
|
|
|
assert status == 502
|
|
|
|
|
assert "no network" in body["error"]
|
|
|
|
|
assert update_docker_stubs["up_called"] == 0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_http_post_update_route(fake_dirs, no_docker, update_docker_stubs):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", env_example="A=real")
|
|
|
|
|
api._do_install("fileshare")
|
|
|
|
|
update_docker_stubs["up_called"] = 0 # reset counter after install
|
|
|
|
|
update_docker_stubs["local"] = {"samba": "sha256:NEW"}
|
|
|
|
|
server = api.HTTPServer(("127.0.0.1", 0), api._Handler)
|
|
|
|
|
port = server.server_address[1]
|
|
|
|
|
t = threading.Thread(target=server.serve_forever, daemon=True)
|
|
|
|
|
t.start()
|
|
|
|
|
try:
|
|
|
|
|
req = urllib.request.Request(
|
|
|
|
|
f"http://127.0.0.1:{port}/api/apps/fileshare/update",
|
|
|
|
|
data=b"{}",
|
|
|
|
|
headers={"Content-Type": "application/json"},
|
|
|
|
|
method="POST",
|
|
|
|
|
)
|
|
|
|
|
with urllib.request.urlopen(req) as r:
|
|
|
|
|
assert r.status == 200
|
|
|
|
|
body = json.loads(r.read())
|
|
|
|
|
assert body["updated"] is True
|
|
|
|
|
assert body["services"][0]["service"] == "samba"
|
|
|
|
|
finally:
|
|
|
|
|
server.shutdown()
|
|
|
|
|
server.server_close()
|
feat(furtka): in-browser app settings + ISO recovery-path fixes
End-to-end VM test today (2026-04-15) validated the resource manager
golden path but exposed four things blocking "dein-Vater-tauglich":
no way to configure an app without SSH+editor, no openssh, no nano,
keyboard stuck on US, and a samba healthcheck that cried wolf.
Resource-manager side:
- Manifest schema gains optional `settings` list (name/label/
description/type/required/default) and `description_long`.
- Bundled-app install opens a form rendered from the manifest;
submit carries values to `POST /api/apps/install` which writes
them into the new app's `.env` before the placeholder check runs.
- Installed apps grow an "Einstellungen" button that merges a
partial settings dict into the existing `.env` (unsubmitted
password fields = keep current), then reconciles to restart.
- New endpoints: `GET/POST /api/apps/<name>/settings`. Passwords
are never returned to the client.
- Fileshare manifest declares its SMB_USER/SMB_PASSWORD settings
in German with help text.
ISO side (so the next build is actually usable on the TTY):
- Add `openssh` to the package list + `sshd` to enabled services.
`archinstall: true` in 4.x did not install openssh-server.
- Add `nano` — `vim` was the only editor pitched at users, which
is brutal for first-timers (and was missing anyway).
- Keyboard layout follows the installer language (`de→de`, `pl→pl`,
`en→us`) instead of hardcoded `us`. A German user couldn't type
`/` or `-` at the console, making even `sudo nano` painful.
- Disable the dperson/samba healthcheck in the compose override —
it timed out on every probe while the share itself worked fine.
19 new tests (manifest parsing + settings-merge + two new API
endpoints over live HTTP); 94 total, format + lint clean.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-04-15 13:00:02 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_http_post_install_with_settings(fake_dirs, no_docker):
|
|
|
|
|
_, bundled = fake_dirs
|
|
|
|
|
_write_bundled(bundled, "fileshare", manifest=SETTINGS_MANIFEST)
|
|
|
|
|
server = api.HTTPServer(("127.0.0.1", 0), api._Handler)
|
|
|
|
|
port = server.server_address[1]
|
|
|
|
|
t = threading.Thread(target=server.serve_forever, daemon=True)
|
|
|
|
|
t.start()
|
|
|
|
|
try:
|
|
|
|
|
req = urllib.request.Request(
|
|
|
|
|
f"http://127.0.0.1:{port}/api/apps/install",
|
|
|
|
|
data=json.dumps(
|
|
|
|
|
{
|
|
|
|
|
"name": "fileshare",
|
|
|
|
|
"settings": {"SMB_USER": "alice", "SMB_PASSWORD": "s3cret"},
|
|
|
|
|
}
|
|
|
|
|
).encode(),
|
|
|
|
|
headers={"Content-Type": "application/json"},
|
|
|
|
|
method="POST",
|
|
|
|
|
)
|
|
|
|
|
with urllib.request.urlopen(req) as r:
|
|
|
|
|
assert r.status == 200
|
|
|
|
|
apps, _ = fake_dirs
|
|
|
|
|
assert "SMB_PASSWORD=s3cret" in (apps / "fileshare" / ".env").read_text()
|
|
|
|
|
finally:
|
|
|
|
|
server.shutdown()
|
|
|
|
|
server.server_close()
|