[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/reso...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Feb 10 06:21:42 2014
New Revision: 5348

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5348&view=rev
Log:
IDP-268 Add a predicate to the LegacyCanonicalizer to shortcut the C14N stage if there are no <PrincipalConnectors>
Add a PrinicipalConnector to the top level test for attribute-resolver.xml.  

This flushed a whole series of bugs around initialization and naming of the C14N beans and their decode sub beans and thus the setting of latter type's identifier by the legacy parsers (they inherit them from the principal connector)

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/LegacyPrincipalDecoder.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
    trunk/idp-attribute-resolver-spring/pom.xml
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/pc/TransientConnectorParser.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/principalconnector/PrincipalConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/principalconnector/PrinicpalConnectorCanonicalizer.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/AbstractSAMLNameCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseCryptoTransientDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseTransientDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DirectNameIDDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DirectNameIdentifierDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyCanonicalization.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/LegacyPrincipalDecoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/LegacyPrincipalDecoder.java?rev=5348&r1=5347&r2=5348&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/LegacyPrincipalDecoder.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/LegacyPrincipalDecoder.java Mon Feb 10 06:21:42 2014
@@ -44,5 +44,11 @@
      *             forth)
      */
     @Nullable String canonicalize(@Nonnull final ConsumedContext context) throws ResolutionException;
+    
+    /** 
+     * Report on whether this decoder has any configured connectors.
+     * @return whether there are any decoders.
+     */
 
+    boolean hasValidConnectors();
 }

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java?rev=5348&r1=5347&r2=5348&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java Mon Feb 10 06:21:42 2014
@@ -150,7 +150,7 @@
      * @return attribute definitions loaded in to this resolver
      */
     @Override @Nonnull @NonnullElements @Unmodifiable public Map<String, AttributeDefinition> 
-            getAttributeDefinitions() {
+           getAttributeDefinitions() {
         return attributeDefinitions;
     }
 
@@ -593,4 +593,9 @@
         }
         return principalConnector.canonicalize(context);
     }
+
+    /** {@inheritDoc} */
+    @Override public boolean hasValidConnectors() {
+        return principalConnector.hasValidConnectors();
+    }
 }

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImplTest.java?rev=5348&r1=5347&r2=5348&view=diff
==============================================================================

[... 776 lines stripped ...]