Skip to content

Discontinue the direct use of http(s).proxyUser and http(s).proxyPassword system properties #790

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 1 commit into from
Jan 18, 2026
+6 −45
Merged

Discontinue the direct use of http(s).proxyUser and http(s).proxyPassword system properties #790

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
51 changes: 6 additions & 45 deletions .../src/main/java/org/apache/hc/client5/http/impl/auth/SystemDefaultCredentialsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,54 +106,15 @@ public Credentials getCredentials(final AuthScope authScope, final HttpContext c
if (host != null) {
final HttpClientContext clientContext = context != null ? HttpClientContext.cast(context) : null;
final String protocol = authScope.getProtocol() != null ? authScope.getProtocol() : (authScope.getPort() == 443 ? URIScheme.HTTPS.id : URIScheme.HTTP.id);
PasswordAuthentication systemcreds = getSystemCreds(
protocol, authScope, Authenticator.RequestorType.SERVER, clientContext);
if (systemcreds == null) {
systemcreds = getSystemCreds(
protocol, authScope, Authenticator.RequestorType.PROXY, clientContext);
final PasswordAuthentication serverCreds = getSystemCreds(protocol, authScope, Authenticator.RequestorType.SERVER, clientContext);
if (serverCreds != null) {
return new UsernamePasswordCredentials(serverCreds.getUserName(), serverCreds.getPassword());
}
if (systemcreds == null) {
// Look for values given using http.proxyUser/http.proxyPassword or
// https.proxyUser/https.proxyPassword. We cannot simply use the protocol from
// the origin since a proxy retrieved from https.proxyHost/https.proxyPort will
// still use http as protocol
systemcreds = getProxyCredentials(URIScheme.HTTP.getId(), authScope);
if (systemcreds == null) {
systemcreds = getProxyCredentials(URIScheme.HTTPS.getId(), authScope);
}
final PasswordAuthentication proxyCreds = getSystemCreds(protocol, authScope, Authenticator.RequestorType.PROXY, clientContext);
if (proxyCreds != null) {
return new UsernamePasswordCredentials(proxyCreds.getUserName(), proxyCreds.getPassword());
}
if (systemcreds != null) {
return new UsernamePasswordCredentials(systemcreds.getUserName(), systemcreds.getPassword());
}
}
return null;
}

private static PasswordAuthentication getProxyCredentials(final String protocol, final AuthScope authScope) {
final String proxyHost = System.getProperty(protocol + ".proxyHost");
if (proxyHost == null) {
return null;
}
final String proxyPort = System.getProperty(protocol + ".proxyPort");
if (proxyPort == null) {
return null;
}

try {
final AuthScope systemScope = new AuthScope(proxyHost, Integer.parseInt(proxyPort));
if (authScope.match(systemScope) >= 0) {
final String proxyUser = System.getProperty(protocol + ".proxyUser");
if (proxyUser == null) {
return null;
}
final String proxyPassword = System.getProperty(protocol + ".proxyPassword");

return new PasswordAuthentication(proxyUser,
proxyPassword != null ? proxyPassword.toCharArray() : new char[] {});
}
} catch (final NumberFormatException ignore) {
}

return null;
}

Expand Down