hzhang
d2b83ad58d
Three coupled fixes so non-admin agents (e.g. nav, role=mgr) can actually create projects through hf-cli with their API key: 1. POST /projects no longer hardcodes is_admin. It checks the global `project.create` perm via role_permissions (admin still wins via is_admin short-circuit). Permission-denied 403 message names the exact perm. 2. /auth/me/permissions now uses get_current_user_or_apikey (was get_current_user JWT-only). This is what hf-cli hits to populate its local permission cache that drives the "not permitted" gate; previously every API-key-authed agent saw all commands as gated. 3. get_current_user_or_apikey now also accepts an API key delivered via Authorization: Bearer (in addition to X-API-Key). hf-cli only knows Bearer; trying to JWT-decode an API key string would fail — so on decode failure, fall through to the API key lookup. Keeps X-API-Key behavior unchanged. 4. init_bootstrap: add `project.create` to DEFAULT_PERMISSIONS and to _MGR_PERMISSIONS so admin (auto-all) + mgr both get it on seed. Bug came to light when manager-agent reported `hf project list`/`create` returned `not permitted`. Root cause: hf-cli calls /auth/me/permissions with the API key via Bearer header → 401 → state.Known=false → every command in the surface is gated false locally. Even after the local gate, POST /projects would still 403 due to the hardcoded admin check. All four steps above are required end-to-end. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
107 lines
3.7 KiB
Python
107 lines
3.7 KiB
Python
"""Shared auth dependencies."""
|
|
from datetime import datetime, timedelta
|
|
from fastapi import Depends, HTTPException, status
|
|
from fastapi.security import OAuth2PasswordBearer, APIKeyHeader
|
|
from jose import JWTError, jwt
|
|
from passlib.context import CryptContext
|
|
from sqlalchemy.orm import Session
|
|
from pydantic import BaseModel
|
|
|
|
from app.core.config import get_db, settings
|
|
from app.models import models
|
|
from app.models.apikey import APIKey
|
|
|
|
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
|
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/token", auto_error=False)
|
|
apikey_header = APIKeyHeader(name="X-API-Key", auto_error=False)
|
|
|
|
|
|
class Token(BaseModel):
|
|
access_token: str
|
|
token_type: str
|
|
|
|
|
|
def verify_password(plain_password: str, hashed_password: str) -> bool:
|
|
if not hashed_password:
|
|
return False
|
|
return pwd_context.verify(plain_password, hashed_password)
|
|
|
|
|
|
def get_password_hash(password: str) -> str:
|
|
return pwd_context.hash(password[:72])
|
|
|
|
|
|
def create_access_token(data: dict, expires_delta: timedelta = None) -> str:
|
|
to_encode = data.copy()
|
|
expire = datetime.utcnow() + (expires_delta or timedelta(minutes=30))
|
|
to_encode.update({"exp": expire})
|
|
return jwt.encode(to_encode, settings.SECRET_KEY, algorithm=settings.ALGORITHM)
|
|
|
|
|
|
async def get_current_user(token: str = Depends(oauth2_scheme), db: Session = Depends(get_db)):
|
|
credentials_exception = HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Could not validate credentials",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
if not token:
|
|
raise credentials_exception
|
|
try:
|
|
payload = jwt.decode(token, settings.SECRET_KEY, algorithms=[settings.ALGORITHM])
|
|
user_id = payload.get("sub")
|
|
if user_id is None:
|
|
raise credentials_exception
|
|
except JWTError:
|
|
raise credentials_exception
|
|
user = db.query(models.User).filter(models.User.id == user_id).first()
|
|
if user is None:
|
|
raise credentials_exception
|
|
return user
|
|
|
|
|
|
def _lookup_api_key(db: Session, key: str) -> models.User | None:
|
|
"""Resolve an API key string to a User; mark last_used_at on hit."""
|
|
if not key:
|
|
return None
|
|
key_obj = db.query(APIKey).filter(APIKey.key == key, APIKey.is_active == True).first() # noqa: E712
|
|
if not key_obj:
|
|
return None
|
|
key_obj.last_used_at = datetime.utcnow()
|
|
db.commit()
|
|
return db.query(models.User).filter(models.User.id == key_obj.user_id).first()
|
|
|
|
|
|
async def get_current_user_or_apikey(
|
|
token: str = Depends(oauth2_scheme),
|
|
api_key: str = Depends(apikey_header),
|
|
db: Session = Depends(get_db)
|
|
):
|
|
"""Authenticate via JWT token (Authorization: Bearer <jwt>) OR API key
|
|
(X-API-Key: <key>, OR — as a convenience for CLI clients that only know
|
|
Bearer — Authorization: Bearer <api-key>; falls back when JWT decode fails).
|
|
"""
|
|
# Native X-API-Key header
|
|
if api_key:
|
|
user = _lookup_api_key(db, api_key)
|
|
if user:
|
|
return user
|
|
|
|
# Bearer header — try JWT first, then API key on decode failure
|
|
if token:
|
|
try:
|
|
return await get_current_user(token=token, db=db)
|
|
except HTTPException:
|
|
user = _lookup_api_key(db, token)
|
|
if user:
|
|
return user
|
|
raise
|
|
|
|
raise HTTPException(status_code=401, detail="Not authenticated")
|
|
|
|
|
|
def require_admin(current_user: models.User = Depends(get_current_user_or_apikey)) -> models.User:
|
|
"""Dependency: caller must be a global admin (JWT or API key)."""
|
|
if not getattr(current_user, "is_admin", False):
|
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required")
|
|
return current_user
|