Skip to content

fix(serverless-auth): fail closed on unexpected upstream status #2238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rafel-roboflow wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(serverless-auth): fail closed on unexpected upstream status #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions inference/core/interfaces/http/http_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,16 @@ def _authorization_error_response(status_code: int, msg: str):
402,
cached_api_keys[api_key].message,
)
else:
logger.warning(
"Unexpected status %s from serverless usage check; "
"failing closed without caching.",
usage_check_result.status_code,
)
return _authorization_error_response(
503,
"Authorization service temporarily unavailable. Please retry.",
)

response = await call_next(request)
if workspace_id:
Expand Down
37 changes: 34 additions & 3 deletions tests/inference/unit_tests/core/interfaces/http/test_http_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ def test_infer_lmm_with_model_id_uses_alias_registry_key(monkeypatch) -> None:
service_secret=None,
)
model_manager.infer_from_request_sync.assert_called_once()
assert (
model_manager.infer_from_request_sync.call_args.args[0] == "florence-2-base"
)
assert model_manager.infer_from_request_sync.call_args.args[0] == "florence-2-base"
inference_request = model_manager.infer_from_request_sync.call_args.args[1]
assert inference_request.model_id == "florence-2-base"
assert inference_request.api_key == "query-api-key"
Expand Down Expand Up @@ -204,3 +202,36 @@ def test_serverless_auth_middleware_caches_payment_required_response(
assert usage_check_mock.await_count == 1
model_manager.add_model.assert_not_called()
model_manager.infer_from_request_sync.assert_not_called()


def test_serverless_auth_middleware_fails_closed_on_unexpected_upstream_status(
monkeypatch,
) -> None:
interface, model_manager, usage_check_mock = _build_serverless_interface(
monkeypatch=monkeypatch,
usage_check_result=ServerlessUsageCheckResponse(status_code=503),
)

with TestClient(interface.app) as client:
first_response = client.post(
"/infer/lmm/florence-2-base",
params={"api_key": "query-api-key"},
json=_make_inference_request(),
)
second_response = client.post(
"/infer/lmm/florence-2-base",
params={"api_key": "query-api-key"},
json=_make_inference_request(),
)

assert first_response.status_code == 503
assert second_response.status_code == 503
assert (
first_response.json()["message"]
== "Authorization service temporarily unavailable. Please retry."
)
assert WORKSPACE_ID_HEADER not in first_response.headers
# Unexpected upstream statuses must not be cached, so every request re-queries.
assert usage_check_mock.await_count == 2
model_manager.add_model.assert_not_called()
model_manager.infer_from_request_sync.assert_not_called()
Loading