Skip to content
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

Add a null check before reading GitHub response #563

Merged
merged 5 commits into from
Sep 21, 2023
Merged

Add a null check before reading GitHub response #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68d18e4
Add a null check before reading GitHub response
vinokurig Sep 13, 2023
c3b3d1f
fixup! Add a null check before reading GitHub response
vinokurig Sep 13, 2023
05e1ece
Merge branch 'main' of https://github.com/eclipse-che/che-server into…
vinokurig Sep 14, 2023
5db40e7
Merge branch 'main' of https://github.com/eclipse-che/che-server into…
vinokurig Sep 14, 2023
b1d2b93
Merge branch 'main' of github.com:eclipse-che/che-server into CRW-4506
vinokurig Sep 18, 2023
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
5 changes: 4 additions & 1 deletion ...ctory-github/src/main/java/org/eclipse/che/api/factory/server/github/GithubApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,10 @@ private <T> T executeRequest(
} else if (response.statusCode() == HTTP_NO_CONTENT) {
return null;
} else {
String body = CharStreams.toString(new InputStreamReader(response.body(), Charsets.UTF_8));
String body =
response.body() == null
? "Unrecognised error"
: CharStreams.toString(new InputStreamReader(response.body(), Charsets.UTF_8));
switch (response.statusCode()) {
case HTTP_BAD_REQUEST:
throw new ScmBadRequestException(body);
Expand Down
23 changes: 23 additions & 0 deletions ...y-github/src/test/java/org/eclipse/che/api/factory/server/github/GithubApiClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
import static java.net.HttpURLConnection.HTTP_NOT_FOUND;
import static java.net.HttpURLConnection.HTTP_NO_CONTENT;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertEqualsNoOrder;
import static org.testng.Assert.assertFalse;
Expand All @@ -33,10 +35,13 @@
import com.github.tomakehurst.wiremock.common.Slf4jNotifier;
import com.google.common.net.HttpHeaders;
import java.lang.reflect.Field;
import java.net.http.HttpClient;
import java.net.http.HttpResponse;
import org.eclipse.che.api.factory.server.scm.exception.ScmBadRequestException;
import org.eclipse.che.api.factory.server.scm.exception.ScmCommunicationException;
import org.eclipse.che.api.factory.server.scm.exception.ScmItemNotFoundException;
import org.eclipse.che.commons.lang.Pair;
import org.mockito.Mockito;
import org.mockito.testng.MockitoTestNGListener;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
Expand Down Expand Up @@ -260,6 +265,24 @@ public void shouldThrowExceptionOnNotFoundError() throws Exception {
client.getUser("token");
}

@Test(
expectedExceptions = ScmBadRequestException.class,
expectedExceptionsMessageRegExp = "Unrecognised error")
public void shouldThrowExceptionWithUnrecognisedErrorIfResponseBodyIsNull() throws Exception {
// given
HttpClient httpClient = Mockito.mock(HttpClient.class);
HttpResponse response = Mockito.mock(HttpResponse.class);
Field declaredField = GithubApiClient.class.getDeclaredField("httpClient");
declaredField.setAccessible(true);
declaredField.set(client, httpClient);
when(httpClient.send(any(), any())).thenReturn(response);
when(response.body()).thenReturn(null);
when(response.statusCode()).thenReturn(HTTP_BAD_REQUEST);

// when
client.getUser("token");
}

@Test(
expectedExceptions = ScmCommunicationException.class,
expectedExceptionsMessageRegExp =
Expand Down