Skip to content

http.nonProxyHosts does not work without http.proxyUser, with quotes … #416

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
uhurusurfa merged 3 commits into from
Mar 17, 2025
+41 −85
Merged

http.nonProxyHosts does not work without http.proxyUser, with quotes … #416

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a50d32
http.nonProxyHosts does not work without http.proxyUser, with quotes …
Mar 10, 2025
5629816
http.nonProxyHosts does not work without http.proxyUser ... add prope…
Mar 17, 2025
8d7d7a9
Cleanup - Remove unused methods #415
Mar 17, 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
126 changes: 41 additions & 85 deletions Server/src/main/java/org/openas2/util/HTTPUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.http.HttpHost;
import org.apache.http.NameValuePair;
import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials;
Expand Down Expand Up @@ -365,7 +364,7 @@ public static ResponseWrapper execRequest(
}
RequestBuilder rb = getRequestBuilder(method, urlObj, params, headers);
RequestConfig.Builder rcBuilder = buildRequestConfig(options);
setProxyConfig(httpBuilder, rcBuilder, urlObj.getProtocol());
setProxyConfig(httpBuilder, urlObj.getProtocol());
rb.setConfig(rcBuilder.build());

String httpUser = (String) options.get(HTTPUtil.PARAM_HTTP_USER);
Expand Down Expand Up @@ -672,107 +671,64 @@ public static KeyStore getTrustedCertsKeystore() throws OpenAS2Exception {
return cachedJavaKeyStore;
}

