Spaces:
Runtime error
Runtime error
Hardened auth and external API propagation
Browse files
app.py
CHANGED
|
@@ -56,7 +56,6 @@ def require_auth(f):
|
|
| 56 |
async def decorated(*args, **kwargs):
|
| 57 |
request = kwargs.get('request')
|
| 58 |
if not request:
|
| 59 |
-
# For methods where request isn't the first kwarg, find it in args
|
| 60 |
for arg in args:
|
| 61 |
if isinstance(arg, Request):
|
| 62 |
request = arg
|
|
@@ -66,17 +65,36 @@ def require_auth(f):
|
|
| 66 |
raise HTTPException(status_code=500, detail="Internal Server Error: Request object not found")
|
| 67 |
|
| 68 |
auth = request.headers.get("Authorization")
|
| 69 |
-
secret = request.headers.get("X-Secret-Token")
|
| 70 |
-
bearer = auth.split(" ")[1] if auth and auth.startswith("Bearer ") else None
|
| 71 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 72 |
# Dual-header authentication:
|
| 73 |
-
# 1. Bearer token must match either
|
| 74 |
-
# 2. X-Secret-Token must match
|
| 75 |
-
is_bearer_valid =
|
| 76 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 77 |
|
| 78 |
if not is_bearer_valid or not is_secret_valid:
|
| 79 |
-
print(f"[AUTH] Denied. Bearer: {'Match' if is_bearer_valid else 'Fail'}, Secret: {'Match' if is_secret_valid else 'Fail'}")
|
|
|
|
|
|
|
|
|
|
| 80 |
raise HTTPException(status_code=401, detail="Unauthorized")
|
| 81 |
|
| 82 |
return await f(*args, **kwargs)
|
|
@@ -88,7 +106,8 @@ async def fetch_download_url(video_id: str, media_type: str):
|
|
| 88 |
url = f"{EXTERNAL_API_URL}/download?url={video_id}&type={media_type}"
|
| 89 |
if API_KEY:
|
| 90 |
url += f"&api_key={API_KEY}"
|
| 91 |
-
|
|
|
|
| 92 |
if resp.status == 200:
|
| 93 |
data = await resp.json()
|
| 94 |
token = data.get("download_token")
|
|
|
|
| 56 |
async def decorated(*args, **kwargs):
|
| 57 |
request = kwargs.get('request')
|
| 58 |
if not request:
|
|
|
|
| 59 |
for arg in args:
|
| 60 |
if isinstance(arg, Request):
|
| 61 |
request = arg
|
|
|
|
| 65 |
raise HTTPException(status_code=500, detail="Internal Server Error: Request object not found")
|
| 66 |
|
| 67 |
auth = request.headers.get("Authorization")
|
| 68 |
+
secret = request.headers.get("X-Secret-Token", "").strip().strip('"').strip("'")
|
|
|
|
| 69 |
|
| 70 |
+
# Extract bearer and clean it
|
| 71 |
+
bearer = None
|
| 72 |
+
if auth and auth.startswith("Bearer "):
|
| 73 |
+
bearer = auth.split(" ")[1].strip().strip('"').strip("'")
|
| 74 |
+
|
| 75 |
+
# Clean environment variables
|
| 76 |
+
clean_hf_token = HF_TOKEN.strip().strip('"').strip("'")
|
| 77 |
+
clean_hf_secret = HF_SECRET.strip().strip('"').strip("'")
|
| 78 |
+
|
| 79 |
# Dual-header authentication:
|
| 80 |
+
# 1. Bearer token must match either clean_hf_token or clean_hf_secret
|
| 81 |
+
# 2. X-Secret-Token must match clean_hf_secret
|
| 82 |
+
is_bearer_valid = False
|
| 83 |
+
if bearer:
|
| 84 |
+
if clean_hf_token and bearer == clean_hf_token:
|
| 85 |
+
is_bearer_valid = True
|
| 86 |
+
elif clean_hf_secret and bearer == clean_hf_secret:
|
| 87 |
+
is_bearer_valid = True
|
| 88 |
+
elif not clean_hf_token and not clean_hf_secret:
|
| 89 |
+
is_bearer_valid = True
|
| 90 |
+
|
| 91 |
+
is_secret_valid = (secret == clean_hf_secret) if clean_hf_secret else True
|
| 92 |
|
| 93 |
if not is_bearer_valid or not is_secret_valid:
|
| 94 |
+
print(f"[AUTH] Denied. Bearer: {'Match' if is_bearer_valid else 'Fail'} (len:{len(bearer or '')}), Secret: {'Match' if is_secret_valid else 'Fail'} (len:{len(secret)})")
|
| 95 |
+
# If Bearer failed, log if it matched the secret instead (common misconfiguration)
|
| 96 |
+
if not is_bearer_valid and bearer == clean_hf_secret:
|
| 97 |
+
print("[AUTH] Warning: Bearer token matched HF_SECRET instead of HF_TOKEN.")
|
| 98 |
raise HTTPException(status_code=401, detail="Unauthorized")
|
| 99 |
|
| 100 |
return await f(*args, **kwargs)
|
|
|
|
| 106 |
url = f"{EXTERNAL_API_URL}/download?url={video_id}&type={media_type}"
|
| 107 |
if API_KEY:
|
| 108 |
url += f"&api_key={API_KEY}"
|
| 109 |
+
headers = {"Authorization": f"Bearer {HF_TOKEN}"} if HF_TOKEN else {}
|
| 110 |
+
async with session.get(url, headers=headers) as resp:
|
| 111 |
if resp.status == 200:
|
| 112 |
data = await resp.json()
|
| 113 |
token = data.get("download_token")
|