[java-idp-testbed COMMIT] in /trunk/src/test/java/idp/c14n/actions: SetupForSAML1C14N.java SetupForSAML2C14N.java

[noreply at shibboleth.net]

Author: scantor
Date: Tue May  6 12:52:24 2014
New Revision: 214

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=214&view=rev
Log:
IDP-377: apply condition to AttributeEncoder use, plus factor out markers for encoders

Modified:
    trunk/src/test/java/idp/c14n/actions/SetupForSAML1C14N.java
    trunk/src/test/java/idp/c14n/actions/SetupForSAML2C14N.java

Modified: trunk/src/test/java/idp/c14n/actions/SetupForSAML1C14N.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/c14n/actions/SetupForSAML1C14N.java?rev=214&r1=213&r2=214&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/actions/SetupForSAML1C14N.java (original)
+++ trunk/src/test/java/idp/c14n/actions/SetupForSAML1C14N.java Tue May  6 12:52:24 2014
@@ -57,12 +57,13 @@
 
     @Override protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
 
-        RelyingPartyContext rpc = profileRequestContext.getSubcontext(RelyingPartyContext.class, false);
+        final RelyingPartyContext rpc = profileRequestContext.getSubcontext(RelyingPartyContext.class);
 
         NameIdentifier nid = null;
-        AttributeContext ac = rpc.getSubcontext(AttributeContext.class, false);
+        final AttributeContext ac = rpc.getSubcontext(AttributeContext.class, false);
         for (final AttributeEncoder enc : ac.getIdPAttributes().get(getAttributeName()).getEncoders()) {
-            if (enc instanceof SAML1NameIdentifierAttributeEncoder) {
+            if (enc instanceof SAML1NameIdentifierAttributeEncoder
+                    && enc.getActivationCondition().apply(profileRequestContext)) {
                 try {
                     nid = ((SAML1NameIdentifierAttributeEncoder) enc).encode(ac.getIdPAttributes().get(getAttributeName()));
                 } catch (AttributeEncodingException e) {
@@ -77,15 +78,14 @@
             return;
         }
 
-        NameIdentifierPrincipal nidp = new NameIdentifierPrincipal(nid);
-        Subject sub = new Subject();
+        final NameIdentifierPrincipal nidp = new NameIdentifierPrincipal(nid);
+        final Subject sub = new Subject();
         sub.getPrincipals().add(nidp);
 
-        SubjectCanonicalizationContext scc =
+        final SubjectCanonicalizationContext scc =
                 profileRequestContext.getSubcontext(SubjectCanonicalizationContext.class, true);
         scc.setSubject(sub);
         scc.setRequesterId(rpc.getRelyingPartyId());
         scc.setResponderId(rpc.getConfiguration().getResponderId());
-
     }
 }

Modified: trunk/src/test/java/idp/c14n/actions/SetupForSAML2C14N.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/c14n/actions/SetupForSAML2C14N.java?rev=214&r1=213&r2=214&view=diff
==============================================================================
--- trunk/src/test/java/idp/c14n/actions/SetupForSAML2C14N.java (original)
+++ trunk/src/test/java/idp/c14n/actions/SetupForSAML2C14N.java Tue May  6 12:52:24 2014
@@ -57,12 +57,13 @@
 
     @Override protected void doExecute(@Nonnull final ProfileRequestContext profileRequestContext) {
 
-        RelyingPartyContext rpc = profileRequestContext.getSubcontext(RelyingPartyContext.class, false);
+        final RelyingPartyContext rpc = profileRequestContext.getSubcontext(RelyingPartyContext.class);
 
         NameID nid = null;
-        AttributeContext ac = rpc.getSubcontext(AttributeContext.class, false);
+        final AttributeContext ac = rpc.getSubcontext(AttributeContext.class, false);
         for (final AttributeEncoder enc : ac.getIdPAttributes().get(getAttributeName()).getEncoders()) {
-            if (enc instanceof SAML2NameIDAttributeEncoder) {
+            if (enc instanceof SAML2NameIDAttributeEncoder &&
+                    enc.getActivationCondition().apply(profileRequestContext)) {
                 try {
                     nid = ((SAML2NameIDAttributeEncoder) enc).encode(ac.getIdPAttributes().get(getAttributeName()));
                 } catch (AttributeEncodingException e) {
@@ -77,15 +78,14 @@
             return;
         }
 
-        NameIDPrincipal nidp = new NameIDPrincipal(nid);
-        Subject sub = new Subject();
+        final NameIDPrincipal nidp = new NameIDPrincipal(nid);
+        final Subject sub = new Subject();
         sub.getPrincipals().add(nidp);
 
-        SubjectCanonicalizationContext scc =
+        final SubjectCanonicalizationContext scc =
                 profileRequestContext.getSubcontext(SubjectCanonicalizationContext.class, true);
         scc.setSubject(sub);
         scc.setRequesterId(rpc.getRelyingPartyId());
         scc.setResponderId(rpc.getConfiguration().getResponderId());
-
     }
 }