Skip to content

Gracefully handle non-json error bodies #356

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

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Gracefully handle non-json error bodies #356

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
8 changes: 7 additions & 1 deletion python-packages/smithy-http/smithy_http/aio/restjson.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@ async def parse_rest_json_error_info(

if check_body:
if body := await http_response.consume_body_async():
json_body = json.loads(body)
try:
json_body = json.loads(body)
except json.JSONDecodeError:
# In some cases the body might end up being HTML depending on the
# configuration of the server. In those cases we can simply ignore
# the body because we can't find the information we need there.
pass

if json_body:
for key, value in json_body.items():
Expand Down
18 changes: 18 additions & 0 deletions python-packages/smithy-http/tests/unit/aio/test_restjson.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,21 @@ async def test_parse_rest_json_error_info_without_body(
)
actual = await parse_rest_json_error_info(response, check_body=False)
assert actual == expected


async def test_parse_error_info_non_json_body() -> None:
response = HTTPResponse(
status=400,
fields=tuples_to_fields([]),
body=async_list(
[
(
b"<html>\r\n<head><title>400 Bad Request</title></head>\r\n"
b"<body>\r\n<center><h1>400 Bad Request</h1></center>\r\n</body>\r\n</html>\r\n"
)
]
),
)
expected = RestJsonErrorInfo("Unknown", "Unknown", None)
actual = await parse_rest_json_error_info(response, check_body=True)
assert actual == expected
Loading