public static String getParamsString(Map<String, String> params) throws UnsupportedEncodingException {
StringBuilder result = new StringBuilder();

for (Map.Entry<String, String> entry : params.entrySet()) {
result.append(URLEncoder.encode(entry.getKey(), "UTF-8"));
result.append("=");
result.append(URLEncoder.encode(entry.getValue(), "UTF-8"));
result.append("&");
}
private static void setProxyConfig(HttpClientBuilder builder, String protocol) throws OpenAS2Exception {

String resultString = result.toString();
return resultString.length() > 0 ? resultString.substring(0, resultString.length() - 1) : resultString;
}
String proxyHostKey = protocol + ".proxyHost";
String proxyPortKey = protocol + ".proxyPort";
String proxyUserKey = protocol + ".proxyUser";
String proxyPasswordKey = protocol + ".proxyPassword";
String proxyNonProxyHostsKey = "http.nonProxyHosts";

public static boolean isLocalhostBound(InetAddress addr) {
// Check if the address is a valid special local or loop back
if (addr.isAnyLocalAddress() || addr.isLoopbackAddress()) {
return true;
}
String proxyHost = getPropertyFromOpenAS2PropertiesOrSystem(proxyHostKey, null);
String proxyPort = getPropertyFromOpenAS2PropertiesOrSystem(proxyPortKey, null);
String proxyUser = getPropertyFromOpenAS2PropertiesOrSystem(proxyUserKey, null);
String proxyPassword = getPropertyFromOpenAS2PropertiesOrSystem(proxyPasswordKey, null);
String proxyNonProxyHosts = getPropertyFromOpenAS2PropertiesOrSystem(proxyNonProxyHostsKey, null);

// Check if the address is defined on any interface
try {
return NetworkInterface.getByInetAddress(addr) != null;
} catch (SocketException e) {
return false;
}
}

private static void setProxyConfig(HttpClientBuilder builder, RequestConfig.Builder rcBuilder, String protocol) throws OpenAS2Exception {
String proxyHost = Properties.getProperty(protocol + ".proxyHost", null);
if (proxyHost == null) {
proxyHost = System.getProperty(protocol + ".proxyHost");
}
if (proxyHost == null) {
// fast fail
return;
}
String proxyPort = Properties.getProperty(protocol + ".proxyPort", null);
if (proxyPort == null) {
proxyPort = System.getProperty(protocol + ".proxyPort");
}
if (proxyPort == null) {
throw new OpenAS2Exception("Missing PROXY port since Proxy host is set");
}
int port = Integer.parseInt(proxyPort);
HttpHost proxy = new HttpHost(proxyHost, port);

rcBuilder.setProxy(proxy);
// Set the system properties to ensure that the DefaultProxySelector uses this configuration
// Note: That overwrites the system properties for the current JVM and the previously set values are lost
System.setProperty(proxyHostKey, proxyHost);
System.setProperty(proxyPortKey, proxyPort);
System.setProperty(proxyNonProxyHostsKey, proxyNonProxyHosts);

String proxyUser1 = Properties.getProperty("http.proxyUser", null);
final String proxyUser = proxyUser1 == null ? System.getProperty("http.proxyUser") : proxyUser1;
if (proxyUser == null) {
return;
}
String proxyPwd1 = Properties.getProperty("http.proxyPassword", null);
final String proxyPassword = proxyPwd1 == null ? System.getProperty("http.proxyPassword") : proxyPwd1;
CredentialsProvider credsProvider = new BasicCredentialsProvider();
credsProvider.setCredentials(new AuthScope(proxyHost, port), new UsernamePasswordCredentials(proxyUser, proxyPassword));
builder.setDefaultCredentialsProvider(credsProvider);
// Don't set an explicit proxy here or else "http.nonProxyHosts" won't be respected.
// Other proxy configurations like https.proxyHost will be read by the DefaultProxySelector.
// See https://issues.apache.org/jira/browse/HTTPCLIENT-1617
builder.setProxy(null);

SystemDefaultRoutePlanner routePlanner = new SystemDefaultRoutePlanner(null);
// Use the system default proxy selector which uses the System properties for proxy settings including http.nonProxyHosts
SystemDefaultRoutePlanner routePlanner = new SystemDefaultRoutePlanner(ProxySelector.getDefault());
builder.setRoutePlanner(routePlanner);
}

// Copy headers from an Http connection to an InternetHeaders object
public static void copyHttpHeaders(HttpURLConnection conn, InternetHeaders headers) {
Iterator<Map.Entry<String, List<String>>> connHeadersIt = conn.getHeaderFields().entrySet().iterator();
Iterator<String> connValuesIt;
Map.Entry<String, List<String>> connHeader;
String headerName;

while (connHeadersIt.hasNext()) {
connHeader = connHeadersIt.next();
headerName = connHeader.getKey();

if (headerName != null) {
connValuesIt = connHeader.getValue().iterator();

while (connValuesIt.hasNext()) {
String value = connValuesIt.next();

String[] existingVals = headers.getHeader(headerName);
if (existingVals == null) {
headers.setHeader(headerName, value);
} else {
// Avoid duplicates of the same value since headers that exist in the HTTP
// headers
// may already have been inserted in the Message object
boolean exists = false;
for (int i = 0; i < existingVals.length; i++) {
if (value.equals(existingVals[i])) {
exists = true;
}
}
if (!exists) {
headers.addHeader(headerName, value);
}
}
}
}
if (proxyUser != null) {
int port = Integer.parseInt(proxyPort);
CredentialsProvider credsProvider = new BasicCredentialsProvider();
credsProvider.setCredentials(new AuthScope(proxyHost, port), new UsernamePasswordCredentials(proxyUser, proxyPassword));
builder.setDefaultCredentialsProvider(credsProvider);
}
}

/**
* @param key key like "http.proxyHost"
* @param fallback default value like null
* @return value from the properties file or as first fallback the value from the system properties or as second fallback the fallback value
*/
private static String getPropertyFromOpenAS2PropertiesOrSystem(String key, String fallback) {
String valueFromProperties = Properties.getProperty(key, fallback);
String valueFromSystem = System.getProperty(key, fallback);
// Prefer the value from the properties file then the system properties
return valueFromProperties != null ? valueFromProperties : valueFromSystem;
}

private static class SelfSignedTrustManager implements X509TrustManager {

Expand Down