[java-identity-provider COMMIT] in /trunk: idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthent...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul  8 11:46:06 2014
New Revision: 6244

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6244&view=rev
Log:
Testing attribute-based c14n, make attribute actions handle a missing subject context.

Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthentication.java
    trunk/idp-conf/src/main/resources/conf/c14n/attribute-sourced-subject-c14n-config.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/FilterAttributes.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ResolveAttributes.java

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthentication.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthentication.java?rev=6244&r1=6243&r2=6244&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthentication.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthentication.java Tue Jul  8 11:46:06 2014
@@ -92,12 +92,15 @@
         if (c14nCtx != null) {
             canonicalPrincipalName = c14nCtx.getPrincipalName();
             profileRequestContext.removeSubcontext(c14nCtx);
+            log.debug("{} Canonical principal name was established as '{}'", getLogPrefix(), canonicalPrincipalName);
         }
         
         if (canonicalPrincipalName == null) {
             final SessionContext sessionCtx = profileRequestContext.getSubcontext(SessionContext.class);
             if (sessionCtx != null && sessionCtx.getIdPSession() != null) {
                 canonicalPrincipalName = sessionCtx.getIdPSession().getPrincipalName();
+                log.debug("{} Canonical principal name established from session as '{}'", getLogPrefix(),
+                        canonicalPrincipalName);
             }
         }
         

Modified: trunk/idp-conf/src/main/resources/conf/c14n/attribute-sourced-subject-c14n-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/c14n/attribute-sourced-subject-c14n-config.xml?rev=6244&r1=6243&r2=6244&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/c14n/attribute-sourced-subject-c14n-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/c14n/attribute-sourced-subject-c14n-config.xml Tue Jul  8 11:46:06 2014
@@ -18,7 +18,7 @@
     an empty list if you just want to resolve everything you normally would.
     -->
     <util:list id="shibboleth.c14n.attribute.AttributesToResolve">
-        <value>uid</value>
+        <value>altuid</value>
     </util:list>
     
     <!--
@@ -26,7 +26,7 @@
     This will normally be something you resolve above.
     -->
     <util:list id="shibboleth.c14n.attribute.AttributeSourceIds">
-        <value>uid</value>
+        <value>altuid</value>
     </util:list>
 
     <!-- Simple transforms to apply to attribute value used for canonicalization result. -->

Modified: trunk/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-flow.xml?rev=6244&r1=6243&r2=6244&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-flow.xml Tue Jul  8 11:46:06 2014
@@ -13,6 +13,6 @@
         <transition on="proceed" to="proceed" />
     </action-state>
 
-    <bean-import resource="simple-subject-c14n-beans.xml" />
+    <bean-import resource="attribute-sourced-subject-c14n-beans.xml" />
 
 </flow>

Modified: trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml?rev=6244&r1=6243&r2=6244&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml Tue Jul  8 11:46:06 2014
@@ -14,6 +14,7 @@
     <!-- Error events to reflect back from this subflow. -->
     <end-state id="InvalidProfileContext" />
     <end-state id="InvalidSubject" />
+    <end-state id="InvalidSubjectContext" />
     <end-state id="InvalidSubjectCanonicalizationContext" />
     <end-state id="ReselectFlow" />

[... 244 lines stripped ...]