portal-commits November 2009

portal-commits@lists.jboss.org

1 participants
34 discussions

JBoss Portal SVN: r13815 - in jbossexo/modules/sso/trunk: auth-callback and 12 other directories.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2009-11-14 07:30:59 -0500 (Sat, 14 Nov 2009) New Revision: 13815 Added: jbossexo/modules/sso/trunk/auth-callback/.settings/ jbossexo/modules/sso/trunk/auth-callback/.settings/org.eclipse.jdt.core.prefs jbossexo/modules/sso/trunk/auth-callback/target/ jbossexo/modules/sso/trunk/auth-callback/target/classes/ jbossexo/modules/sso/trunk/auth-callback/target/classes/conf/ jbossexo/modules/sso/trunk/auth-callback/target/classes/conf/portal/ jbossexo/modules/sso/trunk/auth-callback/target/classes/conf/portal/configuration.xml jbossexo/modules/sso/trunk/auth-callback/target/classes/org/ jbossexo/modules/sso/trunk/auth-callback/target/classes/org/gatein/ jbossexo/modules/sso/trunk/auth-callback/target/classes/org/gatein/sso/ jbossexo/modules/sso/trunk/auth-callback/target/classes/org/gatein/sso/authentication/ jbossexo/modules/sso/trunk/auth-callback/target/classes/org/gatein/sso/authentication/callback/ jbossexo/modules/sso/trunk/auth-callback/target/classes/org/gatein/sso/authentication/callback/AuthenticationHandler.class jbossexo/modules/sso/trunk/auth-callback/target/test-classes/ Modified: jbossexo/modules/sso/trunk/.classpath jbossexo/modules/sso/trunk/auth-callback/.classpath jbossexo/modules/sso/trunk/auth-callback/pom.xml jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/authentication/callback/AuthenticationHandler.java jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/cas/server/TestAuthenticationPlugin.java jbossexo/modules/sso/trunk/pom.xml Log: successful sso callback baseline Modified: jbossexo/modules/sso/trunk/.classpath =================================================================== --- jbossexo/modules/sso/trunk/.classpath 2009-11-13 19:16:04 UTC (rev 13814) +++ jbossexo/modules/sso/trunk/.classpath 2009-11-14 12:30:59 UTC (rev 13815) @@ -8,7 +8,10 @@ <classpathentry kind="var" path="M2_REPO/org/jasig/cas/cas-server-core/3.3.4/cas-server-core-3.3.4.jar" sourcepath="M2_REPO/org/jasig/cas/cas-server-core/3.3.4/cas-server-core-3.3.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/exoplatform/ws/exo.ws.rest.core/2.1.0-Beta02/exo.ws.rest.core-2.1.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/ws/exo.ws.rest.core/2.1.0-Beta02/exo.ws.rest.core-2.1.0-Beta02-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/core/exo.core.component.security.core/2.3.0-Beta02/exo.core.component.security.core-2.3.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/core/exo.core.component.security.core/2.3.0-Beta02/exo.core.component.security.core-2.3.0-Beta02-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.container/2.2.0-Beta02/exo.kernel.container-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.container/2.2.0-Beta02/exo.kernel.container-2.2.0-Beta02-sources.jar"/> <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0.jar" sourcepath="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/picocontainer/picocontainer/1.1/picocontainer-1.1.jar"/> <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> <classpathentry kind="output" path="bin"/> Modified: jbossexo/modules/sso/trunk/auth-callback/.classpath =================================================================== --- jbossexo/modules/sso/trunk/auth-callback/.classpath 2009-11-13 19:16:04 UTC (rev 13814) +++ jbossexo/modules/sso/trunk/auth-callback/.classpath 2009-11-14 12:30:59 UTC (rev 13815) @@ -21,6 +21,7 @@ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.2/commons-io-1.3.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/core/exo.core.component.security.core/2.3.0-Beta02/exo.core.component.security.core-2.3.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/core/exo.core.component.security.core/2.3.0-Beta02/exo.core.component.security.core-2.3.0-Beta02-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/exoplatform/core/exo.core.component.xml-processing/2.3.0-Beta02/exo.core.component.xml-processing-2.3.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/core/exo.core.component.xml-processing/2.3.0-Beta02/exo.core.component.xml-processing-2.3.0-Beta02-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.commons/2.2.0-Beta02/exo.kernel.commons-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.commons/2.2.0-Beta02/exo.kernel.commons-2.2.0-Beta02-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.component.common/2.2.0-Beta02/exo.kernel.component.common-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.component.common/2.2.0-Beta02/exo.kernel.component.common-2.2.0-Beta02-sources.jar"/> @@ -37,7 +38,7 @@ <classpathentry kind="var" path="M2_REPO/jotm/jotm/2.0.10/jotm-2.0.10.jar"/> <classpathentry kind="var" path="M2_REPO/jotm/jotm_jrmp_stubs/2.0.10/jotm_jrmp_stubs-2.0.10.jar"/> <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> <classpathentry kind="var" path="M2_REPO/picocontainer/picocontainer/1.1/picocontainer-1.1.jar"/> Added: jbossexo/modules/sso/trunk/auth-callback/.settings/org.eclipse.jdt.core.prefs =================================================================== --- jbossexo/modules/sso/trunk/auth-callback/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ jbossexo/modules/sso/trunk/auth-callback/.settings/org.eclipse.jdt.core.prefs 2009-11-14 12:30:59 UTC (rev 13815) @@ -0,0 +1,5 @@ +#Fri Nov 13 14:29:00 CST 2009 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 Modified: jbossexo/modules/sso/trunk/auth-callback/pom.xml =================================================================== --- jbossexo/modules/sso/trunk/auth-callback/pom.xml 2009-11-13 19:16:04 UTC (rev 13814) +++ jbossexo/modules/sso/trunk/auth-callback/pom.xml 2009-11-14 12:30:59 UTC (rev 13815) @@ -19,7 +19,11 @@ <dependency> <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.rest.core</artifactId> - </dependency> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + </dependency> <dependency> <groupId>javax.ws.rs</groupId> Modified: jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/authentication/callback/AuthenticationHandler.java =================================================================== --- jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/authentication/callback/AuthenticationHandler.java 2009-11-13 19:16:04 UTC (rev 13814) +++ jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/authentication/callback/AuthenticationHandler.java 2009-11-14 12:30:59 UTC (rev 13815) @@ -23,12 +23,24 @@ import org.apache.log4j.Logger; +import javax.security.auth.login.LoginException; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.container.RootContainer; + +import org.exoplatform.services.security.Authenticator; +import org.exoplatform.services.security.Credential; +import org.exoplatform.services.security.Identity; +import org.exoplatform.services.security.PasswordCredential; +import org.exoplatform.services.security.UsernameCredential; + import org.exoplatform.services.rest.resource.ResourceContainer; /** @@ -41,7 +53,7 @@ @Path("/sso/authcallback") public class AuthenticationHandler implements ResourceContainer { - private static Logger log = Logger.getLogger(AuthenticationHandler.class); + private static Logger log = Logger.getLogger(AuthenticationHandler.class); @GET @Path("/auth/{1}/{2}") @@ -49,16 +61,42 @@ {MediaType.TEXT_PLAIN}) public String authenticate(@PathParam("1") String username, @PathParam("2") String password) { - log.info("---------------------------------------"); - log.info("Username="+username); - log.info("Password="+password); - log.info("---------------------------------------"); - - if(username.equals("root") && password.equals("gtn")) - { - return ""+Boolean.TRUE; - } - - return ""+Boolean.FALSE; + try + { + log.info("---------------------------------------"); + log.info("Username: "+username); + log.info("Password: "+password); + + ExoContainer container = this.getContainer(); + Authenticator authenticator = (Authenticator) getContainer().getComponentInstanceOfType(Authenticator.class); + + Credential[] credentials = new Credential[] { new UsernameCredential(username), + new PasswordCredential(password) }; + + try + { + authenticator.validateUser(credentials); + return ""+Boolean.TRUE; + } + catch(LoginException le) + { + return ""+Boolean.FALSE; + } + } + catch(Exception e) + { + log.error(this, e); + throw new RuntimeException(e); + } } + + private ExoContainer getContainer() throws Exception + { + ExoContainer container = ExoContainerContext.getCurrentContainer(); + if (container instanceof RootContainer) + { + container = RootContainer.getInstance().getPortalContainer("portal"); + } + return container; + } } Added: jbossexo/modules/sso/trunk/auth-callback/target/classes/conf/portal/configuration.xml =================================================================== --- jbossexo/modules/sso/trunk/auth-callback/target/classes/conf/portal/configuration.xml (rev 0) +++ jbossexo/modules/sso/trunk/auth-callback/target/classes/conf/portal/configuration.xml 2009-11-14 12:30:59 UTC (rev 13815) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <type>org.gatein.sso.authentication.callback.AuthenticationHandler</type> + </component> +</configuration> \ No newline at end of file Added: jbossexo/modules/sso/trunk/auth-callback/target/classes/org/gatein/sso/authentication/callback/AuthenticationHandler.class =================================================================== (Binary files differ) Property changes on: jbossexo/modules/sso/trunk/auth-callback/target/classes/org/gatein/sso/authentication/callback/AuthenticationHandler.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/cas/server/TestAuthenticationPlugin.java =================================================================== --- jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/cas/server/TestAuthenticationPlugin.java 2009-11-13 19:16:04 UTC (rev 13814) +++ jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/cas/server/TestAuthenticationPlugin.java 2009-11-14 12:30:59 UTC (rev 13815) @@ -48,17 +48,21 @@ //------------------------------------------------------------------------------------------------------------------------------------------------------------------- public void testAuthenticationCallback() throws Exception { + //Unsuccessful login scenario UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(); credentials.setUsername("root"); - credentials.setPassword("gtn"); + credentials.setPassword("blah"); boolean authResult = this.authPlugin.authenticate(credentials); - assertTrue("Login should have succeeded!!", authResult); + assertFalse("Login should *not* have succeeded!!", authResult); + + //Successful login scenario credentials = new UsernamePasswordCredentials(); credentials.setUsername("root"); - credentials.setPassword("blah"); + credentials.setPassword("gtn"); + authResult = this.authPlugin.authenticate(credentials); - assertFalse("Login should *not* have succeeded!!", authResult); + assertTrue("Login should have succeeded!!", authResult); } } Modified: jbossexo/modules/sso/trunk/pom.xml =================================================================== --- jbossexo/modules/sso/trunk/pom.xml 2009-11-13 19:16:04 UTC (rev 13814) +++ jbossexo/modules/sso/trunk/pom.xml 2009-11-14 12:30:59 UTC (rev 13815) @@ -35,6 +35,7 @@ <version.cas>3.3.4</version.cas>  + <org.exoplatform.core.version>2.3.0-Beta02</org.exoplatform.core.version> <org.exoplatform.ws.version>2.1.0-Beta02</org.exoplatform.ws.version>  @@ -88,6 +89,11 @@ <groupId>org.exoplatform.ws</groupId> <artifactId>exo.ws.rest.core</artifactId> <version>${org.exoplatform.ws.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> </dependency> </dependencies> </dependencyManagement>

