feat(auth): 后台登录改为滑动会话
- JWT 记录 iat,exp=min(now+24h, iat+7d) - 已认证请求自动续签 httpOnly Cookie - 新增 ACCESS_TOKEN_IDLE_HOURS / ACCESS_TOKEN_MAX_HOURS
This commit is contained in:
+14
-5
@@ -8,7 +8,8 @@ from sqlalchemy.orm import Session
|
||||
from .database import SessionLocal, get_db
|
||||
from .models import User
|
||||
from .permissions import get_user_permissions
|
||||
from .security import decode_access_token
|
||||
from .security import decode_access_token, is_session_expired
|
||||
from .session import SESSION_COOKIE_NAME
|
||||
|
||||
# auto_error=False: 允许 token 为空(后续从 cookie 读取)
|
||||
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/login", auto_error=False)
|
||||
@@ -25,13 +26,15 @@ def get_current_user(
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
# 优先从 Authorization Bearer header 读取,回退到 httpOnly cookie
|
||||
from_cookie = False
|
||||
if not token:
|
||||
token = request.cookies.get("access_token")
|
||||
token = request.cookies.get(SESSION_COOKIE_NAME)
|
||||
from_cookie = True
|
||||
if not token:
|
||||
raise credentials_exc
|
||||
try:
|
||||
payload = decode_access_token(token)
|
||||
if payload is None:
|
||||
if payload is None or is_session_expired(payload):
|
||||
raise credentials_exc
|
||||
user_id_raw = payload.get("sub")
|
||||
if user_id_raw is None:
|
||||
@@ -43,6 +46,10 @@ def get_current_user(
|
||||
user = db.query(User).filter(User.id == int(user_id)).first()
|
||||
if user is None or not user.is_active:
|
||||
raise credentials_exc
|
||||
# 中间件据此只在「已通过认证的请求」上续签 Cookie;Bearer 客户端不写 Cookie。
|
||||
request.state.current_user = user
|
||||
if from_cookie:
|
||||
request.state.auth_cookie_token = token
|
||||
return user
|
||||
|
||||
|
||||
@@ -66,11 +73,13 @@ def authenticate_websocket(websocket: WebSocket) -> User | None:
|
||||
Returns:
|
||||
User 如果认证成功,None 如果失败。
|
||||
"""
|
||||
token = websocket.cookies.get("access_token") or websocket.query_params.get("token")
|
||||
token = websocket.cookies.get(SESSION_COOKIE_NAME) or websocket.query_params.get(
|
||||
"token"
|
||||
)
|
||||
if not token:
|
||||
return None
|
||||
payload = decode_access_token(token)
|
||||
if not payload or not payload.get("sub"):
|
||||
if not payload or is_session_expired(payload) or not payload.get("sub"):
|
||||
return None
|
||||
db = SessionLocal()
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user