From 7ad27af8a8efa0b2e02271bc6a7d375cf145a9bb Mon Sep 17 00:00:00 2001 From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com> Date: Thu, 13 Mar 2025 15:43:56 -0500 Subject: [PATCH] simplify get_current_user --- frigate/api/auth.py | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/frigate/api/auth.py b/frigate/api/auth.py index c0ed94d5c..b7e02643b 100644 --- a/frigate/api/auth.py +++ b/frigate/api/auth.py @@ -189,21 +189,9 @@ def set_jwt_cookie(response: Response, cookie_name, encoded_jwt, expiration, sec async def get_current_user(request: Request): - JWT_COOKIE_NAME = request.app.frigate_config.auth.cookie_name - encoded_token = request.cookies.get(JWT_COOKIE_NAME) - if not encoded_token: - return JSONResponse(content={"message": "No JWT token found"}, status_code=401) - - try: - token = jwt.decode(encoded_token, request.app.jwt_token) - if "sub" not in token.claims or "role" not in token.claims: - return JSONResponse( - content={"message": "Invalid JWT token"}, status_code=401 - ) - return {"username": token.claims["sub"], "role": token.claims["role"]} - except Exception as e: - logger.error(f"Error parsing JWT: {e}") - return JSONResponse(content={"message": "Invalid JWT token"}, status_code=401) + username = request.headers.get("remote-user") + role = request.headers.get("remote-role") + return {"username": username, "role": role} def require_role(required_roles: List[str]):