[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid: LegacyCano...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar 25 11:13:18 2014
New Revision: 5635

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5635&view=rev
Log:
Revert addition of second predicate.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyCanonicalization.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyCanonicalization.java?rev=5635&r1=5634&r2=5635&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyCanonicalization.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/LegacyCanonicalization.java Tue Mar 25 11:13:18 2014
@@ -34,7 +34,6 @@
 import net.shibboleth.idp.saml.authn.principal.NameIdentifierPrincipal;
 import net.shibboleth.idp.service.ReloadableService;
 import net.shibboleth.idp.service.ServiceableComponent;
-import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.profile.action.ActionSupport;
@@ -53,12 +52,6 @@
 
     /** Class logger. */
     @Nonnull private final Logger log = LoggerFactory.getLogger(LegacyCanonicalization.class);
-
-    /**
-     * Predicate to validate {@link org.opensaml.saml.saml2.core.NameID} or
-     * {@link org.opensaml.saml.saml1.core.NameIdentifier} for permission to decode.
-     */
-    @Nullable private Predicate<ProfileRequestContext> nameIDPolicyPredicate;
     
     /** Service used to get the resolver used to fetch attributes. */
     @Nonnull private final ReloadableService<AttributeResolver> attributeResolverService;
@@ -70,30 +63,6 @@
      */
     public LegacyCanonicalization(@Nonnull final ReloadableService<AttributeResolver> resolverService) {
         attributeResolverService = Constraint.isNotNull(resolverService, "AttributeResolver cannot be null");
-    }
-
-    /**
-     * Set a predicate used to evaluate the {@link org.opensaml.saml.saml2.core.NameID} or
-     * {@link org.opensaml.saml.saml1.core.NameIdentifier} to determine whether to proceed
-     * with the decoding process.
-     * 
-     * @param predicate predicate used to evaluate the identifier
-     */
-    public void setNameIDPolicyPredicate(@Nullable final Predicate<ProfileRequestContext> predicate) {
-        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
-        
-        nameIDPolicyPredicate = predicate;
-    }
-
-    /** {@inheritDoc} */
-    @Override protected boolean doPreExecute(@Nonnull final ProfileRequestContext profileRequestContext,
-            @Nonnull final SubjectCanonicalizationContext c14nContext) throws SubjectCanonicalizationException {
-
-        if (nameIDPolicyPredicate != null && !nameIDPolicyPredicate.apply(profileRequestContext)) {
-            return false;
-        }
-        
-        return super.doPreExecute(profileRequestContext, c14nContext);
     }
     
     /** {@inheritDoc} */

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java?rev=5635&r1=5634&r2=5635&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java Tue Mar 25 11:13:18 2014
@@ -63,9 +63,6 @@
 
     /** Supplies logic for pre-execute test. */
     @Nonnull private final ActivationCondition embeddedPredicate;
-
-    /** Predicate to validate {@link NameID} for permission to decode. */
-    @Nullable private Predicate<ProfileRequestContext> nameIDPolicyPredicate;
     
     /** Supplies logic for decoding the {@link NameID} into a principal. */
     @NonnullAfterInit private NameIDDecoder decoder;
@@ -96,18 +93,6 @@
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         decoder = Constraint.isNotNull(theDecoder, "Name ID decoder cannot be null");
     }
-
-    /**
-     * Set a predicate used to evaluate the {@link NameID} to determine whether to proceed
-     * with the decoding process.
-     * 
-     * @param predicate predicate used to evaluate the {@link NameID}
-     */
-    public void setNameIDPolicyPredicate(@Nullable final Predicate<ProfileRequestContext> predicate) {

[... 65 lines stripped ...]