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

r1319 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by jcouteau＠users.nuiton.org 12 Jan '12

12 Jan '12

Author: jcouteau Date: 2012-01-12 18:24:58 +0100 (Thu, 12 Jan 2012) New Revision: 1319 Url: http://nuiton.org/repositories/revision/wikitty/1319 Log: Fix castTo Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.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-12 15:16:49 UTC (rev 1318) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-12 17:24:58 UTC (rev 1319) @@ -980,7 +980,6 @@ static private class IdToObjectConverter<T> implements ConvertTreeVisitor.Converter<String, T> { protected Map<String, T> objects = new HashMap<String, T>(); protected String securityToken; - protected WikittyService wikittyService; public IdToObjectConverter(List<String> ids, List<T> objectList) { for (int i = 0; i < ids.size(); i++) { @@ -1368,7 +1367,7 @@ } else if (objects.size() == 0) { // on ne fait rien on met juste une nouvelle liste vide result = new ArrayList<E>(); - } else if (target.isAssignableFrom(Wikitty.class)) { + } else if (Wikitty.class.isAssignableFrom(target)) { // On veut des Wikitties en sortie Object first = objects.get(0); @@ -1440,7 +1439,7 @@ // le queryResult courant contient des Ids // Si ce n'est pas le cas, ca veut dire que le developpeur utilisant // ce queryResult ne sait pas ce qu'il fait :) - List<String> ids = (List<String>) objects.get(0); + List<String> ids = (List<String>) objects; result = (List<E>)restore(ids); } else { throw new ClassCastException("WikittyQueryResult don't contains" @@ -1448,35 +1447,35 @@ + " (accepted Wikitty, BusinessEntityImpl, String id) but not " + first.getClass()); } - } else if (target.isAssignableFrom(BusinessEntity.class)) { + } else if (BusinessEntity.class.isAssignableFrom(target)) { // on commence par tout mettre en Wikitty, en utilisant le if du dessus List<Wikitty> resultTmp = castTo(Wikitty.class, objects); result = (List<E>)WikittyUtil.newInstance((Class<BusinessEntity>)target, resultTmp); - } else if (target.isAssignableFrom(Number.class)) { + } else if (Number.class.isAssignableFrom(target)) { result = new ArrayList<E>(objects.size()); for (Object o : objects) { BigDecimal v = WikittyUtil.toBigDecimal(o); result.add((E)v); } - } else if (target.isAssignableFrom(Date.class)) { + } else if (Date.class.isAssignableFrom(target)) { result = new ArrayList<E>(objects.size()); for (Object o : objects) { Date v = WikittyUtil.toDate(o); result.add((E)v); } - } else if (target.isAssignableFrom(Boolean.class)) { + } else if (Boolean.class.isAssignableFrom(target)) { result = new ArrayList<E>(objects.size()); for (Object o : objects) { Boolean v = WikittyUtil.toBoolean(o); result.add((E)v); } - } else if (target.isAssignableFrom(byte[].class)) { + } else if (byte[].class.isAssignableFrom(target)) { result = new ArrayList<E>(objects.size()); for (Object o : objects) { byte[] v = WikittyUtil.toBinary(o); result.add((E)v); } - } else if (target.isAssignableFrom(String.class)) { + } else if (String.class.isAssignableFrom(target)) { result = new ArrayList<E>(objects.size()); for (Object o : objects) { String v = WikittyUtil.toString(o);

1 0

r1318 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 12 Jan '12

12 Jan '12

