[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn/password-authn-config.xml conf/inte...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov 20 14:59:07 2014
New Revision: 6971

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6971&view=rev
Log:
- Refactor intercept configs into separate flow configs
- Hide authn flow bean processors in system bean files

Added:
    trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml   (with props)
    trunk/idp-conf/src/main/resources/conf/intercept/context-check-intercept-config.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/authn/password-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml
    trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/x509-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/x509-internal-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/context-check-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/password-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/password-authn-config.xml?rev=6971&r1=6970&r2=6971&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/password-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/password-authn-config.xml Thu Nov 20 14:59:07 2014
@@ -11,9 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
-        p:placeholderPrefix="%{" p:placeholderSuffix="}" />
     
     <!-- Choose an import based on the back-end you want to use. -->
     <!-- <import resource="jaas-authn-config.xml" /> -->

Modified: trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml?rev=6971&r1=6970&r2=6971&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/profile-intercept.xml Thu Nov 20 14:59:07 2014
@@ -35,57 +35,5 @@
             </list>
         </property>
     </bean>
-    
-    <!--
-    Condition to evaluate to interrupt SSO flows to check the state of the transaction before allowing.
-    
-    Typically the flow itself will be activated based on configuration in relying-party.xml, and this controls
-    whether to proceed if the flow is activated. The most common use for this flow is to check the set of
-    resolved/filtered attributes and values to see if the user is authorized or provisioned into a service.
-    -->
-    <bean id="shibboleth.context-check.Condition" parent="shibboleth.Conditions.AND">
-        <constructor-arg>
-            <list>
-                <bean parent="shibboleth.Conditions.RelyingPartyId" c:candidates="#{ 'https://sp.example.org' }" />
-                <bean class="net.shibboleth.idp.profile.logic.SimpleAttributePredicate">
-                    <property name="attributeValueMap">
-                        <map>
-                            <entry key="eppn">
-                                <list>
-                                    <value>*</value>
-                                </list>
-                            </entry>
-                        </map>
-                    </property>
-                </bean>
-            </list>
-        </constructor-arg>
-    </bean>
-
-    <!-- The ID of the attribute to be used as the user identifier when storing consent records. -->
-    <!-- TODO add property to properties file -->
-    <!-- TODO doc -->
-    <bean id="shibboleth.consent.UserIdentifierAttributeId" class="java.lang.String"
-        c:_0="%{idp.consent.userIdentifierAttributeId:email}" />
-
-
-    <!-- Attribute release whitelist, blacklist, and match expression to determine 
-        whether consent should be obtained for an attribute based on the attribute ID. -->
-    <util:list id="shibboleth.attribute-release.WhitelistedAttributeIDs">
-        <!--
-        <value>email</value>
-        -->
-    </util:list>
-
-    <util:list id="shibboleth.attribute-release.BlacklistedAttributeIDs">
-        <value>transientId</value>

[... 415 lines stripped ...]