Skip to content

Fix NPE in InternalAbstractHttpAsyncClient by adding null check for resolvedTarget #634

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
arturobernalg merged 1 commit into from
May 2, 2025
+24 −10
Merged

Fix NPE in InternalAbstractHttpAsyncClient by adding null check for resolvedTarget #634

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
13 changes: 8 additions & 5 deletions .../src/main/java/org/apache/hc/client5/http/impl/async/InternalAbstractHttpAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,15 @@ protected <T> Future<T> doExecute(
setupContext(clientContext);

final HttpHost resolvedTarget = target != null ? target : RoutingSupport.determineHost(request);
if (request.getScheme() == null) {
request.setScheme(resolvedTarget.getSchemeName());
}
if (request.getAuthority() == null) {
request.setAuthority(new URIAuthority(resolvedTarget));
if (resolvedTarget != null) {
if (request.getScheme() == null) {
request.setScheme(resolvedTarget.getSchemeName());
}
if (request.getAuthority() == null) {
request.setAuthority(new URIAuthority(resolvedTarget));
}
}

final HttpRoute route = determineRoute(
resolvedTarget,
request,
Expand Down
12 changes: 7 additions & 5 deletions httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,13 @@ protected CloseableHttpResponse doExecute(
setupContext(localcontext);

final HttpHost resolvedTarget = target != null ? target : RoutingSupport.determineHost(request);
if (request.getScheme() == null) {
request.setScheme(resolvedTarget.getSchemeName());
}
if (request.getAuthority() == null) {
request.setAuthority(new URIAuthority(resolvedTarget));
if (resolvedTarget != null) {
Copy link
Member

@garydgregory garydgregory May 1, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HI @arturobernalg 👋
We could throw a more precise exception using Objects.requireNonNull(...), which would reduce the nesting. See also org.apache.hc.core5.util.Args.notNull(T, String)

if (request.getScheme() == null) {
request.setScheme(resolvedTarget.getSchemeName());
}
if (request.getAuthority() == null) {
request.setAuthority(new URIAuthority(resolvedTarget));
}
}
final HttpRoute route = determineRoute(
resolvedTarget,
Expand Down
9 changes: 9 additions & 0 deletions ...client5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@
import org.apache.hc.client5.http.io.HttpClientConnectionManager;
import org.apache.hc.client5.http.protocol.HttpClientContext;
import org.apache.hc.client5.http.routing.HttpRoutePlanner;
import org.apache.hc.core5.http.ClassicHttpRequest;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.config.Lookup;
import org.apache.hc.core5.http.impl.io.HttpRequestExecutor;
import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
import org.apache.hc.core5.http.message.BasicClassicHttpResponse;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
Expand Down Expand Up @@ -233,4 +235,11 @@ void testClientCloseIOException() throws Exception {
Mockito.verify(closeable2).close();
}

@Test
void testDoExecuteThrowsWhenNoTargetOrHost() {
final ClassicHttpRequest request = ClassicRequestBuilder.get("/foo").build();
final HttpClientContext context = HttpClientContext.create();
Assertions.assertThrows(NullPointerException.class, () ->
client.execute(null, request, context));
}
}