Skip to content

~95% on SimpleQA (e.g. Qwen3.6-27B on a 3090). Supports all local and cloud LLMs (llama.cpp, Ollama, Google, ...). 10+ search engines - arXiv, PubMed, your private documents. Everything Local & Encrypted.

refactor(auth): extract session create/cleanup helpers (DRY) (#4712)

LearningCircuitffe426522977
diff --git a/src/local_deep_research/web/auth/routes.py b/src/local_deep_research/web/auth/routes.py
index 0599c98ec8..d8cfaaceb1 100644
--- a/src/local_deep_research/web/auth/routes.py
+++ b/src/local_deep_research/web/auth/routes.py
@@ -44,6 +44,106 @@ from ...security.log_sanitizer import sanitize_for_log
auth_bp = Blueprint("auth", __name__, url_prefix="/auth")
+def _create_user_session(session, username: str, password: str, remember: bool):
+ """Create a new Flask session for ``username``.
+
+ Runs the common post-authentication sequence shared by login and
+ register: clear any prior session data (session-fixation defence),
+ create a server-side session, stash the username + remember flag,
+ store the password in the temp-auth and session-password stores for
+ post-login database access, and return the new session id.
+
+ The caller owns logging, flashing, and redirects — this helper does
+ only the data-layer work.
+ """
+ # Prevent session fixation by clearing old session data before creating new
+ session.clear()
+
+ # Create session
+ session_id = session_manager.create_session(username, remember)
+ session["session_id"] = session_id
+ session["username"] = username
+ session.permanent = remember
+
+ # Store password temporarily for post-login database access
+ from ...database.temp_auth import temp_auth_store
+
+ auth_token = temp_auth_store.store_auth(username, password)
+ session["temp_auth_token"] = auth_token
+
+ # Also store in session password store for metrics access
+ from ...database.session_passwords import session_password_store
+
+ session_password_store.store_session_password(
+ username, session_id, password
+ )
+
+ return session_id
+
+
+def _cleanup_user_session(
+ username: str, session_id=None, new_password=None
+) -> None:
+ """Tear down server-side session state for ``username``.
+
+ Parameterises the two cleanup scopes used by the auth routes:
+
+ * Single-session (logout) — pass ``session_id``: destroys just that
+ session and clears its password-store entry. The caller is
+ responsible for guarding on ``session_id`` being truthy.
+ * All-sessions (change_password) — omit ``session_id``: destroys
+ every session for the user and clears the whole password store.
+
+ When ``new_password`` is supplied (change_password path only), an
+ additional backup purge-and-refresh step runs so old-key encrypted
+ backups are replaced with ones encrypted under the new key.
+
+ The caller owns logging, flashing, redirects, scheduler unregister,
+ database close, per-user lock cleanup, and the final
+ ``session.clear()`` — this helper does only the session/password-store
+ layer plus the optional backup refresh.
+ """
+ if session_id is not None:
+ # Single-session scope (logout)
+ session_manager.destroy_session(session_id)
+
+ from ...database.session_passwords import session_password_store
+
+ session_password_store.clear_session(username, session_id)
+ else:
+ # All-sessions scope (change_password)
+ if new_password is not None:
+ # Purge old backups (encrypted with old key) and create
+ # a fresh backup with the new key. Old-key backups are a
+ # security risk per NIST SP 800-57 / OWASP A02 — they remain
+ # decryptable with the compromised password.
+ try:
+ from ...database.backup.backup_service import BackupService
+
+ svc = BackupService(username=username, password=new_password)
+ result = svc.purge_and_refresh()
+ if result.success:
+ logger.info(
+ f"Backups refreshed after password change for {username}"
+ )
+ else:
+ logger.error(
+ f"Post-password-change backup failed for {username}: "
+ f"{result.error}. Old backups were purged."
+ )
+ except Exception:
+ logger.exception(
+ f"Could not refresh backups after password change "
+ f"for {username}"
+ )
+
+ session_manager.destroy_all_user_sessions(username)
+
+ from ...database.session_passwords import session_password_store
+
+ session_password_store.clear_all_for_user(username)
+
+
@auth_bp.route("/csrf-token", methods=["GET"])
def get_csrf_token():
"""
@@ -158,27 +258,9 @@ def login():
# Success — clear any prior failure count
lockout_mgr.record_success(username)
- # Prevent session fixation by clearing old session data before creating new
- session.clear()
-
- # Create session
- session_id = session_manager.create_session(username, remember)
- session["session_id"] = session_id
- session["username"] = username
- session.permanent = remember
-
- # Store password temporarily for post-login database access
- from ...database.temp_auth import temp_auth_store
-
- auth_token = temp_auth_store.store_auth(username, password)
- session["temp_auth_token"] = auth_token
-
- # Also store in session password store for metrics access
- from ...database.session_passwords import session_password_store
-
- session_password_store.store_session_password(
- username, session_id, password
- )
+ # Create session (clears old data, creates server-side session,
+ # stashes credentials for post-login DB access).
+ _create_user_session(session, username, password, remember)
logger.info(f"User {username} logged in successfully")
@@ -491,26 +573,9 @@ def register():
# Create encrypted database for user
db_manager.create_user_database(username, password)
- # Prevent session fixation by clearing old session data
- session.clear()
-
- # Auto-login after registration
- session_id = session_manager.create_session(username, False)
- session["session_id"] = session_id
- session["username"] = username
-
- # Store password temporarily for post-registration database access
- from ...database.temp_auth import temp_auth_store
-
- auth_token = temp_auth_store.store_auth(username, password)
- session["temp_auth_token"] = auth_token
-
- # Also store in session password store for metrics access
- from ...database.session_passwords import session_password_store
-
- session_password_store.store_session_password(
- username, session_id, password
- )
+ # Auto-login after registration (remember=False: fresh
+ # registrations should not persist as "remember me" sessions).
+ _create_user_session(session, username, password, remember=False)
# Notify the news scheduler about the new user
try:
@@ -613,12 +678,7 @@ def logout():
# Clear session
if session_id:
- session_manager.destroy_session(session_id)
-
- # Clear session password
- from ...database.session_passwords import session_password_store
-
- session_password_store.clear_session(username, session_id)
+ _cleanup_user_session(username, session_id=session_id)
session.clear()
@@ -735,39 +795,13 @@ def change_password():
_pop_per_user_locks(username)
- # 2b. Purge old backups (encrypted with old key) and create
- # a fresh backup with the new key. Old-key backups are a
- # security risk per NIST SP 800-57 / OWASP A02 — they remain
- # decryptable with the compromised password.
- try:
- from ...database.backup.backup_service import BackupService
-
- svc = BackupService(username=username, password=new_password)
- result = svc.purge_and_refresh()
- if result.success:
- logger.info(
- f"Backups refreshed after password change for {username}"
- )
- else:
- logger.error(
- f"Post-password-change backup failed for {username}: "
- f"{result.error}. Old backups were purged."
- )
- except Exception:
- logger.exception(
- f"Could not refresh backups after password change "
- f"for {username}"
- )
-
- # 3. Destroy ALL sessions for this user + clear password store
- session_manager.destroy_all_user_sessions(username)
-
- from ...database.session_passwords import (
- session_password_store,
+ # 3. Destroy ALL sessions for this user + clear password store,
+ # and refresh backups encrypted under the new key (old-key
+ # backups are a security risk — see _cleanup_user_session).
+ _cleanup_user_session(
+ username, session_id=None, new_password=new_password
)
- session_password_store.clear_all_for_user(username)
-
# 4. Clear Flask session dict
session.clear()