Skip to content

HTTPCLIENT-2403: Mutual authentication check not performed for proxies #745

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
ok2c merged 2 commits into from
Oct 21, 2025
Merged

HTTPCLIENT-2403: Mutual authentication check not performed for proxies #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e74c9cc
HTTPCLIENT-2403: Mutual authentication check not performed for proxies
stoty Oct 21, 2025
337666c
improve comment
stoty Oct 21, 2025
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
11 changes: 5 additions & 6 deletions httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,26 +334,25 @@ private boolean needAuthentication(
}
}

boolean targetNeedsAuth = false;
boolean proxyNeedsAuth = false;
if (targetAuthRequested || targetMutualAuthRequired) {
final boolean updated = authenticator.handleResponse(target, ChallengeType.TARGET, response,
targetNeedsAuth = authenticator.handleResponse(target, ChallengeType.TARGET, response,
targetAuthStrategy, targetAuthExchange, context);

if (authCacheKeeper != null) {
authCacheKeeper.updateOnResponse(target, pathPrefix, targetAuthExchange, context);
}

return updated;
}
if (proxyAuthRequested || proxyMutualAuthRequired) {
final boolean updated = authenticator.handleResponse(proxy, ChallengeType.PROXY, response,
proxyNeedsAuth = authenticator.handleResponse(proxy, ChallengeType.PROXY, response,
proxyAuthStrategy, proxyAuthExchange, context);

if (authCacheKeeper != null) {
authCacheKeeper.updateOnResponse(proxy, null, proxyAuthExchange, context);
}

return updated;
}
return targetNeedsAuth || proxyNeedsAuth;
}
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/AuthenticationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ public boolean isChallenged(
}

/**
* Determines whether the given response represents an authentication challenge, without
* changing the {@link AuthExchange} state.
* Determines whether the given response represents an authentication challenge
* of challangeType, without changing the {@link AuthExchange} state.
*
* @param challengeType the challenge type (target or proxy).
* @param response the response message head.
Expand Down
11 changes: 5 additions & 6 deletions httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,26 +295,25 @@ private boolean needAuthentication(
}
}

boolean targetNeedsAuth = false;
boolean proxyNeedsAuth = false;
if (targetAuthRequested || targetMutualAuthRequired) {
final boolean updated = authenticator.handleResponse(target, ChallengeType.TARGET, response,
targetNeedsAuth = authenticator.handleResponse(target, ChallengeType.TARGET, response,
targetAuthStrategy, targetAuthExchange, context);

if (authCacheKeeper != null) {
authCacheKeeper.updateOnResponse(target, pathPrefix, targetAuthExchange, context);
}

return updated;
}
if (proxyAuthRequested || proxyMutualAuthRequired) {
final boolean updated = authenticator.handleResponse(proxy, ChallengeType.PROXY, response,
proxyNeedsAuth = authenticator.handleResponse(proxy, ChallengeType.PROXY, response,
proxyAuthStrategy, proxyAuthExchange, context);

if (authCacheKeeper != null) {
authCacheKeeper.updateOnResponse(proxy, null, proxyAuthExchange, context);
}

return updated;
}
return targetNeedsAuth || proxyNeedsAuth;
}
return false;
}
Expand Down