{{ message }}
+ +{% endblock %} diff --git a/backend/druks/services/exceptions.py b/backend/druks/services/exceptions.py index 0f2d2ff1..d592b769 100644 --- a/backend/druks/services/exceptions.py +++ b/backend/druks/services/exceptions.py @@ -12,6 +12,15 @@ class ServiceConnectError(Exception): and safe to show; it never quotes anything the operator pasted.""" +class OauthPageError(Exception): + """A failure on a browser-navigated OAuth door — the connect and callback + routes, whose failures render an operator page instead of the JSON envelope.""" + + def __init__(self, message: str, *, status_code: int) -> None: + super().__init__(message) + self.status_code = status_code + + class OauthExchangeError(Exception): """Completing an OAuth connect flow failed — an unknown or expired state, or a rejected code exchange. Nothing is stored on failure, so re-running diff --git a/backend/druks/services/routes.py b/backend/druks/services/routes.py index 1afeae97..6c11cf7d 100644 --- a/backend/druks/services/routes.py +++ b/backend/druks/services/routes.py @@ -7,6 +7,7 @@ from druks.extensions.registry import services from druks.services.exceptions import ( OauthExchangeError, + OauthPageError, ServiceConnectError, ServiceNotConnectedError, ) @@ -69,7 +70,7 @@ async def connect_service(slug: str, payload: dict[str, str]) -> ServiceResponse def _get_oauth_service(slug: str): service = services.get(slug) if not service or not service.token_endpoint: - raise HTTPException(status_code=404, detail=f"No OAuth service {slug!r}.") + raise OauthPageError(f"No OAuth service {slug!r}.", status_code=404) return service @@ -82,23 +83,21 @@ async def connect_oauth_service( if connection: row = OauthConnection.get(connection) if not row or row.provider != slug: - raise HTTPException( - status_code=404, detail=f"No connection {connection!r} on {slug!r}." - ) + raise OauthPageError(f"No connection {connection!r} on {slug!r}.", status_code=404) if next and (not next.startswith("/") or next.startswith(("//", "/\\"))): # A bare same-origin path only — anything host-shaped is an open redirect. - raise HTTPException(status_code=422, detail="next must be a path starting with '/'.") + raise OauthPageError("next must be a path starting with '/'.", status_code=422) endpoint = request.app.state.settings.urls.endpoint if not endpoint: - raise HTTPException( - status_code=409, - detail="The provider redirects the operator's browser back to druks. " + raise OauthPageError( + "The provider redirects the operator's browser back to druks. " "Set urls.endpoint to the address druks has in that browser.", + status_code=409, ) try: client = service.get_oauth_client() except ServiceNotConnectedError as error: - raise HTTPException(status_code=409, detail=str(error)) from error + raise OauthPageError(str(error), status_code=409) from error url = await client.begin_connect( redirect_uri=f"{endpoint.rstrip('/')}/api/oauth/callback", scopes=service.required_scopes(), @@ -110,20 +109,20 @@ async def connect_oauth_service( @oauth_router.get("/callback", response_class=HTMLResponse) async def oauth_callback(state: str = "", code: str = "", error: str = "") -> Response: if error: - raise HTTPException( - status_code=400, detail=f"The authorization server denied the request: {error}" + raise OauthPageError( + f"The authorization server denied the request: {error}", status_code=400 ) if not state or not code: - raise HTTPException(status_code=400, detail="Missing state or code in the callback.") + raise OauthPageError("Missing state or code in the callback.", status_code=400) try: tokens, pending = await complete_connect(state=state, code=code) except OauthExchangeError as exchange_error: - raise HTTPException(status_code=400, detail=str(exchange_error)) from exchange_error + raise OauthPageError(str(exchange_error), status_code=400) from exchange_error provider = pending["provider"] service = services.get(provider) if not service: # A state begun by another door (an MCP connect) finishes at its own callback. - raise HTTPException(status_code=400, detail=f"No OAuth service {provider!r}.") + raise OauthPageError(f"No OAuth service {provider!r}.", status_code=400) granted = tokens.get("scope", "").split() or pending["scopes"] identity = await service.get_identity(tokens["access_token"]) connection_id = pending["connection_id"] @@ -133,8 +132,8 @@ async def oauth_callback(state: str = "", code: str = "", error: str = "") -> Re if connection_id: row = OauthConnection.get(connection_id) if not row: - raise HTTPException( - status_code=400, detail="The connection was removed while consent was open." + raise OauthPageError( + "The connection was removed while consent was open.", status_code=400 ) elif service.identity_key and (value := identity.get(service.identity_key)): row = OauthConnection.get_for_identity( diff --git a/backend/tests/test_services.py b/backend/tests/test_services.py index 60ba3270..b49610f6 100644 --- a/backend/tests/test_services.py +++ b/backend/tests/test_services.py @@ -672,7 +672,28 @@ def test_oauth_connect_guards(tmp_path, acme, druks_db): # The client credentials are not connected yet. response = client.get("/api/oauth/acme/connect", follow_redirects=False) assert response.status_code == 409 - assert "not connected" in response.json()["detail"] + assert "not connected" in response.text + + +def test_a_failed_connect_renders_an_operator_page(tmp_path, acme, druks_db): + from druks.testing import configure_app_for_test + + with TestClient(configure_app_for_test(settings=make_settings(tmp_path))) as client: + # The connect door is reached full-page, so a failure is a page that + # names the fix — the dashboard chrome, not the JSON envelope. + page = client.get("/api/oauth/acme/connect", follow_redirects=False) + assert page.status_code == 409 + assert page.headers["content-type"].startswith("text/html") + assert "urls.endpoint" in page.text + assert '