feat: add admin session rbac foundation
This commit is contained in:
1 parent
8f000811a8
commit
2cdf7f9d7a
22 files changed
+1945
-68
No files matched your search
@@ -1,4 +1,5 @@
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from uuid import uuid4
|
||||
import bcrypt
|
||||
import jwt
|
||||
from fastapi import Depends, HTTPException, Request, status
|
||||
@@ -7,6 +8,14 @@ from sqlalchemy.orm import Session
|
||||
from .config import get_settings
|
||||
from .database import get_db
|
||||
from .models import AdminUser, Customer
|
||||
from .redis_session import (
|
||||
AdminSessionStore,
|
||||
RedisUnavailableError,
|
||||
SessionRecord,
|
||||
get_admin_session_store,
|
||||
hash_refresh_token,
|
||||
new_refresh_token,
|
||||
)
|
||||
|
||||
|
||||
bearer = HTTPBearer(auto_error=False)
|
||||
@@ -34,6 +43,67 @@ def create_token(user: AdminUser) -> str:
|
||||
return jwt.encode(payload, settings.jwt_secret, algorithm="HS256")
|
||||
|
||||
|
||||
def create_access_token(user: AdminUser, *, session_id: str, access_jti: str) -> str:
|
||||
settings = get_settings()
|
||||
now = datetime.now(timezone.utc)
|
||||
payload = {
|
||||
"typ": "admin_access",
|
||||
"aud": "admin",
|
||||
"sub": user.id,
|
||||
"email": user.email,
|
||||
"role": user.role,
|
||||
"sid": session_id,
|
||||
"jti": access_jti,
|
||||
"iat": now,
|
||||
"exp": now + timedelta(minutes=settings.admin_access_expires_minutes),
|
||||
}
|
||||
return jwt.encode(payload, settings.jwt_secret, algorithm="HS256")
|
||||
|
||||
|
||||
def decode_admin_access_token(token: str) -> dict:
|
||||
return jwt.decode(token, get_settings().jwt_secret, algorithms=["HS256"], options={"verify_aud": False})
|
||||
|
||||
|
||||
def issue_admin_session(user: AdminUser, store: AdminSessionStore) -> tuple[str, str, int]:
|
||||
settings = get_settings()
|
||||
now = datetime.now(timezone.utc)
|
||||
session_id = str(uuid4())
|
||||
access_jti = str(uuid4())
|
||||
refresh_token = new_refresh_token()
|
||||
access_expires_at = now + timedelta(minutes=settings.admin_access_expires_minutes)
|
||||
refresh_expires_at = now + timedelta(days=settings.admin_refresh_expires_days)
|
||||
store.create(
|
||||
session_id=session_id,
|
||||
user_id=user.id,
|
||||
access_jti=access_jti,
|
||||
refresh_hash=hash_refresh_token(refresh_token),
|
||||
access_expires_at=access_expires_at,
|
||||
refresh_expires_at=refresh_expires_at,
|
||||
)
|
||||
return (
|
||||
create_access_token(user, session_id=session_id, access_jti=access_jti),
|
||||
refresh_token,
|
||||
settings.admin_access_expires_minutes * 60,
|
||||
)
|
||||
|
||||
|
||||
def rotate_admin_session(user: AdminUser, record: SessionRecord, store: AdminSessionStore) -> tuple[str, str, int] | None:
|
||||
settings = get_settings()
|
||||
now = datetime.now(timezone.utc)
|
||||
access_jti = str(uuid4())
|
||||
refresh_token = new_refresh_token()
|
||||
if not store.rotate(
|
||||
session_id=record.session_id,
|
||||
refresh_hash=record.refresh_hash,
|
||||
access_jti=access_jti,
|
||||
refresh_hash_next=hash_refresh_token(refresh_token),
|
||||
access_expires_at=now + timedelta(minutes=settings.admin_access_expires_minutes),
|
||||
refresh_expires_at=now + timedelta(days=settings.admin_refresh_expires_days),
|
||||
):
|
||||
return None
|
||||
return create_access_token(user, session_id=record.session_id, access_jti=access_jti), refresh_token, settings.admin_access_expires_minutes * 60
|
||||
|
||||
|
||||
def create_customer_token(customer: Customer) -> str:
|
||||
settings = get_settings()
|
||||
now = datetime.now(timezone.utc)
|
||||
@@ -50,15 +120,23 @@ def require_admin(
|
||||
request: Request,
|
||||
credentials: HTTPAuthorizationCredentials | None = Depends(bearer),
|
||||
db: Session = Depends(get_db),
|
||||
store: AdminSessionStore = Depends(get_admin_session_store),
|
||||
) -> AdminUser:
|
||||
if credentials is None:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="请先登录后台")
|
||||
try:
|
||||
payload = jwt.decode(credentials.credentials, get_settings().jwt_secret, algorithms=["HS256"])
|
||||
payload = decode_admin_access_token(credentials.credentials)
|
||||
except jwt.PyJWTError as exc:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="请先登录后台") from exc
|
||||
if payload.get("typ", "admin") != "admin":
|
||||
token_type = payload.get("typ", "admin")
|
||||
if token_type not in {"admin", "admin_access"}:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="请先登录后台")
|
||||
if token_type == "admin_access":
|
||||
try:
|
||||
if not payload.get("sid") or not payload.get("jti") or not store.is_access_active(payload["sid"], payload["jti"]):
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="请先登录后台")
|
||||
except RedisUnavailableError as exc:
|
||||
raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="后台会话服务暂时不可用") from exc
|
||||
user_id = payload.get("sub")
|
||||
user = db.get(AdminUser, user_id) if user_id else None
|
||||
if not user or not user.isActive:
|
||||
|
||||
Reference in new issue
Block a user