Author: bpoussin Date: 2012-01-12 16:16:49 +0100 (Thu, 12 Jan 2012) New Revision: 1318 Url: http://nuiton.org/repositories/revision/wikitty/1318 Log: add new WikittyClient.castTo method with list and object as parameter this new method replace deprecated getWikitty method Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.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-12 14:02:29 UTC (rev 1317) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-12 15:16:49 UTC (rev 1318) @@ -1249,7 +1249,9 @@ * * @param entity the BusinessEntity encapsulating the Wikitty * @return the wikitty encapsulated + * @deprecated since 3.4 use {@link #castTo(java.lang.Class, Object) } */ + @Deprecated public Wikitty getWikitty(BusinessEntity entity){ long start = TimeLog.getTime(); Wikitty result; @@ -1340,93 +1342,203 @@ return user; } + /** - * Convert all result to the wanted type and return new WikittyQueryResult - * with this new result list. For business object transformation, if some + * Convert all objects in list parameter to the wanted type and return + * new List. + * For business object transformation, if some * result don't have the right extension (clazz) this extension is * automatically added. - * - * @param queryResult result to convert + * + * If possible this method don't instanciated new Object. If e is Wikitty + * and wanted target is Wikitty a simple cast is done. + * * @param target to cast into. * Can be Wikitty, BusinessEntity, String, Date, Number (returned is BigDecimal), Boolean, byte[] - * @return new WikittyQueryResult with element in right class or Exception + * @param objects objects to convert + * @return List objects in right class or Exception. * if conversion is impossible + * @since 3.4 */ - public <E> WikittyQueryResult<E> castTo(Class<E> target, - WikittyQueryResult queryResult) { - List<E> castedResult; + public <E, F> List<E> castTo(Class<E> target, List<F> objects) { + List<E> result; - if (queryResult.size() == 0) { + if (objects == null) { + result = null; + } else if (objects.size() == 0) { // on ne fait rien on met juste une nouvelle liste vide - castedResult = new ArrayList<E>(); + result = new ArrayList<E>(); } else if (target.isAssignableFrom(Wikitty.class)) { // On veut des Wikitties en sortie - if (queryResult.peek() instanceof Wikitty) { + Object first = objects.get(0); + if (first instanceof Wikitty) { // W, rien a faire - castedResult = queryResult.getAll(); - } else if (queryResult.peek() instanceof BusinessEntityImpl) { + result = (List<E>)objects; + } else if (first instanceof BusinessEntityImpl) { // BusinessEntityImpl, il faut recuperer les wikitty - castedResult = new ArrayList<E>(queryResult.size()); - for (BusinessEntityImpl e : (WikittyQueryResult<BusinessEntityImpl>)queryResult) { - castedResult.add((E)e.getWikitty()); + result = new ArrayList<E>(objects.size()); + for (BusinessEntityImpl e : (WikittyQueryResult<BusinessEntityImpl>)objects) { + result.add((E)e.getWikitty()); } - } else if (queryResult.peek() instanceof String) { + } else if (first instanceof BusinessEntity) { + // BusinessEntity, il faut faire un restore puis remettre la + // valeur des champs dans les wikitties recuperes + + // on collecte tous les ids + List<String> ids = new ArrayList(objects.size()); + for (BusinessEntity e : (List<BusinessEntity>)objects) { + ids.add(e.getWikittyId()); + } + + result = (List<E>)restore(ids); + + // on copie les champs des entities dans les wikitties recuperes + // try settings all fields except version + try { + // les entites a mettre dans les wikitties + BusinessEntity[] entities = objects.toArray(new BusinessEntity[objects.size()]); + // les wikitties qui seront les resultats + Wikitty[] wikitties = result.toArray(new Wikitty[result.size()]); + + //get all fields + Class entityClass = first.getClass(); + Field[] fields = entityClass.getDeclaredFields(); + + for(Field field:fields){ + //for each field that got WikittyField annotation + if (field.isAnnotationPresent(WikittyField.class)){ + + //get the attribute's wikitty fqn + WikittyField annotation = field.getAnnotation(WikittyField.class); + String fieldFQN = annotation.fqn(); + + //set the value + Method m = entityClass.getMethod("get" + StringUtils.capitalize(field.getName())); + + for(int i=0; i<entities.length; i++) { + if (wikitties[i] != null) { + // le wikitty peut etre null, par exemple a cause de la security + Object value = m.invoke(entities[i]); + wikitties[i].setFqField(fieldFQN, value); + } + } + } + } + //manually set version + for(int i=0; i<entities.length; i++) { + if (wikitties[i] != null) { + // le wikitty peut etre null, par exemple a cause de la security + wikitties[i].setVersion(entities[i].getWikittyVersion()); + } + } + } catch (Exception eee) { + throw new WikittyException("Could not transform entity to Wikitty", eee); + } + } else if (first instanceof String) { // String, il faut faire un restore // le queryResult courant contient des Ids // Si ce n'est pas le cas, ca veut dire que le developpeur utilisant // ce queryResult ne sait pas ce qu'il fait :) - List<String> ids = (List<String>) queryResult.getAll(); - castedResult = (List<E>)getWikittyService().restore(securityToken, ids); + List<String> ids = (List<String>) objects.get(0); + result = (List<E>)restore(ids); } else { throw new ClassCastException("WikittyQueryResult don't contains" + " object convertible to Wikitty" - + " (accepted Wikitty, BusinessEntityImpl, String id) but " - + queryResult.peek().getClass()); + + " (accepted Wikitty, BusinessEntityImpl, String id) but not " + + first.getClass()); } - } else if (target.isAssignableFrom(BusinessEntityImpl.class)) { + } else if (target.isAssignableFrom(BusinessEntity.class)) { // on commence par tout mettre en Wikitty, en utilisant le if du dessus - WikittyQueryResult<Wikitty> resultTmp = castTo(Wikitty.class, queryResult); - castedResult = (List<E>)WikittyUtil.newInstance((Class<BusinessEntity>)target, resultTmp.getAll()); + List<Wikitty> resultTmp = castTo(Wikitty.class, objects); + result = (List<E>)WikittyUtil.newInstance((Class<BusinessEntity>)target, resultTmp); } else if (target.isAssignableFrom(Number.class)) { - castedResult = new ArrayList<E>(queryResult.size()); - for (Object o : queryResult) { + result = new ArrayList<E>(objects.size()); + for (Object o : objects) { BigDecimal v = WikittyUtil.toBigDecimal(o); - castedResult.add((E)v); + result.add((E)v); } } else if (target.isAssignableFrom(Date.class)) { - castedResult = new ArrayList<E>(queryResult.size()); - for (Object o : queryResult) { + result = new ArrayList<E>(objects.size()); + for (Object o : objects) { Date v = WikittyUtil.toDate(o); - castedResult.add((E)v); + result.add((E)v); } } else if (target.isAssignableFrom(Boolean.class)) { - castedResult = new ArrayList<E>(queryResult.size()); - for (Object o : queryResult) { + result = new ArrayList<E>(objects.size()); + for (Object o : objects) { Boolean v = WikittyUtil.toBoolean(o); - castedResult.add((E)v); + result.add((E)v); } } else if (target.isAssignableFrom(byte[].class)) { - castedResult = new ArrayList<E>(queryResult.size()); - for (Object o : queryResult) { + result = new ArrayList<E>(objects.size()); + for (Object o : objects) { byte[] v = WikittyUtil.toBinary(o); - castedResult.add((E)v); + result.add((E)v); } } else if (target.isAssignableFrom(String.class)) { - castedResult = new ArrayList<E>(queryResult.size()); - for (Object o : queryResult) { + result = new ArrayList<E>(objects.size()); + for (Object o : objects) { String v = WikittyUtil.toString(o); - castedResult.add((E)v); + result.add((E)v); } }else { throw new ClassCastException(String.format( - "WikittyQueryResult don't contains" + "Object list don't contains" + " object convertible to %s" + " (accepted Wikitty, BusinessEntityImpl, String id, Date," - + " BigDecimal, Boolean, byte[]) but '%s'", - target.getName(), queryResult.peek().getClass())); + + " BigDecimal, Boolean, byte[]) but not '%s'", + target.getName(), objects.get(0).getClass())); } + return result; + } + + /** + * Convert e parameter to the wanted type and return it. + * For business object transformation, if some + * result don't have the right extension (clazz) this extension is + * automatically added. + * + * If possible this method don't instanciated new Object. If e is Wikitty + * and wanted target is Wikitty a simple cast is done. + * + * @param target to cast into. + * Can be Wikitty, BusinessEntity, String, Date, Number (returned is BigDecimal), Boolean, byte[] + * @param e object to convert + * @return Object in right class or Exception. + * if conversion is impossible + * @since 3.4 + */ + public <E> E castTo(Class<E> target, Object e) { + E result; + + if (e == null) { + result = null; + } else { + List<E> tmp = castTo(target, Collections.singletonList(e)); + result = tmp.get(0); + } + + return result; + } + + /** + * Convert all result to the wanted type and return new WikittyQueryResult + * with this new result list. For business object transformation, if some + * result don't have the right extension (clazz) this extension is + * automatically added. + * + * @param queryResult result to convert + * @param target to cast into. + * Can be Wikitty, BusinessEntity, String, Date, Number (returned is BigDecimal), Boolean, byte[] + * @return new WikittyQueryResult with element in right class or Exception + * if conversion is impossible + */ + public <E> WikittyQueryResult<E> castTo(Class<E> target, + WikittyQueryResult queryResult) { + List<E> castedResult = castTo(target, queryResult.getAll()); + WikittyQueryResult<E> result = new WikittyQueryResult<E>( queryResult.getQueryName(), queryResult.getFirst(), queryResult.getTotalResult(),

