feat: desktop — connexion compte central + environnement prod/dev (#230)
CI / lint (push) Failing after 29s
CI / test (push) Skipped
CI / build (push) Skipped
CI / e2e (push) Skipped
CI / security (push) Failing after 16s

Liaison d'appareil sur og/og-dev, validation du jeton draco et ouverture de la session de l'admin local. Sélecteur prod/dev (Configuration + premier lancement), admin local par défaut admin/chab30, sans impact sur le web Docker. Inclut BUG-126 (runtime python-embed/_pth + copie de backend/frontend + signature updater opt-in) et BUG-127 (retour /liaison même hôte).
This commit is contained in:
2026-11-20 07:19:08 -05:00
parent 5794595d88
commit f77b0e6574
34 changed files with 1789 additions and 119 deletions
+25
View File
@@ -152,6 +152,31 @@ ok("shouldShowWizard reflects dismissed flag via localStorage",
// ── crash banner ────────────────────────────────────────────────────────────
console.log("environment");
{
let called = null;
let args = null;
window.__TAURI__ = { core: { invoke: async (cmd, a) => {
called = cmd; args = a;
return { environment: "dev", agent_url: "https://agent-dev.dracodev.net",
central_url: "https://og-dev.dracodev.net" };
} } };
const settings = await desktop.getDesktopSettings();
ok("getDesktopSettings invokes get_desktop_settings", called === "get_desktop_settings");
ok("getDesktopSettings returns central URL", settings.central_url === "https://og-dev.dracodev.net");
const label = desktop.desktopEnvironmentLabel(settings.environment, settings.central_url);
ok("desktopEnvironmentLabel shows og-dev", label.includes("og-dev.dracodev.net"));
await desktop.setDesktopEnvironment("dev");
ok("setDesktopEnvironment invokes set_desktop_environment", called === "set_desktop_environment");
ok("setDesktopEnvironment forwards the environment", args && args.environment === "dev");
}
{
delete window.__TAURI__;
ok("getDesktopSettings degrades on web", (await desktop.getDesktopSettings()) === undefined);
ok("openExternalUrl returns false on web",
(await desktop.openExternalUrl("https://og.dracodev.net")) === false);
}
console.log("crash banner");
{
delete window.__TAURI__;
+72
View File
@@ -0,0 +1,72 @@
"""Garde-fous des scripts de build desktop (BUG-126).
Sans dépendance : lecture texte de `desktop/build-windows.bat` et
`desktop/build-linux.sh`, suffisante pour verrouiller les régressions qui
rendaient l'exe Windows inutilisable (module `encodings` introuvable, runtime
absent à côté de l'exe) et l'invite interactive du mot de passe updater.
"""
from __future__ import annotations
from pathlib import Path
DESKTOP = Path(__file__).resolve().parent.parent / "desktop"
WINDOWS_SCRIPT = DESKTOP / "build-windows.bat"
LINUX_SCRIPT = DESKTOP / "build-linux.sh"
def _read(path: Path) -> str:
return path.read_text(encoding="utf-8")
def test_windows_pth_is_written_explicitly() -> None:
"""`python311._pth` doit contenir stdlib + site + racine de l'exe.
L'ancien script ajoutait deux lignes au fichier de l'archive ; un état
partiel (ou un fichier déjà réécrit) laissait un `_pth` sans
`python311.zip` ni `.` → `ModuleNotFoundError: No module named
'encodings'`, backend mort, interface sans CSS.
"""
script = _read(WINDOWS_SCRIPT)
assert "echo python311.zip" in script
assert "echo import site" in script
assert "echo .." in script
assert ">> python-embed\\python311._pth" not in script
assert ">> \"%OUTDIR%\\python-embed\\python311._pth\"" not in script
def test_windows_copies_full_runtime_next_to_exe() -> None:
"""L'exe résout `python-embed/`, `backend/` et `frontend/` à côté de lui."""
script = _read(WINDOWS_SCRIPT)
assert "for %%D in (python-embed backend frontend) do" in script
assert "xcopy /E /I /Q /Y \"%%D\" \"%OUTDIR%\\%%D\"" in script
def test_windows_runs_from_script_directory() -> None:
"""Un appel `desktop\\build-windows.bat` ne doit pas nettoyer le dépôt."""
script = _read(WINDOWS_SCRIPT).lower()
assert 'cd /d "%~dp0"' in script
# Un exe encore lancé verrouille sa cible (Access is denied) : le build
# doit fermer l'application avant de recompiler.
assert "taskkill /f /im obsigate-desktop.exe" in script
def test_windows_verifies_runtime_before_building() -> None:
script = _read(WINDOWS_SCRIPT)
assert 'if not exist "python-embed\\python.exe"' in script
assert "import encodings, uvicorn, fastapi, pyotp" in script
def test_updater_signing_is_opt_in_without_password_prompt() -> None:
"""Pas de `.sig` et aucune invite si le mot de passe n'est pas fourni."""
windows = _read(WINDOWS_SCRIPT)
linux = _read(LINUX_SCRIPT)
for script in (windows, linux):
assert "TAURI_SIGNING_PRIVATE_KEY_PASSWORD" in script
assert "TAURI_SIGNING_PRIVATE_KEY_PATH" in script
assert "--ci" in script
assert "set /p TAURI_SIGNING_PRIVATE_KEY=" not in windows
+211
View File
@@ -0,0 +1,211 @@
# tests/test_desktop_sso.py
# Desktop #230 — connexion avec un compte central : le backend embarqué
# démarre une liaison d'appareil sur le site central choisi, valide le jeton
# draco (via /api/auth/me du central) puis ouvre la session de l'admin local.
# Toutes les routes sont inertes (404) hors du shell desktop.
import json
import os
import shutil
from pathlib import Path
import pytest
from fastapi import HTTPException
from fastapi.testclient import TestClient
from backend.auth.password import hash_password
@pytest.fixture
def desktop_client(tmp_path, monkeypatch):
"""Application réelle, données isolées, mode desktop + admin local."""
data_dir = tmp_path / "data"
data_dir.mkdir()
users = {
"version": 1,
"users": {
"admin": {
"id": "admin-1",
"username": "admin",
"display_name": "Admin local",
"password_hash": hash_password("chab30"),
"role": "admin",
"vaults": ["*"],
"active": True,
"created_at": "2026-01-01T00:00:00",
}
},
}
(data_dir / "users.json").write_text(json.dumps(users), encoding="utf-8")
src_secret = Path("data/secret.key")
if src_secret.exists():
shutil.copy2(str(src_secret), str(data_dir / "secret.key"))
orig_cwd = os.getcwd()
os.chdir(str(tmp_path))
monkeypatch.setenv("OBSIGATE_AUTH_ENABLED", "true")
monkeypatch.setenv("OBSIGATE_ADMIN_USER", "admin")
monkeypatch.setenv("OBSIGATE_ADMIN_PASSWORD", "chab30")
monkeypatch.setenv("OBSIGATE_WATCHER_ENABLED", "false")
monkeypatch.setenv("OBSIGATE_DESKTOP_SSO", "1")
monkeypatch.setenv("OBSIGATE_DESKTOP_ENV", "dev")
monkeypatch.setenv("DRACO_OBSIGATE_URL", "https://og-dev.dracodev.net")
import backend.main
backend.main._load_config = lambda: {"watcher_enabled": False}
from backend.main import app
client = TestClient(app)
yield client
os.chdir(orig_cwd)
def test_desktop_sso_disabled_returns_404(desktop_client, monkeypatch):
monkeypatch.delenv("OBSIGATE_DESKTOP_SSO", raising=False)
assert desktop_client.get("/api/desktop/sso/status").status_code == 404
assert desktop_client.post("/api/desktop/sso/start").status_code == 404
def test_status_reports_environment(desktop_client):
res = desktop_client.get("/api/desktop/sso/status")
assert res.status_code == 200
body = res.json()
assert body["enabled"] is True
assert body["environment"] == "dev"
assert body["central_url"] == "https://og-dev.dracodev.net"
def test_start_rejects_foreign_browser_origin(desktop_client):
res = desktop_client.post(
"/api/desktop/sso/start",
headers={"Origin": "https://evil.example"},
)
assert res.status_code == 403
def test_start_delegates_to_central_liaison(desktop_client, monkeypatch):
from backend.routers import desktop_sso
calls = {}
def fake_post(path, payload):
calls["path"] = path
calls["payload"] = payload
return {
"demande_id": "d1",
"code_utilisateur": "ABCD-2345",
"code_appareil": "secret",
"expire_dans_s": 600,
"url_liaison": "/liaison?code=ABCD-2345",
# Le central derrière un proxy peut renvoyer http:// : le pont
# desktop reconstruit toujours l'URL sur le site configuré (https).
"url_liaison_absolue":
"http://og-dev.dracodev.net/liaison?code=ABCD-2345",
}
monkeypatch.setattr(desktop_sso, "_central_post", fake_post)
res = desktop_client.post("/api/desktop/sso/start")
assert res.status_code == 200
body = res.json()
assert body["code_utilisateur"] == "ABCD-2345"
assert body["url_liaison_absolue"] == (
"https://og-dev.dracodev.net/liaison?code=ABCD-2345")
assert calls["path"] == "/api/v1/liaison"
assert calls["payload"]["type"] == "desktop"
assert "ObsiGate Desktop" in calls["payload"]["nom"]
def test_poll_pending_returns_status(desktop_client, monkeypatch):
from backend.routers import desktop_sso
monkeypatch.setattr(
desktop_sso, "_central_post",
lambda path, payload: {"statut": "en_attente"},
)
res = desktop_client.post("/api/desktop/sso/poll", json={
"demande_id": "d1", "code_appareil": "secret",
})
assert res.status_code == 200
assert res.json() == {"statut": "en_attente"}
def test_poll_approved_opens_local_admin(desktop_client, monkeypatch):
from backend.routers import desktop_sso
validated = {}
def fake_post(path, payload):
return {"statut": "approuvee", "jeton": "draco-token"}
def fake_me(token):
validated["token"] = token
return {"username": "bruno", "display_name": "Bruno",
"role": "admin"}
monkeypatch.setattr(desktop_sso, "_central_post", fake_post)
monkeypatch.setattr(desktop_sso, "_central_me", fake_me)
res = desktop_client.post("/api/desktop/sso/poll", json={
"demande_id": "d1", "code_appareil": "secret", "remember_me": True,
})
assert res.status_code == 200
body = res.json()
assert validated["token"] == "draco-token"
assert body["statut"] == "approuvee"
assert body["user"]["username"] == "admin"
assert body["central_user"]["username"] == "bruno"
assert body["access_token"]
assert "access_token" in res.cookies
assert "refresh_token" in res.cookies
def test_poll_central_refusal_is_relayed(desktop_client, monkeypatch):
from backend.routers import desktop_sso
monkeypatch.setattr(
desktop_sso, "_central_post",
lambda path, payload: {"statut": "approuvee", "jeton": "x"},
)
def refuse(token):
raise HTTPException(status_code=403, detail="rôle « aucun »")
monkeypatch.setattr(desktop_sso, "_central_me", refuse)
res = desktop_client.post("/api/desktop/sso/poll", json={
"demande_id": "d1", "code_appareil": "secret",
})
assert res.status_code == 403
assert "aucun" in res.json()["detail"]
def test_central_url_rejects_unknown_host(desktop_client, monkeypatch):
from backend.routers import desktop_sso
monkeypatch.setenv("DRACO_OBSIGATE_URL", "https://evil.example")
with pytest.raises(HTTPException) as exc:
desktop_sso.central_url()
assert exc.value.status_code == 503
def test_local_admin_prefers_admin_username(tmp_path, monkeypatch):
from backend.routers import desktop_sso
data_dir = tmp_path / "data"
data_dir.mkdir()
(data_dir / "users.json").write_text(json.dumps({
"version": 1,
"users": {
"boss": {"id": "1", "username": "boss", "role": "admin",
"vaults": ["*"], "active": True,
"display_name": "Boss"},
"alice": {"id": "2", "username": "alice", "role": "user",
"vaults": [], "active": True, "display_name": "Alice"},
},
}), encoding="utf-8")
orig_cwd = os.getcwd()
os.chdir(str(tmp_path))
try:
monkeypatch.setenv("OBSIGATE_ADMIN_USER", "admin")
assert desktop_sso._local_admin()["username"] == "boss"
finally:
os.chdir(orig_cwd)
+46
View File
@@ -0,0 +1,46 @@
"""Garde-fous UI — desktop #230 (compte central + environnement).
Vérifie que le pont desktop reste conditionné à ``isTauriEnv()`` (aucun
impact web) et que les deux environnements (prod/dev) sont exposés dans la
Configuration et le premier lancement. Le comportement serveur est couvert
par ``tests/test_desktop_sso.py`` et les tests Rust.
"""
from pathlib import Path
FRONTEND = Path(__file__).resolve().parent.parent / "frontend"
def _read(*parts: str) -> str:
return (FRONTEND.joinpath(*parts)).read_text(encoding="utf-8")
def test_auth_exposes_desktop_central_login():
auth_js = _read("js", "auth.js")
assert "initDesktopCentralLogin" in auth_js
assert "if (!isTauriEnv()) return;" in auth_js
assert "/api/desktop/sso/start" in auth_js
assert "/api/desktop/sso/poll" in auth_js
# Le login local reste le chemin par défaut.
assert 'fetch("/api/auth/login"' in auth_js
def test_desktop_bridge_exposes_environment_commands():
desktop_js = _read("js", "desktop.js")
assert "get_desktop_settings" in desktop_js
assert "set_desktop_environment" in desktop_js
assert "export async function getDesktopSettings" in desktop_js
assert "export async function setDesktopEnvironment" in desktop_js
assert "export async function openExternalUrl" in desktop_js
def test_config_section_has_environment_selector():
index = _read("index.html")
assert 'id="cfg-desktop-environment"' in index
assert 'id="cfg-desktop-environment-status"' in index
def test_first_run_wizard_has_environment_selector():
desktop_js = _read("js", "desktop.js")
assert "desktop-wizard-environment" in desktop_js
assert "desktop.wizard_env_label" in desktop_js
+10
View File
@@ -191,6 +191,16 @@ def test_retour_sso_refresh_force_bug_125():
assert auth_js.count("if (this._honorReturnTo()) return true;") == 2
def test_retour_liaison_meme_hote_230():
# #230 : la page publique /liaison renvoie vers elle-même après le
# login central (`return_to` même hôte). Le desktop en a besoin pour
# reprendre l'approbation d'appareil ; les autres retours même-hôte
# restent ignorés (pas de boucle).
auth_js = (FRONTEND / "js" / "auth.js").read_text(encoding="utf-8")
assert 'u.pathname.startsWith("/liaison")' in auth_js
assert "(!sameHost || sameHostLiaison)" in auth_js
def test_panneau_spark_integre_218():
# #218 : le bouton Spark de la barre ouvre le panneau de l'agent
# commun (mêmes assets partagés que TikTak / Flowdeck / Kanbante).