4ade6939b6
The audio stream endpoint was unauthenticated. Add a get_streaming_user dependency that accepts the access token either as a ?token= query param (the browser <audio> element can't send an Authorization header) or a bearer header for native clients. Update streaming tests accordingly and add a test asserting unauthenticated requests are rejected with 401. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
190 lines
6.5 KiB
Python
190 lines
6.5 KiB
Python
"""Shared FastAPI dependencies — the composition root for request-scoped wiring.
|
|
|
|
Concrete adapters are bound to ports here so routers and services stay
|
|
decoupled from infrastructure. Each request gets its own repositories/services
|
|
bound to the request-scoped DB session; stateless adapters (hasher, token
|
|
service) are process-cached.
|
|
"""
|
|
|
|
from collections.abc import AsyncIterator
|
|
from functools import lru_cache
|
|
from typing import Annotated
|
|
|
|
from fastapi import Depends
|
|
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.application.auth_service import AuthService
|
|
from app.application.streaming_service import StreamingService
|
|
from app.application.upload_service import UploadService
|
|
from app.application.user_service import UserService
|
|
from app.core.config import get_settings
|
|
from app.core.security import Argon2PasswordHasher, JwtTokenService
|
|
from app.domain.entities import User
|
|
from app.domain.errors import AuthenticationError, PermissionDeniedError
|
|
from app.domain.ports import FileStorage, PasswordHasher, TokenService
|
|
from app.infrastructure.db import get_sessionmaker
|
|
from app.infrastructure.db.repositories import (
|
|
SqlAlchemyAlbumRepository,
|
|
SqlAlchemyArtistRepository,
|
|
SqlAlchemyHistoryRepository,
|
|
SqlAlchemyLikeRepository,
|
|
SqlAlchemyPlaylistRepository,
|
|
SqlAlchemyRefreshTokenRepository,
|
|
SqlAlchemyTrackRepository,
|
|
SqlAlchemyUserRepository,
|
|
)
|
|
from app.infrastructure.storage.provider import get_file_storage
|
|
|
|
|
|
async def get_session() -> AsyncIterator[AsyncSession]:
|
|
"""Request-scoped DB session. Commits on success, rolls back on exception."""
|
|
session = get_sessionmaker()()
|
|
try:
|
|
yield session
|
|
await session.commit()
|
|
except Exception:
|
|
await session.rollback()
|
|
raise
|
|
finally:
|
|
await session.close()
|
|
|
|
|
|
SessionDep = Annotated[AsyncSession, Depends(get_session)]
|
|
|
|
|
|
# -- stateless adapters (process-cached) ---------------------------------------
|
|
@lru_cache
|
|
def get_password_hasher() -> PasswordHasher:
|
|
return Argon2PasswordHasher()
|
|
|
|
|
|
@lru_cache
|
|
def get_token_service() -> TokenService:
|
|
return JwtTokenService(get_settings())
|
|
|
|
|
|
# -- request-scoped services ---------------------------------------------------
|
|
def get_auth_service(session: SessionDep) -> AuthService:
|
|
return AuthService(
|
|
users=SqlAlchemyUserRepository(session),
|
|
refresh_tokens=SqlAlchemyRefreshTokenRepository(session),
|
|
hasher=get_password_hasher(),
|
|
tokens=get_token_service(),
|
|
)
|
|
|
|
|
|
def get_user_service(session: SessionDep) -> UserService:
|
|
return UserService(
|
|
users=SqlAlchemyUserRepository(session),
|
|
refresh_tokens=SqlAlchemyRefreshTokenRepository(session),
|
|
hasher=get_password_hasher(),
|
|
)
|
|
|
|
|
|
AuthServiceDep = Annotated[AuthService, Depends(get_auth_service)]
|
|
UserServiceDep = Annotated[UserService, Depends(get_user_service)]
|
|
|
|
|
|
# -- file storage (process-cached) ---------------------------------------------
|
|
FileStorageDep = Annotated[FileStorage, Depends(get_file_storage)]
|
|
|
|
|
|
def get_upload_service(session: SessionDep, storage: FileStorageDep) -> UploadService:
|
|
settings = get_settings()
|
|
return UploadService(
|
|
tracks=SqlAlchemyTrackRepository(session),
|
|
artists=SqlAlchemyArtistRepository(session),
|
|
storage=storage,
|
|
tmp_dir=settings.upload_tmp_dir,
|
|
)
|
|
|
|
|
|
def get_streaming_service(session: SessionDep, storage: FileStorageDep) -> StreamingService:
|
|
return StreamingService(
|
|
tracks=SqlAlchemyTrackRepository(session),
|
|
storage=storage,
|
|
)
|
|
|
|
|
|
UploadServiceDep = Annotated[UploadService, Depends(get_upload_service)]
|
|
StreamingServiceDep = Annotated[StreamingService, Depends(get_streaming_service)]
|
|
|
|
|
|
# -- library repository deps ---------------------------------------------------
|
|
def get_track_repository(session: SessionDep) -> SqlAlchemyTrackRepository:
|
|
return SqlAlchemyTrackRepository(session)
|
|
|
|
|
|
def get_artist_repository(session: SessionDep) -> SqlAlchemyArtistRepository:
|
|
return SqlAlchemyArtistRepository(session)
|
|
|
|
|
|
def get_album_repository(session: SessionDep) -> SqlAlchemyAlbumRepository:
|
|
return SqlAlchemyAlbumRepository(session)
|
|
|
|
|
|
def get_playlist_repository(session: SessionDep) -> SqlAlchemyPlaylistRepository:
|
|
return SqlAlchemyPlaylistRepository(session)
|
|
|
|
|
|
def get_like_repository(session: SessionDep) -> SqlAlchemyLikeRepository:
|
|
return SqlAlchemyLikeRepository(session)
|
|
|
|
|
|
def get_history_repository(session: SessionDep) -> SqlAlchemyHistoryRepository:
|
|
return SqlAlchemyHistoryRepository(session)
|
|
|
|
|
|
TrackRepoDep = Annotated[SqlAlchemyTrackRepository, Depends(get_track_repository)]
|
|
ArtistRepoDep = Annotated[SqlAlchemyArtistRepository, Depends(get_artist_repository)]
|
|
AlbumRepoDep = Annotated[SqlAlchemyAlbumRepository, Depends(get_album_repository)]
|
|
PlaylistRepoDep = Annotated[SqlAlchemyPlaylistRepository, Depends(get_playlist_repository)]
|
|
LikeRepoDep = Annotated[SqlAlchemyLikeRepository, Depends(get_like_repository)]
|
|
HistoryRepoDep = Annotated[SqlAlchemyHistoryRepository, Depends(get_history_repository)]
|
|
|
|
|
|
# -- current user / authorization ----------------------------------------------
|
|
# auto_error=False: we raise domain AuthenticationError (mapped to 401) so the
|
|
# error envelope stays consistent with the rest of the API.
|
|
_bearer = HTTPBearer(auto_error=False)
|
|
BearerDep = Annotated[HTTPAuthorizationCredentials | None, Depends(_bearer)]
|
|
|
|
|
|
async def get_current_user(credentials: BearerDep, auth: AuthServiceDep) -> User:
|
|
if credentials is None:
|
|
raise AuthenticationError("Missing bearer token.")
|
|
return await auth.authenticate_access(credentials.credentials)
|
|
|
|
|
|
CurrentUser = Annotated[User, Depends(get_current_user)]
|
|
|
|
|
|
async def get_current_superuser(user: CurrentUser) -> User:
|
|
if not user.is_superuser:
|
|
raise PermissionDeniedError("Administrator privileges required.")
|
|
return user
|
|
|
|
|
|
SuperUser = Annotated[User, Depends(get_current_superuser)]
|
|
|
|
|
|
async def get_streaming_user(
|
|
auth: AuthServiceDep,
|
|
credentials: BearerDep,
|
|
token: str | None = None,
|
|
) -> User:
|
|
"""Authenticate a stream request.
|
|
|
|
The browser ``<audio>`` element cannot send an ``Authorization`` header, so
|
|
the access token is accepted as a ``?token=`` query param; native clients may
|
|
still use a bearer header. Either way it's the same access token.
|
|
"""
|
|
raw = token or (credentials.credentials if credentials else None)
|
|
if not raw:
|
|
raise AuthenticationError("Missing access token.")
|
|
return await auth.authenticate_access(raw)
|
|
|
|
|
|
StreamUser = Annotated[User, Depends(get_streaming_user)]
|