1 0

r1317 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-dto/src/main/java/org/nuiton/wikitty/dto wikitty-dto/src/test/java/org/nuiton/wikitty/dto
by jcouteau＠users.nuiton.org 12 Jan '12

12 Jan '12

Author: jcouteau Date: 2012-01-12 15:02:29 +0100 (Thu, 12 Jan 2012) New Revision: 1317 Url: http://nuiton.org/repositories/revision/wikitty/1317 Log: DTOHelper do not use deprecated API anymore Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.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-12 13:55:21 UTC (rev 1316) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-01-12 14:02:29 UTC (rev 1317) @@ -515,8 +515,8 @@ * Null field are not used in search request. * * @param e sample wikitty - * @param firstIndex - * @param endIndex + * @param first + * @param limit * @param fieldFacet * @return */ Modified: trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java =================================================================== --- trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java 2012-01-12 13:55:21 UTC (rev 1316) +++ trunk/wikitty-dto/src/main/java/org/nuiton/wikitty/dto/DTOHelper.java 2012-01-12 14:02:29 UTC (rev 1317) @@ -27,7 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ObjectUtil; -import org.nuiton.wikitty.WikittyProxy; +import org.nuiton.wikitty.WikittyClient; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.BusinessEntity; import org.nuiton.wikitty.entities.Wikitty; @@ -59,16 +59,15 @@ return result; } - public static <E extends BusinessEntity> E fromDto(WikittyProxy proxy, Class<E> clazz, E dto) { + public static <E extends BusinessEntity> E fromDto(WikittyClient client, Class<E> clazz, E dto) { - E result = proxy.restore(clazz, dto.getWikittyId()); + E result = client.restore(clazz, dto.getWikittyId()); if (result == null){ try { String wikittyId = dto.getWikittyId(); Wikitty wikitty = new WikittyImpl(wikittyId); - result = WikittyUtil.newInstance( proxy.getSecurityToken(), - proxy.getWikittyService(), clazz, wikitty); + result = WikittyUtil.newInstance(clazz, wikitty); } catch (Exception eee) { log.error("Could not transform DTO to Wikitty", eee); } Modified: trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java =================================================================== --- trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2012-01-12 13:55:21 UTC (rev 1316) +++ trunk/wikitty-dto/src/test/java/org/nuiton/wikitty/dto/WikittyDTOTest.java 2012-01-12 14:02:29 UTC (rev 1317) @@ -24,34 +24,25 @@ */ package org.nuiton.wikitty.dto; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyProxy; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Assert; import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.WikittyServiceFactory; +import org.nuiton.wikitty.WikittyClient; +import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.WikittyLabel; import org.nuiton.wikitty.entities.WikittyLabelImpl; public class WikittyDTOTest { - static private Log log = LogFactory.getLog(WikittyDTOTest.class); + WikittyClient client; - WikittyProxy proxy; - @Before public void clear() throws Exception { - ApplicationConfig config = WikittyConfig.getConfig("refcomp-test.properties"); - - WikittyService ws = WikittyServiceFactory.buildWikittyService(config); - ws.clear(null); - proxy = new WikittyProxy(ws); + ApplicationConfig config = WikittyConfig.getConfig(); + client = new WikittyClient(config); } @Test @@ -73,7 +64,7 @@ //First dto=>entity conversion test, no modification //make conversion to wikitty - WikittyLabel secondLabel = DTOHelper.fromDto(proxy, WikittyLabel.class, dto); + WikittyLabel secondLabel = DTOHelper.fromDto(client, WikittyLabel.class, dto); //check that dto fields are the same than the wikitty ones Assert.assertNotNull(secondLabel); @@ -88,7 +79,7 @@ dto.addLabels("toto"); //make conversion to wikitty - WikittyLabel thirdLabel = DTOHelper.fromDto(proxy,WikittyLabel.class,dto); + WikittyLabel thirdLabel = DTOHelper.fromDto(client,WikittyLabel.class,dto); //check that dto fields are the same than the wikitty ones Assert.assertNotNull(thirdLabel);

