[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=0f0def818a150416697e746a9963d323f300281f

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

commit 0f0def818a150416697e746a9963d323f300281f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Aug 11 12:34:31 2017 -0400

    IDP-1170 - REST DataConnector
    
    https://issues.shibboleth.net/jira/browse/IDP-1170
    
    Rename certificate to serverCertificate.
---
 .../spring/dc/http/impl/HTTPDataConnectorParser.java     |  5 +++--
 .../dc/http/http-attribute-resolver-v2-certificate.xml   |  2 +-
 .../resources/schema/shibboleth-attribute-resolver.xsd   | 16 +++++++++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
index 3d49cfc..dcd0b09 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
@@ -302,7 +302,8 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
          */
         @Nullable public BeanDefinition buildHttpClientSecurityParams(@Nullable final String id) {
             BeanDefinitionBuilder builder = null;
-            final String certificate = StringSupport.trimOrNull(configElement.getAttributeNS(null, "certificate"));
+            final String certificate =
+                    StringSupport.trimOrNull(configElement.getAttributeNS(null, "serverCertificate"));
             if (certificate != null) {
                 log.debug("Auto-configuring connector {} with a server certificate to authenticate", id);
                 builder = BeanDefinitionBuilder.genericBeanDefinition(HttpClientSecurityParameters.class);
@@ -316,7 +317,7 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
                     StringSupport.trimOrNull(configElement.getAttributeNS(null, "certificateAuthority"));
             if (certificateAuthority != null) {
                 if (builder != null) {
-                    log.warn("Ignoring certificateAuthority set on connector {}, superseded by certificate", id);
+                    log.warn("Ignoring certificateAuthority on connector {}, superseded by serverCertificate", id);
                 } else {
                     log.debug("Auto-configuring connector {} with a certificate authority to authenticate", id);
                     builder = BeanDefinitionBuilder.genericBeanDefinition(HttpClientSecurityParameters.class);
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-certificate.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-certificate.xml
index 12f5b53..d12f4b6 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-certificate.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/http/http-attribute-resolver-v2-certificate.xml
@@ -5,7 +5,7 @@
 
     <DataConnector id="myHTTP" xsi:type="HTTP"
             httpClientRef="TrustEngineHttpClient"
-            certificate="%{certificate}">
+            serverCertificate="%{certificate}">
             
         <URLTemplate>%{serviceURL}</URLTemplate>
         
diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
index e70e3ff..9f26b12 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -1269,7 +1269,7 @@
                         </documentation>
                     </annotation>
                 </attribute>
-                <attribute name="certificate" type="string">
+                <attribute name="serverCertificate" type="string">
                     <annotation>
                         <documentation>
                             Location of certificate to authenticate HTTP server
@@ -1283,6 +1283,20 @@
                         </documentation>
                     </annotation>
                 </attribute>
+                <attribute name="clientPrivateKey" type="string">
+                    <annotation>
+                        <documentation>
+                            Location of private key to authenticate with via TLS
+                        </documentation>
+                    </annotation>
+                </attribute>
+                <attribute name="clientCertificate" type="string">
+                    <annotation>
+                        <documentation>
+                            Location of client certificate to authenticate with via TLS
+                        </documentation>
+                    </annotation>
+                </attribute>
                 <attribute name="templateEngine" type="string">
                     <annotation>
                         <documentation>

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