March 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r1443 - in trunk/simexplorer-is: simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service simexplorer-is-storage
by glandais＠users.labs.libre-entreprise.org 21 Mar '08

21 Mar '08

Author: glandais Date: 2008-03-21 16:52:52 +0000 (Fri, 21 Mar 2008) New Revision: 1443 Added: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/AuthenticationServiceTest.java Modified: trunk/simexplorer-is/simexplorer-is-storage/pom.xml Log: Tests Added: trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/AuthenticationServiceTest.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/AuthenticationServiceTest.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-service/src/test/fr/cemagref/simexplorer/is/service/AuthenticationServiceTest.java 2008-03-21 16:52:52 UTC (rev 1443) @@ -0,0 +1,129 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Gabriel Landais +* +* 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 2 +* 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, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.service; + +import com.bm.testsuite.BaseSessionBeanFixture; + +import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; +import fr.cemagref.simexplorer.is.security.entities.Actor; +import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.security.entities.LoginAction; +import fr.cemagref.simexplorer.is.security.entities.Permission; +import fr.cemagref.simexplorer.is.security.entities.User; + +public class AuthenticationServiceTest extends BaseSessionBeanFixture<AuthenticationServiceImpl> { + + /** The Constant usedEntityBeans. */ + private static final Class<?>[] usedEntityBeans = { Actor.class, User.class, Group.class, Permission.class, + LoginAction.class }; + + /** + * Instantiates a new credential manager testbase. + */ + public AuthenticationServiceTest() { + super(AuthenticationServiceImpl.class, usedEntityBeans); + } + + public void testLoginUser() throws SimExplorerException { + String password = "password"; + password = AuthenticationServiceHelper.computeHash(password.toCharArray()); + String loginUser = getBeanToTest().loginUser("superadmin", password); + assertNotNull(loginUser); + } + + public void testRequestAccount() { + fail("Not yet implemented"); + } + + public void testSaveUser() { + fail("Not yet implemented"); + } + + public void testResetPassword() { + fail("Not yet implemented"); + } + + public void testGetActor() { + fail("Not yet implemented"); + } + + public void testGetUserStringInteger() { + fail("Not yet implemented"); + } + + public void testGetUserStringString() { + fail("Not yet implemented"); + } + + public void testUpdateUser() { + fail("Not yet implemented"); + } + + public void testDeleteUser() { + fail("Not yet implemented"); + } + + public void testGetUsers() { + fail("Not yet implemented"); + } + + public void testSaveGroup() { + fail("Not yet implemented"); + } + + public void testGetGroupStringInteger() { + fail("Not yet implemented"); + } + + public void testGetGroupStringString() { + fail("Not yet implemented"); + } + + public void testUpdateGroup() { + fail("Not yet implemented"); + } + + public void testDeleteGroup() { + fail("Not yet implemented"); + } + + public void testGetGroups() { + fail("Not yet implemented"); + } + + public void testGetLoggedUser() { + fail("Not yet implemented"); + } + + public void testGetElementsOwnedByCount() { + fail("Not yet implemented"); + } + + public void testGetElementsOwnedBy() { + fail("Not yet implemented"); + } + + public void testGetPermissions() { + fail("Not yet implemented"); + } + + public void testSetPermissions() { + fail("Not yet implemented"); + } + +} Modified: trunk/simexplorer-is/simexplorer-is-storage/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2008-03-21 16:52:29 UTC (rev 1442) +++ trunk/simexplorer-is/simexplorer-is-storage/pom.xml 2008-03-21 16:52:52 UTC (rev 1443) @@ -26,7 +26,7 @@ </activation> <properties>  - <maven.test.skip>false</maven.test.skip> + <maven.test.skip>true</maven.test.skip> </properties> </profile> </profiles>

1 0

r1442 - trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by glandais＠users.labs.libre-entreprise.org 21 Mar '08

21 Mar '08

