[java-identity-provider] branch master updated: IDP-1170 - REST DataConnector

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=8e35d333cb2e0445ce5a909b945ecace3eaebe2d

The following commit(s) were added to refs/heads/master by this push:
       new  8e35d33   IDP-1170 - REST DataConnector
8e35d33 is described below

commit 8e35d333cb2e0445ce5a909b945ecace3eaebe2d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Aug 10 15:39:13 2017 -0400

    IDP-1170 - REST DataConnector
    
    https://issues.shibboleth.net/jira/browse/IDP-1170
    
    Use correct instance of security parameters during call.
---
 .../attribute/resolver/dc/http/impl/AbstractHTTPSearchBuilder.java    | 2 +-
 .../idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/AbstractHTTPSearchBuilder.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/AbstractHTTPSearchBuilder.java
index 671ddd8..1f9b951 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/AbstractHTTPSearchBuilder.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/AbstractHTTPSearchBuilder.java
@@ -115,7 +115,7 @@ public abstract class AbstractHTTPSearchBuilder extends AbstractInitializableCom
                     @Nonnull final HTTPResponseMappingStrategy mappingStrategy) throws IOException {
                 
                 final HttpClientContext clientContext = HttpClientContext.create();
-                HttpClientSecuritySupport.marshalSecurityParameters(clientContext, httpClientSecurityParameters, true);
+                HttpClientSecuritySupport.marshalSecurityParameters(clientContext, securityParameters, true);
                 HttpClientSecuritySupport.addDefaultTLSTrustEngineCriteria(clientContext, request);
                 final Map<String,IdPAttribute> results = client.execute(request, mappingStrategy, clientContext);
                 HttpClientSecuritySupport.checkTLSCredentialEvaluated(clientContext, request.getURI().getScheme());
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java
index af5880f..f6650bd 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnectorTest.java
@@ -76,6 +76,8 @@ public class HTTPDataConnectorTest {
     @Test public void test() throws ComponentInitializationException, ResolutionException, ScriptException, IOException {
         final HttpClientSecurityParameters params = new HttpClientSecurityParameters();
         params.setTLSProtocols(Collections.singleton("TLSv1"));
+        connector.setHttpClientSecurityParameters(params);
+        
         final TemplatedURLBuilder builder = new TemplatedURLBuilder();
         builder.setTemplateText(TEST_URL);
         builder.setVelocityEngine(VelocityEngine.newVelocityEngine());
@@ -112,6 +114,8 @@ public class HTTPDataConnectorTest {
             throws ComponentInitializationException, ResolutionException, ScriptException, IOException {
         final HttpClientSecurityParameters params = new HttpClientSecurityParameters();
         params.setTLSProtocols(Collections.singleton("SSLv3"));
+        connector.setHttpClientSecurityParameters(params);
+        
         final TemplatedURLBuilder builder = new TemplatedURLBuilder();
         builder.setTemplateText(TEST_URL);
         builder.setVelocityEngine(VelocityEngine.newVelocityEngine());

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.