[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src: main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Apr 30 06:02:05 2014
New Revision: 5805

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5805&view=rev
Log:
IDP-390 Warn on <SecurityPolicy> try to parse trust engines.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java?rev=5805&r1=5804&r2=5805&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyGroupParser.java Wed Apr 30 06:02:05 2014
@@ -29,6 +29,8 @@
 import net.shibboleth.idp.spring.SpringSupport;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
@@ -45,6 +47,9 @@
 
     /** Element name. */
     public static final QName ELEMENT_NAME = new QName(RelyingPartyNamespaceHandler.NAMESPACE, "RelyingPartyGroup");
+    
+    /** Logger.*/
+    private final Logger log = LoggerFactory.getLogger(RelyingPartyGroupParser.class);
 
     /** {@inheritDoc} */
     @Override protected Class<DefaultRelyingPartyConfigurationResolver> getBeanClass(Element element) {
@@ -110,9 +115,16 @@
         // <Credential> (for metadata & signing)
         SpringSupport.parseCustomElements(configChildren.get(SecurityNamespaceHandler.CREDENTIAL_ELEMENT_NAME),
                 parserContext);
-        // TODO Security
         // <TrustEngine> (for metadata)
+        SpringSupport.parseCustomElements(configChildren.get(SecurityNamespaceHandler.TRUST_ENGINE_ELEMENT_NAME),
+                parserContext);
+
         // <SecurityPolicy> (warn and ignore).
+        final List<Element> policies = configChildren.get(SecurityNamespaceHandler.SECRURITY_POLICY_NAME);
+        if (null != policies && !policies.isEmpty()) {
+            log.warn("{}: {} Occurence(s of unsupported <SecurityPolicy/> elements have been ignored",
+                    parserContext.getReaderContext().getResource().getDescription(), policies.size());
+        }
 
     }
 

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java?rev=5805&r1=5804&r2=5805&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/security/SecurityNamespaceHandler.java Wed Apr 30 06:02:05 2014
@@ -32,15 +32,22 @@
 
     /** Namespace for this handler. */
     public static final String NAMESPACE = "urn:mace:shibboleth:2.0:security";
+
     /** Credential element name. */
     public static final QName CREDENTIAL_ELEMENT_NAME = new QName(NAMESPACE, "Credential");
+
+    /** TrustEngine element name. */
+    public static final QName TRUST_ENGINE_ELEMENT_NAME = new QName(NAMESPACE, "TrustEngine");
+
+    /** SecurityPolicy element name. */
+    public static final QName SECRURITY_POLICY_NAME = new QName(NAMESPACE, "SecurityPolicy");
 
     /** {@inheritDoc} */
     @Override public void init() {
         registerBeanDefinitionParser(X509FilesystemCredentialParser.SCHEMA_TYPE, new X509FilesystemCredentialParser());
         registerBeanDefinitionParser(X509InlineCredentialParser.SCHEMA_TYPE, new X509InlineCredentialParser());
         registerBeanDefinitionParser(BasicInlineCredentialParser.SCHEMA_TYPE, new BasicInlineCredentialParser());
-        registerBeanDefinitionParser(BasicFilesystemCredentialParser.SCHEMA_TYPE,
+        registerBeanDefinitionParser(BasicFilesystemCredentialParser.SCHEMA_TYPE, 
                 new BasicFilesystemCredentialParser());
         registerBeanDefinitionParser(ResourceCredentialParser.X509_RESOURCE_TYPE, new ResourceCredentialParser());

[... 26 lines stripped ...]