ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
fix(update): integrity probe distinguishes corruption from probe failure
Juan Denis146113bd824a
diff --git a/scripts/test/test_update.sh b/scripts/test/test_update.shindex 991cf944..4260db5d 100644--- a/scripts/test/test_update.sh+++ b/scripts/test/test_update.sh@@ -244,6 +244,8 @@ t="$WORK/t10/serverkit-b"mkdir -p "$t/venv/bin" "$t/backend/instance": > "$t/venv/bin/activate" # sourceable no-op: > "$t/backend/instance/serverkit.db" # the slot's DB copy+printf '#!/usr/bin/env bash\necho ok\n' > "$t/venv/bin/python" # integrity probe: healthy DB+chmod +x "$t/venv/bin/python"printf 'DATABASE_URL=sqlite:///opt/serverkit/backend/instance/serverkit.db\n' > "$t/.env"FLASK_CAP="$WORK/t10/flask-saw-dburl"cat > "$STUB_BIN/flask" <<EOF@@ -267,7 +269,61 @@ firm -f "$STUB_BIN/flask"# ---------------------------------------------------------------------------# T11 — zero-downtime regression: reload_nginx_graceful must RELOAD a running+# T10b — the corrupt-DB fail-fast: when the integrity probe reports real+# corruption, migrate_database must halt BEFORE flask runs, with the update+# still on the old slot. A python stub simulates PRAGMA integrity_check+# returning 'database disk image is malformed'.+# --------------------------------------------------------------------------+t="$WORK/t10b/serverkit-b"+mkdir -p "$t/venv/bin" "$t/backend/instance"+: > "$t/venv/bin/activate"+: > "$t/backend/instance/serverkit.db"+printf 'DATABASE_URL=sqlite:///opt/serverkit/backend/instance/serverkit.db\n' > "$t/.env"+printf '#!/usr/bin/env bash\necho "database disk image is malformed"\n' > "$t/venv/bin/python"+chmod +x "$t/venv/bin/python"+FLASK_CAP="$WORK/t10b/flask-ran"+cat > "$STUB_BIN/flask" <<EOF+#!/usr/bin/env bash+touch "$FLASK_CAP"+exit 0+EOF+chmod +x "$STUB_BIN/flask"+mig_rc=0+(+ set -Eeuo pipefail+ DRY_RUN=0+ migrate_database "$t"+) >/dev/null 2>&1 || mig_rc=$?+if [ "$mig_rc" -ne 0 ] && [ ! -e "$FLASK_CAP" ]; then+ ok "migrate_database halts on a corrupt SQLite DB before flask runs (fail-fast)"+else+ bad "migrate_database corrupt-DB: rc=$mig_rc (want non-zero), flask-ran=$([ -e "$FLASK_CAP" ] && echo yes || echo no) (want no)"+fi+rm -f "$STUB_BIN/flask"++# --------------------------------------------------------------------------+# T10c — a probe that can't run at all (no usable venv python) is NOT proof+# of corruption: warn and proceed so flask can surface any real problem.+# --------------------------------------------------------------------------+t="$WORK/t10c/serverkit-b"+mkdir -p "$t/venv/bin" "$t/backend/instance"+: > "$t/venv/bin/activate"+: > "$t/backend/instance/serverkit.db"+printf 'DATABASE_URL=sqlite:///opt/serverkit/backend/instance/serverkit.db\n' > "$t/.env"+printf '#!/usr/bin/env bash\nexit 0\n' > "$STUB_BIN/flask"+chmod +x "$STUB_BIN/flask"+mig_rc=0+(+ set -Eeuo pipefail+ DRY_RUN=0+ migrate_database "$t"+) >/dev/null 2>&1 || mig_rc=$?+if [ "$mig_rc" -eq 0 ]; then+ ok "migrate_database proceeds (with a warning) when the integrity probe can't run"+else+ bad "migrate_database probe-unavailable: rc=$mig_rc, expected rc 0 (warn + proceed)"+fi+rm -f "$STUB_BIN/flask"# nginx and must NEVER stop it. Host nginx fronts every managed app, so a stop# during a panel update used to black out unrelated sites. A recording systemctl# stub (PATH-prepended ahead of the global stub) captures every invocation.@@ -701,6 +757,8 @@ t="$WORK/t24/serverkit-b"mkdir -p "$t/venv/bin" "$t/backend/instance": > "$t/venv/bin/activate": > "$t/backend/instance/serverkit.db"+printf '#!/usr/bin/env bash\necho ok\n' > "$t/venv/bin/python" # integrity probe: healthy DB+chmod +x "$t/venv/bin/python"printf 'DATABASE_URL=sqlite:////opt/serverkit/backend/instance/serverkit.db\n' > "$t/.env"printf '#!/usr/bin/env bash\nexit 0\n' > "$STUB_BIN/flask"chmod +x "$STUB_BIN/flask"diff --git a/scripts/update.sh b/scripts/update.shindex 16fa2373..20687ca7 100644--- a/scripts/update.sh+++ b/scripts/update.sh@@ -693,13 +693,18 @@ migrate_database() {# Fail fast with an actionable message when the SQLite slot copy is# corrupt, instead of dying deep inside app boot with "database disk# image is malformed". The sqlite3 CLI isn't guaranteed to be- # installed — probe via the venv's Python instead.+ # installed — probe via the venv's Python instead. An EMPTY result+ # means the probe itself couldn't run (no usable venv python) — that+ # is not proof of corruption, so warn and let `flask db upgrade`+ # surface any real problem rather than halting on a false positive.local integrityintegrity="$("$venv/bin/python" -c \"import sqlite3,sys;print(sqlite3.connect(sys.argv[1]).execute('PRAGMA integrity_check').fetchone()[0])" \"$slot_db" 2>/dev/null || true)"- if [ "$integrity" != "ok" ]; then- halt "SQLite database is corrupt (${integrity:-integrity check failed to run}). Repair or restore it from $BACKUP_DIR and re-run the update. The previous installation is still active."+ if [ -n "$integrity" ] && [ "$integrity" != "ok" ]; then+ halt "SQLite database is corrupt ($integrity). Repair or restore it from $BACKUP_DIR and re-run the update. The previous installation is still active."+ elif [ -z "$integrity" ]; then+ warn "Could not pre-check SQLite integrity (venv python unavailable) — proceeding"fifiif ! (