[java-idp-testbed COMMIT] in /trunk: pom.xml src/main/java/common/Main.java src/main/resources/conf/jaas.config src/m...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Sep 10 17:58:23 2013
New Revision: 5

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=5&view=rev
Log:
Embed Jetty so the webapp can be run inside Eclipse without the jetty-maven-plugin. Support LDAP authentication via JAAS. Replace hardcoded path to JAAS configuration via Spring classpath resource.

Added:
    trunk/src/main/java/common/Main.java   (with props)
Modified:
    trunk/pom.xml
    trunk/src/main/resources/conf/jaas.config
    trunk/src/main/resources/logback.xml
    trunk/src/main/webapp/WEB-INF/idp/flows/authn/jaas-basic-authn-beans.xml
    trunk/src/main/webapp/WEB-INF/idp/flows/authn/jaas-form-authn-beans.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=5&r1=4&r2=5&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Sep 10 17:58:23 2013
@@ -165,6 +165,28 @@
         </dependency>
 
         <!-- Runtime scope -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-jsp</artifactId>
+            <version>${jetty.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.ldaptive</groupId>
+            <artifactId>ldaptive</artifactId>
+            <version>1.0.1</version>
+            <scope>runtime</scope>
+        </dependency>
 
         <!-- Test scope -->
 
@@ -177,7 +199,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.0.3.v20130506</version>
+                <version>${jetty.version}</version>
 
                 <configuration>
                     <scanIntervalSeconds>10</scanIntervalSeconds>

Modified: trunk/src/main/resources/conf/jaas.config
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/jaas.config?rev=5&r1=4&r2=5&view=diff
==============================================================================
--- trunk/src/main/resources/conf/jaas.config (original)
+++ trunk/src/main/resources/conf/jaas.config Tue Sep 10 17:58:23 2013
@@ -1,3 +1,10 @@
 ShibUserPassAuth {
 	com.sun.security.auth.module.Krb5LoginModule required;
+/*
+    org.ldaptive.jaas.LdapLoginModule required
+      ldapUrl="ldap://ldap.example.org"
+      baseDn="ou=people,dc=example,dc=org"
+      ssl="true"
+      userFilter="uid={user}";
+*/
 };

Modified: trunk/src/main/resources/logback.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/logback.xml?rev=5&r1=4&r2=5&view=diff
==============================================================================
--- trunk/src/main/resources/logback.xml (original)
+++ trunk/src/main/resources/logback.xml Tue Sep 10 17:58:23 2013
@@ -17,6 +17,10 @@
   <logger name="net.shibboleth.idp" level="WARN"/>
   
   <logger name="org.opensaml" level="WARN"/>
+  
+  <logger name="org.eclipse.jetty" level="WARN"/>
+  
+  <logger name="org.ldaptive" level="WARN"/>
     
   <logger name="PROTOCOL_MESSAGE" level="DEBUG" />
 

Modified: trunk/src/main/webapp/WEB-INF/idp/flows/authn/jaas-basic-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/WEB-INF/idp/flows/authn/jaas-basic-authn-beans.xml?rev=5&r1=4&r2=5&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/idp/flows/authn/jaas-basic-authn-beans.xml (original)
+++ trunk/src/main/webapp/WEB-INF/idp/flows/authn/jaas-basic-authn-beans.xml Tue Sep 10 17:58:23 2013
@@ -13,13 +13,19 @@
     
     <bean id="ExtractUsernamePasswordFromBasicAuth" class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromBasicAuth" scope="prototype" />
         
+    <bean id="JAASConfig" class="org.springframework.core.io.ClassPathResource">
+        <constructor-arg type="java.lang.String" value="conf/jaas.config" />
+    </bean>
+
+    <util:property-path id="JAASConfigURI" path="JAASConfig.URI" />
+        
     <bean id="ValidateUsernamePasswordAgainstJAAS" class="net.shibboleth.idp.authn.impl.ValidateUsernamePasswordAgainstJAAS" scope="prototype"
             p:loginConfigName="ShibUserPassAuth" p:loginConfigType="JavaLoginConfig">
         <property name="loginConfigParameters">
             <bean class="java.security.URIParameter">
                 <constructor-arg>
                     <bean class="java.net.URI">
-                        <constructor-arg value="file:///Users/scantor/Documents/workspace/3.0/java-shib-testbed/src/main/resources/conf/jaas.config" />

[... 33 lines stripped ...]