- Wikitty-commits - mailman.cloud.codelutin.com

r396 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr
by bpoussin＠users.nuiton.org Oct. 8, 2010

Oct. 8, 2010

Author: bpoussin Date: 2010-10-08 17:48:28 +0200 (Fri, 08 Oct 2010) New Revision: 396 Url: http://nuiton.org/repositories/revision/wikitty/396 Log: ajout d'un petit fixme a verifier Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-10-08 15:41:19 UTC (rev 395) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-10-08 15:48:28 UTC (rev 396) @@ -510,6 +510,7 @@ @Override public void clear(WikittyTransaction transaction) { try { + // FIXME poussin 20100618 pourquoi n'est pas fait dans la transaction ? solrResource.init(); solrServer.deleteByQuery("*:*"); } catch (Exception eee) {

1 0

r395 - trunk/wikitty-ui-zk
by bpoussin＠users.nuiton.org Oct. 8, 2010

Oct. 8, 2010

Author: bpoussin Date: 2010-10-08 17:41:19 +0200 (Fri, 08 Oct 2010) New Revision: 395 Url: http://nuiton.org/repositories/revision/wikitty/395 Log: add zk repo to permit compilation for all users in the world easily Modified: trunk/wikitty-ui-zk/pom.xml Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-10-08 15:39:47 UTC (rev 394) +++ trunk/wikitty-ui-zk/pom.xml 2010-10-08 15:41:19 UTC (rev 395) @@ -121,9 +121,11 @@  <redmine.releaseFiles>target/${project.build.finalName}.${project.packaging}</redmine.releaseFiles> </properties> + + <repositories> + <repository> + <id>zk repository</id> + <url>http://mavensync.zkoss.org/maven2</url> + </repository> + </repositories> </project> - - - - -

1 0

r394 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform
by bpoussin＠users.nuiton.org Oct. 8, 2010

Oct. 8, 2010

Author: bpoussin Date: 2010-10-08 17:39:47 +0200 (Fri, 08 Oct 2010) New Revision: 394 Url: http://nuiton.org/repositories/revision/wikitty/394 Log: correction test on export: test work Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-10-08 15:39:29 UTC (rev 393) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-10-08 15:39:47 UTC (rev 394) @@ -42,6 +42,7 @@ @Test public void testExport() throws Exception { + ws.clear(null); // Database must be clean before create and export final List<Wikitty> wikitties = createSampleWikitty(ws); Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, AbstractTestConformance.EXTNAME).criteria(); @@ -65,8 +66,11 @@ assertEquals( "wikittyExt", attrs.get("name") ); } else if ( "object".equals(nodeName) ) { Wikitty wikitty = null; + String id = attrs.get("id"); for ( Wikitty w : wikitties ) { - if ( w.getId().equals(attrs.get("id")) ) { wikitty = w; break; } + if ( w.getId().equals(id) ) { + wikitty = w; break; + } } assertNotNull( wikitty ); assertEquals( "1.0", attrs.get("version") );

1 0

r393 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api
by bpoussin＠users.nuiton.org Oct. 8, 2010

Oct. 8, 2010

Author: bpoussin Date: 2010-10-08 17:39:29 +0200 (Fri, 08 Oct 2010) New Revision: 393 Url: http://nuiton.org/repositories/revision/wikitty/393 Log: correction test on date: test work Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-10-08 14:57:16 UTC (rev 392) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-10-08 15:39:29 UTC (rev 393) @@ -192,7 +192,7 @@ Assert.assertEquals(intValue, w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1") ); Date dateValue = new Date(); - w.setField(StorageTest.EXTNAME, "fieldName2", new Date() ); + w.setField(StorageTest.EXTNAME, "fieldName2", dateValue); Assert.assertEquals(dateValue, w.getFieldAsDate(StorageTest.EXTNAME, "fieldName2") ); // null or empty assignment ...

1 0

r392 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform
by bleny＠users.nuiton.org Oct. 8, 2010

Oct. 8, 2010

