[java-identity-provider] branch master updated: IDP-465 - Cleanup

[Tom Zeller]

This is an automated email from the git hooks/post-receive script.

tzeller pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=a94ac73a3b54ba88664fe3053fb6dd632cbdcda1

The following commit(s) were added to refs/heads/master by this push:
       new  a94ac73   IDP-465 - Cleanup
a94ac73 is described below

commit a94ac73a3b54ba88664fe3053fb6dd632cbdcda1
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Sep 24 10:13:33 2018 -0500

    IDP-465 - Cleanup
    
    https://issues.shibboleth.net/jira/browse/IDP-465
---
 .../flows/intercept/attribute-release-query-beans.xml     |  2 ++
 .../flows/intercept/attribute-release-query-flow.xml      | 15 ++++-----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-beans.xml b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-beans.xml
index 31febcc..db6aaa4 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-beans.xml
@@ -14,6 +14,8 @@
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
+    <!-- Use 'intercept/attribute-release' as storage context. -->
+
     <bean id="AttributeReleaseStorageContextLookupStrategy" class="com.google.common.base.Functions"
         factory-method="constant" c:_0="intercept/attribute-release" />
 
diff --git a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-flow.xml b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-flow.xml
index 8d73e84..a1cefbb 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-flow.xml
@@ -13,17 +13,17 @@
         <evaluate expression="AttributeConsentFlowDescriptorLookupStrategy.apply(opensamlProfileRequestContext)"
             result="flowScope.attributeReleaseFlowDescriptor" />
     </on-start>
-    
+
     <action-state id="AttributeConsentSetup">
         <evaluate expression="InitializeConsentContext" />
         <evaluate expression="InitializeAttributeConsentContext" />
         <evaluate expression="PopulateAttributeConsentContext" />
-        <!-- <evaluate expression="PopulatePreConsentAuditContext" /> -->
         <evaluate expression="'proceed'" />
 
         <transition on="proceed" to="ReadConsentFromStorage" />
     </action-state>
 
+
     <!-- Read consent from storage. -->
 
     <action-state id="ReadConsentFromStorage">
@@ -59,10 +59,9 @@
             else="ReleaseAttributes" />
     </decision-state>
 
+
     <!-- Release attributes consented to as well as non-consentable attributes from attribute context. -->
-    
-    <!-- TODO auditing ? -->
-    
+
     <action-state id="ReleaseAttributes">
         <evaluate expression="ReleaseAttributes" />
         <evaluate expression="'proceed'" />
@@ -72,12 +71,6 @@
 
     <end-state id="proceed" />
 
-    <end-state id="Log">
-        <on-entry>
-            <!-- Log violation. -->
-            <evaluate expression="T(org.slf4j.LoggerFactory).getLogger('net.shibboleth.idp.attributeReleaseQuery').warn('Log end-state')" />
-        </on-entry>
-    </end-state>
 
     <global-transitions>
         <!-- Catch "InvalidAttributeContext" and short-circuit this intercept flow. -->

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.