Auth II

wmde · RickiJay-WMDE · Sep 8, 2025 · Aug 27, 2025 · Aug 28, 2025 · Aug 28, 2025
commit e733bae5264a3463ca0bfdbf45d7f281032a58ba
diff --git a/app.py b/app.py
@@ -1,15 +1,15 @@
 """Main Application"""
 
 from contextlib import asynccontextmanager
+from typing import Optional
 from fastapi import BackgroundTasks, FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import StreamingResponse
-from starlette.requests import Request
+from fastapi.responses import PlainTextResponse, StreamingResponse
 from strawberry.fastapi import GraphQLRouter
 
 from export_csv import export_metric_csv
 from model.strawberry import schema
-from resolvers.authentication import authenticate_request
+from resolvers.authentication import authenticate_token
 from schedule import scheduler
 
 
@@ -49,10 +49,18 @@ def read_root():
 
 @app.get("/csv/metrics", response_class=StreamingResponse)
 async def metric_csv(
-    request: Request, background_tasks: BackgroundTasks
+    background_tasks: BackgroundTasks, authorization: Optional[str] = None
 ) -> StreamingResponse:
     """Quantity CSV"""
 
-    authenticate_request(request)
+    try:
+        assert authorization is not None
+    except AssertionError:
+        return PlainTextResponse("Authorization Missing", 403)
+
+    try:
+        authenticate_token(authorization)
+    except AssertionError:
+        return PlainTextResponse("Authorization Failed", 403)
 
     return await export_metric_csv(background_tasks)
diff --git a/resolvers/authentication.py b/resolvers/authentication.py
@@ -37,6 +37,10 @@ def authenticate_request(request: Request):
     if len(auth_header_value_split) != 2:
         raise ValueError("Invalid authorization header, expected 'bearer <token>'")
 
-    auth_header_token = auth_header_value_split[1]
+    authenticate_token(auth_header_value_split[1])
 
-    assert auth_header_token == auth_token, "Authorization Failed"
+
+def authenticate_token(token: str):
+    """Authenticate Token"""
+
+    assert token == auth_token, "Authorization Failed"