1 0

r1316 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 12 Jan '12

12 Jan '12

Author: bpoussin Date: 2012-01-12 14:55:21 +0100 (Thu, 12 Jan 2012) New Revision: 1316 Url: http://nuiton.org/repositories/revision/wikitty/1316 Log: Anomalie #1897: BusinessEntity with null wikitty if cast result with null wikitty if wikitty is null, BusinessEntity must be null Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-01-12 13:49:00 UTC (rev 1315) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-01-12 13:55:21 UTC (rev 1316) @@ -765,10 +765,12 @@ * @return */ static public <E extends BusinessEntity> E newInstance(Class<E> target, Wikitty w) { - E result = newInstance(target); - BusinessEntityImpl bean = (BusinessEntityImpl) result; - bean.setWikitty(w); - + E result = null; + if (w != null) { + result = newInstance(target); + BusinessEntityImpl bean = (BusinessEntityImpl) result; + bean.setWikitty(w); + } return result; }

1 0

r1315 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 12 Jan '12

12 Jan '12

Author: bpoussin Date: 2012-01-12 14:49:00 +0100 (Thu, 12 Jan 2012) New Revision: 1315 Url: http://nuiton.org/repositories/revision/wikitty/1315 Log: Anomalie #1897: BusinessEntity with null wikitty if cast result with null wikitty if wikitty is null, BusinessEntity must be null Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-01-12 10:43:48 UTC (rev 1314) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-01-12 13:49:00 UTC (rev 1315) @@ -795,7 +795,11 @@ static public <E extends BusinessEntity> List<E> newInstance(Class<E> target, List<Wikitty> wikitties) { List<E> result = new ArrayList<E>(wikitties.size()); for (Wikitty w : wikitties) { - result.add(newInstance(target, w)); + if (w == null) { + result.add(null); + } else { + result.add(newInstance(target, w)); + } } return result; }

1 0

r1314 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by echatellier＠users.nuiton.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 11:43:48 +0100 (Thu, 12 Jan 2012) New Revision: 1314 Url: http://nuiton.org/repositories/revision/wikitty/1314 Log: #1895: WikittyCopyOnWrite#addExtension method allways invalidate cache Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2012-01-12 10:43:28 UTC (rev 1313) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2012-01-12 10:43:48 UTC (rev 1314) @@ -133,7 +133,7 @@ * * @param exts extensions to add */ - void addExtension(List<WikittyExtension> exts); + void addExtension(Collection<WikittyExtension> exts); /** * Check that the wikitty has a metaExtension about a given extension. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2012-01-12 10:43:28 UTC (rev 1313) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2012-01-12 10:43:48 UTC (rev 1314) @@ -186,14 +186,18 @@ @Override public void addExtension(WikittyExtension ext) { - substituteTargetWithCopy(); - target.addExtension(ext); + if (!target.getExtensions().contains(ext)) { + substituteTargetWithCopy(); + target.addExtension(ext); + } } @Override - public void addExtension(List<WikittyExtension> exts) { - substituteTargetWithCopy(); - target.addExtension(exts); + public void addExtension(Collection<WikittyExtension> exts) { + if (!target.getExtensions().containsAll(exts)) { + substituteTargetWithCopy(); + target.addExtension(exts); + } } @Override Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2012-01-12 10:43:28 UTC (rev 1313) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2012-01-12 10:43:48 UTC (rev 1314) @@ -354,10 +354,10 @@ } /* - * @see org.nuiton.wikitty.Wikitty#addExtension(java.util.List) + * @see org.nuiton.wikitty.Wikitty#addExtension(java.util.Collection) */ @Override - public void addExtension(List<WikittyExtension> exts) { + public void addExtension(Collection<WikittyExtension> exts) { for (WikittyExtension ext : exts) { addExtension(ext); }

1 0

r1313 - in trunk: wikitty-api/src/it/generation wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5 wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by echatellier＠users.nuiton.org 12 Jan '12

12 Jan '12

