[java-identity-provider COMMIT] in /trunk/idp-conf/src: main/resources/flows/post-authn/attribute-release/messages.pr...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Oct 23 13:29:55 2014
New Revision: 6779

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6779&view=rev
Log:
Fix bug in attribute release flow and add integration test.

Modified:
    trunk/idp-conf/src/main/resources/flows/post-authn/attribute-release/messages.properties
    trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/post-authn/attribute-release.vm
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/saml2/SAML2TestResponseValidator.java

Modified: trunk/idp-conf/src/main/resources/flows/post-authn/attribute-release/messages.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/post-authn/attribute-release/messages.properties?rev=6779&r1=6778&r2=6779&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/post-authn/attribute-release/messages.properties (original)
+++ trunk/idp-conf/src/main/resources/flows/post-authn/attribute-release/messages.properties Thu Oct 23 13:29:55 2014
@@ -1,6 +1,6 @@
 # Messages related to attribute consent.
 
-idp.attribute-release.title                        = Attribute Consent
+idp.attribute-release.title                        = Attribute Release
 
 idp.attribute-release.attributesHeader             = Data Requested by Service
 

Modified: trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-flow.xml?rev=6779&r1=6778&r2=6779&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/post-authn/attribute-release-abstract-flow.xml Thu Oct 23 13:29:55 2014
@@ -8,6 +8,10 @@
 
 
     <!-- Attribute consent setup. -->
+    
+    <on-start>
+        <evaluate expression="AttributeConsentFlowDescriptorLookupStrategy.apply(opensamlProfileRequestContext)" result="flowScope.attributeReleaseFlowDescriptor" />
+    </on-start>
 
     <action-state id="AttributeConsentSetup">
         <evaluate expression="InitializeConsentContext" />
@@ -35,7 +39,7 @@
     </action-state>
 
     <decision-state id="TestForReadGlobalAttributeConsentFromStorage">
-        <if test="flowScope.allowGlobalConsent" then="ReadGlobalAttributeConsentFromStorage" else="IsAttributeConsentRequired" />
+        <if test="attributeReleaseFlowDescriptor.globalConsentAllowed" then="ReadGlobalAttributeConsentFromStorage" else="IsAttributeConsentRequired" />
     </decision-state>
 
     <action-state id="ReadGlobalAttributeConsentFromStorage">
@@ -79,7 +83,6 @@
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
             <evaluate expression="opensamlProfileRequestContext" result="viewScope.profileRequestContext" />
-            <evaluate expression="AttributeConsentFlowDescriptorLookupStrategy.apply(opensamlProfileRequestContext)" result="viewScope.attributeConsentFlowDescriptor" />
             <evaluate expression="new net.shibboleth.idp.consent.logic.AttributeDisplayNameFunction(flowRequestContext.getExternalContext().getLocale())" result="requestScope.attributeDisplayNameFunction" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.ConsentContext))" result="viewScope.consentContext" />
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.consent.context.AttributeReleaseContext))" result="viewScope.attributeConsentContext" />
@@ -127,7 +130,7 @@
     </action-state>
 
     <decision-state id="TestForRevokeGlobalAttributeConsent">
-        <if test="flowScope.allowGlobalConsent" then="RevokeGlobalAttributeConsent" else="IsAttributeConsentRequired" />
+        <if test="flowScope.allowGlobalConsent" then="RevokeGlobalAttributeConsent" else="ReleaseAttributes" />
     </decision-state>
 
     <action-state id="RevokeGlobalAttributeConsent">

Modified: trunk/idp-conf/src/main/resources/views/post-authn/attribute-release.vm
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/views/post-authn/attribute-release.vm?rev=6779&r1=6778&r2=6779&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/views/post-authn/attribute-release.vm (original)
+++ trunk/idp-conf/src/main/resources/views/post-authn/attribute-release.vm Thu Oct 23 13:29:55 2014
@@ -4,7 +4,7 @@
 ## Velocity context will contain the following properties :
 ##

[... 229 lines stripped ...]