From 47a850abd83e1d41b3493c4d64760db39c440334 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Fri, 31 Jan 2014 14:23:26 -0500 Subject: [PATCH] Changed references of DefaultHttpClient to SystemDefaultHttpClient to inherit system proxy settings, should address #548 --- .../IntrospectingTokenService.java | 6 +++--- .../connect/client/OIDCAuthenticationFilter.java | 5 +++-- .../mitre/openid/connect/client/UserInfoFetcher.java | 4 ++-- ...DynamicRegistrationClientConfigurationService.java | 4 ++-- .../impl/DynamicServerConfigurationService.java | 11 ++++++++--- .../client/service/impl/WebfingerIssuerService.java | 4 ++-- .../jwt/signer/service/impl/JWKSetCacheService.java | 5 +++-- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java index 4b9ae7617..c5b529c45 100644 --- a/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java +++ b/openid-connect-client/src/main/java/org/mitre/oauth2/introspectingfilter/IntrospectingTokenService.java @@ -22,12 +22,12 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.client.HttpClient; +import org.apache.http.impl.client.SystemDefaultHttpClient; import org.mitre.oauth2.introspectingfilter.service.IntrospectionAuthorityGranter; import org.mitre.oauth2.introspectingfilter.service.IntrospectionConfigurationService; import org.mitre.oauth2.introspectingfilter.service.impl.SimpleIntrospectionAuthorityGranter; import org.mitre.oauth2.model.RegisteredClient; -import org.mitre.openid.connect.client.service.ClientConfigurationService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpMethod; @@ -64,7 +64,7 @@ public class IntrospectingTokenService implements ResourceServerTokenServices { private IntrospectionConfigurationService introspectionConfigurationService; private IntrospectionAuthorityGranter introspectionAuthorityGranter = new SimpleIntrospectionAuthorityGranter(); - private DefaultHttpClient httpClient = new DefaultHttpClient(); + private HttpClient httpClient = new SystemDefaultHttpClient(); private HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(httpClient); // Inner class to store in the hash map diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java index bf84a4d16..30c6caa49 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java @@ -29,7 +29,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.client.HttpClient; +import org.apache.http.impl.client.SystemDefaultHttpClient; import org.mitre.jwt.signer.service.JwtSigningAndValidationService; import org.mitre.jwt.signer.service.impl.JWKSetCacheService; import org.mitre.oauth2.model.RegisteredClient; @@ -254,7 +255,7 @@ public class OIDCAuthenticationFilter extends AbstractAuthenticationProcessingFi } // Handle Token Endpoint interaction - DefaultHttpClient httpClient = new DefaultHttpClient(); + HttpClient httpClient = new SystemDefaultHttpClient(); httpClient.getParams().setParameter("http.socket.timeout", new Integer(httpSocketTimeout)); diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java index 416365653..dbf97071e 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java @@ -17,7 +17,7 @@ package org.mitre.openid.connect.client; import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.SystemDefaultHttpClient; import org.mitre.openid.connect.config.ServerConfiguration; import org.mitre.openid.connect.model.DefaultUserInfo; import org.mitre.openid.connect.model.OIDCAuthenticationToken; @@ -58,7 +58,7 @@ public class UserInfoFetcher { // if we got this far, try to actually get the userinfo - HttpClient httpClient = new DefaultHttpClient(); + HttpClient httpClient = new SystemDefaultHttpClient(); HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory(httpClient); diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java index 5f6cc570c..9d9c1ed77 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicRegistrationClientConfigurationService.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.SystemDefaultHttpClient; import org.mitre.oauth2.model.RegisteredClient; import org.mitre.openid.connect.ClientDetailsEntityJsonProcessor; import org.mitre.openid.connect.client.service.ClientConfigurationService; @@ -156,7 +156,7 @@ public class DynamicRegistrationClientConfigurationService implements ClientConf * */ public class DynamicClientRegistrationLoader extends CacheLoader { - private HttpClient httpClient = new DefaultHttpClient(); + private HttpClient httpClient = new SystemDefaultHttpClient(); private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); private Gson gson = new Gson(); // note that this doesn't serialize nulls by default diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java index 559401c10..2893e537d 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/DynamicServerConfigurationService.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.concurrent.ExecutionException; import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.SystemDefaultHttpClient; import org.mitre.openid.connect.client.service.ServerConfigurationService; import org.mitre.openid.connect.config.ServerConfiguration; import org.slf4j.Logger; @@ -40,7 +40,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import static org.mitre.discovery.util.JsonUtils.*; +import static org.mitre.discovery.util.JsonUtils.getAsBoolean; +import static org.mitre.discovery.util.JsonUtils.getAsEncryptionMethodList; +import static org.mitre.discovery.util.JsonUtils.getAsJweAlgorithmList; +import static org.mitre.discovery.util.JsonUtils.getAsJwsAlgorithmList; +import static org.mitre.discovery.util.JsonUtils.getAsString; +import static org.mitre.discovery.util.JsonUtils.getAsStringList; /** * @@ -117,7 +122,7 @@ public class DynamicServerConfigurationService implements ServerConfigurationSer * */ private class OpenIDConnectServiceConfigurationFetcher extends CacheLoader { - private HttpClient httpClient = new DefaultHttpClient(); + private HttpClient httpClient = new SystemDefaultHttpClient(); private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); private JsonParser parser = new JsonParser(); diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java index 22630cb0a..944ad2f8b 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/service/impl/WebfingerIssuerService.java @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.http.client.HttpClient; import org.apache.http.client.utils.URIBuilder; -import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.SystemDefaultHttpClient; import org.mitre.discovery.util.WebfingerURLNormalizer; import org.mitre.openid.connect.client.model.IssuerServiceResponse; import org.mitre.openid.connect.client.service.IssuerService; @@ -168,7 +168,7 @@ public class WebfingerIssuerService implements IssuerService { * */ private class WebfingerIssuerFetcher extends CacheLoader { - private HttpClient httpClient = new DefaultHttpClient(); + private HttpClient httpClient = new SystemDefaultHttpClient(); private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); private JsonParser parser = new JsonParser(); diff --git a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetCacheService.java b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetCacheService.java index 2d961a3b1..e44b8125b 100644 --- a/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetCacheService.java +++ b/openid-connect-common/src/main/java/org/mitre/jwt/signer/service/impl/JWKSetCacheService.java @@ -24,6 +24,7 @@ import java.util.concurrent.TimeUnit; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.SystemDefaultHttpClient; import org.mitre.jose.keystore.JWKSetKeyStore; import org.mitre.jwt.encryption.service.JwtEncryptionAndDecryptionService; import org.mitre.jwt.encryption.service.impl.DefaultJwtEncryptionAndDecryptionService; @@ -98,7 +99,7 @@ public class JWKSetCacheService { * */ private class JWKSetVerifierFetcher extends CacheLoader { - private HttpClient httpClient = new DefaultHttpClient(); + private HttpClient httpClient = new SystemDefaultHttpClient(); private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); private RestTemplate restTemplate = new RestTemplate(httpFactory); @@ -126,7 +127,7 @@ public class JWKSetCacheService { * */ private class JWKSetEncryptorFetcher extends CacheLoader { - private HttpClient httpClient = new DefaultHttpClient(); + private HttpClient httpClient = new SystemDefaultHttpClient(); private HttpComponentsClientHttpRequestFactory httpFactory = new HttpComponentsClientHttpRequestFactory(httpClient); private RestTemplate restTemplate = new RestTemplate(httpFactory); /* (non-Javadoc)