Skip to content

fix: correct http proxy configuration precedence (#AXIS2-6044) #796

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
robertlazarski merged 1 commit into from
Nov 9, 2024
Merged

fix: correct http proxy configuration precedence (#AXIS2-6044) #796

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
29 changes: 15 additions & 14 deletions ...src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPProxyConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,18 @@ public static void configure(MessageContext messageContext, RequestConfig.Builde
String proxyUser = null;
String proxyPassword = null;

// Getting configuration values from Axis2.xml

// First: get settings from system properties
String host = System.getProperty(HTTPTransportConstants.HTTP_PROXY_HOST);
if (host != null) {
proxyHost = host;
}
String port = System.getProperty(HTTPTransportConstants.HTTP_PROXY_PORT);
if (port != null && !port.isEmpty()) {
proxyPort = Integer.parseInt(port);
}

// Override with settings from Axis2.xml
Parameter proxySettingsFromAxisConfig = messageContext.getConfigurationContext()
.getAxisConfiguration().getParameter(HTTPTransportConstants.ATTR_PROXY);
if (proxySettingsFromAxisConfig != null) {
Expand All @@ -99,17 +110,16 @@ public static void configure(MessageContext messageContext, RequestConfig.Builde
if (proxyUser.length() > proxyUserDomainIndex + 1) {
String user = proxyUser.substring(proxyUserDomainIndex + 1);
proxyCredentials = new NTCredentials(user, proxyPassword.toCharArray(), proxyHost,
domain);
domain);
}
}
}
}

// If there is runtime proxy settings, these settings will override
// settings from axis2.xml
// Override with settings from MessageContext
HttpTransportProperties.ProxyProperties proxyProperties =
(HttpTransportProperties.ProxyProperties) messageContext
.getProperty(HTTPConstants.PROXY);
.getProperty(HTTPConstants.PROXY);
if (proxyProperties != null) {
String proxyHostProp = proxyProperties.getProxyHostName();
if (proxyHostProp == null || proxyHostProp.length() <= 0) {
Expand All @@ -132,16 +142,7 @@ public static void configure(MessageContext messageContext, RequestConfig.Builde

}

// Overriding proxy settings if proxy is available from JVM settings
String host = System.getProperty(HTTPTransportConstants.HTTP_PROXY_HOST);
if (host != null) {
proxyHost = host;
}

String port = System.getProperty(HTTPTransportConstants.HTTP_PROXY_PORT);
if (port != null && !port.isEmpty()) {
proxyPort = Integer.parseInt(port);
}

// AXIS2-6051, CredentialsProvider no longer has setCredentials() however BasicCredentialsProvider
// does have it. clientContext.getCredentialsProvider() returns CredentialsProvider.
Expand Down