Author: glandais Date: 2008-03-21 16:52:29 +0000 (Fri, 21 Mar 2008) New Revision: 1442 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java Log: Security entities Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-03-21 16:52:18 UTC (rev 1441) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-03-21 16:52:29 UTC (rev 1442) @@ -124,15 +124,13 @@ * @throws SimExplorerException the sim explorer exception */ public Object onSuccess() throws SimExplorerException { - Collection<Actor> members = new ArrayList<Actor>(); - members.addAll(usersInGroup); - members.addAll(groupsInGroup); - group.setMembers(members); - if (group.getActorId() == null) { group = RemoteSecurityService.getAuthentificationService().saveGroup(getToken(), group.getName()); } else { - group = RemoteSecurityService.getAuthentificationService().updateGroup(getToken(), group); + Collection<Actor> members = new ArrayList<Actor>(); + members.addAll(usersInGroup); + members.addAll(groupsInGroup); + group = RemoteSecurityService.getAuthentificationService().updateGroup(getToken(), group, members); } return groupList; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-21 16:52:18 UTC (rev 1441) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-21 16:52:29 UTC (rev 1442) @@ -20,7 +20,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.ValueEncoder; @@ -58,7 +60,7 @@ /** The groups of user. */ @Persist - private Collection<Group> groupsOfUser; + private List<Group> groupsOfUser; /** The group encoder. */ @Persist @@ -121,7 +123,8 @@ if (userId == -1) { this.user = new User(); } else { - groupsOfUser = getUserLogged().getMemberOf(); + this.user = RemoteSecurityService.getAuthentificationService().getUser(getToken(), userId); + groupsOfUser.addAll(this.user.getMemberOf()); } groupEncoder = new GroupValueEncoder(getToken()); } @@ -152,7 +155,9 @@ user.getMail()); return this; } - user.setMemberOf(groupsOfUser); + Set<Group> groups = new HashSet<Group>(); + groups.addAll(groupsOfUser); + user.setMemberOf(groups); user = RemoteSecurityService.getAuthentificationService().updateUser(getToken(), user); return userList; } @@ -272,7 +277,7 @@ * * @return the groups of user */ - public Collection<Group> getGroupsOfUser() { + public List<Group> getGroupsOfUser() { return groupsOfUser; }

1 0

r1441 - trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services
by glandais＠users.labs.libre-entreprise.org 21 Mar '08

21 Mar '08

Author: glandais Date: 2008-03-21 16:52:18 +0000 (Fri, 21 Mar 2008) New Revision: 1441 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java Log: Format Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java 2008-03-21 16:51:21 UTC (rev 1440) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/GroupValueEncoder.java 2008-03-21 16:52:18 UTC (rev 1441) @@ -34,8 +34,7 @@ /** * Instantiates a new group value encoder. * - * @param token - * the token + * @param token the token */ public GroupValueEncoder(String token) { super(); @@ -55,8 +54,7 @@ public Group toValue(String arg0) { Group group = null; try { - group = RemoteSecurityService.getAuthentificationService().getGroup( - token, Integer.decode(arg0)); + group = RemoteSecurityService.getAuthentificationService().getGroup(token, Integer.decode(arg0)); } catch (SimExplorerException e) { throw new RuntimeException(e); }

1 0

r1440 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by glandais＠users.labs.libre-entreprise.org 21 Mar '08

21 Mar '08

Author: glandais Date: 2008-03-21 16:51:21 +0000 (Fri, 21 Mar 2008) New Revision: 1440 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java Log: Update group Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java 2008-03-21 16:50:29 UTC (rev 1439) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java 2008-03-21 16:51:21 UTC (rev 1440) @@ -17,6 +17,8 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +import java.util.Collection; + import javax.ejb.Remote; import fr.cemagref.simexplorer.is.exceptions.SimExplorerException; @@ -200,7 +202,7 @@ * * @throws SimExplorerException the sim explorer service exception */ - public Group updateGroup(String token, Group group) throws SimExplorerException; + public Group updateGroup(String token, Group group, Collection<Actor> members) throws SimExplorerException; /** * Delete group. Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-21 16:50:29 UTC (rev 1439) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-03-21 16:51:21 UTC (rev 1440) @@ -23,7 +23,9 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.UUID; import javax.ejb.EJB; @@ -143,7 +145,6 @@ msg.setHeader("X-Mailer", "JavaMailer"); msg.setSentDate(new java.util.Date()); Transport.send(msg); - log.info(mailFrom + " - " + mailRecipient + " - " + subject + " - " + content); } catch (MessagingException e) { throw new SimExplorerTechnicalException(e); } catch (NamingException e) { @@ -386,7 +387,7 @@ Group group = new Group(); group.setName(name); group.setOwner(getLoggedUser(token)); - daoActor.saveGroup(group); + daoActor.saveActor(group); group = getGroup(token, group.getActorId()); return group; } @@ -408,16 +409,18 @@ user.setLogin(login); user.setMail(mail); char[] password = generatePassword(); - sendMail(Config.getProperties().getProperty("simexplorer.adminmail"), mail, - _("simexplorer.service.mail.subject"), getMailContentWithPassword(login, password)); String passwordHash = AuthenticationServiceHelper.computeHash(password); user.setPasswordHash(passwordHash); - // reset array - Arrays.fill(password, (char) 0); user.setAdmin(false); user.setSuperAdmin(false); - daoActor.saveUser(user); + daoActor.saveActor(user); user = getUser(token, user.getActorId()); + + sendMail(Config.getProperties().getProperty("simexplorer.adminmail"), mail, + _("simexplorer.service.mail.subject"), getMailContentWithPassword(login, password)); + // reset array + Arrays.fill(password, (char) 0); + return user; } throw new SimExplorerSecurityException(); @@ -440,10 +443,28 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.AuthenticationService#updateGroup(java.lang.String, fr.cemagref.simexplorer.is.security.entities.Group) */ - public Group updateGroup(String token, Group group) throws SimExplorerException { + public Group updateGroup(String token, Group group, Collection<Actor> members) throws SimExplorerException { if (canUpdateGroup(token, group.getActorId())) { - // TODO isContaining - return daoActor.updateGroup(group); + Set<Actor> toUpdate = new HashSet<Actor>(); + for (Actor oldMember : group.getMembersReadOnly()) { + + Set<Group> memberOf = oldMember.getMemberOf(); + Set<Group> copy = new HashSet<Group>(memberOf); + copy.remove(group); + oldMember.setMemberOf(copy); + + toUpdate.add(oldMember); + } + for (Actor newMember : members) { + if (!(newMember instanceof Group) || !isContaining((Group) newMember, group)) { + newMember.getMemberOf().add(group); + toUpdate.add(newMember); + } + } + for (Actor actor : toUpdate) { + daoActor.updateActor(actor); + } + return (Group) daoActor.updateActor(group); } throw new SimExplorerSecurityException(); } @@ -476,7 +497,7 @@ */ public User updateUser(String token, User user) throws SimExplorerException { if (canUpdateUser(token, user)) { - return daoActor.updateUser(user); + return (User) daoActor.updateActor(user); } throw new SimExplorerSecurityException(); } @@ -489,7 +510,6 @@ return null; } User loggedUser; - // FIXME cleanup getLoggedUser loggedUser = daoActor.getLoggedUser(token); if (loggedUser != null) { return loggedUser; @@ -512,7 +532,7 @@ user.setPasswordHash(passwordHash); user.setAdmin(true); user.setSuperAdmin(true); - daoActor.saveUser(user); + daoActor.saveActor(user); } } @@ -572,7 +592,7 @@ // reset char[] Arrays.fill(password, (char) 0); user.setPasswordHash(passwordHash); - daoActor.updateUser(user); + daoActor.updateActor(user); } else { throw new SimExplorerSecurityException(); }

1 0

r1439 - trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials
by glandais＠users.labs.libre-entreprise.org 21 Mar '08

21 Mar '08

Author: glandais Date: 2008-03-21 16:50:29 +0000 (Fri, 21 Mar 2008) New Revision: 1439 Modified: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java Log: test update Modified: trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java 2008-03-21 16:50:15 UTC (rev 1438) +++ trunk/simexplorer-is/simexplorer-is-security/src/test/fr/cemagref/simexplorer/is/security/credentials/CredentialDataSet.java 2008-03-21 16:50:29 UTC (rev 1439) @@ -89,7 +89,7 @@ List<?> resultList = entityManager.createQuery("SELECT a FROM Actor a").getResultList(); for (Object object : resultList) { Actor actor = (Actor) object; - actor.setMemberOf(new ArrayList<Group>()); + actor.setMemberOf(new HashSet<Group>()); entityManager.merge(actor); } @@ -188,7 +188,7 @@ Group group1 = createGroup("group1", usera); - group1.addMember(usera); + usera.getMemberOf().add(group1); commit(); entityManager.refresh(usera);

1 0

r1438 - trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities
by glandais＠users.labs.libre-entreprise.org 21 Mar '08

21 Mar '08

Author: glandais Date: 2008-03-21 16:50:15 +0000 (Fri, 21 Mar 2008) New Revision: 1438 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java Log: Security entities Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-03-21 16:49:29 UTC (rev 1437) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-03-21 16:50:15 UTC (rev 1438) @@ -20,9 +20,8 @@ import java.io.Serializable; import java.util.Collection; import java.util.HashSet; -import java.util.Iterator; +import java.util.Set; -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -53,8 +52,8 @@ protected Integer actorId; /** The groups with actor is member of. */ - @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL) - private Collection<Group> memberOf; + @ManyToMany(fetch = FetchType.EAGER) + private Set<Group> memberOf; /** The visible. */ @Column(nullable = false) @@ -106,7 +105,7 @@ * * @return the member of */ - public Collection<Group> getMemberOf() { + public Set<Group> getMemberOf() { if (memberOf == null) { return new HashSet<Group>(); } @@ -118,27 +117,10 @@ * * @param memberOf the new member of */ - public void setMemberOf(Collection<Group> memberOf) { + public void setMemberOf(Set<Group> memberOf) { this.memberOf = memberOf; } - /** - * Hash code groups. - * - * @param hashedGroups the hashed groups - * - * @return the int - */ - private int hashCodeGroups(Collection<Group> hashedGroups) { - final int prime = 31; - int result = 1; - result = prime * result + hashedGroups.size(); - for (Group group : hashedGroups) { - result = prime * result + ((group == null) ? 0 : group.actorId); - } - return result; - } - /* (non-Javadoc) * @see java.lang.Object#hashCode() */ @@ -146,41 +128,10 @@ public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((memberOf == null) ? 0 : hashCodeGroups(memberOf)); result = prime * result + ((actorId == null) ? 0 : actorId.hashCode()); return result; } - /** - * Equals groups. - * - * @param groups1 the groups1 - * @param groups2 the groups2 - * - * @return true, if successful - */ - private boolean equalsGroups(Collection<Group> groups1, Collection<Group> groups2) { - if (groups1 == groups2) - return true; - if (groups2 == null) - return false; - if (groups1.size() != groups2.size()) { - return false; - } - Iterator<Group> iterator2 = groups2.iterator(); - for (Group group1 : groups1) { - Group group2 = iterator2.next(); - if (group1 == null) { - if (group2 != null) - return false; - } else if (group1.actorId == null) { - return false; - } else if (!group1.actorId.equals(group2.actorId)) - return false; - } - return true; - } - /* (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ @@ -193,11 +144,11 @@ if (getClass() != obj.getClass()) return false; final Actor other = (Actor) obj; - if (memberOf == null) { - if (other.memberOf != null) - return false; - } else if (!equalsGroups(memberOf, other.memberOf)) - return false; +// if (memberOf == null) { +// if (other.memberOf != null) +// return false; +// } else if (!equalsGroups(memberOf, other.memberOf)) +// return false; if (actorId == null) { if (other.actorId != null) return false; Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java 2008-03-21 16:49:29 UTC (rev 1437) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Group.java 2008-03-21 16:50:15 UTC (rev 1438) @@ -48,7 +48,7 @@ private User owner; /** The members. */ - @ManyToMany(mappedBy = "memberOf") + @ManyToMany(mappedBy = "memberOf", fetch = FetchType.EAGER) private Collection<Actor> members; /** @@ -104,15 +104,19 @@ * * @param actor the actor */ + /* public void addMember(Actor actor) { actor.getMemberOf().add(this); + members.add(actor); } + */ /** * Sets the members. * * @param newMembers the new members */ + /* public void setMembers(Collection<Actor> newMembers) { for (Actor oldMember : getMembersReadOnly()) { oldMember.getMemberOf().remove(this); @@ -122,6 +126,7 @@ } members = newMembers; } + */ /* (non-Javadoc) * @see java.lang.Object#toString() Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-03-21 16:49:29 UTC (rev 1437) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/User.java 2008-03-21 16:50:15 UTC (rev 1438) @@ -22,7 +22,7 @@ import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import javax.persistence.FetchType; import javax.persistence.OneToMany; import javax.persistence.Table; import javax.persistence.Transient; @@ -43,7 +43,7 @@ private String login; /** The mail. */ - @Column(unique = true, nullable = false, length = 256) + @Column(unique = false, nullable = false, length = 256) private String mail; /** The password hash. */ @@ -59,7 +59,7 @@ private boolean superAdmin; /** The groups owned. */ - @OneToMany(mappedBy = "owner") + @OneToMany(mappedBy = "owner", fetch = FetchType.EAGER) private Collection<Group> groupsOwned; /** The logins. */

1 0

r1437 - trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao
by glandais＠users.labs.libre-entreprise.org 21 Mar '08

21 Mar '08

Author: glandais Date: 2008-03-21 16:49:29 +0000 (Fri, 21 Mar 2008) New Revision: 1437 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java Log: Mergin save and update of actors Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java 2008-03-21 16:49:07 UTC (rev 1436) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActor.java 2008-03-21 16:49:29 UTC (rev 1437) @@ -39,13 +39,22 @@ public Actor getActor(Integer id); /** - * Save user. + * Update actor. * - * @param user the user + * @param actor the actor + * + * @return the actor */ - public void saveUser(User user); + public Actor updateActor(Actor actor); /** + * Save actor. + * + * @param actor the actor + */ + public void saveActor(Actor actor); + + /** * Gets the user. * * @param id the id @@ -64,15 +73,6 @@ public User getUser(String login); /** - * Update user. - * - * @param user the user - * - * @return the user - */ - public User updateUser(User user); - - /** * Delete user. * * @param id the id @@ -80,13 +80,6 @@ public void deleteUser(Integer id); /** - * Save group. - * - * @param group the group - */ - public void saveGroup(Group group); - - /** * Gets the group. * * @param id the id @@ -105,15 +98,6 @@ public Group getGroup(String name); /** - * Update group. - * - * @param group the group - * - * @return the group - */ - public Group updateGroup(Group group); - - /** * Delete group. * * @param id the id @@ -168,6 +152,6 @@ */ public Collection<User> getUsers(); - //public Object debugQuery(String query, int type); + // public Object debugQuery(String query, int type); } Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-21 16:49:07 UTC (rev 1436) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoActorImpl.java 2008-03-21 16:49:29 UTC (rev 1437) @@ -146,39 +146,17 @@ actor.setVisible(true); } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#saveGroup(fr.cemagref.simexplorer.is.security.entities.Group) - */ - public void saveGroup(Group group) { - setActorVisible(group); - em.persist(group); + public void saveActor(Actor actor) { + setActorVisible(actor); + em.persist(actor); } - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#saveUser(fr.cemagref.simexplorer.is.security.entities.User) - */ - public void saveUser(User user) { - setActorVisible(user); - em.persist(user); + public Actor updateActor(Actor actor) { + setActorVisible(actor); + return em.merge(actor); } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#updateGroup(fr.cemagref.simexplorer.is.security.entities.Group) - */ - public Group updateGroup(Group group) { - setActorVisible(group); - return em.merge(group); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#updateUser(fr.cemagref.simexplorer.is.security.entities.User) - */ - public User updateUser(User user) { - setActorVisible(user); - return em.merge(user); - } - - /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.security.dao.DaoActor#getLoggedUser(java.lang.String) */ public User getLoggedUser(String token) { @@ -190,7 +168,6 @@ loginAction.setLoginDate((new Date()).getTime()); em.merge(loginAction); } - // TODO avoid NPE return loggedUser; }

1 0

r1436 - trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials
by glandais＠users.labs.libre-entreprise.org 21 Mar '08

21 Mar '08

Author: glandais Date: 2008-03-21 16:49:07 +0000 (Fri, 21 Mar 2008) New Revision: 1436 Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java Log: Rules update (user not logged) Modified: trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-03-21 16:48:43 UTC (rev 1435) +++ trunk/simexplorer-is/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/credentials/CredentialManagerImpl.java 2008-03-21 16:49:07 UTC (rev 1436) @@ -92,52 +92,59 @@ Permission p = null; User user = daoActor.getLoggedUser(token); - - if (user.isSuperAdmin()) { + if (user == null) { p = new Permission(); - p.setOwner(true); - p.setCanAdmin(true); - p.setCanRead(true); - p.setCanWrite(true); + p.setOwner(false); + p.setCanAdmin(false); + p.setCanRead(false); + p.setCanWrite(false); } else { - p = new Permission(); - - List<Permission> permissions = daoPermission.getPermissions(businessId); - - if (permissions.size() == 0) { + if (user.isSuperAdmin()) { + p = new Permission(); p.setOwner(true); p.setCanAdmin(true); p.setCanRead(true); p.setCanWrite(true); } else { - p.setOwner(false); - p.setCanAdmin(false); - p.setCanRead(false); - p.setCanWrite(false); - } + p = new Permission(); - for (Permission permission : permissions) { - boolean appliesTo = appliesTo(user, permission.getActor()); - if (appliesTo) { - p.setOwner(p.isOwner() || permission.isOwner()); - p.setCanAdmin(p.isCanAdmin() || permission.isCanAdmin()); - p.setCanRead(p.isCanRead() || permission.isCanRead()); - p.setCanWrite(p.isCanWrite() || permission.isCanWrite()); + List<Permission> permissions = daoPermission.getPermissions(businessId); + + if (permissions.size() == 0) { + p.setOwner(true); + p.setCanAdmin(true); + p.setCanRead(true); + p.setCanWrite(true); + } else { + p.setOwner(false); + p.setCanAdmin(false); + p.setCanRead(false); + p.setCanWrite(false); } - } - if (p.isCanWrite()) { - p.setCanRead(true); + for (Permission permission : permissions) { + boolean appliesTo = appliesTo(user, permission.getActor()); + if (appliesTo) { + p.setOwner(p.isOwner() || permission.isOwner()); + p.setCanAdmin(p.isCanAdmin() || permission.isCanAdmin()); + p.setCanRead(p.isCanRead() || permission.isCanRead()); + p.setCanWrite(p.isCanWrite() || permission.isCanWrite()); + } + } + + if (p.isCanWrite()) { + p.setCanRead(true); + } + if (p.isCanAdmin()) { + p.setCanRead(true); + p.setCanWrite(true); + } + if (p.isOwner()) { + p.setCanAdmin(true); + p.setCanRead(true); + p.setCanWrite(true); + } } - if (p.isCanAdmin()) { - p.setCanRead(true); - p.setCanWrite(true); - } - if (p.isOwner()) { - p.setCanAdmin(true); - p.setCanRead(true); - p.setCanWrite(true); - } } return p; @@ -148,23 +155,25 @@ */ public void saveElement(String token, String businessId) { User user = daoActor.getLoggedUser(token); - if (!user.isSuperAdmin()) { - Permission p = daoPermission.getPermission(businessId, user); - if (p == null) { - p = new Permission(); - p.setActor(user); - p.setBusinessId(businessId); - p.setOwner(true); - daoPermission.savePermission(p); - log.debug("CREATED PERMISSION : " + p.toString()); - } else { - p.setOwner(true); - daoPermission.updatePermission(p); + if (user != null) { + if (!user.isSuperAdmin()) { + Permission p = daoPermission.getPermission(businessId, user); + if (p == null) { + p = new Permission(); + p.setActor(user); + p.setBusinessId(businessId); + p.setOwner(true); + daoPermission.savePermission(p); + log.debug("CREATED PERMISSION : " + p.toString()); + } else { + p.setOwner(true); + daoPermission.updatePermission(p); + } } + synchronized (usersCachedSynchronizer) { + usersCached.clear(); + } } - synchronized (usersCachedSynchronizer) { - usersCached.clear(); - } } /* (non-Javadoc) @@ -211,10 +220,14 @@ List<String> businessIdsVisibleBy = null; User user = daoActor.getLoggedUser(token); - if (!user.isSuperAdmin()) { - Set<Actor> actors = new HashSet<Actor>(); - getActors(user, actors); - businessIdsVisibleBy = daoPermission.getBusinessIdsVisibleBy(actors); + if (user == null) { + businessIdsVisibleBy = new ArrayList<String>(); + } else { + if (!user.isSuperAdmin()) { + Set<Actor> actors = new HashSet<Actor>(); + getActors(user, actors); + businessIdsVisibleBy = daoPermission.getBusinessIdsVisibleBy(actors); + } } synchronized (usersCachedSynchronizer) { @@ -245,6 +258,9 @@ @Override public String getUserFilter(String token) { User user = daoActor.getLoggedUser(token); + if (user == null) { + return ""; + } return user.getActorId().toString(); }

1 0

r1435 - trunk/simexplorer-is
by glandais＠users.labs.libre-entreprise.org 21 Mar '08

21 Mar '08

Author: glandais Date: 2008-03-21 16:48:43 +0000 (Fri, 21 Mar 2008) New Revision: 1435 Modified: trunk/simexplorer-is/pom.xml Log: format Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-03-21 16:48:21 UTC (rev 1434) +++ trunk/simexplorer-is/pom.xml 2008-03-21 16:48:43 UTC (rev 1435) @@ -235,7 +235,7 @@ <artifactId>lutinutil</artifactId> <version>0.29-SNAPSHOT</version> <scope>compile</scope> - </dependency> + </dependency> </dependencies> <modules>

1 0

r1434 - trunk/simexplorer-is/simexplorer-is-security
by glandais＠users.labs.libre-entreprise.org 21 Mar '08

21 Mar '08

Author: glandais Date: 2008-03-21 16:48:21 +0000 (Fri, 21 Mar 2008) New Revision: 1434 Modified: trunk/simexplorer-is/simexplorer-is-security/pom.xml Log: Weird dependencies Modified: trunk/simexplorer-is/simexplorer-is-security/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-security/pom.xml 2008-03-20 16:43:50 UTC (rev 1433) +++ trunk/simexplorer-is/simexplorer-is-security/pom.xml 2008-03-21 16:48:21 UTC (rev 1434) @@ -32,6 +32,11 @@ <dependencies> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> + </dependency> + <dependency> <groupId>javax.persistence</groupId> <artifactId>persistence-api</artifactId> <version>1.0</version> @@ -60,7 +65,19 @@ <artifactId>ejb3unit</artifactId> <version>1.2</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + <version>3.7.ga</version> + <scope>test</scope> + </dependency> </dependencies> </project>

1 0