[java-identity-provider] branch main updated: IDP-1652 - Redesign handling of lists of descriptors
Scott Cantor
cantor.2 at osu.edu
Tue Aug 18 22:09:23 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=15aba3595cb41326fbce49e1c2648082334b79a9
The following commit(s) were added to refs/heads/main by this push:
new 15aba3595 IDP-1652 - Redesign handling of lists of descriptors
15aba3595 is described below
commit 15aba3595cb41326fbce49e1c2648082334b79a9
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Aug 18 18:09:14 2020 -0400
IDP-1652 - Redesign handling of lists of descriptors
https://issues.shibboleth.net/jira/browse/IDP-1652
Support auto-wired
ProfileInterceptorFlowDescriptors.
---
.../idp/conf/profile-intercept-system.xml | 6 +++
.../idp/flows/cas/cas-abstract-beans.xml | 4 +-
.../net/shibboleth/idp/flows/cas/login-beans.xml | 2 +-
.../idp/flows/saml/saml-abstract-beans.xml | 6 +--
.../ProfileInterceptorFlowDescriptorManager.java | 47 ++++++++++++++++++++++
5 files changed, 59 insertions(+), 6 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 0f41497ff..d32f1621c 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
@@ -14,6 +14,12 @@
<import resource="${idp.home}/conf/intercept/profile-intercept.xml" />
+ <!-- Management bean to collect and expose AuthenticationFlowDescriptors. -->
+
+ <bean id="shibboleth.ProfileInterceptorFlowDescriptorManager"
+ class="net.shibboleth.idp.profile.interceptor.impl.ProfileInterceptorFlowDescriptorManager"
+ p:components="#{getObject('shibboleth.AvailableInterceptFlows')}" />
+
<!-- Parent bean for intercept interceptor flows. -->
<bean id="shibboleth.InterceptFlow" abstract="true"
class="net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
index 8b7ce5eec..42c8ff730 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/cas-abstract-beans.xml
@@ -35,7 +35,7 @@
<bean id="PopulateInboundInterceptContext"
class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
- p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
+ p:availableFlows="#{@'shibboleth.ProfileInterceptorFlowDescriptorManager'.getComponents()}">
<property name="activeFlowsLookupStrategy">
<bean class="net.shibboleth.idp.profile.config.navigate.InboundFlowsLookupFunction" />
</property>
@@ -43,7 +43,7 @@
<bean id="PopulateOutboundInterceptContext"
class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
- p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
+ p:availableFlows="#{@'shibboleth.ProfileInterceptorFlowDescriptorManager'.getComponents()}">
<property name="activeFlowsLookupStrategy">
<bean class="net.shibboleth.idp.profile.config.navigate.OutboundFlowsLookupFunction" />
</property>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-beans.xml
index 02b45ec7e..1fab7270f 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/cas/login-beans.xml
@@ -43,7 +43,7 @@
<bean id="PopulatePostAuthnInterceptContext"
class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
- p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
+ p:availableFlows="#{@'shibboleth.ProfileInterceptorFlowDescriptorManager'.getComponents()}">
<property name="activeFlowsLookupStrategy">
<bean class="net.shibboleth.idp.authn.config.navigate.PostAuthenticationFlowsLookupFunction" />
</property>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
index c40d67cc6..668b1a6df 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml-abstract-beans.xml
@@ -111,7 +111,7 @@
<bean id="PopulateInboundInterceptContext"
class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
- p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
+ p:availableFlows="#{@'shibboleth.ProfileInterceptorFlowDescriptorManager'.getComponents()}">
<property name="activeFlowsLookupStrategy">
<bean class="net.shibboleth.idp.profile.config.navigate.InboundFlowsLookupFunction" />
</property>
@@ -229,7 +229,7 @@
<bean id="PopulatePostAuthnInterceptContext"
class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
- p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
+ p:availableFlows="#{@'shibboleth.ProfileInterceptorFlowDescriptorManager'.getComponents()}">
<property name="activeFlowsLookupStrategy">
<bean class="net.shibboleth.idp.authn.config.navigate.PostAuthenticationFlowsLookupFunction" />
</property>
@@ -288,7 +288,7 @@
<bean id="PopulateOutboundInterceptContext"
class="net.shibboleth.idp.profile.interceptor.impl.PopulateProfileInterceptorContext" scope="prototype"
- p:availableFlows-ref="shibboleth.AvailableInterceptFlows">
+ p:availableFlows="#{@'shibboleth.ProfileInterceptorFlowDescriptorManager'.getComponents()}">
<property name="activeFlowsLookupStrategy">
<bean class="net.shibboleth.idp.profile.config.navigate.OutboundFlowsLookupFunction" />
</property>
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/ProfileInterceptorFlowDescriptorManager.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/ProfileInterceptorFlowDescriptorManager.java
new file mode 100644
index 000000000..c7e3403d8
--- /dev/null
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/interceptor/impl/ProfileInterceptorFlowDescriptorManager.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.shibboleth.idp.profile.interceptor.impl;
+
+import java.util.Collection;
+
+import javax.annotation.Nullable;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import net.shibboleth.ext.spring.util.IdentifiedComponentManager;
+import net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor;
+import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+
+/**
+ * Manager of {@link ProfileInterceptorFlowDescriptor} objects.
+ */
+public class ProfileInterceptorFlowDescriptorManager
+ extends IdentifiedComponentManager<ProfileInterceptorFlowDescriptor> {
+
+ /**
+ * Constructor.
+ *
+ * @param freeObjects free-standing objects to add
+ */
+ @Autowired
+ public ProfileInterceptorFlowDescriptorManager(
+ @Nullable @NonnullElements final Collection<ProfileInterceptorFlowDescriptor> freeObjects) {
+ super(freeObjects);
+ }
+
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list