[java-identity-provider] branch master updated: IDP-1397 - Removal of deprecated features

[Scott Cantor]

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=c691d33e86575d2313abbaea91fd15f9bd2cc91a

The following commit(s) were added to refs/heads/master by this push:
       new  c691d33   IDP-1397 - Removal of deprecated features
c691d33 is described below

commit c691d33e86575d2313abbaea91fd15f9bd2cc91a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Aug 30 12:22:12 2019 -0400

    IDP-1397 - Removal of deprecated features
    
    https://issues.shibboleth.net/jira/browse/IDP-1397
    
    Pull attribute-based login flow filtering.
---
 .../main/resources/system/conf/global-system.xml   |  4 +---
 .../resources/system/flows/authn/authn-beans.xml   | 26 ----------------------
 .../resources/system/flows/authn/authn-flow.xml    |  4 ----
 3 files changed, 1 insertion(+), 33 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 8196ee9..424e6d5 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -72,9 +72,6 @@
         <property name="deprecatedProperties">
             <map>
                 <entry key="idp.httpclient.useTrustEngineTLSSocketFactory" value="idp.httpclient.useSecurityEnhancedTLSSocketFactory" />
-                <entry key="idp.authn.resolveAttribute">
-                    <null/>
-                </entry>
                 <entry key="idp.nameid.saml2.legacyGenerator">
                     <null/>
                 </entry>
@@ -91,6 +88,7 @@
         <property name="deadProperties">
             <list>
                 <value>idp.authn.flows.initial</value>
+                <value>idp.authn.resolveAttribute</value>
                 <value>idp.nameid.saml1.legacyGenerator</value>
                 <value>idp.nameid.saml2.legacyGenerator</value>
             </list>
diff --git a/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml b/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
index 2532332..38881ef 100644
--- a/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
@@ -49,32 +49,6 @@
         class="net.shibboleth.idp.authn.impl.InitializeRequestedPrincipalContext" scope="prototype"
         p:replaceExistingContext="%{idp.authn.overrideRequestedAuthnContext:false}" />
 
-    <bean id="ResolveAttributes"
-            class="net.shibboleth.idp.profile.impl.ResolveAttributes" scope="prototype"
-            c:resolverService-ref="shibboleth.AttributeResolverService"
-            p:activationCondition="#{ '%{idp.authn.resolveAttribute:null}' != 'null' }"
-            p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}">
-        <property name="attributesToResolve">
-            <bean parent="shibboleth.CommaDelimStringArray" c:_0="#{ '%{idp.authn.resolveAttribute:null}'.trim() }" />
-        </property>
-        <property name="principalNameLookupStrategy">
-            <bean parent="shibboleth.Functions.Compose"
-                c:g-ref="shibboleth.PrincipalNameLookup.Session"
-                c:f-ref="shibboleth.ChildLookup.SessionContext" />
-        </property>
-        <property name="attributeContextCreationStrategy">
-            <bean parent="shibboleth.Functions.Compose"
-                c:g-ref="shibboleth.ChildLookupOrCreate.AttributeContext"
-                c:f-ref="shibboleth.ChildLookup.AuthenticationContext" />
-        </property>
-    </bean>
-
-    <bean id="FilterFlowsByAttribute"
-        class="net.shibboleth.idp.authn.impl.FilterFlowsByAttribute" scope="prototype"
-        p:activationCondition="#{ '%{idp.authn.resolveAttribute:null}' != 'null' }"
-        p:attributeId="#{ T(org.springframework.util.StringUtils).commaDelimitedListToStringArray('%{idp.authn.resolveAttribute:null}'.trim())[0] }"
-        p:filterActiveResults="%{idp.authn.filterActiveResultsByAttribute:true}" />
-
     <bean id="FilterFlowsByForcedAuthn"
         class="net.shibboleth.idp.authn.impl.FilterFlowsByForcedAuthn" scope="prototype" />
     
diff --git a/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml b/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
index afdb9d2..2adc483 100644
--- a/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
@@ -28,13 +28,9 @@
    
     <action-state id="SessionExists">
         <evaluate expression="ExtractActiveAuthenticationResults" />
-        <evaluate expression="ResolveAttributes" />
-        <evaluate expression="FilterFlowsByAttribute" />
         <evaluate expression="'proceed'" />
 
         <transition on="proceed" to="FilterFlows" />
-        <!-- Suppress resolution failure. -->
-        <transition on="UnableToResolveAttributes" to="FilterFlows" />
     </action-state>
    
     <action-state id="FilterFlows">

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