[java-idp-testbed COMMIT] in /trunk/src/main/resources: conf/idp.properties conf/ipaddress-authn-config.xml conf/jaas...

[noreply at shibboleth.net]

Author: scantor
Date: Sat Oct 19 17:04:58 2013
New Revision: 21

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=21&view=rev
Log:
Factor out JAAS config, and add extraction config beans to all methods.

Added:
    trunk/src/main/resources/conf/jaas-authn-config.xml   (with props)
Modified:
    trunk/src/main/resources/conf/idp.properties
    trunk/src/main/resources/conf/ipaddress-authn-config.xml
    trunk/src/main/resources/conf/remoteuser-authn-config.xml
    trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml
    trunk/src/main/resources/flows/authn/jaas-basic-authn-beans.xml
    trunk/src/main/resources/flows/authn/jaas-form-authn-beans.xml
    trunk/src/main/resources/flows/authn/remoteuser-authn-beans.xml

Modified: trunk/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/idp.properties?rev=21&r1=20&r2=21&view=diff
==============================================================================
--- trunk/src/main/resources/conf/idp.properties (original)
+++ trunk/src/main/resources/conf/idp.properties Sat Oct 19 17:04:58 2013
@@ -29,7 +29,7 @@
 idp.session.secondaryServiceIndex = false
 
 # Regular expression expressing flows to enable 
-idp.authn.flows = IPAddress
+idp.authn.flows = JAASForm
 
 # Default lifetime and timeout of various authentication methods
 idp.authn.defaultLifetime = PT60M

Modified: trunk/src/main/resources/conf/ipaddress-authn-config.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/ipaddress-authn-config.xml?rev=21&r1=20&r2=21&view=diff
==============================================================================
--- trunk/src/main/resources/conf/ipaddress-authn-config.xml (original)
+++ trunk/src/main/resources/conf/ipaddress-authn-config.xml Sat Oct 19 17:04:58 2013
@@ -9,10 +9,23 @@
                            http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-3.2.xsd
                            http://www.springframework.org/schema/util classpath:/org/springframework/beans/factory/xml/spring-util-3.2.xsd">
 
-    <!--
-    You can configure the address range(s) and principal name(s) for IP-based login here.
-    Do not change the name of the bean.
-    -->
+
+
+    <!-- Simple transforms to apply to address before validation. -->
+    <bean id="shibboleth.authn.IPAddress.Lowercase" class="java.lang.Boolean">
+        <constructor-arg type="boolean" value="false" />
+    </bean>
+    <bean id="shibboleth.authn.IPAddress.Uppercase" class="java.lang.Boolean">
+        <constructor-arg type="boolean" value="false" />
+    </bean>
+    <bean id="shibboleth.authn.IPAddress.Trim" class="java.lang.Boolean">
+        <constructor-arg type="boolean" value="true" />
+    </bean>
+
+    <!-- Apply any regular expression replacement pairs before validation. -->
+    <util:list id="shibboleth.authn.IPAddress.Transforms"/>
+
+    <!-- You can configure the address range(s) and principal name(s) for IP-based login here. -->
 
     <util:map id="shibboleth.authn.IPAddress.Mappings">
         <entry key="jdoe">

Modified: trunk/src/main/resources/conf/remoteuser-authn-config.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/remoteuser-authn-config.xml?rev=21&r1=20&r2=21&view=diff
==============================================================================
--- trunk/src/main/resources/conf/remoteuser-authn-config.xml (original)
+++ trunk/src/main/resources/conf/remoteuser-authn-config.xml Sat Oct 19 17:04:58 2013
@@ -32,6 +32,24 @@
         -->
     </util:list>
     
+    <!-- Simple transforms to apply to username before validation. -->
+    <bean id="shibboleth.authn.RemoteUser.Lowercase" class="java.lang.Boolean">
+        <constructor-arg type="boolean" value="false" />
+    </bean>
+    <bean id="shibboleth.authn.RemoteUser.Uppercase" class="java.lang.Boolean">
+        <constructor-arg type="boolean" value="false" />
+    </bean>
+    <bean id="shibboleth.authn.RemoteUser.Trim" class="java.lang.Boolean">
+        <constructor-arg type="boolean" value="true" />
+    </bean>
+
+    <!-- Apply any regular expression replacement pairs before validation. -->
+    <util:list id="shibboleth.authn.RemoteUser.Transforms">
+        <!--
+        <bean class="net.shibboleth.utilities.java.support.collection.Pair" p:first="^(.+)@example\.edu$" p:second="$1" />
+        -->
+    </util:list>
+    
     <!-- Uncomment/configure to install username whitelist, blacklist, and/or match expressions. -->
     
     <util:list id="shibboleth.authn.RemoteUser.whitelistedUsernames">
@@ -50,5 +68,5 @@
     <bean id="shibboleth.authn.RemoteUser.matchExpression" class="java.util.regex.Pattern" factory-method="compile"
         c:_0="^(.+)@example\.edu]$" />
     -->
-
+    
 </beans>

Modified: trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml?rev=21&r1=20&r2=21&view=diff

[... 112 lines stripped ...]