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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jan 28 08:17:30 2014
New Revision: 5256

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5256&view=rev
Log:
IDP-359 NameIdentifier Canonicalizer

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java
      - copied, changed from r5255, trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalizationTest.java
Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java

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=5256&r1=5255&r2=5256&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 Jan 28 08:17:30 2014
@@ -105,11 +105,11 @@
         if (embeddedPredicate.apply(profileRequestContext, c14nContext, true)) {
 
             final Set<NameIDPrincipal> nameIDs = c14nContext.getSubject().getPrincipals(NameIDPrincipal.class);
-            final NameID nameId = nameIDs.iterator().next().getNameID();
+            final NameID nameID = nameIDs.iterator().next().getNameID();
 
             try {
                 transientPrincipal =
-                        decoder.decode(nameId.getValue(), c14nContext.getResponderId(), c14nContext.getRequesterId());
+                        decoder.decode(nameID.getValue(), c14nContext.getResponderId(), c14nContext.getRequesterId());
             } catch (SubjectCanonicalizationException e) {
                 c14nContext.setException(e);
                 ActionSupport.buildEvent(profileRequestContext, AuthnEventIds.SUBJECT_C14N_ERROR);

Copied: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java (from r5255, 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/NameIdentifierCanonicalization.java?p2=trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java&p1=trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java&r1=5255&r2=5256&rev=5256&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/NameIdentifierCanonicalization.java Tue Jan 28 08:17:30 2014
@@ -25,7 +25,7 @@
 import net.shibboleth.idp.authn.AuthnEventIds;
 import net.shibboleth.idp.authn.SubjectCanonicalizationException;
 import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
-import net.shibboleth.idp.saml.authn.principal.NameIDPrincipal;
+import net.shibboleth.idp.saml.authn.principal.NameIdentifierPrincipal;
 import net.shibboleth.idp.saml.nameid.NameIdentifierAttributeDecoder;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
@@ -34,16 +34,16 @@
 
 import org.opensaml.profile.action.ActionSupport;
 import org.opensaml.profile.context.ProfileRequestContext;
-import org.opensaml.saml.saml2.core.NameID;
+import org.opensaml.saml.saml1.core.NameIdentifier;
 
 import com.google.common.base.Predicate;
 
 /**
  * An action that operates on a {@link SubjectCanonicalizationContext} child of the current
  * {@link ProfileRequestContext}, and transforms the input {@link javax.security.auth.Subject} into a principal name by
- * searching for one and only one {@link NameIDPrincipal} custom principal. <br/>
+ * searching for one and only one {@link NameIdentifierPrincipal} custom principal. <br/>
  * The precise decide is controlled by the
- *
+ * 
  * @event {@link org.opensaml.profile.action.EventIds#PROCEED_EVENT_ID}
  * @event {@link AuthnEventIds#INVALID_SUBJECT}
  * @pre <pre>
@@ -53,7 +53,7 @@
  * SubjectCanonicalizationContext.getPrincipalName() != null || SubjectCanonicalizationContext.getException() != null
  * </pre>
  */
-public class NameIDCanonicalization extends AbstractSAMLNameCanonicalization {
+public class NameIdentifierCanonicalization extends AbstractSAMLNameCanonicalization {
 
     /** The custom Principal to operate on. */
     @Nullable private String transientPrincipal;
@@ -61,19 +61,19 @@
     /** Supplies logic for pre-execute test. */

[... 106 lines stripped ...]