[java-identity-provider] branch main updated: Fix direct reference to query consent interceptor bean.
Scott Cantor
cantor.2 at osu.edu
Mon Nov 2 23:34:18 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=2694d2f850b2319b668428bf95505840f3bd82ba
The following commit(s) were added to refs/heads/main by this push:
new 2694d2f85 Fix direct reference to query consent interceptor bean.
2694d2f85 is described below
commit 2694d2f850b2319b668428bf95505840f3bd82ba
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Nov 2 18:33:55 2020 -0500
Fix direct reference to query consent interceptor bean.
---
.../shibboleth/idp/conf/profile-intercept-system.xml | 18 +++++++++---------
.../idp/flows/saml/saml1/attribute-query-beans.xml | 12 ++----------
.../idp/flows/saml/saml1/attribute-query-flow.xml | 2 +-
.../idp/flows/saml/saml2/attribute-query-beans.xml | 12 ++----------
.../idp/flows/saml/saml2/attribute-query-flow.xml | 2 +-
.../idp/consent/storage/impl/ConsentSerializer.java | 2 --
6 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
index 11b7305b8..2a3fa7094 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/profile-intercept-system.xml
@@ -85,15 +85,15 @@
<!-- Parent bean for terms of use consent flows. -->
<bean id="shibboleth.consent.TermsOfUseFlow" abstract="true"
- class="net.shibboleth.idp.consent.flow.impl.ConsentFlowDescriptor"
- p:storageService-ref="#{'%{idp.consent.StorageService:shibboleth.ClientPersistentStorageService}'.trim()}"
- p:compareValues="%{idp.consent.compareValues:false}"
- p:lifetime="%{idp.consent.storageRecordLifetime:P1Y}"
- p:maximumNumberOfStoredRecords="%{idp.consent.maxStoredRecords:10}"
- p:expandedNumberOfStoredRecords="%{idp.consent.expandedMaxStoredRecords:0}"
- p:expandedStorageThreshold="%{idp.consent.expandedStorageThreshold:1048576}"
- p:nonBrowserSupported="false"
- p:activationCondition-ref="#{'%{idp.consent.terms-of-use.activationCondition:shibboleth.Conditions.TRUE}'.trim()}" />
+ class="net.shibboleth.idp.consent.flow.impl.ConsentFlowDescriptor"
+ p:storageService-ref="#{'%{idp.consent.StorageService:shibboleth.ClientPersistentStorageService}'.trim()}"
+ p:compareValues="%{idp.consent.compareValues:false}"
+ p:lifetime="%{idp.consent.storageRecordLifetime:P1Y}"
+ p:maximumNumberOfStoredRecords="%{idp.consent.maxStoredRecords:10}"
+ p:expandedNumberOfStoredRecords="%{idp.consent.expandedMaxStoredRecords:0}"
+ p:expandedStorageThreshold="%{idp.consent.expandedStorageThreshold:1048576}"
+ p:nonBrowserSupported="false"
+ p:activationCondition-ref="#{'%{idp.consent.terms-of-use.activationCondition:shibboleth.Conditions.TRUE}'.trim()}" />
<!-- Function to lookup consent-specific audit context as a child of the consent context. -->
<bean id="shibboleth.consent.ChildLookup.ConsentAuditContext" parent="shibboleth.Functions.Compose">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
index 661cf97af..dd40ceaa3 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
@@ -71,16 +71,8 @@
</bean>
<bean id="PopulateConsentInterceptContext"
- class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype">
- <property name="availableFlows">
- <bean class="org.springframework.beans.factory.config.ListFactoryBean">
- <property name="sourceList">
- <list>
- <ref bean="intercept/attribute-release-query" />
- </list>
- </property>
- </bean>
- </property>
+ class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
+ p:availableFlows="#{@'shibboleth.ProfileInterceptorFlowDescriptorManager'.getComponents()}">
<property name="activeFlowsLookupStrategy">
<bean parent="shibboleth.Functions.Constant" c:target="#{ {'attribute-release-query' } }" />
</property>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml
index ac8da6fc0..b51a10d40 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-flow.xml
@@ -30,7 +30,7 @@
<action-state id="ConsentSetup">
<evaluate expression="PopulateConsentInterceptContext" />
- <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.profile.context.ProfileInterceptorContext)).setAttemptedFlow(flowRequestContext.getActiveFlow().getApplicationContext().getBean('intercept/attribute-release-query'))" />
+ <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.profile.context.ProfileInterceptorContext)).setAttemptedFlow(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.ProfileInterceptorFlowDescriptorManager').getComponents().?[id matches 'intercept/attribute-release-query'])" />
<transition on="success" to="ConsentFlow" />
</action-state>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
index 3de40872d..16b607626 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
@@ -76,16 +76,8 @@
</bean>
<bean id="PopulateConsentInterceptContext"
- class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype">
- <property name="availableFlows">
- <bean class="org.springframework.beans.factory.config.ListFactoryBean">
- <property name="sourceList">
- <list>
- <ref bean="intercept/attribute-release-query" />
- </list>
- </property>
- </bean>
- </property>
+ class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
+ p:availableFlows="#{@'shibboleth.ProfileInterceptorFlowDescriptorManager'.getComponents()}">
<property name="activeFlowsLookupStrategy">
<bean parent="shibboleth.Functions.Constant" c:target="#{ {'attribute-release-query' } }" />
</property>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml
index f8ce6ba70..c32534bce 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-flow.xml
@@ -30,7 +30,7 @@
<action-state id="ConsentSetup">
<evaluate expression="PopulateConsentInterceptContext" />
- <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.profile.context.ProfileInterceptorContext)).setAttemptedFlow(flowRequestContext.getActiveFlow().getApplicationContext().getBean('intercept/attribute-release-query'))" />
+ <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.profile.context.ProfileInterceptorContext)).setAttemptedFlow(flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.ProfileInterceptorFlowDescriptorManager').getComponents().?[id matches 'intercept/attribute-release-query'])" />
<transition on="success" to="ConsentFlow" />
</action-state>
diff --git a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java
index cf301630e..cdad484e4 100644
--- a/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java
+++ b/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java
@@ -100,8 +100,6 @@ public class ConsentSerializer extends AbstractInitializableComponent implements
ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
symbolics = HashBiMap.create(Constraint.isNotNull(mappings, "Symbolic mappings cannot be null"));
-
- log.debug("symbolics '{}'", symbolics);
}
/**
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list