14 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r13814 - in jbossexo/modules/sso: trunk and 40 other directories.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2009-11-13 14:16:04 -0500 (Fri, 13 Nov 2009) New Revision: 13814 Added: jbossexo/modules/sso/trunk/ jbossexo/modules/sso/trunk/.classpath jbossexo/modules/sso/trunk/.project jbossexo/modules/sso/trunk/auth-callback/ jbossexo/modules/sso/trunk/auth-callback/.classpath jbossexo/modules/sso/trunk/auth-callback/.project jbossexo/modules/sso/trunk/auth-callback/pom.xml jbossexo/modules/sso/trunk/auth-callback/src/ jbossexo/modules/sso/trunk/auth-callback/src/main/ jbossexo/modules/sso/trunk/auth-callback/src/main/java/ jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/ jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/ jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/ jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/authentication/ jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/authentication/callback/ jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/authentication/callback/AuthenticationHandler.java jbossexo/modules/sso/trunk/auth-callback/src/main/resources/ jbossexo/modules/sso/trunk/auth-callback/src/main/resources/conf/ jbossexo/modules/sso/trunk/auth-callback/src/main/resources/conf/portal/ jbossexo/modules/sso/trunk/auth-callback/src/main/resources/conf/portal/configuration.xml jbossexo/modules/sso/trunk/auth-callback/src/test/ jbossexo/modules/sso/trunk/auth-callback/src/test/java/ jbossexo/modules/sso/trunk/auth-callback/src/test/resources/ jbossexo/modules/sso/trunk/bin/ jbossexo/modules/sso/trunk/bin/org/ jbossexo/modules/sso/trunk/bin/org/gatein/ jbossexo/modules/sso/trunk/bin/org/gatein/sso/ jbossexo/modules/sso/trunk/bin/org/gatein/sso/authentication/ jbossexo/modules/sso/trunk/bin/org/gatein/sso/authentication/callback/ jbossexo/modules/sso/trunk/bin/org/gatein/sso/authentication/callback/AuthenticationHandler.class jbossexo/modules/sso/trunk/bin/org/gatein/sso/cas/ jbossexo/modules/sso/trunk/bin/org/gatein/sso/cas/server/ jbossexo/modules/sso/trunk/bin/org/gatein/sso/cas/server/AuthenticationPlugin.class jbossexo/modules/sso/trunk/bin/org/gatein/sso/cas/server/TestAuthenticationPlugin.class jbossexo/modules/sso/trunk/gatein-cas/ jbossexo/modules/sso/trunk/gatein-cas/.classpath jbossexo/modules/sso/trunk/gatein-cas/.project jbossexo/modules/sso/trunk/gatein-cas/.settings/ jbossexo/modules/sso/trunk/gatein-cas/.settings/org.eclipse.jdt.core.prefs jbossexo/modules/sso/trunk/gatein-cas/pom.xml jbossexo/modules/sso/trunk/gatein-cas/src/ jbossexo/modules/sso/trunk/gatein-cas/src/main/ jbossexo/modules/sso/trunk/gatein-cas/src/main/config/ jbossexo/modules/sso/trunk/gatein-cas/src/main/config/deployerConfigContext.xml jbossexo/modules/sso/trunk/gatein-cas/src/main/java/ jbossexo/modules/sso/trunk/gatein-cas/src/main/java/org/ jbossexo/modules/sso/trunk/gatein-cas/src/main/java/org/gatein/ jbossexo/modules/sso/trunk/gatein-cas/src/main/java/org/gatein/sso/ jbossexo/modules/sso/trunk/gatein-cas/src/main/java/org/gatein/sso/cas/ jbossexo/modules/sso/trunk/gatein-cas/src/main/java/org/gatein/sso/cas/server/ jbossexo/modules/sso/trunk/gatein-cas/src/main/java/org/gatein/sso/cas/server/AuthenticationPlugin.java jbossexo/modules/sso/trunk/gatein-cas/src/main/resources/ jbossexo/modules/sso/trunk/gatein-cas/src/main/resources/log4j.properties jbossexo/modules/sso/trunk/gatein-cas/src/test/ jbossexo/modules/sso/trunk/gatein-cas/src/test/java/ jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/ jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/ jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/ jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/cas/ jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/cas/server/ jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/cas/server/TestAuthenticationPlugin.java jbossexo/modules/sso/trunk/gatein-cas/src/test/resources/ jbossexo/modules/sso/trunk/pom.xml Log: sso component Added: jbossexo/modules/sso/trunk/.classpath =================================================================== --- jbossexo/modules/sso/trunk/.classpath (rev 0) +++ jbossexo/modules/sso/trunk/.classpath 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="auth-callback/src/main/java"/> + <classpathentry kind="src" path="auth-callback/src/test/java"/> + <classpathentry kind="src" path="gatein-cas/src/main/java"/> + <classpathentry kind="src" path="gatein-cas/src/test/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/org/jasig/cas/cas-server-core/3.3.4/cas-server-core-3.3.4.jar" sourcepath="M2_REPO/org/jasig/cas/cas-server-core/3.3.4/cas-server-core-3.3.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/ws/exo.ws.rest.core/2.1.0-Beta02/exo.ws.rest.core-2.1.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/ws/exo.ws.rest.core/2.1.0-Beta02/exo.ws.rest.core-2.1.0-Beta02-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0.jar" sourcepath="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: jbossexo/modules/sso/trunk/.project =================================================================== --- jbossexo/modules/sso/trunk/.project (rev 0) +++ jbossexo/modules/sso/trunk/.project 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>gatein-sso-trunk</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: jbossexo/modules/sso/trunk/auth-callback/.classpath =================================================================== --- jbossexo/modules/sso/trunk/auth-callback/.classpath (rev 0) +++ jbossexo/modules/sso/trunk/auth-callback/.classpath 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,51 @@ +<classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-api/1.2/jsf-api-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0.jar" sourcepath="M2_REPO/javax/ws/rs/jsr311-api/1.0/jsr311-api-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar" sourcepath="M2_REPO/javax/mail/mail/1.4/mail-1.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/portlet/portlet-api/2.0/portlet-api-2.0.jar" sourcepath="M2_REPO/javax/portlet/portlet-api/2.0/portlet-api-2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/bcel/bcel/5.1/bcel-5.1.jar" sourcepath="M2_REPO/bcel/bcel/5.1/bcel-5.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/objectweb/carol/carol/2.0.5/carol-2.0.5.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.0/commons-collections-2.0.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.0/commons-fileupload-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.2/commons-io-1.3.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/core/exo.core.component.xml-processing/2.3.0-Beta02/exo.core.component.xml-processing-2.3.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/core/exo.core.component.xml-processing/2.3.0-Beta02/exo.core.component.xml-processing-2.3.0-Beta02-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.commons/2.2.0-Beta02/exo.kernel.commons-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.commons/2.2.0-Beta02/exo.kernel.commons-2.2.0-Beta02-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.component.common/2.2.0-Beta02/exo.kernel.component.common-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.component.common/2.2.0-Beta02/exo.kernel.component.common-2.2.0-Beta02-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/kernel/exo.kernel.container/2.2.0-Beta02/exo.kernel.container-2.2.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/kernel/exo.kernel.container/2.2.0-Beta02/exo.kernel.container-2.2.0-Beta02-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/tool/exo.tool.framework.junit/1.2.0/exo.tool.framework.junit-1.2.0.jar" sourcepath="M2_REPO/org/exoplatform/tool/exo.tool.framework.junit/1.2.0/exo.tool.framework.junit-1.2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/ws/exo.ws.frameworks.json/2.1.0-Beta02/exo.ws.frameworks.json-2.1.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/ws/exo.ws.frameworks.json/2.1.0-Beta02/exo.ws.frameworks.json-2.1.0-Beta02-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/exoplatform/ws/exo.ws.rest.core/2.1.0-Beta02/exo.ws.rest.core-2.1.0-Beta02.jar" sourcepath="M2_REPO/org/exoplatform/ws/exo.ws.rest.core/2.1.0-Beta02/exo.ws.rest.core-2.1.0-Beta02-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/howl/howl-logger/0.1.11/howl-logger-0.1.11.jar"/> + <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.7/jaxb-impl-2.1.7.jar" sourcepath="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.7/jaxb-impl-2.1.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jibx/jibx-bind/1.2.1/jibx-bind-1.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jibx/jibx-extras/1.2.1/jibx-extras-1.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jibx/jibx-run/1.2.1/jibx-run-1.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/jmock/jmock/1.0.1/jmock-1.0.1.jar" sourcepath="M2_REPO/jmock/jmock/1.0.1/jmock-1.0.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jotm/jotm/2.0.10/jotm-2.0.10.jar"/> + <classpathentry kind="var" path="M2_REPO/jotm/jotm_jrmp_stubs/2.0.10/jotm_jrmp_stubs-2.0.10.jar"/> + <classpathentry kind="var" path="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar" sourcepath="M2_REPO/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/picocontainer/picocontainer/1.1/picocontainer-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.5.0-RC2/quartz-1.5.0-RC2.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-resolver/xml-resolver/1.1/xml-resolver-1.1.jar" sourcepath="M2_REPO/xml-resolver/xml-resolver/1.1/xml-resolver-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar" sourcepath="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.0.2/xstream-1.0.2.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Added: jbossexo/modules/sso/trunk/auth-callback/.project =================================================================== --- jbossexo/modules/sso/trunk/auth-callback/.project (rev 0) +++ jbossexo/modules/sso/trunk/auth-callback/.project 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,13 @@ +<projectDescription> + <name>auth-callback</name> + <comment>Gatein Single Sign On Integration</comment> + <projects/> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Added: jbossexo/modules/sso/trunk/auth-callback/pom.xml =================================================================== --- jbossexo/modules/sso/trunk/auth-callback/pom.xml (rev 0) +++ jbossexo/modules/sso/trunk/auth-callback/pom.xml 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,30 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>gatein-sso-parent</artifactId> + <relativePath>../pom.xml</relativePath> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>auth-callback</artifactId> + <packaging>jar</packaging> + <name>A RESTful call back service used by SSO servers to perform authentication against the Gatein instance</name> + + <properties> + </properties> + + <dependencies> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + </dependency> + + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + </dependency> + </dependencies> +</project> + Added: jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/authentication/callback/AuthenticationHandler.java =================================================================== --- jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/authentication/callback/AuthenticationHandler.java (rev 0) +++ jbossexo/modules/sso/trunk/auth-callback/src/main/java/org/gatein/sso/authentication/callback/AuthenticationHandler.java 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,64 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.gatein.sso.authentication.callback; + +import org.apache.log4j.Logger; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +import org.exoplatform.services.rest.resource.ResourceContainer; + +/** + * This is a RESTful component that is invoked by central SSO servers like CAS server, JOSSO server etc, to invoke + * Gatein authentication related queries during their own "Authentication process" + * + * + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + */ +@Path("/sso/authcallback") +public class AuthenticationHandler implements ResourceContainer +{ + private static Logger log = Logger.getLogger(AuthenticationHandler.class); + + @GET + @Path("/auth/{1}/{2}") + @Produces( + {MediaType.TEXT_PLAIN}) + public String authenticate(@PathParam("1") String username, @PathParam("2") String password) + { + log.info("---------------------------------------"); + log.info("Username="+username); + log.info("Password="+password); + log.info("---------------------------------------"); + + if(username.equals("root") && password.equals("gtn")) + { + return ""+Boolean.TRUE; + } + + return ""+Boolean.FALSE; + } +} Added: jbossexo/modules/sso/trunk/auth-callback/src/main/resources/conf/portal/configuration.xml =================================================================== --- jbossexo/modules/sso/trunk/auth-callback/src/main/resources/conf/portal/configuration.xml (rev 0) +++ jbossexo/modules/sso/trunk/auth-callback/src/main/resources/conf/portal/configuration.xml 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <type>org.gatein.sso.authentication.callback.AuthenticationHandler</type> + </component> +</configuration> \ No newline at end of file Added: jbossexo/modules/sso/trunk/bin/org/gatein/sso/authentication/callback/AuthenticationHandler.class =================================================================== (Binary files differ) Property changes on: jbossexo/modules/sso/trunk/bin/org/gatein/sso/authentication/callback/AuthenticationHandler.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: jbossexo/modules/sso/trunk/bin/org/gatein/sso/cas/server/AuthenticationPlugin.class =================================================================== (Binary files differ) Property changes on: jbossexo/modules/sso/trunk/bin/org/gatein/sso/cas/server/AuthenticationPlugin.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: jbossexo/modules/sso/trunk/bin/org/gatein/sso/cas/server/TestAuthenticationPlugin.class =================================================================== (Binary files differ) Property changes on: jbossexo/modules/sso/trunk/bin/org/gatein/sso/cas/server/TestAuthenticationPlugin.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: jbossexo/modules/sso/trunk/gatein-cas/.classpath =================================================================== --- jbossexo/modules/sso/trunk/gatein-cas/.classpath (rev 0) +++ jbossexo/modules/sso/trunk/gatein-cas/.classpath 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,59 @@ +<classpath> + <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="src" path="src/main/java" including="**/*.java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/xml/xmldsig/1.0/xmldsig-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/> + <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jasig/cas/cas-server-core/3.3.4/cas-server-core-3.3.4.jar" sourcepath="M2_REPO/org/jasig/cas/cas-server-core/3.3.4/cas-server-core-3.3.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.2/commons-lang-2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar"/> + <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/> + <classpathentry kind="var" path="M2_REPO/org/inspektr/inspektr-core/0.7.0/inspektr-core-0.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/> + <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1-beta-6/jaxen-1.1-beta-6.jar"/> + <classpathentry kind="var" path="M2_REPO/jaxme/jaxme-api/0.3/jaxme-api-0.3.jar"/> + <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar" sourcepath="M2_REPO/jdom/jdom/1.0/jdom-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9/ognl-2.6.9.jar"/> + <classpathentry kind="var" path="M2_REPO/org/opensaml/opensaml/1.1b/opensaml-1.1b.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jasig/service/person-directory-api/1.5.0-RC5/person-directory-api-1.5.0-RC5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jasig/service/person-directory-impl/1.5.0-RC5/person-directory-impl-1.5.0-RC5.jar"/> + <classpathentry kind="var" path="M2_REPO/pull-parser/pull-parser/2/pull-parser-2.jar"/> + <classpathentry kind="var" path="M2_REPO/msv/relaxngDatatype/20030807/relaxngDatatype-20030807.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-beans/2.5.6/spring-beans-2.5.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-binding/1.0.5/spring-binding-1.0.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context/2.5.6/spring-context-2.5.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-context-support/2.5.6/spring-context-support-2.5.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-core/2.5.6/spring-core-2.5.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-orm/2.5.6/spring-orm-2.5.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-tx/2.5.6/spring-tx-2.5.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-web/2.5.6/spring-web-2.5.6.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webflow/1.0.5/spring-webflow-1.0.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/springframework/spring-webmvc/2.5.6/spring-webmvc-2.5.6.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/santuario/xmlsec/1.4.0/xmlsec-1.4.0.jar"/> + <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.3/xpp3-1.1.3.3.jar"/> + <classpathentry kind="var" path="M2_REPO/msv/xsdlib/20030807/xsdlib-20030807.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +</classpath> \ No newline at end of file Added: jbossexo/modules/sso/trunk/gatein-cas/.project =================================================================== --- jbossexo/modules/sso/trunk/gatein-cas/.project (rev 0) +++ jbossexo/modules/sso/trunk/gatein-cas/.project 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,13 @@ +<projectDescription> + <name>gatein-cas</name> + <comment>Gatein Single Sign On Integration</comment> + <projects/> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Added: jbossexo/modules/sso/trunk/gatein-cas/.settings/org.eclipse.jdt.core.prefs =================================================================== --- jbossexo/modules/sso/trunk/gatein-cas/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ jbossexo/modules/sso/trunk/gatein-cas/.settings/org.eclipse.jdt.core.prefs 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,5 @@ +#Fri Nov 13 12:35:24 CST 2009 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 Added: jbossexo/modules/sso/trunk/gatein-cas/pom.xml =================================================================== --- jbossexo/modules/sso/trunk/gatein-cas/pom.xml (rev 0) +++ jbossexo/modules/sso/trunk/gatein-cas/pom.xml 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,42 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.gatein.sso</groupId> + <artifactId>gatein-sso-parent</artifactId> + <relativePath>../pom.xml</relativePath> + <version>trunk-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>gatein-cas</artifactId> + <packaging>jar</packaging> + <name>Gatein Integration for CAS Single Sign On Framework</name> + + <properties> + </properties> + + <dependencies> + <dependency> + <groupId>org.jasig.cas</groupId> + <artifactId>cas-server-core</artifactId> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + </plugins> + </build> +</project> + Added: jbossexo/modules/sso/trunk/gatein-cas/src/main/config/deployerConfigContext.xml =================================================================== --- jbossexo/modules/sso/trunk/gatein-cas/src/main/config/deployerConfigContext.xml (rev 0) +++ jbossexo/modules/sso/trunk/gatein-cas/src/main/config/deployerConfigContext.xml 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:p="http://www.springframework.org/schema/p" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"> +  + <bean id="authenticationManager" + class="org.jasig.cas.authentication.AuthenticationManagerImpl"> +  + <property name="credentialsToPrincipalResolvers"> + <list> +  + <bean + class="org.jasig.cas.authentication.principal.UsernamePasswordCredentialsToPrincipalResolver" /> +  + <bean + class="org.jasig.cas.authentication.principal.HttpBasedServiceCredentialsToPrincipalResolver" /> + </list> + </property> + +  + <property name="authenticationHandlers"> + <list> +  + <bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler" + p:httpClient-ref="httpClient" /> +  + +  +  + <bean class="org.gatein.sso.cas.server.AuthenticationPlugin"> + <property name="gateInHost"><value>localhost</value></property> + <property name="gateInPort"><value>1500</value></property> + <property name="gateInContext"><value>portal</value></property> + </bean> + </list> + </property> + </bean> + + +  + <bean id="userDetailsService" class="org.springframework.security.userdetails.memory.InMemoryDaoImpl"> + <property name="userMap"> + <value> + + </value> + </property> + </bean> + +  + <bean id="attributeRepository" + class="org.jasig.services.persondir.support.StubPersonAttributeDao"> + <property name="backingMap"> + <map> + <entry key="uid" value="uid" /> + <entry key="eduPersonAffiliation" value="eduPersonAffiliation" /> + <entry key="groupMembership" value="groupMembership" /> + </map> + </property> + </bean> + +  + <bean + id="serviceRegistryDao" + class="org.jasig.cas.services.InMemoryServiceRegistryDaoImpl" /> +</beans> Added: jbossexo/modules/sso/trunk/gatein-cas/src/main/java/org/gatein/sso/cas/server/AuthenticationPlugin.java =================================================================== --- jbossexo/modules/sso/trunk/gatein-cas/src/main/java/org/gatein/sso/cas/server/AuthenticationPlugin.java (rev 0) +++ jbossexo/modules/sso/trunk/gatein-cas/src/main/java/org/gatein/sso/cas/server/AuthenticationPlugin.java 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,140 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.gatein.sso.cas.server; + +import org.apache.log4j.Logger; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.GetMethod; + +import org.jasig.cas.authentication.handler.support.AbstractUsernamePasswordAuthenticationHandler; +import org.jasig.cas.authentication.principal.UsernamePasswordCredentials; + +/** + * This is a Gatein Authentication Plugin for the CAS server. It is deployed along with the CAS server and provides authentication + * against a Gatein instance + * + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + */ +public class AuthenticationPlugin extends AbstractUsernamePasswordAuthenticationHandler +{ + private static Logger log = Logger.getLogger(AuthenticationPlugin.class); + + private String gateInHost; + private String gateInPort; + private String gateInContext; + + public AuthenticationPlugin() + { + + } + + public String getGateInHost() + { + return gateInHost; + } + + + + public void setGateInHost(String gateInHost) + { + this.gateInHost = gateInHost; + } + + + + public String getGateInPort() + { + return gateInPort; + } + + + public void setGateInPort(String gateInPort) + { + this.gateInPort = gateInPort; + } + + public String getGateInContext() + { + return gateInContext; + } + + public void setGateInContext(String gateInContext) + { + this.gateInContext = gateInContext; + } + //----------------------------------------------------------------------------------------------------------------------------------------------------------------- + public boolean authenticateUsernamePasswordInternal(final UsernamePasswordCredentials credentials) + { + try + { + final String username = credentials.getUsername(); + final String password = credentials.getPassword(); + + StringBuilder urlBuffer = new StringBuilder(); + urlBuffer.append("http://"+this.gateInHost+":"+this.gateInPort+"/"+this.gateInContext+"/rest/sso/authcallback/auth/"+username+"/"+password); + + log.info("-------------------------------------------------------------------"); + log.info("REST Request="+urlBuffer.toString()); + log.info("-------------------------------------------------------------------"); + + return this.executeRemoteCall(urlBuffer.toString()); + } + catch(Exception e) + { + log.error(this, e); + throw new RuntimeException(e); + } + } + + private boolean executeRemoteCall(String authUrl) throws Exception + { + HttpClient client = new HttpClient(); + GetMethod method = null; + try + { + method = new GetMethod(authUrl); + + int status = client.executeMethod(method); + String response = method.getResponseBodyAsString(); + + switch(status) + { + case 200: + if(response.equals(Boolean.TRUE.toString())) + { + return true; + } + break; + } + + return false; + } + finally + { + if(method != null) + { + method.releaseConnection(); + } + } + } +} Added: jbossexo/modules/sso/trunk/gatein-cas/src/main/resources/log4j.properties =================================================================== --- jbossexo/modules/sso/trunk/gatein-cas/src/main/resources/log4j.properties (rev 0) +++ jbossexo/modules/sso/trunk/gatein-cas/src/main/resources/log4j.properties 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,8 @@ +# Set root category priority to INFO and its only appender to CONSOLE. +log4j.rootCategory=INFO, CONSOLE + +# CONSOLE is set to be a ConsoleAppender using a PatternLayout. +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.Threshold=INFO +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n Added: jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/cas/server/TestAuthenticationPlugin.java =================================================================== --- jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/cas/server/TestAuthenticationPlugin.java (rev 0) +++ jbossexo/modules/sso/trunk/gatein-cas/src/test/java/org/gatein/sso/cas/server/TestAuthenticationPlugin.java 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,64 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.gatein.sso.cas.server; + +import junit.framework.TestCase; + +import org.jasig.cas.authentication.principal.UsernamePasswordCredentials; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + */ +public class TestAuthenticationPlugin extends TestCase +{ + private AuthenticationPlugin authPlugin; + + public void setUp() throws Exception + { + this.authPlugin = new AuthenticationPlugin(); + + this.authPlugin.setGateInHost("localhost"); + this.authPlugin.setGateInPort("1500"); + this.authPlugin.setGateInContext("portal"); + } + + public void tearDown() throws Exception + { + this.authPlugin = null; + } + //------------------------------------------------------------------------------------------------------------------------------------------------------------------- + public void testAuthenticationCallback() throws Exception + { + UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(); + credentials.setUsername("root"); + credentials.setPassword("gtn"); + + boolean authResult = this.authPlugin.authenticate(credentials); + assertTrue("Login should have succeeded!!", authResult); + + credentials = new UsernamePasswordCredentials(); + credentials.setUsername("root"); + credentials.setPassword("blah"); + authResult = this.authPlugin.authenticate(credentials); + assertFalse("Login should *not* have succeeded!!", authResult); + } +} Added: jbossexo/modules/sso/trunk/pom.xml =================================================================== --- jbossexo/modules/sso/trunk/pom.xml (rev 0) +++ jbossexo/modules/sso/trunk/pom.xml 2009-11-13 19:16:04 UTC (rev 13814) @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.gatein.sso</groupId> + <artifactId>gatein-sso-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Gatein Single Sign On Integration</name> + <url>http://www.jboss.org/gatein</url> + <description>Gatein Single Sign On Integration</description> + + <properties> + <version.junit>3.8.1</version.junit> + +  + <version.commons-httpclient>3.1</version.commons-httpclient> + +  + <version.log4j>1.2.14</version.log4j> + <version.jboss.logging>2.0.2.GA</version.jboss.logging> + <version.apache.logging>1.0.4-jboss</version.apache.logging> + +  + <version.cas>3.3.4</version.cas> + +  + <org.exoplatform.ws.version>2.1.0-Beta02</org.exoplatform.ws.version> + +  + <version.javax.ws.rs>1.0</version.javax.ws.rs> + </properties> + + <modules> + <module>gatein-cas</module> + <module>auth-callback</module> + </modules> + + <dependencyManagement> + <dependencies> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${version.junit}</version> + </dependency> + +  + <dependency> + <groupId>org.jasig.cas</groupId> + <artifactId>cas-server-core</artifactId> + <version>${version.cas}</version> + </dependency> + +  + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + <version>${version.log4j}</version> + </dependency> + +  + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${version.commons-httpclient}</version> + </dependency> + +  + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <version>${version.javax.ws.rs}</version> + </dependency> + +  + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.rest.core</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <layout>default</layout> + <url>http://repository.jboss.org/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <layout>default</layout> + <url>http://snapshots.jboss.org/maven2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + + <repository> + <id>josso-m2-repo</id> + <name>JOSSO Maven2 Repository</name> + <url>http://repository.josso.org</url> + <releases> + <checksumPolicy>fail</checksumPolicy> + <enabled>true</enabled> + </releases> + <snapshots> + <checksumPolicy>fail</checksumPolicy> + <enabled>false</enabled> + </snapshots> + </repository> + + <repository> + <id>exo-int</id> + <url>http://maven2.exoplatform.org/rest/maven2</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3.1</version> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + + <pluginRepositories> + <pluginRepository> + <id>java.net maven repository</id> + <url>http://download.java.net/maven/2/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> +</project>

