Fix OAuth introspection endpoint

main
Thomas Sileo 2023-02-03 08:32:50 +01:00
parent 2bd6c98538
commit 625f399309
1 changed files with 41 additions and 7 deletions

View File

@ -10,6 +10,8 @@ from fastapi import Form
from fastapi import HTTPException from fastapi import HTTPException
from fastapi import Request from fastapi import Request
from fastapi.responses import JSONResponse from fastapi.responses import JSONResponse
from fastapi.security import HTTPBasic
from fastapi.security import HTTPBasicCredentials
from loguru import logger from loguru import logger
from pydantic import BaseModel from pydantic import BaseModel
from sqlalchemy import select from sqlalchemy import select
@ -26,6 +28,8 @@ from app.redirect import redirect
from app.utils import indieauth from app.utils import indieauth
from app.utils.datetime import now from app.utils.datetime import now
basic_auth = HTTPBasic()
router = APIRouter() router = APIRouter()
@ -496,19 +500,49 @@ async def indieauth_revocation_endpoint(
@router.post("/token_introspection") @router.post("/token_introspection")
async def oauth_introspection_endpoint( async def oauth_introspection_endpoint(
request: Request, request: Request,
access_token_info: AccessTokenInfo = Depends(enforce_access_token), credentials: HTTPBasicCredentials = Depends(basic_auth),
db_session: AsyncSession = Depends(get_db_session),
token: str = Form(), token: str = Form(),
) -> JSONResponse: ) -> JSONResponse:
# Ensure the requested token is the same as bearer token registered_client = (
if token != access_token_info.access_token: await db_session.scalars(
raise HTTPException(status_code=401, detail="access token required") select(models.OAuthClient).where(
models.OAuthClient.client_id == credentials.username,
models.OAuthClient.client_secret == credentials.password,
)
)
).one_or_none()
if not registered_client:
raise HTTPException(status_code=401, detail="unauthenticated")
access_token = (
await db_session.scalars(
select(models.IndieAuthAccessToken)
.where(models.IndieAuthAccessToken.access_token == token)
.join(
models.IndieAuthAuthorizationRequest,
models.IndieAuthAccessToken.indieauth_authorization_request_id
== models.IndieAuthAuthorizationRequest.id,
)
.where(
models.IndieAuthAuthorizationRequest.client_id == credentials.username
)
)
).one_or_none()
if not access_token:
return JSONResponse(content={"active": False})
return JSONResponse( return JSONResponse(
content={ content={
"active": True, "active": True,
"client_id": access_token_info.client_id, "client_id": credentials.username,
"scope": " ".join(access_token_info.scopes), "scope": access_token.scope,
"exp": access_token_info.exp, "exp": int(
(
access_token.created_at.replace(tzinfo=timezone.utc)
+ timedelta(seconds=access_token.expires_in)
).timestamp()
),
}, },
status_code=200, status_code=200,
) )