Author: echatellier Date: 2012-01-12 11:43:28 +0100 (Thu, 12 Jan 2012) New Revision: 1313 Url: http://nuiton.org/repositories/revision/wikitty/1313 Log: #1884: Integration test 5 fails : wikitty model dependency #1896: Method inherited are not redifined since muti inheritance addition Modified: trunk/wikitty-api/src/it/generation/pom.xml trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java Modified: trunk/wikitty-api/src/it/generation/pom.xml =================================================================== --- trunk/wikitty-api/src/it/generation/pom.xml 2012-01-09 19:05:10 UTC (rev 1312) +++ trunk/wikitty-api/src/it/generation/pom.xml 2012-01-12 10:43:28 UTC (rev 1313) @@ -139,8 +139,6 @@ </goals> </execution> -  + </execution> </executions> <dependencies> Modified: trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java =================================================================== --- trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java 2012-01-09 19:05:10 UTC (rev 1312) +++ trunk/wikitty-api/src/it/generation/src/test/java/org/nuiton/wikitty/test/entities5/TestEntities.java 2012-01-12 10:43:28 UTC (rev 1313) @@ -33,20 +33,19 @@ * @author tchemit <chemit(a)codelutin.com> * @since 3.0 */ -@Ignore public class TestEntities { @Test public void testUser() { - /*User u = new UserImpl(); + User u = new UserImpl(); u.getLastName(); - u.setLastName("lastName");*/ + u.setLastName("lastName"); } @Test public void testAgent() { - /*Agent a = new AgentImpl(); + Agent a = new AgentImpl(); a.getLastName(); a.setLastName("lastName"); @@ -58,6 +57,6 @@ a.setLogin("login"); a.getPassword(); - a.setPassword("password");*/ + a.setPassword("password"); } } 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 2012-01-09 19:05:10 UTC (rev 1312) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-12 10:43:28 UTC (rev 1313) @@ -502,7 +502,7 @@ // now, add to this abstract all operation due to inheritence from // other business entities - List<ObjectModelClass> superClasses = WikittyTransformerUtil.getAllSuperClasses(businessEntity); + List<ObjectModelClass> superClasses = WikittyTransformerUtil.getAllSuperClasses(model, businessEntity); for (ObjectModelClass superClass : superClasses) { // FIXME echatellier 20120106 it an eugene bug Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2012-01-09 19:05:10 UTC (rev 1312) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2012-01-12 10:43:28 UTC (rev 1313) @@ -82,7 +82,7 @@ // classe courante List<String> attributeNames = new ArrayList<String>(); - List<ObjectModelClass> allClasses = WikittyTransformerUtil.getAllSuperClasses(clazz); + List<ObjectModelClass> allClasses = WikittyTransformerUtil.getAllSuperClasses(model, clazz); allClasses.add(clazz); // also manage current class (last one) for (ObjectModelClass superClass : allClasses) { Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2012-01-09 19:05:10 UTC (rev 1312) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2012-01-12 10:43:28 UTC (rev 1313) @@ -30,9 +30,10 @@ import java.util.List; import java.util.Map; import java.util.Set; + import org.apache.commons.lang.StringEscapeUtils; - import org.apache.commons.lang.StringUtils; +import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -283,13 +284,19 @@ * Get all super class of class (recursively) ordered from top class to * bottom classes. * + * @param model model (only usefull due to a bug in eugene) * @param clazz class to get super classes * @return all class super classes */ - public static List<ObjectModelClass> getAllSuperClasses(ObjectModelClass clazz) { + public static List<ObjectModelClass> getAllSuperClasses(ObjectModel model, ObjectModelClass clazz) { List<ObjectModelClass> superClasses = new ArrayList<ObjectModelClass>(); for (ObjectModelClass superClass : clazz.getSuperclasses()) { - superClasses.addAll(getAllSuperClasses(superClass)); + + // FIXME echatellier 20120106 it an eugene bug + // super class are not same instance as model classes + superClass = model.getClass(superClass.getQualifiedName()); + + superClasses.addAll(getAllSuperClasses(model, superClass)); superClasses.add(superClass); } return superClasses;

1 0

r1312 - trunk/src/site/rst/user
by bpoussin＠users.nuiton.org 09 Jan '12

09 Jan '12

Author: bpoussin Date: 2012-01-09 20:05:10 +0100 (Mon, 09 Jan 2012) New Revision: 1312 Url: http://nuiton.org/repositories/revision/wikitty/1312 Log: Evolution #1890: Add external authentication like LDAP ajout de la documentation pour l'option wikitty.security.externalAuthenticationOnly Modified: trunk/src/site/rst/user/security.rst Modified: trunk/src/site/rst/user/security.rst =================================================================== --- trunk/src/site/rst/user/security.rst 2012-01-09 19:03:18 UTC (rev 1311) +++ trunk/src/site/rst/user/security.rst 2012-01-09 19:05:10 UTC (rev 1312) @@ -81,11 +81,15 @@ // ...autres.services...,\ org.nuiton.wikitty.services.WikittyServiceSecurity wikitty.WikittyServiceSecurity.components=packages.MyExternalAuthentication + wikitty.security.externalAuthenticationOnly=true Il faut bien vérifier que org.nuiton.wikitty.services.WikittyServiceSecurity est déclaré dans la configuration sinon l'option seule wikitty.WikittyServiceSecurity.components n'aura aucun effet. +La dernier option wikitty.security.externalAuthenticationOnly indique ici que si +l'authentification sur MyExternalAuthentication échoue il ne faut pas essayer +sur le local (par défaut on essaie en local) Exemple d'utilisation de WikittyServiceSecurityExternalAuthenticationLDAP +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

1 0

r1311 - in trunk: src/site/rst/user wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-api/src/test/java/org/nuiton/wikitty/layers wikitty-api/src/test/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org 09 Jan '12

09 Jan '12

Author: bpoussin Date: 2012-01-09 20:03:18 +0100 (Mon, 09 Jan 2012) New Revision: 1311 Url: http://nuiton.org/repositories/revision/wikitty/1311 Log: Evolution #1890: Add external authentication like LDAP Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthentication.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthenticationLDAP.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceSecurityTest.java Modified: trunk/src/site/rst/user/security.rst trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java Modified: trunk/src/site/rst/user/security.rst =================================================================== --- trunk/src/site/rst/user/security.rst 2012-01-09 15:15:11 UTC (rev 1310) +++ trunk/src/site/rst/user/security.rst 2012-01-09 19:03:18 UTC (rev 1311) @@ -68,6 +68,52 @@ +--------------+ +--------------+ serveur client +Utiliser un moyen externe d'authentification +-------------------------------------------- + +Il est possible d'utiliser un moyen externe d'authentification, par exemple LDAP. +Pour cela il faut implanter la classe WikittyServiceSecurityExternalAuthentication +en implantant le mécanisme que l'on souhaite. Ensuite il faut l'ajouter a la +configuration pour que le service de security l'utilise:: + + wikitty.WikittyService.components=\ + org.nuiton.wikitty.WikittyServiceStorage,\ + // ...autres.services...,\ + org.nuiton.wikitty.services.WikittyServiceSecurity + wikitty.WikittyServiceSecurity.components=packages.MyExternalAuthentication + +Il faut bien vérifier que org.nuiton.wikitty.services.WikittyServiceSecurity est +déclaré dans la configuration sinon l'option seule +wikitty.WikittyServiceSecurity.components n'aura aucun effet. + + +Exemple d'utilisation de WikittyServiceSecurityExternalAuthenticationLDAP ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +Dans wikitty une implantation par défaut a été faite pour l'authentification LDAP +Voici un exemple de configuration:: + + wikitty.WikittyService.components=\ + org.nuiton.wikitty.WikittyServiceStorage,\ + // ...autres.services...,\ + org.nuiton.wikitty.services.WikittyServiceSecurity + wikitty.WikittyServiceSecurity.components=\ + org.nuiton.wikitty.services.WikittyServiceSecurityExternalAuthenticationLDAP + wikitty.security.externalAuthentication.ldap.server=ldap://intranet.codelutin.home:389 + wikitty.security.externalAuthentication.ldap.loginPattern=uid=%s,ou=People,dc=codelutin,dc=home + +Les deux options obligatoires sont l'url du serveur et le format des logins (DN) +le '%s' est remplacé par le login. + +Il est possible d'ajouter toutes les options acceptées par JNDI en les préfixant +par 'wikitty.security.externalAuthentication.ldap.jndi.' Par exemple on peut +modifier la factory par défaut avec:: + + wikitty.security.externalAuthentication.ldap.jndi.java.naming.factory.initial + +Voir la documentation JNDI pour toutes les options possibles + + Utilisateurs et groupes ----------------------- 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-09 15:15:11 UTC (rev 1310) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2012-01-09 19:03:18 UTC (rev 1311) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2011 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Poussin Benjamin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -22,22 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* - * Copyright (c) 2011 poussin. 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; import static org.nuiton.i18n.I18n.n_; @@ -207,6 +191,51 @@ n_("Indique la liste d'extension dont il faut monitorer l'acces"), "WikittyPubText,WikittyPubData", String.class, false, false), + WIKITTY_WIKITTYSERVICESECURITY_COMPONENTS( + "wikitty.WikittyServiceSecurity.components", + n_("Indique le composant a utiliser pour l'authentification externe" + + " ex:WikittyServiceSecurityExternalAuthenticationLDAP"), + null, + String.class, false, false), + WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_ONLY( + "wikitty.security.externalAuthenticationOnly", + n_("Indique si on doit utiliser que le composant d'authentification externe" + + " pour authentifier les utilisateurs. Dans ce cas le module doit" + + " etre configurer, sinon aucun utilisateur ne pourra se logguer"), + "false", + Boolean.class, false, false), + WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_JNDI( + "wikitty.security.externalAuthentication.ldap.jndi.", + n_("Prefix a utiliser pour ajouter n'importe quelle option supporte par le" + + " jndi pour la creation du initialContext. Vous ajoutez derriere" + + " se prefixe la cle jndi ex: '<prefix>java.naming.security.protocol"), + null, + String.class, false, false), + WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_JNDI_INITIAL_CONTEXT_FACTORY( + WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_JNDI.getKey() + "java.naming.factory.initial", + n_("Indique l'initial context factory a utiliser par defaut 'com.sun.jndi.ldap.LdapCtxFactory'"), + "com.sun.jndi.ldap.LdapCtxFactory", + String.class, false, false), + WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_JNDI_SECURITY_AUTHENTICATION( + WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_JNDI.getKey() + "java.naming.security.authentication", + n_("Indique le mode d'authentification a utiliser par defaut 'simple'." + + " Les modes possibles sont 'simple', 'SSL', 'SASL'"), + "simple", + String.class, false, false), + // LDAP serveur n'est pas en prefix JNDI, car pourrait servir ailleur que pour JNDI + WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_SERVER( + "wikitty.security.externalAuthentication.ldap.server", + n_("Indique l'url du serveur LDAP (obligatoire)"), + null, + String.class, false, false), + // LDAP login pattern n'est pas en prefix JNDI, car pourrait servir ailleur que pour JNDI + WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_LOGIN_PATTERN( + "wikitty.security.externalAuthentication.ldap.loginPattern", + n_("Le pattern utilise pour generer le DN de l'utilisateur. le '%s' est" + + " remplace par le login (obligatoire)." + + " Par exemple: 'uid=%s,ou=People,dc=codelutin,dc=com'"), + null, + String.class, false, false), WIKITTY_SERVER_CONFIG( "wikitty.service.server.config", n_("Jetty server configuration file name"), Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2012-01-09 15:15:11 UTC (rev 1310) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2012-01-09 19:03:18 UTC (rev 1311) @@ -33,6 +33,7 @@ import java.util.Date; import java.util.List; import java.util.Set; +import java.util.UUID; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -54,8 +55,8 @@ import org.nuiton.wikitty.entities.WikittyUser; import org.nuiton.wikitty.entities.WikittyUserHelper; import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.Search; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; /** * @@ -78,14 +79,24 @@ /** cache de l'id du groupe AppAdmin */ transient protected String appAdminGroupId = null; + /** si non null alors un mecanisme d'authentification externe est utilise */ + protected WikittyServiceSecurityExternalAuthentication auth; + protected boolean externalAuthOnly = false; + /** * - * @param config not use currently but needed in futur + * @param config * @param ws + * @param auth si non null alors un mecanisme d'authentification externe est + * utilise */ - public WikittyServiceSecurity(ApplicationConfig config, WikittyService ws) { + public WikittyServiceSecurity(ApplicationConfig config, WikittyService ws, + WikittyServiceSecurityExternalAuthentication auth) { super(ws); + this.auth = auth; if (config != null) { + externalAuthOnly = config.getOptionAsBoolean(WikittyConfigOption. + WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_ONLY.getKey()); long timeToLogInfo = config.getOptionAsInt(WikittyConfigOption. WIKITTY_SECURITY_TIME_TO_LOG_INFO.getKey()); long timeToLogWarn = config.getOptionAsInt(WikittyConfigOption. @@ -109,35 +120,74 @@ public String login(String login, String password) { long start = TimeLog.getTime(); + Wikitty user = null; String tokenId; - Criteria criteria = Search.query() - .eq(WikittyUser.FQ_FIELD_WIKITTYUSER_LOGIN, login).criteria(); - String userId = getDelegate().findByCriteria(null, + WikittyQuery criteria = new WikittyQueryMaker() + .eq(WikittyUser.FQ_FIELD_WIKITTYUSER_LOGIN, login).end(); + String userId = getDelegate().findByQuery(null, Collections.singletonList(criteria)).get(0); - if (userId == null) { - throw new IllegalArgumentException(String.format( - "no such account '%s'", login)); - } else { - Wikitty user = WikittyServiceEnhanced.restore( - getDelegate(), null, userId); - // check password is valid - if (WikittyUserHelper.getPassword(user).equals(password)) { - tokenId = WikittyUtil.genSecurityTokenId(); - Wikitty wikittyToken = new WikittyImpl(tokenId); - // force add extension to wikitty - WikittyTokenHelper.addExtension(wikittyToken); - WikittyTokenHelper.setUser(wikittyToken, user.getId()); - WikittyTokenHelper.setDate(wikittyToken, new Date()); - getDelegate().store(null, Arrays.asList(wikittyToken), false); - if (log.isDebugEnabled()) { - log.debug(String.format("token '%s' is for login '%s'", - tokenId, login)); + + boolean authenticated = false; + if (auth != null) { + // on a un moyen externe d'authentification, on l'utilise en 1er + authenticated = auth.login(login, password); + if (authenticated) { + log.info(String.format( + "External authentication success for account '%s'", login)); + // authentification reussi + // si l'utilisateur n'existe pas encore on le cree + if (userId == null) { + user = new WikittyImpl(); + WikittyUserHelper.addExtension(user); + WikittyUserHelper.setLogin(user, login); + // on met un mot de passe genere car l'authentification + // est faite par un moyen externe. Si pour une raison + // celui-ci n'est pas active, il ne faut pas que l'utilisateur + // puisse se loguer avec une mot de passe reel (trouvable facilement) + String generatedPassword = "external-" + UUID.randomUUID(); + WikittyUserHelper.setPassword(user, generatedPassword); + getDelegate().store(null, Collections.singletonList(user), false); + log.info(String.format( + "Automatic user creation for account '%s'", login)); + } else { + // sinon on le charge + user = WikittyServiceEnhanced.restore( + getDelegate(), null, userId); } + } + } + + // si pas authentification externe ou l'authentification n'a pas reussi + // c'est peut-etre un utilisateur local, et qu'on authorise l'authentification + // local + if (!authenticated && !externalAuthOnly) { + if (userId == null) { + log.info(String.format("no such account '%s'", login)); } else { - throw new SecurityException("bad password"); + user = WikittyServiceEnhanced.restore( + getDelegate(), null, userId); + // check password is valid + authenticated = WikittyUserHelper.getPassword(user).equals(password); } } + + if (authenticated) { + tokenId = WikittyUtil.genSecurityTokenId(); + Wikitty wikittyToken = new WikittyImpl(tokenId); + // force add extension to wikitty + WikittyTokenHelper.addExtension(wikittyToken); + WikittyTokenHelper.setUser(wikittyToken, user.getId()); + WikittyTokenHelper.setDate(wikittyToken, new Date()); + getDelegate().store(null, Arrays.asList(wikittyToken), false); + if (log.isDebugEnabled()) { + log.debug(String.format("token '%s' is for login '%s'", + tokenId, login)); + } + } else { + throw new SecurityException("bad login or password"); + } + timeLog.log(start, "login"); return tokenId; } @@ -776,10 +826,10 @@ getDelegate(), securityToken, appAdminGroupId); if (group == null) { // 1er fois, on le recherche - Criteria criteria = Search.query() + WikittyQuery criteria = new WikittyQueryMaker() .eq(WikittyGroup.FQ_FIELD_WIKITTYGROUP_NAME, - WikittySecurityHelper.WIKITTY_APPADMIN_GROUP_NAME).criteria(); - String groupId = getDelegate().findByCriteria( + WikittySecurityHelper.WIKITTY_APPADMIN_GROUP_NAME).end(); + String groupId = getDelegate().findByQuery( securityToken, Collections.singletonList(criteria)).get(0); appAdminGroupId = groupId; group = WikittyServiceEnhanced.restore( Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthentication.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthentication.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthentication.java 2012-01-09 19:03:18 UTC (rev 1311) @@ -0,0 +1,26 @@ +package org.nuiton.wikitty.services; + +/** + * Pour permettre de géré l'authentification par un mecanisme externe (ex:LDAP) + * a wikitty en plus du mecanisme traditionnel, il faut implanter cette + * interface et la declarer dans le fichier de configuration + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public interface WikittyServiceSecurityExternalAuthentication { + + /** + * Authentifie l'utilisateur ayant pour login et password les arguments. + * La methode retourne true, si l'utilisateur a pu etre authentifier. + * + * @param login + * @param password + * @return true si l'utilisateur existe et que le mot de passe est le bon + */ + public boolean login(String login, String password); + +} Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthenticationLDAP.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthenticationLDAP.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurityExternalAuthenticationLDAP.java 2012-01-09 19:03:18 UTC (rev 1311) @@ -0,0 +1,81 @@ +package org.nuiton.wikitty.services; + +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Properties; +import javax.naming.Context; +import javax.naming.NamingException; +import javax.naming.directory.DirContext; +import javax.naming.directory.InitialDirContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfigOption; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyServiceSecurityExternalAuthenticationLDAP + implements WikittyServiceSecurityExternalAuthentication{ + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyServiceSecurityExternalAuthenticationLDAP.class); + + protected ApplicationConfig config; + protected Properties jndiProp; + protected String ldapLoginPattern; + + public WikittyServiceSecurityExternalAuthenticationLDAP(ApplicationConfig config) { + this.config = config; + + // on charge toutes les options jndi + Properties jndiPropTmp = config.getOptionStartsWith(WikittyConfigOption + .WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_JNDI.getKey()); + + jndiProp = new Properties(); + for (Enumeration<String> e=(Enumeration<String>)jndiPropTmp.propertyNames(); e.hasMoreElements();) { + String key = e.nextElement(); + String value = jndiPropTmp.getProperty(key); + int debut = WikittyConfigOption.WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_JNDI.getKey().length(); + key = key.substring(debut); + jndiProp.setProperty(key, value); + } + + // on charge l'url du serveur ldap + String serverUrl = config.getOption( + WikittyConfigOption.WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_SERVER.getKey()); + jndiProp.put(Context.PROVIDER_URL, serverUrl); + + // on charge le pattern des logins (DN) + ldapLoginPattern = config.getOption( + WikittyConfigOption.WIKITTY_SECURITY_EXTERNAL_AUTHENTICATION_LDAP_LOGIN_PATTERN.getKey()); + } + + public boolean login(String login, String password) { + boolean result = false; + String ldapLogin = String.format(ldapLoginPattern, login); + + // on fait une copie pour etre thread safe (si plusieurs thread appele + // cette methode en meme temps + Hashtable<String, String> env = new Hashtable(jndiProp); + env.put(Context.SECURITY_PRINCIPAL, ldapLogin); + env.put(Context.SECURITY_CREDENTIALS, password); + + try { + DirContext dirContext = new InitialDirContext(env); + dirContext.close(); + result = true; + } catch (NamingException eee) { + log.debug(String.format( + "Erreur lors de l'acces au serveur LDAP pour l'utilisateur %s -> %s", + login, ldapLogin), eee); + } + return result; + } + +} 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 2012-01-09 15:15:11 UTC (rev 1310) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2012-01-09 19:03:18 UTC (rev 1311) @@ -56,6 +56,7 @@ public class WikittyServiceSecurityTest extends AbstractWikittyServiceTest { // FIXME 20101112 poussin classe a revoir suite au refactoring de la secu + // et surtout la mettre dans son package private static final Log log = LogFactory.getLog(WikittyServiceSecurityTest.class); @@ -73,7 +74,7 @@ WikittyService inMemoryService = new WikittyServiceInMemory(config); WikittyServiceSecurity securityService = - new WikittyServiceSecurity(config, inMemoryService); + new WikittyServiceSecurity(config, inMemoryService, null); /** / // TODO 20101005 bleny implementation should be able to allow Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceSecurityTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceSecurityTest.java 2012-01-09 19:03:18 UTC (rev 1311) @@ -0,0 +1,51 @@ +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()); + + } +}

