[java-identity-provider COMMIT] in /trunk/idp-authn-impl/src: main/java/net/shibboleth/idp/authn/impl/DisplayUsername...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Sep  2 15:28:24 2013
New Revision: 4739

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4739&view=rev
Log:
Convert login form display into a view-state.

Added:
    trunk/idp-authn-impl/src/main/resources/conf/
    trunk/idp-authn-impl/src/main/resources/conf/jaas.config
    trunk/idp-authn-impl/src/main/resources/flows/jaas-form-authn-beans.xml   (with props)
    trunk/idp-authn-impl/src/main/resources/flows/jaas-form-authn-flow.xml   (with props)
    trunk/idp-authn-impl/src/main/resources/templates/login.vm
      - copied, changed from r4730, trunk/idp-authn-impl/src/main/resources/templates/login.vt
Modified:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DisplayUsernamePasswordPage.java
    trunk/idp-authn-impl/src/main/resources/flows/authn-flow-descriptors.xml
    trunk/idp-authn-impl/src/main/resources/templates/login.vt
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/DisplayUsernamePasswordPageTest.java

Modified: trunk/idp-authn-impl/src/main/resources/flows/authn-flow-descriptors.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/resources/flows/authn-flow-descriptors.xml?rev=4739&r1=4738&r2=4739&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/resources/flows/authn-flow-descriptors.xml (original)
+++ trunk/idp-authn-impl/src/main/resources/flows/authn-flow-descriptors.xml Mon Sep  2 15:28:24 2013
@@ -17,7 +17,7 @@
     -->
 
     <util:list id="AvailableAuthenticationFlows">
-        <!--
+        
         <bean c:id="AuthenticationFlow/IPAddress" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
                 p:passiveAuthenticationSupported="true"
                 p:forcedAuthenticationSupported="false"
@@ -29,7 +29,35 @@
                 </list>
             </property>
         </bean>
-        -->
+        
+        <bean c:id="AuthenticationFlow/RemoteUser" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
+                p:passiveAuthenticationSupported="false"
+                p:forcedAuthenticationSupported="true"
+                p:lifetime="PT60M" p:inactivityTimeout="PT30M">
+            <property name="supportedPrincipals">
+                <list>
+                    <bean class="net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal"
+                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
+                    <bean class="net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal"
+                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Password" />
+                </list>
+            </property>
+        </bean>
+
+        <bean c:id="AuthenticationFlow/JAASForm" class="net.shibboleth.idp.authn.AuthenticationFlowDescriptor"
+                p:passiveAuthenticationSupported="false"
+                p:forcedAuthenticationSupported="true"
+                p:lifetime="PT60M" p:inactivityTimeout="PT30M">
+            <property name="supportedPrincipals">
+                <list>
+                    <bean class="net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal"
+                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport" />
+                    <bean class="net.shibboleth.idp.saml.authn.AuthnContextClassRefPrincipal"
+                        c:classRef="urn:oasis:names:tc:SAML:2.0:ac:classes:Password" />
+                </list>
+            </property>
+        </bean>
+        
     </util:list>
 
 </beans>

Copied: trunk/idp-authn-impl/src/main/resources/templates/login.vm (from r4730, trunk/idp-authn-impl/src/main/resources/templates/login.vt)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/resources/templates/login.vm?p2=trunk/idp-authn-impl/src/main/resources/templates/login.vm&p1=trunk/idp-authn-impl/src/main/resources/templates/login.vt&r1=4730&r2=4739&rev=4739&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/resources/templates/login.vt (original)
+++ trunk/idp-authn-impl/src/main/resources/templates/login.vm Mon Sep  2 15:28:24 2013
@@ -1,22 +1,27 @@
 ##
-## Velocity Template for DisplayUsernamePasswordPage action
+## Velocity Template for DisplayUsernamePasswordPage view-state
 ##
-## Velocity context may contain the following properties
-## context - ProfileRequestContext
-## encoder - ESAPI Encoder
-## action - String - the action URL for the form
-## usernameFieldName - String - the field name for collecting username
-## passwordFieldName - String - the field name for collecting password
+## Velocity context will contain the following properties
+## flowExecutionUrl - the form action location
+## flowRequestContext - the Spring Web Flow RequestContext
+## flowExecutionKey - the SWF execution key (this is built into the flowExecutionUrl)
+

[... 25 lines stripped ...]