[java-identity-provider] branch master updated: IDP-1397 - Removal of deprecated features
Scott Cantor
cantor.2 at osu.edu
Wed Jan 9 19:15:36 EST 2019
This is an automated email from the git hooks/post-receive script.
scantor 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=6bcec4042dca84067575fb555686be68b388aa15
The following commit(s) were added to refs/heads/master by this push:
new 6bcec40 IDP-1397 - Removal of deprecated features
6bcec40 is described below
commit 6bcec4042dca84067575fb555686be68b388aa15
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jan 9 19:15:13 2019 -0500
IDP-1397 - Removal of deprecated features
https://issues.shibboleth.net/jira/browse/IDP-1397
Removal of initial authentication feature.
---
.../main/resources/system/conf/global-system.xml | 4 +---
.../main/resources/system/conf/webflow-config.xml | 1 -
.../system/flows/admin/admin-abstract-beans.xml | 4 ----
.../system/flows/admin/admin-abstract-flow.xml | 24 ++++----------------
.../system/flows/cas/login/login-beans.xml | 4 ----
.../system/flows/cas/login/login-flow.xml | 24 ++++----------------
.../system/flows/saml/saml-abstract-beans.xml | 4 ----
.../system/flows/saml/saml1/sso-abstract-flow.xml | 26 +++++-----------------
.../system/flows/saml/saml2/sso-abstract-flow.xml | 26 +++++-----------------
9 files changed, 19 insertions(+), 98 deletions(-)
diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index 3d95223..179b947 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -69,9 +69,6 @@
<property name="deprecatedProperties">
<map>
<entry key="idp.httpclient.useTrustEngineTLSSocketFactory" value="idp.httpclient.useSecurityEnhancedTLSSocketFactory" />
- <entry key="idp.authn.flows.initial">
- <null/>
- </entry>
<entry key="idp.authn.resolveAttribute">
<null/>
</entry>
@@ -90,6 +87,7 @@
</property>
<property name="deadProperties">
<list>
+ <value>idp.authn.flows.initial</value>
</list>
</property>
</bean>
diff --git a/idp-conf/src/main/resources/system/conf/webflow-config.xml b/idp-conf/src/main/resources/system/conf/webflow-config.xml
index 261fc99..6b6a4b1 100644
--- a/idp-conf/src/main/resources/system/conf/webflow-config.xml
+++ b/idp-conf/src/main/resources/system/conf/webflow-config.xml
@@ -72,7 +72,6 @@
<!-- Master flow for authentication. -->
<entry key="authn.events" value="../conf/authn/authn-events-flow.xml" />
<entry key="authn.abstract" value="../system/flows/authn/authn-abstract-flow.xml" />
- <entry key="authn-initial" value="../system/flows/authn/initial-authn-flow.xml" />
<entry key="authn" value="../system/flows/authn/authn-flow.xml" />
<!-- Login methods. -->
diff --git a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml b/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
index 4a10b95..79b04bc 100644
--- a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
@@ -48,10 +48,6 @@
<bean id="InitializeAuthenticationContext"
class="net.shibboleth.idp.saml.profile.impl.InitializeAuthenticationContext" scope="prototype" />
- <bean id="InitialAuthenticationFlag" class="java.lang.Boolean">
- <constructor-arg value="#{ '%{idp.authn.flows.initial:}'.trim().length() gt 0 }" type="boolean" />
- </bean>
-
<bean id="InitializeRequestedPrincipalContext"
class="net.shibboleth.idp.authn.impl.InitializeRequestedPrincipalContext" scope="prototype" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
index f5293ba..912a78f 100644
--- a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
@@ -35,31 +35,15 @@
<evaluate expression="'proceed'" />
<transition on="proceed" to="ClientStorageLoad" />
- <transition on="NoLoadNeeded" to="CheckInitialAuthentication" />
+ <transition on="NoLoadNeeded" to="AuthenticationSetup" />
</action-state>
<subflow-state id="ClientStorageLoad" subflow="client-storage/read">
<input name="calledAsSubflow" value="true" />
- <transition on="proceed" to="CheckInitialAuthentication"/>
+ <transition on="proceed" to="AuthenticationSetup"/>
</subflow-state>
- <decision-state id="CheckInitialAuthentication">
- <if test="InitialAuthenticationFlag" then="PreInitialSetup" else="PostInitialSetup" />
- </decision-state>
-
- <action-state id="PreInitialSetup">
- <evaluate expression="InitializeAuthenticationContext" />
- <evaluate expression="'proceed'" />
-
- <transition on="proceed" to="DoInitialAuthenticationSubflow" />
- </action-state>
-
- <subflow-state id="DoInitialAuthenticationSubflow" subflow="authn-initial">
- <input name="calledAsSubflow" value="true" />
- <transition on="proceed" to="PostInitialSetup" />
- </subflow-state>
-
- <action-state id="PostInitialSetup">
+ <action-state id="AuthenticationSetup">
<evaluate expression="InitializeAuthenticationContext" />
<evaluate expression="InitializeRequestedPrincipalContext" />
<evaluate expression="'proceed'" />
@@ -70,7 +54,7 @@
<subflow-state id="DoAuthenticationSubflow" subflow="authn">
<input name="calledAsSubflow" value="true" />
<transition on="proceed" to="ResolveAttributes" />
- <transition on="RestartAuthentication" to="PostInitialSetup" />
+ <transition on="RestartAuthentication" to="AuthenticationSetup" />
</subflow-state>
<decision-state id="ResolveAttributes">
diff --git a/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml b/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
index fbaf62d..a87c776 100644
--- a/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
@@ -66,10 +66,6 @@
<bean id="PopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
p:fieldExtractors="#{getObject('shibboleth.CASLoginAuditExtractors') ?: getObject('shibboleth.DefaultCASLoginAuditExtractors')}" />
- <bean id="InitialAuthenticationFlag" class="java.lang.Boolean">
- <constructor-arg value="#{ '%{idp.authn.flows.initial:}'.trim().length() gt 0 }" type="boolean" />
- </bean>
-
<!-- Supplementary beans -->
<bean id="SessionContextLookup"
class="org.opensaml.messaging.context.navigate.ChildContextLookup"
diff --git a/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml b/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
index 44dfae0..f19a142 100644
--- a/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
@@ -50,7 +50,7 @@
<decision-state id="CheckAuthenticationRequired">
<if test="flowScope.serviceTicketRequest.gateway"
then="CheckForExistingSession"
- else="CheckInitialAuthenticationRequired" />
+ else="AuthenticationSetup" />
</decision-state>
<decision-state id="CheckForExistingSession">
@@ -67,23 +67,7 @@
<transition to="CheckOutboundInterceptContext" />
</action-state>
- <decision-state id="CheckInitialAuthenticationRequired">
- <if test="InitialAuthenticationFlag" then="PreInitialSetup" else="PostInitialSetup" />
- </decision-state>
-
- <action-state id="PreInitialSetup">
- <evaluate expression="BuildAuthenticationContext"/>
- <evaluate expression="'proceed'" />
-
- <transition on="proceed" to="DoInitialAuthenticationSubflow" />
- </action-state>
-
- <subflow-state id="DoInitialAuthenticationSubflow" subflow="authn-initial">
- <input name="calledAsSubflow" value="true" />
- <transition on="proceed" to="PostInitialSetup" />
- </subflow-state>
-
- <action-state id="PostInitialSetup">
+ <action-state id="AuthenticationSetup">
<evaluate expression="BuildAuthenticationContext"/>
<evaluate expression="'proceed'" />
@@ -95,7 +79,7 @@
<transition on="proceed" to="CheckResolveAttributes">
<evaluate result="flowScope.hasAuthenticationContext" expression="true" />
</transition>
- <transition on="RestartAuthentication" to="PostInitialSetup" />
+ <transition on="RestartAuthentication" to="AuthenticationSetup" />
</subflow-state>
<decision-state id="CheckResolveAttributes">
@@ -133,7 +117,7 @@
<subflow-state id="DoPostAuthnInterceptSubflow" subflow="intercept">
<input name="calledAsSubflow" value="true" />
<transition on="proceed" to="GrantServiceTicket" />
- <transition on="RestartAuthentication" to="PostInitialSetup" />
+ <transition on="RestartAuthentication" to="AuthenticationSetup" />
</subflow-state>
<action-state id="GrantServiceTicket">
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml b/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
index c3f4d92..5a2d3b8 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
@@ -227,10 +227,6 @@
<bean id="InitializeAuthenticationContext"
class="net.shibboleth.idp.saml.profile.impl.InitializeAuthenticationContext" scope="prototype" />
- <bean id="InitialAuthenticationFlag" class="java.lang.Boolean">
- <constructor-arg value="#{ '%{idp.authn.flows.initial:}'.trim().length() gt 0 }" type="boolean" />
- </bean>
-
<bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes" scope="prototype"
c:resolverService-ref="shibboleth.AttributeResolverService"
p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}" />
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
index 29f3750..3769480 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
@@ -21,31 +21,15 @@
<evaluate expression="'proceed'" />
<transition on="proceed" to="ClientStorageLoad" />
- <transition on="NoLoadNeeded" to="CheckInitialAuthentication" />
+ <transition on="NoLoadNeeded" to="AuthenticationSetup" />
</action-state>
<subflow-state id="ClientStorageLoad" subflow="client-storage/read">
<input name="calledAsSubflow" value="true" />
- <transition on="proceed" to="CheckInitialAuthentication"/>
+ <transition on="proceed" to="AuthenticationSetup"/>
</subflow-state>
- <decision-state id="CheckInitialAuthentication">
- <if test="InitialAuthenticationFlag" then="PreInitialSetup" else="PostInitialSetup" />
- </decision-state>
-
- <action-state id="PreInitialSetup">
- <evaluate expression="InitializeAuthenticationContext" />
- <evaluate expression="'proceed'" />
-
- <transition on="proceed" to="DoInitialAuthenticationSubflow" />
- </action-state>
-
- <subflow-state id="DoInitialAuthenticationSubflow" subflow="authn-initial">
- <input name="calledAsSubflow" value="true" />
- <transition on="proceed" to="PostInitialSetup" />
- </subflow-state>
-
- <action-state id="PostInitialSetup">
+ <action-state id="AuthenticationSetup">
<evaluate expression="InitializeAuthenticationContext" />
<evaluate expression="'proceed'" />
@@ -55,7 +39,7 @@
<subflow-state id="DoAuthenticationSubflow" subflow="authn">
<input name="calledAsSubflow" value="true" />
<transition on="proceed" to="ResolveAttributes" />
- <transition on="RestartAuthentication" to="PostInitialSetup" />
+ <transition on="RestartAuthentication" to="AuthenticationSetup" />
</subflow-state>
<decision-state id="ResolveAttributes">
@@ -81,7 +65,7 @@
<subflow-state id="DoPostAuthnInterceptSubflow" subflow="intercept">
<input name="calledAsSubflow" value="true" />
<transition on="proceed" to="BuildResponse" />
- <transition on="RestartAuthentication" to="PostInitialSetup" />
+ <transition on="RestartAuthentication" to="AuthenticationSetup" />
</subflow-state>
<action-state id="BuildResponse">
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
index 574a98a..cfe78d5 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
@@ -26,31 +26,15 @@
<evaluate expression="'proceed'" />
<transition on="proceed" to="ClientStorageLoad" />
- <transition on="NoLoadNeeded" to="CheckInitialAuthentication" />
+ <transition on="NoLoadNeeded" to="AuthenticationSetup" />
</action-state>
<subflow-state id="ClientStorageLoad" subflow="client-storage/read">
<input name="calledAsSubflow" value="true" />
- <transition on="proceed" to="CheckInitialAuthentication"/>
+ <transition on="proceed" to="AuthenticationSetup"/>
</subflow-state>
- <decision-state id="CheckInitialAuthentication">
- <if test="InitialAuthenticationFlag" then="PreInitialSetup" else="PostInitialSetup" />
- </decision-state>
-
- <action-state id="PreInitialSetup">
- <evaluate expression="InitializeAuthenticationContext" />
- <evaluate expression="'proceed'" />
-
- <transition on="proceed" to="DoInitialAuthenticationSubflow" />
- </action-state>
-
- <subflow-state id="DoInitialAuthenticationSubflow" subflow="authn-initial">
- <input name="calledAsSubflow" value="true" />
- <transition on="proceed" to="PostInitialSetup" />
- </subflow-state>
-
- <action-state id="PostInitialSetup">
+ <action-state id="AuthenticationSetup">
<evaluate expression="InitializeAuthenticationContext" />
<evaluate expression="ProcessRequestedAuthnContext" />
<evaluate expression="'proceed'" />
@@ -61,7 +45,7 @@
<subflow-state id="DoAuthenticationSubflow" subflow="authn">
<input name="calledAsSubflow" value="true" />
<transition on="proceed" to="ResolveAttributes" />
- <transition on="RestartAuthentication" to="PostInitialSetup" />
+ <transition on="RestartAuthentication" to="AuthenticationSetup" />
</subflow-state>
<decision-state id="ResolveAttributes">
@@ -87,7 +71,7 @@
<subflow-state id="DoPostAuthnInterceptSubflow" subflow="intercept">
<input name="calledAsSubflow" value="true" />
<transition on="proceed" to="BuildResponse" />
- <transition on="RestartAuthentication" to="PostInitialSetup" />
+ <transition on="RestartAuthentication" to="AuthenticationSetup" />
</subflow-state>
<action-state id="BuildResponse">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list