Skip to content

fix(crt): fail request on HTTP 200 with error body #7071

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
arnabnandy7 wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −1
Open

fix(crt): fail request on HTTP 200 with error body #7071

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
6 changes: 5 additions & 1 deletion ...ain/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtResponseHandlerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ private void notifyResponsePublisherErrorIfNeeded(Throwable error) {
private void handleServiceError(int responseStatus, HttpHeader[] headers, byte[] errorPayload) {
SdkHttpResponse.Builder errorResponse = populateSdkHttpResponse(SdkHttpResponse.builder(),
responseStatus, headers);
if (requestFailedMidwayOfOtherError(responseStatus)) {
if (requestFailedMidwayOfOtherError(responseStatus) || isSuccessStatus(responseStatus)) {
AwsServiceException s3Exception = buildS3Exception(responseStatus, errorPayload, errorResponse);

SdkClientException sdkClientException =
Expand All @@ -226,6 +226,10 @@ private void handleServiceError(int responseStatus, HttpHeader[] headers, byte[]
}
}

private static boolean isSuccessStatus(int responseStatus) {
return responseStatus >= 200 && responseStatus < 300;
}

private static AwsServiceException buildS3Exception(int responseStatus,
byte[] errorPayload,
SdkHttpResponse.Builder errorResponse) {
Expand Down
15 changes: 15 additions & 0 deletions ...java/software/amazon/awssdk/services/s3/internal/crt/S3CrtResponseHandlerAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,21 @@ public void errorResponse_shouldCompleteFutureSuccessfully() {
verify(sdkResponseHandler).onHeaders(any(SdkHttpResponse.class));
}

@Test
public void errorResponseWith200Status_shouldCompleteFutureExceptionally() {
int statusCode = 200;
responseHandlerAdapter.onResponseHeaders(statusCode, new HttpHeader[0]);

byte[] errorPayload = "errorResponse".getBytes(StandardCharsets.UTF_8);
responseHandlerAdapter.onFinished(stubResponseContext(1, statusCode, errorPayload));

Throwable actualException = sdkResponseHandler.error;
assertThat(actualException).isInstanceOf(S3Exception.class);
assertThat(((S3Exception) actualException).statusCode()).isEqualTo(200);
assertThat(future).isCompletedExceptionally();
verify(s3MetaRequest).close();
}

@Test
public void requestFailed_shouldCompleteFutureExceptionally() {

Expand Down