Author: bleny Date: 2010-10-08 16:57:16 +0200 (Fri, 08 Oct 2010) New Revision: 392 Url: http://nuiton.org/repositories/revision/wikitty/392 Log: renaming non-test class to be ignored by test-runner Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java Removed: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java Copied: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java (from rev 391, trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java) =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2010-10-08 14:57:16 UTC (rev 392) @@ -0,0 +1,97 @@ +/* *##% + * Copyright (c) 2009 ruchaud. All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + *##%*/ + +package org.nuiton.wikitty.conform; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Random; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.nuiton.wikitty.FieldType; +import org.nuiton.wikitty.Wikitty; +import org.nuiton.wikitty.WikittyExtension; +import org.nuiton.wikitty.WikittyImpl; +import org.nuiton.wikitty.WikittyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * This class is NOT a test. It's a benchlark that + * computes values and log them. This class is named properly to + * prevent any test Runner to run it. + * + * @author ruchaud + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +(a)RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations="classpath:META-INF/spring/wikitty-test.xml") +public class PerformanceBenchMark { + + protected final static Log log = LogFactory.getLog(PerformanceBenchMark.class); + + protected final static int WIKITTY_SIZE = 10000; + + @Autowired + protected WikittyService wikittyService; + + @Test + public void testPerformanceWikitty() throws Exception { + testPerformanceWikitty(3); + testPerformanceWikitty(50); + testPerformanceWikitty(100); + } + + protected void testPerformanceWikitty(int fieldSize) { + WikittyExtension extension = new WikittyExtension("Performance" + fieldSize); + for (int i = 0; i < fieldSize; i++) { + FieldType fieldType = new FieldType(FieldType.TYPE.STRING, 1, 1); + extension.addField("field" + i, fieldType); + } + wikittyService.storeExtension(null, extension); + + Collection<Wikitty> wikitties = new ArrayList<Wikitty>(WIKITTY_SIZE); + for (int i = 0; i < WIKITTY_SIZE; i++) { + Wikitty wikitty = new WikittyImpl("Performance" + fieldSize + "id" + i); + wikitty.addExtension(extension); + for (int j = 0; j < fieldSize; j++) { + wikitty.setField("Performance" + fieldSize, "field" + j, "value" + j); + } + wikitties.add(wikitty); + } + long start = System.currentTimeMillis(); + wikittyService.store(null, wikitties); + long end = System.currentTimeMillis(); + log.info("[Performance" + fieldSize + "] Write times : " + ((end - start) / 1000) + "s"); + + Random random = new Random(); + start = System.currentTimeMillis(); + for (int i = 0; i < WIKITTY_SIZE; i++) { + int nextInt = random.nextInt(WIKITTY_SIZE); + wikittyService.restore(null, "Performance" + fieldSize + "id" + nextInt); + } + end = System.currentTimeMillis(); + log.info("[Performance" + fieldSize + "] Read times : " + ((end - start) / 1000) + "s"); + } +} Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Deleted: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java 2010-10-06 17:42:23 UTC (rev 391) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceTest.java 2010-10-08 14:57:16 UTC (rev 392) @@ -1,93 +0,0 @@ -/* *##% - * Copyright (c) 2009 ruchaud. All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - *##%*/ - -package org.nuiton.wikitty.conform; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Random; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.nuiton.wikitty.FieldType; -import org.nuiton.wikitty.Wikitty; -import org.nuiton.wikitty.WikittyExtension; -import org.nuiton.wikitty.WikittyImpl; -import org.nuiton.wikitty.WikittyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * @author ruchaud - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -(a)RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations="classpath:META-INF/spring/wikitty-test.xml") -public class PerformanceTest { - - protected final static Log log = LogFactory.getLog(PerformanceTest.class); - - protected final static int WIKITTY_SIZE = 10000; - - @Autowired - protected WikittyService wikittyService; - - @Test - public void testPerformanceWikitty() throws Exception { - testPerformanceWikitty(3); - testPerformanceWikitty(50); - testPerformanceWikitty(100); - } - - protected void testPerformanceWikitty(int fieldSize) { - WikittyExtension extension = new WikittyExtension("Performance" + fieldSize); - for (int i = 0; i < fieldSize; i++) { - FieldType fieldType = new FieldType(FieldType.TYPE.STRING, 1, 1); - extension.addField("field" + i, fieldType); - } - wikittyService.storeExtension(null, extension); - - Collection<Wikitty> wikitties = new ArrayList<Wikitty>(WIKITTY_SIZE); - for (int i = 0; i < WIKITTY_SIZE; i++) { - Wikitty wikitty = new WikittyImpl("Performance" + fieldSize + "id" + i); - wikitty.addExtension(extension); - for (int j = 0; j < fieldSize; j++) { - wikitty.setField("Performance" + fieldSize, "field" + j, "value" + j); - } - wikitties.add(wikitty); - } - long start = System.currentTimeMillis(); - wikittyService.store(null, wikitties); - long end = System.currentTimeMillis(); - log.info("[Performance" + fieldSize + "] Write times : " + ((end - start) / 1000) + "s"); - - Random random = new Random(); - start = System.currentTimeMillis(); - for (int i = 0; i < WIKITTY_SIZE; i++) { - int nextInt = random.nextInt(WIKITTY_SIZE); - wikittyService.restore(null, "Performance" + fieldSize + "id" + nextInt); - } - end = System.currentTimeMillis(); - log.info("[Performance" + fieldSize + "] Read times : " + ((end - start) / 1000) + "s"); - } -}

