Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-1718, HTTPCLEINT-1719: credentials fix to allow proxy authetication 

Contributed by 212427891 <munene.kiruja at ge.com>

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/branches/4.5.x@1730836 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2016-02-17 13:54:29 +00:00
parent 3cde2e432d
commit 96c4a55029
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiCredentialsProvider.java
View File

@ -72,11 +72,9 @@ final class OSGiCredentialsProvider implements CredentialsProvider {
final ProxyConfiguration proxyConfiguration = (ProxyConfiguration) proxyConfigurationObject; final ProxyConfiguration proxyConfiguration = (ProxyConfiguration) proxyConfigurationObject;
if (proxyConfiguration.isEnabled()) { if (proxyConfiguration.isEnabled()) {
final AuthScope actual = new AuthScope(proxyConfiguration.getHostname(), proxyConfiguration.getPort()); final AuthScope actual = new AuthScope(proxyConfiguration.getHostname(), proxyConfiguration.getPort());
if (authscope.equals(actual)) { if (authscope.match(actual) >= 12) {
return new UsernamePasswordCredentials(proxyConfiguration.getUsername(), return new UsernamePasswordCredentials(proxyConfiguration.getUsername(), proxyConfiguration.getPassword());
proxyConfiguration.getPassword());
} }
} }
} }
} }

2
httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiProxyConfiguration.java
View File

@ -63,7 +63,7 @@ public final class OSGiProxyConfiguration implements ProxyConfiguration {
/** /**
* Property representing the username to authenticate with towards the proxy. Defaults to empty. * Property representing the username to authenticate with towards the proxy. Defaults to empty.
*/ */
private static final String PROPERTYNAME_PROXY_USERNAME = "proxy.username"; private static final String PROPERTYNAME_PROXY_USERNAME = "proxy.user";
private static final String PROPERTYDEFAULT_PROXY_USERNAME = ""; private static final String PROPERTYDEFAULT_PROXY_USERNAME = "";

2
httpclient-osgi/src/test/java/org/apache/http/osgi/impl/OSGiProxyConfigurationTest.java
View File

@ -43,7 +43,7 @@ public class OSGiProxyConfigurationTest {
config.put("proxy.enabled", false); config.put("proxy.enabled", false);
config.put("proxy.host", "h"); config.put("proxy.host", "h");
config.put("proxy.port", 1); config.put("proxy.port", 1);
config.put("proxy.username", "u"); config.put("proxy.user", "u");
config.put("proxy.password", "p"); config.put("proxy.password", "p");
config.put("proxy.exceptions", new String[]{"e"}); config.put("proxy.exceptions", new String[]{"e"});