Author: bpoussin Date: 2012-01-24 12:11:47 +0100 (Tue, 24 Jan 2012) New Revision: 1355 Url: http://nuiton.org/repositories/revision/wikitty/1355 Log: Evolution #1916: Split WikittyServiceSecurity in two service Authentication and Authorization - remove WikittyServiceSecurity in sample properties files and replace it with WikittyServiceAuthorization and WikittyServiceAuthentication - remove WikittyServiceSecurity in other java class Removed: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceSecurityTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthorization.java trunk/wikitty-api/src/main/resources/wikitty-config-sample-client.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-24 11:11:47 UTC (rev 1355) @@ -71,9 +71,9 @@ * It is used to transform wikitty object used by {@link WikittyService} * into business objects used by applications. * - * It also manage {@link #securityToken} for {@link org.nuiton.wikitty.services.WikittyServiceSecurity}. + * It also manage {@link #securityToken} for {@link org.nuiton.wikitty.services.WikittyService}. * - * All method that need {@link #securityToken} and {@link org.nuiton.wikitty.services.WikittyServiceSecurity} + * All method that need {@link #securityToken} and {@link org.nuiton.wikitty.services.WikittyService} * must be in this class and not in {@link WikittyUtil} * * @author poussin @@ -96,7 +96,7 @@ /** * Security token. * - * @see org.nuiton.wikitty.services.WikittyServiceSecurity#login(String, String) + * @see org.nuiton.wikitty.services.WikittyServiceAuthentication#login(String, String) */ protected String securityToken; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2012-01-24 11:11:47 UTC (rev 1355) @@ -130,7 +130,8 @@ "wikitty.WikittyService.components", n_("WikittyService to use (list must be in right order. " + "ex: org.nuiton.wikitty.WikittyServiceStorage,org.nuiton.wikitty.WikittyServiceNotifier," - + "org.nuiton.wikitty.WikittyServiceCached,org.nuiton.wikitty.WikittyServiceSecurity)"), + + "org.nuiton.wikitty.WikittyServiceCached,org.nuiton.wikitty.WikittyServiceAuthentication," + + "org.nuiton.wikitty.WikittyServiceAuthorization)"), WikittyServiceInMemory.class.getName(), String.class, false, false), WIKITTY_WIKITTYSERVICEINMEMORY_PERSISTENCE( @@ -191,6 +192,7 @@ n_("Indique la liste d'extension dont il faut monitorer l'acces"), "WikittyPubText,WikittyPubData", String.class, false, false), + @Deprecated WIKITTY_WIKITTYSERVICESECURITY_COMPONENTS( "wikitty.WikittyServiceSecurity.components", n_("Indique le composant a utiliser pour l'authentification externe" Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2012-01-24 11:11:47 UTC (rev 1355) @@ -33,7 +33,6 @@ import org.nuiton.wikitty.services.WikittyListener; import org.nuiton.wikitty.services.WikittyServiceCached; import org.nuiton.wikitty.services.WikittyServiceNotifier; -import org.nuiton.wikitty.services.WikittyServiceSecurity; import org.nuiton.wikitty.services.WikittyServiceStorage; import java.util.Collection; @@ -54,8 +53,10 @@ * <dl> * <dt>{@link WikittyServiceCached}</dt> * <dd>add a cache for wikitties</dd> - * <dt>{@link WikittyServiceSecurity}</dt> - * <dd>add user authentication support and right management</dd> + * <dt>{@link WikittyServiceAuthentication}</dt> + * <dd>add user authentication support</dd> + * <dt>{@link WikittyServiceAuthorization}</dt> + * <dd>add right management</dd> * <dt>{@link WikittyServiceNotifier}</dt> * <dd>add notifications between client of the same wikitty service</dd> * </dl> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java 2012-01-24 11:11:47 UTC (rev 1355) @@ -53,7 +53,7 @@ /** * Recursively add extension with requires ones (orderer). - * WikittyService used in this method must not have WikittyServiceSecurity + * WikittyService used in this method must not have WikittyServiceAuthorization * in stack because we pass null as secuirtyToken to method. (TODO poussin * 2010 verify this assertion, when we use Migration, we don't need * Security) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthorization.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthorization.java 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthorization.java 2012-01-24 11:11:47 UTC (rev 1355) @@ -2,8 +2,8 @@ * #%L * Wikitty :: api * - * $Id: WikittyServiceSecurity.java 1311 2012-01-09 19:03:18Z bpoussin $ - * $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-api/src/main/java/org/nuiton... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2010 CodeLutin * %% Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-client.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-client.properties 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-client.properties 2012-01-24 11:11:47 UTC (rev 1355) @@ -25,7 +25,7 @@ wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceHessianClient,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceCached,\ -org.nuiton.wikitty.services.WikittyServiceSecurity +org.nuiton.wikitty.services.WikittyServiceAuthorization wikitty.WikittyServiceNotifier.components=org.nuiton.wikitty.services.XMPPNotifierTransporter wikitty.WikittyServiceCached.components=org.nuiton.wikitty.services.WikittyCacheJCS wikitty.service.cache.allwaysRestoreCopies=false Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties 2012-01-24 11:11:47 UTC (rev 1355) @@ -35,7 +35,8 @@ wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceCached,\ -org.nuiton.wikitty.services.WikittyServiceSecurity +org.nuiton.wikitty.services.WikittyServiceAuthentication,\ +org.nuiton.wikitty.services.WikittyServiceAuthorization wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties 2012-01-24 11:11:47 UTC (rev 1355) @@ -38,7 +38,7 @@ org.nuiton.wikitty.services.WikittyServiceSlave,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceCached,\ -org.nuiton.wikitty.services.WikittyServiceSecurity,\ +org.nuiton.wikitty.services.WikittyServiceAuthorization,\ org.nuiton.wikitty.services.WikittyServiceHessianServer wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties 2012-01-24 11:11:47 UTC (rev 1355) @@ -37,7 +37,8 @@ wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceCached,\ -org.nuiton.wikitty.services.WikittyServiceSecurity,\ +org.nuiton.wikitty.services.WikittyServiceAuthentication,\ +org.nuiton.wikitty.services.WikittyServiceAuthorization,\ org.nuiton.wikitty.services.WikittyServiceHessianServer wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties 2012-01-24 11:11:47 UTC (rev 1355) @@ -37,7 +37,8 @@ wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceCached,\ -org.nuiton.wikitty.services.WikittyServiceSecurity +org.nuiton.wikitty.services.WikittyServiceAuthentication,\ +org.nuiton.wikitty.services.WikittyServiceAuthorization wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceHelperTest.java 2012-01-24 11:11:47 UTC (rev 1355) @@ -80,8 +80,10 @@ + "," + WikittySearchEngineInMemory.class.getName()); WikittyService ws = WikittyServiceFactory.buildWikittyService(config); - Assert.assertEquals(WikittyServiceSecurity.class, ws.getClass()); - ws = ((WikittyServiceSecurity) ws).getDelegate(); + Assert.assertEquals(WikittyServiceAuthorization.class, ws.getClass()); + ws = ((WikittyServiceAuthorization) ws).getDelegate(); + Assert.assertEquals(WikittyServiceAuthentication.class, ws.getClass()); + ws = ((WikittyServiceAuthentication) ws).getDelegate(); Assert.assertEquals(WikittyServiceCached.class, ws.getClass()); ws = ((WikittyServiceCached) ws).getDelegate(); Assert.assertEquals(WikittyServiceNotifier.class, ws.getClass()); Deleted: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceSecurityTest.java 2012-01-24 10:39:11 UTC (rev 1354) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceSecurityTest.java 2012-01-24 11:11:47 UTC (rev 1355) @@ -1,51 +0,0 @@ -package org.nuiton.wikitty.services; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Ignore; -import org.junit.Test; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyClient; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyConfigOption; - -/** - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class WikittyServiceSecurityTest { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittyServiceSecurityTest.class); - - @Test - @Ignore // on l'ignore car il faut avoir accept a un LDAP et mettre en clair un mot de passe :( - public void testLDAP() throws Exception { - ApplicationConfig config = WikittyConfig.getConfig(); - - String services = config.getOption(WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey()); - services += "," + WikittyServiceSecurity.class.getName(); - config.setOption(WikittyConfigOption.WIKITTY_WIKITTYSERVICE_COMPONENTS.getKey(), - services); - config.setOption(WikittyConfigOption.WIKITTY_WIKITTYSERVICESECURITY_COMPONENTS.getKey(), - WikittyServiceSecurityExternalAuthenticationLDAP.class.getName()); - - config.setOption(WikittyConfigOption - .WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_SERVER.getKey(), - "ldap://intranet:389"); - config.setOption(WikittyConfigOption - .WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_LOGIN_PATTERN.getKey(), - "uid=%s,ou=People,dc=codelutin,dc=home"); - WikittyClient client = new WikittyClient(config); - client.login("poussin", "xxxx"); - System.out.println("token:" + client.getSecurityToken()); - System.out.println("user: " + client.getUser()); - - System.out.println("config: " + config.getFlatOptions()); - - } -}