mirror of
https://gitlab.archlinux.org/archlinux/aurweb.git
synced 2025-02-03 10:43:03 +01:00
fix aurweb.auth test coverage
With mysqlclient, we no longer need to account for a user not existing when an ssh key is found. Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
parent
aecb649473
commit
228bc8fe7c
2 changed files with 13 additions and 8 deletions
|
@ -4,7 +4,8 @@ from datetime import datetime
|
|||
from http import HTTPStatus
|
||||
|
||||
from fastapi.responses import RedirectResponse
|
||||
from starlette.authentication import AuthCredentials, AuthenticationBackend, AuthenticationError
|
||||
from sqlalchemy import and_
|
||||
from starlette.authentication import AuthCredentials, AuthenticationBackend
|
||||
from starlette.requests import HTTPConnection
|
||||
|
||||
import aurweb.config
|
||||
|
@ -42,14 +43,17 @@ class BasicAuthBackend(AuthenticationBackend):
|
|||
|
||||
now_ts = datetime.utcnow().timestamp()
|
||||
record = session.query(Session).filter(
|
||||
Session.SessionID == sid, Session.LastUpdateTS >= now_ts).first()
|
||||
and_(Session.SessionID == sid,
|
||||
Session.LastUpdateTS >= now_ts)).first()
|
||||
|
||||
# If no session with sid and a LastUpdateTS now or later exists.
|
||||
if not record:
|
||||
return None, AnonymousUser()
|
||||
|
||||
# At this point, we cannot have an invalid user if the record
|
||||
# exists, due to ForeignKey constraints in the schema upheld
|
||||
# by mysqlclient.
|
||||
user = session.query(User).filter(User.ID == record.UsersID).first()
|
||||
if not user:
|
||||
raise AuthenticationError(f"Invalid User ID: {record.UsersID}")
|
||||
|
||||
user.authenticated = True
|
||||
return AuthCredentials(["authenticated"]), user
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue