Spaces:
Sleeping
Sleeping
Commit
·
9fdf42c
1
Parent(s):
434c40e
Fix HF Spaces authentication: support __sign parameter and make auth optional
Browse files- backend/middleware/auth.py +47 -17
- backend/routers/auth.py +12 -2
backend/middleware/auth.py
CHANGED
|
@@ -75,15 +75,20 @@ class ConditionalAuthMiddleware(BaseHTTPMiddleware):
|
|
| 75 |
# Check user authentication
|
| 76 |
user = await self._get_current_user(request)
|
| 77 |
if not user:
|
| 78 |
-
#
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
status_code=401,
|
| 82 |
-
content={"error": "Authentication required", "login_url": "/auth/login"}
|
| 83 |
-
)
|
| 84 |
|
| 85 |
-
# For
|
| 86 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 87 |
|
| 88 |
# Add user info to request state
|
| 89 |
request.state.user = user
|
|
@@ -100,23 +105,48 @@ class ConditionalAuthMiddleware(BaseHTTPMiddleware):
|
|
| 100 |
"""
|
| 101 |
Get current user from session or token.
|
| 102 |
|
| 103 |
-
|
| 104 |
-
1.
|
| 105 |
-
2.
|
| 106 |
-
3.
|
| 107 |
-
|
| 108 |
-
For now, we'll implement a basic session check.
|
| 109 |
"""
|
| 110 |
-
# Check if user info is in session
|
| 111 |
user = request.session.get("user") if hasattr(request, "session") else None
|
| 112 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 113 |
# Check Authorization header as fallback
|
| 114 |
if not user:
|
| 115 |
auth_header = request.headers.get("Authorization")
|
| 116 |
if auth_header and auth_header.startswith("Bearer "):
|
| 117 |
# In a full implementation, validate this token with HF API
|
| 118 |
-
# For now, we'll assume it's valid if present
|
| 119 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 120 |
|
| 121 |
return user
|
| 122 |
|
|
|
|
| 75 |
# Check user authentication
|
| 76 |
user = await self._get_current_user(request)
|
| 77 |
if not user:
|
| 78 |
+
# In HF Spaces, if OAuth is configured but user is not authenticated,
|
| 79 |
+
# we can still allow access but with limited functionality
|
| 80 |
+
# This makes the auth "optional" rather than "required"
|
|
|
|
|
|
|
|
|
|
| 81 |
|
| 82 |
+
# For now, let's allow access but log the unauthenticated state
|
| 83 |
+
logger.info(f"Unauthenticated access to {request.url.path} in HF Spaces")
|
| 84 |
+
|
| 85 |
+
# You can uncomment these lines to make auth strictly required:
|
| 86 |
+
# if request.url.path.startswith("/api/"):
|
| 87 |
+
# return JSONResponse(
|
| 88 |
+
# status_code=401,
|
| 89 |
+
# content={"error": "Authentication required", "login_url": "/auth/login"}
|
| 90 |
+
# )
|
| 91 |
+
# return RedirectResponse(url="/auth/login", status_code=302)
|
| 92 |
|
| 93 |
# Add user info to request state
|
| 94 |
request.state.user = user
|
|
|
|
| 105 |
"""
|
| 106 |
Get current user from session or token.
|
| 107 |
|
| 108 |
+
For HF Spaces, we check:
|
| 109 |
+
1. Session cookies (our own auth)
|
| 110 |
+
2. HF __sign parameter (HF pre-auth)
|
| 111 |
+
3. Authorization header
|
|
|
|
|
|
|
| 112 |
"""
|
| 113 |
+
# Check if user info is in session (our own auth)
|
| 114 |
user = request.session.get("user") if hasattr(request, "session") else None
|
| 115 |
|
| 116 |
+
# In HF Spaces, check for __sign parameter which indicates HF has pre-authenticated the user
|
| 117 |
+
if not user and is_huggingface_space():
|
| 118 |
+
sign_param = request.query_params.get("__sign")
|
| 119 |
+
if sign_param:
|
| 120 |
+
# HF has authenticated the user via __sign parameter
|
| 121 |
+
# We'll create a basic user object to indicate authentication
|
| 122 |
+
user = {
|
| 123 |
+
"id": "hf_authenticated",
|
| 124 |
+
"name": "HF User",
|
| 125 |
+
"username": "hf_user",
|
| 126 |
+
"email": None,
|
| 127 |
+
"avatar_url": None,
|
| 128 |
+
"auth_method": "hf_sign"
|
| 129 |
+
}
|
| 130 |
+
# Store in session for future requests
|
| 131 |
+
if hasattr(request, "session"):
|
| 132 |
+
request.session["user"] = user
|
| 133 |
+
logger.info("User authenticated via HF __sign parameter")
|
| 134 |
+
|
| 135 |
# Check Authorization header as fallback
|
| 136 |
if not user:
|
| 137 |
auth_header = request.headers.get("Authorization")
|
| 138 |
if auth_header and auth_header.startswith("Bearer "):
|
| 139 |
# In a full implementation, validate this token with HF API
|
| 140 |
+
# For now, we'll assume it's valid if present in HF environment
|
| 141 |
+
if is_huggingface_space():
|
| 142 |
+
user = {
|
| 143 |
+
"id": "hf_bearer_auth",
|
| 144 |
+
"name": "HF Bearer User",
|
| 145 |
+
"username": "hf_bearer_user",
|
| 146 |
+
"email": None,
|
| 147 |
+
"avatar_url": None,
|
| 148 |
+
"auth_method": "bearer_token"
|
| 149 |
+
}
|
| 150 |
|
| 151 |
return user
|
| 152 |
|
backend/routers/auth.py
CHANGED
|
@@ -19,14 +19,22 @@ router = APIRouter(prefix="/auth", tags=["authentication"])
|
|
| 19 |
|
| 20 |
|
| 21 |
@router.get("/status")
|
| 22 |
-
async def auth_status():
|
| 23 |
"""Get authentication status and configuration."""
|
| 24 |
config = get_oauth_config()
|
|
|
|
|
|
|
| 25 |
return {
|
| 26 |
"auth_enabled": should_enable_auth(),
|
| 27 |
"environment": "huggingface_spaces" if is_huggingface_space() else "local_development",
|
| 28 |
"oauth_available": bool(config),
|
| 29 |
-
"login_required":
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
}
|
| 31 |
|
| 32 |
|
|
@@ -173,6 +181,8 @@ async def get_current_user(request: Request):
|
|
| 173 |
"username": user.get("username"),
|
| 174 |
"email": user.get("email"),
|
| 175 |
"avatar_url": user.get("avatar_url"),
|
|
|
|
|
|
|
| 176 |
}
|
| 177 |
|
| 178 |
|
|
|
|
| 19 |
|
| 20 |
|
| 21 |
@router.get("/status")
|
| 22 |
+
async def auth_status(request: Request):
|
| 23 |
"""Get authentication status and configuration."""
|
| 24 |
config = get_oauth_config()
|
| 25 |
+
user = getattr(request.state, "user", None) or (request.session.get("user") if hasattr(request, "session") else None)
|
| 26 |
+
|
| 27 |
return {
|
| 28 |
"auth_enabled": should_enable_auth(),
|
| 29 |
"environment": "huggingface_spaces" if is_huggingface_space() else "local_development",
|
| 30 |
"oauth_available": bool(config),
|
| 31 |
+
"login_required": False, # Set to optional for now
|
| 32 |
+
"user_authenticated": bool(user),
|
| 33 |
+
"user_info": {
|
| 34 |
+
"auth_method": user.get("auth_method") if user else None,
|
| 35 |
+
"username": user.get("username") if user else None,
|
| 36 |
+
} if user else None,
|
| 37 |
+
"hf_sign_detected": bool(request.query_params.get("__sign")) if is_huggingface_space() else False,
|
| 38 |
}
|
| 39 |
|
| 40 |
|
|
|
|
| 181 |
"username": user.get("username"),
|
| 182 |
"email": user.get("email"),
|
| 183 |
"avatar_url": user.get("avatar_url"),
|
| 184 |
+
"auth_method": user.get("auth_method", "unknown"),
|
| 185 |
+
"authenticated": True,
|
| 186 |
}
|
| 187 |
|
| 188 |
|