14 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r13813 - jbossexo/modules.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2009-11-13 14:14:51 -0500 (Fri, 13 Nov 2009) New Revision: 13813 Added: jbossexo/modules/sso/ Log: sso component

14 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r13812 - in modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity: ldap and 1 other directory.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2009-11-10 13:07:03 -0500 (Tue, 10 Nov 2009) New Revision: 13812 Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java Log: - Some configuration tweaks to support user creation and password update in MSAD Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2009-10-14 07:32:35 UTC (rev 13811) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2009-11-10 18:07:03 UTC (rev 13812) @@ -63,6 +63,14 @@ public static final String USER_PASSWORD_ATTRIBUTE_ID = "passwordAttributeID"; + public static final String USER_PASSWORD_ENCLOSE_WITH = "enclosePasswordWith"; + + public static final String USER_PASSWORD_ENCODING = "passwordEncoding"; + + public static final String USER_PASSWORD_UPDATE_ATTRIBUTES = "passwordUpdateAttributeValues"; + + public static final String USER_SET_PASSWORD_AFTER_USER_CREATE = "setPasswordAfterUserCreate"; + public static final String USER_CONTEXT_DN = "userCtxDN"; public static final String USER_CONTAINER_DN = USER_CONTEXT_DN; Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java 2009-10-14 07:32:35 UTC (rev 13811) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java 2009-11-10 18:07:03 UTC (rev 13812) @@ -44,6 +44,8 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; +import java.util.Set; +import java.io.UnsupportedEncodingException; /** * Abstract LDAPUserModule that should be extended to provide compabitibility across identity modules @@ -81,19 +83,74 @@ public void updatePassword(LDAPUserImpl ldapu, String password) throws IdentityException { + if ((password == null || password.length() == 0) && !isAllowEmptyPasswords()) + { + throw new IdentityException("Cannot update password with empty value - please set proper option to allow this"); + } + String attributeName = getPasswordAttributeId(); LdapContext ldapContext = getConnectionContext().createInitialContext(); + String passwordString = password; + + if (getEnclosePasswordWith() != null) + { + String enc = getEnclosePasswordWith(); + passwordString = enc + passwordString + enc; + } + + byte[] encodedPassword = null; + + if (getPasswordEncoding() != null && passwordString != null) + { + try + { + encodedPassword = passwordString.getBytes(getPasswordEncoding()); + } + catch (UnsupportedEncodingException e) + { + throw new IdentityException("Error while encoding password with configured setting: " + getPasswordEncoding(), + e); + } + } + + + + + try { //TODO: maybe perform a schema check if this attribute is allowed for such entry Attributes attrs = new BasicAttributes(true); Attribute attr = new BasicAttribute(attributeName); - attr.add(password); + if (encodedPassword != null) + { + + attr.add(encodedPassword); + } + else + { + attr.add(passwordString); + } attrs.put(attr); + if(getUpdatePasswordAttributeValues().size() > 0) + { + Map<String, Set<String>> attributesToAdd = getUpdatePasswordAttributeValues(); + for (Map.Entry<String, Set<String>> entry : attributesToAdd.entrySet()) + { + Attribute additionalAttr = new BasicAttribute(entry.getKey()); + for (String val : entry.getValue()) + { + additionalAttr.add(val); + } + attrs.put(additionalAttr); + } + + } + ldapContext.modifyAttributes(ldapu.getDn(), DirContext.REPLACE_ATTRIBUTE,attrs); } catch (NamingException e) @@ -114,6 +171,8 @@ } + + public boolean validatePassword(LDAPUserImpl ldapu, String password) throws IdentityException { @@ -434,20 +493,17 @@ return Boolean.FALSE.booleanValue(); } - - /*protected String getEmailAttributeId() throws IdentityException + protected boolean isSetPasswordAfterUserCreate() { - String email = getIdentityConfiguration().getValue(IdentityConfiguration.USER_EMAIL_ATTRIBUTE_ID); - if (email == null) + String userNameToLowerCase = getIdentityConfiguration().getValue(IdentityConfiguration.USER_SET_PASSWORD_AFTER_USER_CREATE); + if (userNameToLowerCase != null && userNameToLowerCase.equalsIgnoreCase("true")) { - return "mail"; + return Boolean.TRUE.booleanValue(); } - else - { - return email; - } - }*/ + return Boolean.FALSE.booleanValue(); + } + protected Map getAttributesToAdd() throws IdentityException { Map attributesToAdd = getIdentityConfiguration().getOptions(IdentityConfiguration.GROUP_USER_CREATE_ATTRIBUTES); @@ -462,5 +518,41 @@ { this.connectionContext = connectionContext; } + + protected String getPasswordEncoding() throws IdentityException + { + String encoding = getIdentityConfiguration().getValue(IdentityConfiguration.USER_PASSWORD_ENCODING); + if (encoding == null) + { + throw new IdentityException(IdentityConfiguration.USER_PASSWORD_ENCODING + " missing in configuration"); + } + else + { + return encoding; + } + } + + protected Map getUpdatePasswordAttributeValues() throws IdentityException + { + Map attributesToAdd = getIdentityConfiguration().getOptions(IdentityConfiguration.USER_PASSWORD_UPDATE_ATTRIBUTES); + if (attributesToAdd == null) + { + throw new IdentityException(IdentityConfiguration.USER_PASSWORD_UPDATE_ATTRIBUTES + " missing in configuration"); + } + return attributesToAdd; + } + + protected String getEnclosePasswordWith() throws IdentityException + { + String enc = getIdentityConfiguration().getValue(IdentityConfiguration.USER_PASSWORD_ENCLOSE_WITH); + if (enc == null) + { + throw new IdentityException(IdentityConfiguration.USER_PASSWORD_ENCLOSE_WITH + " missing in configuration"); + } + else + { + return enc; + } + } } Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2009-10-14 07:32:35 UTC (rev 13811) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2009-11-10 18:07:03 UTC (rev 13812) @@ -180,6 +180,10 @@ for (Iterator it1 = attributesToAdd.keySet().iterator(); it1.hasNext();) { String attributeName = (String)it1.next(); + if (getUidAttributeID().equals(attributeName)) + { + continue; + } log.debug("adding attribute: " + attributeName); Attribute attr = new BasicAttribute(attributeName); Set attributeValues = (Set)attributesToAdd.get(attributeName); @@ -194,15 +198,19 @@ attrs.put(attr); } - attrs.put(getPasswordAttributeId(), password); + if (!isSetPasswordAfterUserCreate()) + { + attrs.put(getPasswordAttributeId(), password); + } - String validUserName = LDAPTools.encodeRfc2253Name(userName); String dn = getUidAttributeID().concat("=").concat(validUserName); log.debug("creating ldap entry for: " + dn + "; " + attrs); ctx.createSubcontext(dn, attrs); + + } catch (Exception e) { @@ -219,13 +227,21 @@ throw new IdentityException("Failed to close LDAP connection", e); } } - User u = findUserByUserName(userName); + LDAPUserImpl u = (LDAPUserImpl)findUserByUserName(userName); + if (isSetPasswordAfterUserCreate()) + { + updatePassword(u, password); + } + + fireUserCreatedEvent(u.getId(), u.getUserName()); return u; } + + //TODO: remove user assignments before? public void removeUser(Object id) throws IdentityException, IllegalArgumentException {

14 years, 7 months

1
0
0 / 0

← Newer
1
2
3
4
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits November 2009