This commit is contained in:
2026-09-26 23:18:54 +03:00
parent c707c60a35
commit 5c203a0eea
18 changed files with 1558 additions and 56 deletions

View File

@@ -20,10 +20,11 @@ from sqlalchemy.exc import SQLAlchemyError
from .database import HockeyDatabase
from .async_work import run_db
from .models import HockeyWebSession
from .account_activity import ACCOUNT_IDLE_SECONDS, lock_account
HOCKEY_COOKIE_NAME = "hockey_auth_token"
HOCKEY_SESSION_SECONDS = 2 * 60 * 60
HOCKEY_SESSION_SECONDS = ACCOUNT_IDLE_SECONDS
@dataclass(frozen=True, slots=True)
@@ -110,6 +111,7 @@ class WFLAuthAdapter:
token = secrets.token_urlsafe(48)
now = datetime.utcnow()
with self.hockey_database.session() as session:
lock_account(session, user.id)
session.add(
HockeyWebSession(
token_hash=_token_hash(token),
@@ -168,6 +170,12 @@ class WFLAuthAdapter:
with self.hockey_database.session() as session:
query = select(HockeyWebSession).where(HockeyWebSession.token_hash == token_hash)
if idle_ms is not None:
user_id = session.scalar(select(HockeyWebSession.wfl_user_id).where(
HockeyWebSession.token_hash == token_hash))
if user_id is None:
return None
# Same lock order as cleanup: account, then session row.
lock_account(session, user_id)
query = query.with_for_update()
web_session = session.scalar(query)
if web_session is None or web_session.revoked_at is not None or _session_deadline(web_session) <= now: