[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-spring/pom.xml idp-attribute-resolver-spring/src/ma...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Sep 11 09:28:50 2016
New Revision: 8384

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8384&view=rev
Log:
IDP-813 Shortcut to specify TLSTrustCredential

https://issues.shibboleth.net/jira/browse/IDP-813

StartTLSTrustCredential xsi:type="sec:X509ResourceBacked">
   <sec:Certificate>path</sec:Certificate>
</StartTLSTrustCredential>

becomes

 trustFile="path"

Modified:
    trunk/idp-attribute-resolver-spring/pom.xml
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd

Modified: trunk/idp-attribute-resolver-spring/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/pom.xml?rev=8384&r1=8383&r2=8384&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/pom.xml	(original)
+++ trunk/idp-attribute-resolver-spring/pom.xml	Sun Sep 11 09:28:50 2016
@@ -48,6 +48,12 @@
             <artifactId>idp-saml-impl</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-profile-spring</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        
 
         <dependency>
             <groupId>${opensaml.groupId}</groupId>
@@ -86,13 +92,7 @@
             <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>idp-profile-spring</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
+       
 
         <!-- Test Dependencies -->
         <dependency>

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java?rev=8384&r1=8383&r2=8384&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java	Sun Sep 11 09:28:50 2016
@@ -33,6 +33,7 @@
 import net.shibboleth.idp.attribute.resolver.spring.dc.impl.CacheConfigParser;
 import net.shibboleth.idp.attribute.resolver.spring.dc.impl.DataConnectorNamespaceHandler;
 import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
+import net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean;
 import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -333,11 +334,23 @@
             final BeanDefinitionBuilder result =
                     BeanDefinitionBuilder.genericBeanDefinition(CredentialConfigFactoryBean.class);
 
-            final List<Element> trustElements = ElementSupport.getChildElements(configElement,
-                            new QName(DataConnectorNamespaceHandler.NAMESPACE, "StartTLSTrustCredential"));
-            trustElements.addAll(ElementSupport.getChildElements(configElement,
-                    new QName(AttributeResolverNamespaceHandler.NAMESPACE, "StartTLSTrustCredential")));
-            if (!trustElements.isEmpty()) {
+            final List<Element> trustElements =
+                    ElementSupport.getChildElements(configElement, new QName(DataConnectorNamespaceHandler.NAMESPACE,
+                            "StartTLSTrustCredential"));
+            trustElements.addAll(ElementSupport.getChildElements(configElement, new QName(
+                    AttributeResolverNamespaceHandler.NAMESPACE, "StartTLSTrustCredential")));
+            final String trustResource =
+                    StringSupport.trimOrNull(AttributeSupport.getAttributeValue(configElement, null, "trustFile"));
+            if (trustResource != null) {
+                if (!trustElements.isEmpty()) {
+                    log.warn("{} StartTLSTrustCredential and trustFile= are incompatible.  trustFile used.",
+                            getLogPrefix());
+                }
+                final BeanDefinitionBuilder credential =

[... 93 lines stripped ...]