[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml id...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jul 21 06:41:45 2014
New Revision: 6316

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6316&view=rev
Log:
IDP-245 Checkpoint work on providing MDUI information to Velocity

Added:
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/SetRPUIInformation.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIContext.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIData.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/RelyingPartyUIInformation.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/SAMLRelyingPartyUIInformation.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/context/package-info.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/saml/
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceDescriptionTag.java
    trunk/idp-ui/src/test/java/net/

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml?rev=6316&r1=6315&r2=6316&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml Mon Jul 21 06:41:45 2014
@@ -24,6 +24,10 @@
         p:uppercase-ref="shibboleth.authn.Password.Uppercase"
         p:trim-ref="shibboleth.authn.Password.Trim"
         p:transforms-ref="shibboleth.authn.Password.Transforms" />
+
+    <bean id="SetRPUIInformation"
+        class="net.shibboleth.idp.ui.context.SetRPUIInformation" scope="prototype"
+        p:httpServletRequest-ref="shibboleth.HttpServletRequest"/>
     
     <bean id="ExtractUsernamePasswordFromFormRequest"
         class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromFormRequest" scope="prototype"
@@ -62,5 +66,55 @@
         p:classifiedMessages-ref="shibboleth.authn.Password.ClassifiedMessageMap"
         p:resultCachingPredicate="#{getObject('shibboleth.authn.Password.resultCachingPredicate')}"
         p:returnAttributes-ref="shibboleth.authn.LDAP.returnAttributes" />
+
+    <bean name="authenticator" class="org.ldaptive.auth.Authenticator" lazy-init="true"
+            p:resolveEntryOnFailure="true">
+        <constructor-arg index="0">
+            <bean class="org.ldaptive.auth.SearchDnResolver"
+                p:baseDn-ref="shibboleth.authn.LDAP.baseDn"
+                p:subtreeSearch-ref="shibboleth.authn.LDAP.subtreeSearch"
+                p:userFilter-ref="shibboleth.authn.LDAP.userFilter"
+                p:connectionFactory-ref="connectionFactory" />
+        </constructor-arg>
+        <constructor-arg index="1">
+            <bean class="org.ldaptive.auth.BindAuthenticationHandler"
+                p:connectionFactory-ref="connectionFactory" />
+        </constructor-arg>
+        <!-- used to test account states
+             see businessCategory in src/test/config/ldap.ldif
+        <property name="authenticationResponseHandlers">
+          <bean class="common.MockAuthenticationResponseHandler">
+            <constructor-arg>
+              <array>
+              <bean class="org.ldaptive.auth.AccountState">
+                <constructor-arg>
+                  <bean class="org.ldaptive.auth.AccountState.DefaultWarning">
+                    <constructor-arg index="0">
+                      <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+                        <property name="staticMethod"><value>java.util.Calendar.getInstance</value></property>
+                      </bean>
+                    </constructor-arg>
+                    <constructor-arg index="1"><value>10</value></constructor-arg>
+                  </bean>
+                </constructor-arg>
+              </bean>
+              <bean class="org.ldaptive.auth.ext.PasswordPolicyAccountState">
+                <constructor-arg index="0">
+                  <value type="org.ldaptive.control.PasswordPolicyControl.Error">PASSWORD_EXPIRED</value>
+                </constructor-arg>
+              </bean>
+              </array>
+            </constructor-arg>
+          </bean>
+        </property>
+        -->
+    </bean>
+
+    <bean name="connectionFactory" class="org.ldaptive.DefaultConnectionFactory" lazy-init="true">
+        <constructor-arg>
+            <bean class="org.ldaptive.ConnectionConfig"
+                p:ldapUrl-ref="shibboleth.authn.LDAP.ldapUrl" />
+        </constructor-arg>
+    </bean>
     
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml

[... 402 lines stripped ...]