[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn/general-authn.xml conf/authn/jaas-a...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jul  2 20:28:11 2014
New Revision: 6208

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6208&view=rev
Log:
Consolidate password flows into one flow. This is just clearly simpler.

Added:
    trunk/idp-conf/src/main/resources/conf/authn/password-authn-config.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
      - copied, changed from r6207, trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml
      - copied, changed from r6207, trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml
    trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/logback.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml?rev=6208&r1=6207&r2=6208&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml Wed Jul  2 20:28:11 2014
@@ -47,11 +47,7 @@
 
         <bean id="authn/RemoteUserInternal" parent="shibboleth.AuthenticationFlow" />
 
-        <bean id="authn/JAAS" parent="shibboleth.AuthenticationFlow"
-                p:passiveAuthenticationSupported="true"
-                p:forcedAuthenticationSupported="true" />
-
-        <bean id="authn/LDAP" parent="shibboleth.AuthenticationFlow"
+        <bean id="authn/Password" parent="shibboleth.AuthenticationFlow"
                 p:passiveAuthenticationSupported="true"
                 p:forcedAuthenticationSupported="true" />
 

Modified: trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml?rev=6208&r1=6207&r2=6208&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml Wed Jul  2 20:28:11 2014
@@ -11,11 +11,9 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-       
-    <context:property-placeholder />
     
     <!-- Specify your JAAS config. -->
-    <bean id="JAASConfig" class="org.springframework.core.io.FileSystemResource" c:path="${idp.home}/conf/authn/jaas.config" />
+    <bean id="JAASConfig" class="org.springframework.core.io.FileSystemResource" c:path="%{idp.home}/conf/authn/jaas.config" />
     
     <util:property-path id="shibboleth.authn.JAAS.JAASConfigURI" path="JAASConfig.URI" />
     
@@ -24,50 +22,6 @@
         <value>ShibUserPassAuth</value>
     </util:list>
 
-    <!-- Names of form fields to pull username and password from. -->
-    <bean id="shibboleth.authn.JAAS.UsernameFieldName" class="java.lang.String" c:_0="j_username" />
-    <bean id="shibboleth.authn.JAAS.PasswordFieldName" class="java.lang.String" c:_0="j_password" />
-    <bean id="shibboleth.authn.JAAS.SSOBypassFieldName" class="java.lang.String" c:_0="donotcache" />
-
-    <!-- Simple transforms to apply to username before validation. -->
-    <util:constant id="shibboleth.authn.JAAS.Lowercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.authn.JAAS.Uppercase" static-field="java.lang.Boolean.FALSE"/>
-    <util:constant id="shibboleth.authn.JAAS.Trim" static-field="java.lang.Boolean.TRUE"/>
-
-    <!-- Apply any regular expression replacement pairs before validation. -->
-    <util:list id="shibboleth.authn.JAAS.Transforms">
-        <!--
-        <bean parent="shibboleth.Pair" p:first="^(.+)@example\.edu$" p:second="$1" />
-        -->
-    </util:list>
-
-    <!--
-    Define entries here to map error messages thrown by JAAS modules and classify them as particular
-    kinds of errors for use in your templates and as events in flows.
-    -->
-    <util:map id="shibboleth.authn.JAAS.ClassifiedMessageMap">
-        <entry key="UnknownUsername">
-            <list>
-                <value>CLIENT_NOT_FOUND</value>
-                <value>DN_RESOLUTION_FAILURE</value>
-            </list>
-        </entry>
-        <entry key="InvalidPassword">

[... 310 lines stripped ...]