1 0

r1310 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr wikitty-struts
by maven-release＠users.nuiton.org 09 Jan '12

09 Jan '12

Author: maven-release Date: 2012-01-09 16:15:11 +0100 (Mon, 09 Jan 2012) New Revision: 1310 Url: http://nuiton.org/repositories/revision/wikitty/1310 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-struts/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-09 15:15:10 UTC (rev 1309) +++ trunk/pom.xml 2012-01-09 15:15:11 UTC (rev 1310) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> <modules> @@ -783,10 +783,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.3</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.3 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.3</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm> <distributionManagement> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2012-01-09 15:15:10 UTC (rev 1309) +++ trunk/wikitty-api/pom.xml 2012-01-09 15:15:11 UTC (rev 1310) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2012-01-09 15:15:10 UTC (rev 1309) +++ trunk/wikitty-dto/pom.xml 2012-01-09 15:15:11 UTC (rev 1310) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2012-01-09 15:15:10 UTC (rev 1309) +++ trunk/wikitty-generators/pom.xml 2012-01-09 15:15:11 UTC (rev 1310) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2012-01-09 15:15:10 UTC (rev 1309) +++ trunk/wikitty-hessian-client/pom.xml 2012-01-09 15:15:11 UTC (rev 1310) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2012-01-09 15:15:10 UTC (rev 1309) +++ trunk/wikitty-hessian-server/pom.xml 2012-01-09 15:15:11 UTC (rev 1310) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2012-01-09 15:15:10 UTC (rev 1309) +++ trunk/wikitty-jdbc/pom.xml 2012-01-09 15:15:11 UTC (rev 1310) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2012-01-09 15:15:10 UTC (rev 1309) +++ trunk/wikitty-perf-test/pom.xml 2012-01-09 15:15:11 UTC (rev 1310) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2012-01-09 15:15:10 UTC (rev 1309) +++ trunk/wikitty-solr/pom.xml 2012-01-09 15:15:11 UTC (rev 1310) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2012-01-09 15:15:10 UTC (rev 1309) +++ trunk/wikitty-struts/pom.xml 2012-01-09 15:15:11 UTC (rev 1310) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.4-SNAPSHOT</version> </parent>

1 0