1 0

r391 - in trunk: src/site wikitty-api/src/main/java/org/nuiton/wikitty wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org Oct. 6, 2010

Oct. 6, 2010

Author: bleny Date: 2010-10-06 19:42:23 +0200 (Wed, 06 Oct 2010) New Revision: 391 Url: http://nuiton.org/repositories/revision/wikitty/391 Log: code style ; javadoc Modified: trunk/src/site/site.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-10-05 17:40:50 UTC (rev 390) +++ trunk/src/site/site.xml 2010-10-06 17:42:23 UTC (rev 391) @@ -17,6 +17,8 @@ <item name="TODO" href="todo.html"/> </menu> + <menu ref="modules"/> + <menu ref="reports"/> </body> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-10-05 17:40:50 UTC (rev 390) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-10-06 17:42:23 UTC (rev 391) @@ -36,27 +36,24 @@ void addExtension(List<WikittyExtension> exts); - /** - * check that the wikitty has a metaExtension about a given extension - * @param metaExtension the metaExtension to be checked - * @param extension an extension already added to the wikitty + /** check that the wikitty has a metaExtension about a given extension. + * @param metaExtensionName the metaExtension to be checked + * @param extensionName an extension already added to the wikitty * @since 2.2.0 */ boolean hasMetaExtension(String metaExtensionName, String extensionName); - /** - * add a meta-extension about the given extension to this wikitty + /** add a meta-extension about the given extension to this wikitty. * @param metaExtension the metaExtension to add * @param extension an extension already added to the wikitty * @since 2.1 */ void addMetaExtension(WikittyExtension metaExtension, WikittyExtension extension); - - /** - * add a meta-extension on the given extension to this wikitty + + /** add a meta-extension on the given extension to this wikitty. * @param metaExtension the metaExtension to add * @param extensionFqn the name of the extension already added to the wikitty * @since 2.1 @@ -162,6 +159,7 @@ Set<String> fieldNames(); + /** get the value of and field given its fqn */ Object getFqField(String fqFieldName); String getVersion(); @@ -178,25 +176,22 @@ * @since 2.2.0 */ Set<String> getDirty(); - - /** - * Server only used - * @param version - */ + + /** clear the lists of modified field since last restore. */ void clearDirty(); - /** - * Server only used + /** set the value of a field given is fqn. * @param fieldName fqn (ex: extensionName.fieldName) * @param value new value */ void setFqField(String fieldName, Object value); boolean isEmpty(); - + + /** + * @see Cloneable#clone() + */ Wikitty clone() throws CloneNotSupportedException; - - } \ No newline at end of file Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-10-05 17:40:50 UTC (rev 390) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-10-06 17:42:23 UTC (rev 391) @@ -38,7 +38,7 @@ * for the string "abc{foo|bar}defrzeg{uvw|xyz}oeira" * will match {foo|bar} and {uvw|xyz} with groups for foo, bar, uvw and xyz */ - protected Pattern p = Pattern.compile("\\{(([^|}])*)(?:\\|([^}]*))?\\}"); + protected Pattern toStringTagValuePattern = Pattern.compile("\\{(([^|}])*)(?:\\|([^}]*))?\\}"); /** map "Client.name" to "getName()" or any getter to read this attribute * those getter names are stored while generating in order to be found @@ -406,7 +406,7 @@ // "hello {Person.name|unknow} employe of {Company.name|unknow}" // - Matcher matcher = p.matcher(toStringPattern); + Matcher matcher = toStringTagValuePattern.matcher(toStringPattern); while (matcher.find()) { String wholeMatch = matcher.group(0); // "{foo|bar}"

1 0

r388 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/layers
by bleny＠users.nuiton.org Oct. 5, 2010

Oct. 5, 2010

