+ rename slugs + {% if sites %} + + + + id + current slug + owner + rename + + + + {% for site in sites %} + + {{ site['id'] }} + {{ site['slug'] }} + {{ site['owner_username'] }} + + + + rename slug + + + + {% endfor %} + + + {% else %} + no sites uploaded yet. + {% endif %} +
create user @@ -265,7 +327,7 @@ DASHBOARD_BODY_TEMPLATE = """ {% if user['id'] != current_user['id'] %} - delete + delete {% else %} current account @@ -354,6 +416,45 @@ def rewrite_root_path(path_without_leading_slash: str, slug: str) -> str: return f"/s/{slug}/{value}" +def build_slug_runtime_guard(slug: str) -> str: + slug_json = json.dumps(slug) + return ( + '" + ) + + def rewrite_html_for_slug(html_text: str, slug: str) -> str: def repl(match: re.Match[str]) -> str: attr = match.group(1) @@ -363,12 +464,16 @@ def rewrite_html_for_slug(html_text: str, slug: str) -> str: return f"{attr}={quote}{rewritten}{quote}" updated = ROOT_ATTR_RE.sub(repl, html_text) - if "]*>", updated) - if head_match: - base_tag = f"\n " + head_match = re.search(r"(?i)]*>", updated) + if head_match: + inject_parts = [] + if "id=\"shim-slug-runtime-guard\"" not in updated: + inject_parts.append("\n " + build_slug_runtime_guard(slug)) + if "") + if inject_parts: insert_at = head_match.end() - updated = updated[:insert_at] + base_tag + updated[insert_at:] + updated = updated[:insert_at] + "".join(inject_parts) + updated[insert_at:] return updated @@ -555,6 +660,7 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: """ CREATE TABLE IF NOT EXISTS users ( id INTEGER PRIMARY KEY AUTOINCREMENT, + user_uuid TEXT UNIQUE NOT NULL, username TEXT UNIQUE NOT NULL, role TEXT NOT NULL CHECK (role IN ('admin', 'user')), encrypted_challenge TEXT NOT NULL, @@ -571,6 +677,7 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: CREATE TABLE IF NOT EXISTS sites ( id INTEGER PRIMARY KEY AUTOINCREMENT, + site_uuid TEXT UNIQUE NOT NULL, owner_user_id INTEGER NOT NULL, slug TEXT UNIQUE NOT NULL, storage_key TEXT UNIQUE NOT NULL, @@ -586,6 +693,54 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: """ ) + # migration for existing installs - add and backfill uuid ids for users. + user_columns = { + row["name"] + for row in conn.execute("PRAGMA table_info(users)").fetchall() + } + if "user_uuid" not in user_columns: + conn.execute("ALTER TABLE users ADD COLUMN user_uuid TEXT") + + missing_user_ids = conn.execute( + """ + SELECT id FROM users + WHERE user_uuid IS NULL OR user_uuid = '' + """ + ).fetchall() + for row in missing_user_ids: + conn.execute( + "UPDATE users SET user_uuid = ? WHERE id = ?", + (str(uuid.uuid4()), row["id"]), + ) + + conn.execute( + "CREATE UNIQUE INDEX IF NOT EXISTS idx_users_user_uuid ON users(user_uuid)" + ) + + # migration for existing installs - add and backfill uuid ids for sites. + site_columns = { + row["name"] + for row in conn.execute("PRAGMA table_info(sites)").fetchall() + } + if "site_uuid" not in site_columns: + conn.execute("ALTER TABLE sites ADD COLUMN site_uuid TEXT") + + missing_site_ids = conn.execute( + """ + SELECT id FROM sites + WHERE site_uuid IS NULL OR site_uuid = '' + """ + ).fetchall() + for row in missing_site_ids: + conn.execute( + "UPDATE sites SET site_uuid = ? WHERE id = ?", + (str(uuid.uuid4()), row["id"]), + ) + + conn.execute( + "CREATE UNIQUE INDEX IF NOT EXISTS idx_sites_site_uuid ON sites(site_uuid)" + ) + # auth provider is injected as a single backend to keep swap-over simple. auth_backend: AuthBackend = LocalMojicryptAuthBackend( connect_db=connect_db, @@ -625,7 +780,7 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: conn.execute("DELETE FROM sessions WHERE expires_at <= ?", (now,)) return conn.execute( """ - SELECT u.id, u.username, u.role + SELECT u.id AS internal_id, u.user_uuid AS id, u.username, u.role FROM sessions s JOIN users u ON u.id = s.user_id WHERE s.token = ? AND s.expires_at > ? @@ -738,6 +893,15 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: def healthz() -> tuple[str, int]: return "ok", 200 + @app.get("/app/noir-overrides.css") + def noir_overrides_css() -> Response: + css_path = cfg.base_dir / "noir-overrides.css" + if not css_path.is_file(): + abort(404) + response = make_response(send_file(css_path, mimetype="text/css", conditional=True)) + response.headers["Cache-Control"] = "no-cache" + return response + @app.get("/app") def dashboard() -> Response: if auth_backend.bootstrap_required(): @@ -751,24 +915,24 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: if is_admin: sites = conn.execute( """ - SELECT s.id, s.slug, s.original_filename, s.created_at, u.username AS owner_username + SELECT s.site_uuid AS id, s.slug, s.original_filename, s.created_at, u.username AS owner_username FROM sites s JOIN users u ON u.id = s.owner_user_id ORDER BY s.id DESC """ ).fetchall() users = conn.execute( - "SELECT id, username, role, created_at FROM users ORDER BY id ASC" + "SELECT user_uuid AS id, username, role, created_at FROM users ORDER BY id ASC" ).fetchall() else: sites = conn.execute( """ - SELECT id, slug, original_filename, created_at + SELECT site_uuid AS id, slug, original_filename, created_at FROM sites WHERE owner_user_id = ? ORDER BY id DESC """, - (g.current_user["id"],), + (g.current_user["internal_id"],), ).fetchall() users = [] @@ -896,6 +1060,7 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: site_root = find_site_root(extract_dir) slug = reserve_random_slug(connect_db) + site_uuid = str(uuid.uuid4()) storage_key = secrets.token_hex(24) final_dir = cfg.sites_dir / storage_key @@ -904,11 +1069,12 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: with connect_db() as conn: conn.execute( """ - INSERT INTO sites (owner_user_id, slug, storage_key, original_filename, created_at, updated_at) - VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) + INSERT INTO sites (site_uuid, owner_user_id, slug, storage_key, original_filename, created_at, updated_at) + VALUES (?, ?, ?, ?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) """, ( - int(g.current_user["id"]), + site_uuid, + int(g.current_user["internal_id"]), slug, storage_key, Path(archive.filename).name, @@ -935,15 +1101,15 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: flash("site uploaded", "success") return redirect(url_for("dashboard")) - @app.post("/app/sites//delete") - def delete_site(site_id: int) -> Response: + @app.post("/app/sites//delete") + def delete_site(site_id: str) -> Response: auth_redirect = require_auth() if auth_redirect is not None: return auth_redirect with connect_db() as conn: site = conn.execute( - "SELECT id, owner_user_id, slug, storage_key FROM sites WHERE id = ?", + "SELECT site_uuid, owner_user_id, slug, storage_key FROM sites WHERE site_uuid = ?", (site_id,), ).fetchone() if site is None: @@ -951,11 +1117,11 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: return redirect(url_for("dashboard")) is_admin = g.current_user["role"] == "admin" - if not is_admin and int(site["owner_user_id"]) != int(g.current_user["id"]): + if not is_admin and int(site["owner_user_id"]) != int(g.current_user["internal_id"]): flash("not allowed", "error") return redirect(url_for("dashboard")) - conn.execute("DELETE FROM sites WHERE id = ?", (site_id,)) + conn.execute("DELETE FROM sites WHERE site_uuid = ?", (site_id,)) shutil.rmtree(cfg.sites_dir / site["storage_key"], ignore_errors=True) flash("site deleted", "success") @@ -975,28 +1141,31 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: flash(message, "success" if ok else "error") return redirect(url_for("dashboard")) - @app.post("/app/admin/users//delete") - def admin_delete_user(user_id: int) -> Response: + @app.post("/app/admin/users//delete") + def admin_delete_user(user_id: str) -> Response: admin_redirect = require_admin() if admin_redirect is not None: return admin_redirect - if int(g.current_user["id"]) == int(user_id): + if g.current_user["id"] == user_id: flash("you cannot delete your own account", "error") return redirect(url_for("dashboard")) with connect_db() as conn: - user = conn.execute("SELECT id, username FROM users WHERE id = ?", (user_id,)).fetchone() + user = conn.execute( + "SELECT id AS internal_id, user_uuid, username FROM users WHERE user_uuid = ?", + (user_id,), + ).fetchone() if user is None: flash("user not found", "error") return redirect(url_for("dashboard")) owned_site_keys = conn.execute( "SELECT storage_key FROM sites WHERE owner_user_id = ?", - (user_id,), + (user["internal_id"],), ).fetchall() - conn.execute("DELETE FROM users WHERE id = ?", (user_id,)) + conn.execute("DELETE FROM users WHERE id = ?", (user["internal_id"],)) for row in owned_site_keys: shutil.rmtree(cfg.sites_dir / row["storage_key"], ignore_errors=True) @@ -1004,8 +1173,8 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: flash("user deleted", "success") return redirect(url_for("dashboard")) - @app.post("/app/admin/sites//slug") - def admin_update_slug(site_id: int) -> Response: + @app.post("/app/admin/sites//slug") + def admin_update_slug(site_id: str) -> Response: admin_redirect = require_admin() if admin_redirect is not None: return admin_redirect @@ -1021,7 +1190,7 @@ def create_app(base_dir: Optional[Path] = None) -> Flask: """ UPDATE sites SET slug = ?, updated_at = CURRENT_TIMESTAMP - WHERE id = ? + WHERE site_uuid = ? """, (new_slug, site_id), ) -- cgit v1.2.3