[java-shib-idp2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/edu/internet2/middleware/shibboleth/i...

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Oct 10 19:41:37 2011
New Revision: 3074

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3074&view=rev
Log:
Expose configuration options to indicate whether the external authn system login handler support passive and forced authentication - SIDP-511

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/AbstractLoginHandler.java
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/ExternalAuthnSystemLoginHandlerBeanDefinitionParser.java
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/ExternalAuthnSystemLoginHandlerFactoryBean.java
    branches/REL_2/src/main/resources/schema/shibboleth-2.0-idp-profile-handler.xsd

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=3074&r1=3073&r2=3074&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Mon Oct 10 19:41:37 2011
@@ -1,8 +1,9 @@
 Changes in Release 2.3.4
 =============================================
-[SIDP-516] - Example login.jsp / Usage of label tag
+[SIDP-511] - ExternalAuthnSystemLoginHandler does not support forceAuthn/isPassive
 [SIDP-513] - idpui taglib could look for more languages matches
 [SIDP-514] - Alt text for IdP Logos is not esapiEncoder.encodeForHTMLAttribute
+[SIDP-516] - Example login.jsp / Usage of label tag
 [SIDP-519] - Switching between multiple login handlers cause first context to be sticky in Shib-Authentication-Method
 [SIDP-520] - Ipad/iOS devices will auto capitalize text entered into the IdP login screen, which can cause errors. Adding an HTML element will prevent that
 [SIDP-522] - supplied examples shouldn't promote federation URIs as relying parties

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/AbstractLoginHandler.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/AbstractLoginHandler.java?rev=3074&r1=3073&r2=3074&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/AbstractLoginHandler.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/authn/provider/AbstractLoginHandler.java Mon Oct 10 19:41:37 2011
@@ -23,9 +23,7 @@
 
 import edu.internet2.middleware.shibboleth.idp.authn.LoginHandler;
 
-/**
- * Base class for authentication handlers.
- */
+/** Base class for authentication handlers. */
 public abstract class AbstractLoginHandler implements LoginHandler {
     
     /** Authentication methods this handler supports. */
@@ -34,7 +32,7 @@
     /** Length of time, in milliseconds, after which a user should be re-authenticated. */
     private long authenticationDuration;
 
-    /** Whether this handler supports foreced re-authentication. */
+    /** Whether this handler supports forced re-authentication. */
     private boolean supportsForceAuthentication;
 
     /** Whether this handler supports passive authentication. */

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/ExternalAuthnSystemLoginHandlerBeanDefinitionParser.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/ExternalAuthnSystemLoginHandlerBeanDefinitionParser.java?rev=3074&r1=3073&r2=3074&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/ExternalAuthnSystemLoginHandlerBeanDefinitionParser.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/config/profile/authn/ExternalAuthnSystemLoginHandlerBeanDefinitionParser.java Mon Oct 10 19:41:37 2011
@@ -20,6 +20,7 @@
 import javax.xml.namespace.QName;
 
 import org.opensaml.xml.util.DatatypeHelper;
+import org.opensaml.xml.util.XMLHelper;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.w3c.dom.Element;
 
@@ -41,8 +42,22 @@
     /** {@inheritDoc} */
     protected void doParse(Element config, BeanDefinitionBuilder builder) {
         super.doParse(config, builder);
-
+        
         builder.addPropertyValue("externalAuthnPath",
                 DatatypeHelper.safeTrimOrNullString(config.getAttributeNS(null, "externalAuthnPath")));
+        
+        if (config.hasAttributeNS(null, "supportsForcedAuthentication")) {
+            builder.addPropertyValue("supportsForcedAuthentication", XMLHelper.getAttributeValueAsBoolean(config
+                    .getAttributeNodeNS(null, "supportsForcedAuthentication")));
+        } else {

[... 108 lines stripped ...]