Author: bleny Date: 2010-10-05 18:34:28 +0200 (Tue, 05 Oct 2010) New Revision: 388 Url: http://nuiton.org/repositories/revision/wikitty/388 Log: removing dead code ; refactoring ; some javadoc Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-10-05 14:23:14 UTC (rev 387) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-10-05 16:34:28 UTC (rev 388) @@ -39,31 +39,6 @@ public WikittyServiceSecurity(WikittyService ws) { this.ws = ws; - -// Wikitty appAdminGroup = getAppAdminGroup(null); -// -// if (WikittyGroupHelper.getMembers(appAdminGroup) == null) { -// // first time boot -// ws.storeExtension(null, WikittyUserAbstract.extensions); -// ws.storeExtension(null, SecurityTokenAbstract.extensions); -// ws.storeExtension(null, WikittyGroupAbstract.extensions); -// -// // create the appAdmin account -// Wikitty appAdmin = new WikittyImpl(); -// WikittyUserHelper.addExtension(appAdmin); -// WikittyUserHelper.setLogin(appAdmin, APPADMIN_LOGIN); -// WikittyUserHelper.setPassword(appAdmin, APPADMIN_PASSWORD); -// ws.store(null, appAdmin); -// - -// -// // login as admin to add some security polices -// String adminToken = login(APPADMIN_LOGIN, APPADMIN_PASSWORD); -// -// // FIXME 20100923 bleny make all tokens unwritable, except for app admin -// -// logout(adminToken); -// } } @Override @@ -121,10 +96,20 @@ } } + /** + * @return a wikitty id + */ protected String extensionToWikittySecurityId(String extensionName) { return String.format("WikittySecurity:%s", extensionName); } + /** create an new account. + * create a new account, require to be appAdmin or anonymous if security + * is not yet enabled + * @param securityToken token (null for anonymous, or a token of an appAdmin) + * @param login the login of the account to be created + * @param password the password of the account to be created + */ public void createAccount(String securityToken, String login, String password) { String userId = getUserId(securityToken); boolean creationAllowed = userIsAnonymousOrAppAdmin(securityToken, userId); @@ -149,6 +134,12 @@ } } + /** get the id of a user given his login. + * + * @param securityToken a token + * @param login the login of the user to search for + * @return a wikitty id + */ public String getUserWikittyId(String securityToken, String login) { getUserId(securityToken); String userWikittyId = null; @@ -160,9 +151,33 @@ return userWikittyId; } - /** */ - public Wikitty addWikittyAuthorisation(String securityToken, + /** if app-admin group exists, return true if given userId is app-admin + * if app-admin group doesn't exists, return true if user is anonymous + */ + protected boolean userIsAnonymousOrAppAdmin(String securityToken, String userId) { + boolean userIsAnonymousOrAppAdmin = false; + + if (getAppAdminGroup(securityToken) == null) { + if (securityToken == null) { + // user is anonymous + userIsAnonymousOrAppAdmin = true; + } + } else { + if (isAppAdmin(securityToken, userId)) { + // user is appAdmin + userIsAnonymousOrAppAdmin = true; + } + } + + return userIsAnonymousOrAppAdmin; + } + + /** add a level 2 security policy on the given extension. */ + public Wikitty addExtensionAuthorisation(String securityToken, WikittyExtension extension) { + + // TODO 20101005 bleny merge into storeExtensionAuthorisation by adding an extension paramater ? + String userId = getUserId(securityToken); boolean creationAllowed = userIsAnonymousOrAppAdmin(securityToken, userId); @@ -186,37 +201,6 @@ } } - protected boolean userIsAnonymousOrAppAdmin(String securityToken, String userId) { - boolean userIsAnonymousOrAppAdmin = false; - /* - if (securityToken == null) { - // user is anonymous - userIsAnonymousOrAppAdmin = true; - } else { - if (getAppAdminGroup(securityToken) != null) { - if ( isAppAdmin(securityToken, userId)) { - // user is appAdmin - userIsAnonymousOrAppAdmin = true; - } - } - } - */ - - if (getAppAdminGroup(securityToken) == null) { - if (securityToken == null) { - // user is anonymous - userIsAnonymousOrAppAdmin = true; - } - } else { - if (isAppAdmin(securityToken, userId)) { - // user is appAdmin - userIsAnonymousOrAppAdmin = true; - } - } - - return userIsAnonymousOrAppAdmin; - } - /** restore the wikitty authorisation attached to given extension. * * @return a wikitty with WikittyAuthorisation extension, or null if given @@ -250,44 +234,33 @@ } return wikittyAuthorisation; } - + + /** + * + * @param securityToken token with rights to modify extension + * @param extensionRights a wikitty that has extension WikittyAuthorisation + */ public void storeExtensionAuthorisation(String securityToken, - Wikitty wikitty) { + Wikitty extensionRights) { String userId = getUserId(securityToken); - Wikitty oldVersion = ws.restore(securityToken, wikitty.getId()); + Wikitty oldVersion = ws.restore(securityToken, extensionRights.getId()); - // check that the wikitty does not have - if (WikittyAuthorisationHelper.hasExtension(wikitty)) { + // check that the extensionRights does not have + if (WikittyAuthorisationHelper.hasExtension(extensionRights)) { if (oldVersion == null) { - // if this exception is raised, you should use addWikittyAuthorisation() + // if this exception is raised, you should use addExtensionAuthorisation() throw new IllegalArgumentException("you can't store an authorisation for the fist time"); } else { if ( userIsAnonymousOrAppAdmin(securityToken, userId) || - canAdmin(securityToken, userId, null, oldVersion) ) { -// -// if (isAdmin(securityToken, userId, oldVersion, null)) { -// // admin can't change owner, admin or parent -// // putting back old values -// Object oldValue = oldVersion.getFieldAsObject( -// WikittyAuthorisation.EXT_WIKITTYAUTHORISATION, -// WikittyAuthorisation.FIELD_WIKITTYAUTHORISATION_OWNER); -// wikitty.setField(WikittyAuthorisation.EXT_WIKITTYAUTHORISATION, -// WikittyAuthorisation.FIELD_WIKITTYAUTHORISATION_OWNER, -// oldValue); -// -// WikittyAuthorisationHelper.setOwner(wikitty, -// WikittyAuthorisationHelper.getOwner(oldVersion)); -// WikittyAuthorisationHelper.setParent(wikitty, -// WikittyAuthorisationHelper.getParent(oldVersion)); -// -// } + canAdmin(securityToken, userId, null, oldVersion) ) { - ws.store(securityToken, wikitty); + ws.store(securityToken, extensionRights); + } else { throw new SecurityException(String.format( "user %s can't admin rights for this extension", userId)); @@ -295,8 +268,8 @@ } } else { throw new IllegalArgumentException(String.format( - "wikitty %s is not a wikittyAuthorisation. It misses the extension", - wikitty)); + "extensionRights %s is not a wikittyAuthorisation. It misses the extension", + extensionRights)); } } @@ -337,7 +310,7 @@ // usual case, a user want to store a wikitty Wikitty oldVersion = ws.restore(securityToken, wikitty.getId()); - Collection<String> newExtensions = wikitty.getExtensionNames(); + Collection<String> newExtensions = new ArrayList<String>(wikitty.getExtensionNames()); if (oldVersion != null) { // we already checked the rights for those extension // re-do the check has too much cost, avoid it @@ -368,8 +341,16 @@ fqFieldDirtyName, concernedExtensionName)); } - boolean canChange; - if (WikittyAuthorisation.EXT_WIKITTYAUTHORISATION.equals(concernedExtensionName)) { + boolean fieldRequireAdminRights = // true if field is a field of WikittyAuthorisation + // concerned extension is "WikittyAuthorisation" + WikittyAuthorisation.EXT_WIKITTYAUTHORISATION.equals(concernedExtensionName) + // or concerned extension is something like "AnyExtension:WikittyAuthorisation" + || WikittyAuthorisation.EXT_WIKITTYAUTHORISATION.equals( + WikittyUtil.getMetaExtensionNameFromFQMetaExtensionName(concernedExtensionName)); + + boolean canChange; // will be true if user can modify the value of this field + // according to his level of rights + if (fieldRequireAdminRights) { canChange = canAdmin(securityToken, userId, concernedExtensionName, wikitty); } else { canChange = canWrite(securityToken, userId, concernedExtensionName, wikitty); @@ -579,8 +560,12 @@ if ( ! userIsAnonymousOrAppAdmin(securityToken, userId)) { for (WikittyExtension extension : exts) { Wikitty extensionAuthorisation = restoreExtensionAuthorisation(securityToken, extension.getName()); - if ( ! canWrite(securityToken, userId, null, extensionAuthorisation)) { - throw new SecurityException(_("user %s don't have write right for extension %s", userId, extension)); + if (extensionAuthorisation != null) { + // canWrite is true if this user can modify the field for this extension + boolean canWrite = canWrite(securityToken, userId, null, extensionAuthorisation); + if ( ! canWrite) { + throw new SecurityException(_("user %s don't have write right for extension %s", userId, extension)); + } } } } @@ -757,11 +742,9 @@ // Method helper to check right // - /** - * Recupere l'identifiant de l'utilisateur associe au securityToken - * - * @param securityToken - * @return l'identifiant de l'utilisateur, ou null si le token est invalide + /** tell who own a token (who got this token after login). + * @param securityToken the token whose owner will be returned + * @return a wikitty Id (wikitty has extension WikittyUser) */ protected String getUserId(String securityToken) { String result = null; @@ -830,7 +813,7 @@ return result; } - /** + /** true if given user is owner * * @param securityToken * @param userId @@ -857,12 +840,26 @@ } return isOwner; } - + + /** {@link #isMember(String, String, Wikitty, String, boolean)} with default value */ protected boolean isMember(String securityToken, String userId, Wikitty extensionRights, String fqFieldName) { - // by default, user is considered not member if she is not in the group, so passing "false" + // by default, user is considered not member if he is not in the group, so passing "false" return isMember(securityToken, userId, extensionRights, fqFieldName, false); } + /** check if a user is listed in a level of rights + * + * @param securityToken + * @param userId the userId to look for + * @param extensionRights a wikitty with WikittyAuthorisation as extension OR meta-extension + * @param fqFieldName the field to look into, it should be one of the field of extension WikittyAuthorisation + * it has to be a FQN and may contain an extension-name if using meta-extension + * @param considerEmptyGroupAsMembership if true, an empty field value will be considered as + * "every-one is in the group". Most of the time, it will be false but true should be + * passed for "reader" level because user has right to read if he belongs to "reader" OR + * if reader is empty + * @return true if userId appear in the single/list of group/user of given field + */ protected boolean isMember(String securityToken, String userId, Wikitty extensionRights, String fqFieldName, boolean considerEmptyGroupAsMembership) { @@ -891,44 +888,7 @@ return isMember; } -// /** -// * Par defaut un objet est lisible par tous, sauf s'il a l'extension -// * d'autorisation et que la liste des readers existe et n'est pas vide -// * -// * @param userId -// * @param w -// * @return true si l'utilisateur est dans la liste des reader (ou que cette -// * liste n'existe pas ce qui indique que tout le monde est reader) -// */ -// @Deprecated -// protected boolean isReader(String securityToken, String userId, Wikitty w) { -// boolean result = true; -// if (WikittyAuthorisationHelper.isExtension(w)) { -// Set<String> groupOrUser = WikittyAuthorisationHelper.getReader(w); -// if (groupOrUser == null || groupOrUser.size() == 0) { -// // il n'y a pas de reader sur l'objet actuel, il faut regarder -// // sur le parent s'il y en a -// String parentId = WikittyAuthorisationHelper.getParent(w); -// if (parentId != null) { -// Wikitty parent = ws.restore(securityToken, parentId); -// result = isReader(securityToken, userId, parent); -// } -// } else { -// // il y a des readers sur l'objet actuel, il faut donc checker -// // comme pour les autres droits en parent aussi les parents -// result = isMember( -// securityToken, userId, w, WikittyAuthorisation.FIELD_WIKITTYAUTHORISATION_READER); -// } -// } -// return result; -// } - - /** - * Verifie si l'utilisateur est considere comme un AppAdmin - * - * @param userId - * @return - */ + /** check if a given user belong to the group of app-admins. */ protected boolean isAppAdmin(String securityToken, String userId) { Wikitty group = getAppAdminGroup(securityToken); Set<String> ids = WikittyGroupHelper.getMembers(group); @@ -962,6 +922,7 @@ } } + /** get the wikitty with extension WikittyGroup that contains all app-admin. */ protected Wikitty getAppAdminGroup(String securityToken) { Wikitty group; if (appAdminGroupId == null) { Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-10-05 14:23:14 UTC (rev 387) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-10-05 16:34:28 UTC (rev 388) @@ -10,12 +10,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.nuiton.wikitty.FieldType; -import org.nuiton.wikitty.FieldType.TYPE; -import org.nuiton.wikitty.SecurityToken; -import org.nuiton.wikitty.TreeNodeAbstract; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyAuthorisation; import org.nuiton.wikitty.WikittyAuthorisationAbstract; @@ -62,7 +58,7 @@ securityService.createAccount(token, "admin", ""); securityService.createAccount(token, "owner", ""); - Wikitty authorizations = securityService.addWikittyAuthorisation(token, extension); + Wikitty authorizations = securityService.addExtensionAuthorisation(token, extension); WikittyAuthorisationHelper.addReader(authorizations, securityService.getUserWikittyId(token, "reader")); WikittyAuthorisationHelper.addWriter(authorizations, securityService.getUserWikittyId(token, "writer")); WikittyAuthorisationHelper.addAdmin(authorizations, securityService.getUserWikittyId(token, "admin"));

3 3

r390 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org Oct. 5, 2010

Oct. 5, 2010

Author: bleny Date: 2010-10-05 19:40:50 +0200 (Tue, 05 Oct 2010) New Revision: 390 Url: http://nuiton.org/repositories/revision/wikitty/390 Log: refactoring generated code about adding a meta-extension to a wikity Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-10-05 16:46:42 UTC (rev 389) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-10-05 17:40:50 UTC (rev 390) @@ -16,7 +16,6 @@ import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; @@ -455,13 +454,12 @@ ObjectModelAttribute extension = addAttribute(abstractClassForThisMetaExtension, "extensionForMetaExtension", WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN); setDocumentation(extension, "the metaExtension operations target this extension, may be null"); - ObjectModelOperation addMetaExtension = addOperation(abstractClassForThisMetaExtension, "addMetaExtension", "void"); - addAnnotation(abstractClassForThisMetaExtension, addMetaExtension, "Override"); - addParameter(addMetaExtension, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); - setDocumentation(addMetaExtension, String.format( + ObjectModelOperation setExtensionForMetaExtension = addOperation(abstractClassForThisMetaExtension, "setExtensionForMetaExtension", "void"); + addParameter(setExtensionForMetaExtension, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + setDocumentation(setExtensionForMetaExtension, String.format( "add %s meta-extension on given extension to this entity", metaExtension.getName())); - setOperationBody(addMetaExtension, "" + setOperationBody(setExtensionForMetaExtension, "" /*{ extensionForMetaExtension = extension; <%=helperClassName%>.addMetaExtension(extension, getWikitty()); Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-10-05 16:46:42 UTC (rev 389) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-10-05 17:40:50 UTC (rev 390) @@ -237,16 +237,6 @@ /** add stuff if input model element is stereotyped as "meta" */ protected void processMetaExtension(ObjectModelClass metaExtension) { - log.debug("processing meta-extension : " + metaExtension.getPackageName() + - "." + metaExtension.getName()); - - ObjectModelInterface contract = prepareOutputClass(metaExtension); - - ObjectModelOperation addMetaExtension = addOperation(contract, "addMetaExtension", "void"); - addParameter(addMetaExtension, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); - setDocumentation(addMetaExtension, String.format( - "add %s meta-extension on given extension to this entity", - metaExtension.getName())); - + // nothing to do } } Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-10-05 16:46:42 UTC (rev 389) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-10-05 17:40:50 UTC (rev 390) @@ -36,16 +36,14 @@ } protected ObjectModelClass prepareImplementation(ObjectModelClass clazz) { - ObjectModelClass implementation; + ObjectModelClass implementation = processedClasses.get(clazz); - if (processedClasses.containsKey(clazz)) { - // class has been already processed, return the implementation - implementation = processedClasses.get(clazz); - } else { + if (implementation == null) { + implementation = createClass( WikittyTransformerUtil.businessEntityToImplementationName(clazz), clazz.getPackageName()); - + // TODO 20100811 bleny remove unused imports addImport(implementation, WikittyTransformerUtil.BUSINESS_ENTITY_CLASS_FQN); addImport(implementation, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN); @@ -65,9 +63,9 @@ addImport(implementation, java.util.Set.class); addImport(implementation, java.util.Date.class); addImport(implementation, java.util.LinkedHashSet.class); - + setSuperClass(implementation, WikittyTransformerUtil.businessEntityToAbstractName(clazz)); - + // adding a generated serialVersionUID Random random = new Random(); Long serialVersionUIDs = random.nextLong(); @@ -76,7 +74,8 @@ "long", serialVersionUIDs.toString() + "L", ObjectModelModifier.PRIVATE); - + + processedClasses.put(clazz, implementation); } return implementation; @@ -118,9 +117,8 @@ String contractName = WikittyTransformerUtil.businessEntityToContractName(metaExtension); setOperationBody(constructor, "" /*{ - this.extensionForMetaExtension = extension; this.wikitty = wikitty; - addMetaExtension(extension<%=contractName%>, extension); + setExtensionForMetaExtension(extension); }*/); } }

1 0

r389 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bleny＠users.nuiton.org Oct. 5, 2010

Oct. 5, 2010

Author: bleny Date: 2010-10-05 18:46:42 +0200 (Tue, 05 Oct 2010) New Revision: 389 Url: http://nuiton.org/repositories/revision/wikitty/389 Log: bug fixes ; missing instructions in meta-extension constructors Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-10-05 16:34:28 UTC (rev 388) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-10-05 16:46:42 UTC (rev 389) @@ -29,7 +29,7 @@ processBusinessEntity(clazz, implementation); } - if ( WikittyTransformerUtil.isBusinessEntity(clazz) ) { + if ( WikittyTransformerUtil.isMetaExtension(clazz) ) { ObjectModelClass implementation = prepareImplementation(clazz); processMetaExtension(clazz, implementation); } @@ -118,6 +118,7 @@ String contractName = WikittyTransformerUtil.businessEntityToContractName(metaExtension); setOperationBody(constructor, "" /*{ + this.extensionForMetaExtension = extension; this.wikitty = wikitty; addMetaExtension(extension<%=contractName%>, extension); }*/);

1 0

r387 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/layers
by bleny＠users.nuiton.org Oct. 5, 2010

Oct. 5, 2010

Author: bleny Date: 2010-10-05 16:23:14 +0200 (Tue, 05 Oct 2010) New Revision: 387 Url: http://nuiton.org/repositories/revision/wikitty/387 Log: security bug fixes Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-10-05 13:34:48 UTC (rev 386) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-10-05 14:23:14 UTC (rev 387) @@ -185,10 +185,10 @@ WIKITTY_APPADMIN_GROUP_NAME)); } } - + protected boolean userIsAnonymousOrAppAdmin(String securityToken, String userId) { boolean userIsAnonymousOrAppAdmin = false; - + /* if (securityToken == null) { // user is anonymous userIsAnonymousOrAppAdmin = true; @@ -200,6 +200,20 @@ } } } + */ + + if (getAppAdminGroup(securityToken) == null) { + if (securityToken == null) { + // user is anonymous + userIsAnonymousOrAppAdmin = true; + } + } else { + if (isAppAdmin(securityToken, userId)) { + // user is appAdmin + userIsAnonymousOrAppAdmin = true; + } + } + return userIsAnonymousOrAppAdmin; } @@ -410,10 +424,12 @@ protected void refuseUnauthorizedRead( String securityToken, String userId, Wikitty wikitty) { - for (String extensionName : wikitty.getExtensionNames()) { - if ( ! canRead(securityToken, userId, extensionName, wikitty)) { - throw new SecurityException(_("user %s can't read extension %s on wikitty %s, it may be due to a global policy on the wikitty", - userId, extensionName, wikitty)); + if (wikitty != null) { + for (String extensionName : wikitty.getExtensionNames()) { + if ( ! canRead(securityToken, userId, extensionName, wikitty)) { + throw new SecurityException(_("user %s can't read extension %s on wikitty %s, it may be due to a global policy on the wikitty", + userId, extensionName, wikitty)); + } } } } @@ -486,12 +502,7 @@ || isOwner(securityToken, userId, wikitty, null); } else if ( ! canAdmin ) { // still not admin, check appAdmin - if (getAppAdminGroup(securityToken) == null) { - canAdmin = isAppAdmin(securityToken, userId); - } - } else { - // no security policy, everything is allowed - canAdmin = true; + canAdmin = userIsAnonymousOrAppAdmin(securityToken, userId); } return canAdmin; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-10-05 13:34:48 UTC (rev 386) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-10-05 14:23:14 UTC (rev 387) @@ -45,6 +45,12 @@ securityService = new WikittyServiceSecurity(inMemoryService); + /** / + // FIXME 20101005 bleny implementation should be able to allow + // passing trough two security layers + securityService = new WikittyServiceSecurity(securityService); + /**/ + service = securityService; // token = service.login(APPADMIN_LOGIN, APPADMIN_PASSWORD);

1 0