diff options
Diffstat (limited to 'src/services/api')
| -rw-r--r-- | src/services/api/rest/libs/token_auth.py | 6 | ||||
| -rw-r--r-- | src/services/api/rest/routers.py | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/services/api/rest/libs/token_auth.py b/src/services/api/rest/libs/token_auth.py index ea0b14a9c..e0710cc20 100644 --- a/src/services/api/rest/libs/token_auth.py +++ b/src/services/api/rest/libs/token_auth.py @@ -46,6 +46,7 @@ def verify_oidc_token(token: str): disc_url = f"{state.oidc_issuer}/.well-known/openid-configuration" with _req.urlopen(disc_url, timeout=10) as r: jwks_uri = _json.loads(r.read())["jwks_uri"] + state.oidc_jwks_uri = jwks_uri jwks_client = PyJWKClient(jwks_uri, cache_keys=True) signing_key = jwks_client.get_signing_key_from_jwt(token) decode_options = {"require": ["exp"]} @@ -60,9 +61,8 @@ def verify_oidc_token(token: str): else: decode_options["verify_aud"] = False payload = jwt.decode(token, signing_key.key, **decode_kwargs) - return payload.get("sub") or payload.get("client_id") or "oidc-client" - except Exception as e: - print(f"OIDC token validation failed: {e}", flush=True) + return payload.get("sub") or payload.get("client_id") + except Exception: return None diff --git a/src/services/api/rest/routers.py b/src/services/api/rest/routers.py index 0f0662327..1808e5a5b 100644 --- a/src/services/api/rest/routers.py +++ b/src/services/api/rest/routers.py @@ -1046,9 +1046,10 @@ def traceroute_op(data: TracerouteModel): @router.post('/token') -def token_op(data: ApiModel): +def token_op(data: ApiModel, x_api_key: Optional[str] = Header(None)): session = SessionState() - key_id = check_auth(session.keys, data.key) + key = data.key or x_api_key + key_id = check_auth(session.keys, key) if not key_id: raise HTTPException(status_code=401, detail='Valid API key is required') return success(generate_token(key_id)) |