X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fcore%2FDefaultSecurityService.java;h=b9b85087b31f45c1b15786e918eb2d9f5e60bc29;hb=11703221f489a07fec8f1ccbfacbe401587e9ce5;hp=23e2372c8a5b1adb171c7e5a462d3ddad0e62be3;hpb=5bfc0d2e2e34f86b454a1ec209617a9fc0f306b1;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java
index 23e2372c8..b9b85087b 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/DefaultSecurityService.java
@@ -16,6 +16,9 @@
 
 package org.argeo.security.core;
 
+import java.util.Iterator;
+import java.util.List;
+
 import org.argeo.ArgeoException;
 import org.argeo.security.ArgeoSecurity;
 import org.argeo.security.ArgeoSecurityDao;
@@ -56,27 +59,39 @@ public class DefaultSecurityService implements ArgeoSecurityService {
 	public void updateUserPassword(String username, String password) {
 		SimpleArgeoUser user = new SimpleArgeoUser(
 				securityDao.getUser(username));
-		user.setPassword(password);
+		user.setPassword(securityDao.encodePassword(password));
 		securityDao.update(user);
 	}
 
 	public void updateCurrentUserPassword(String oldPassword, String newPassword) {
 		SimpleArgeoUser user = new SimpleArgeoUser(getCurrentUser());
-		if (!user.getPassword().equals(oldPassword))
+		if (!securityDao.isPasswordValid(user.getPassword(), oldPassword))
 			throw new ArgeoException("Old password is not correct.");
-		user.setPassword(newPassword);
+		user.setPassword(securityDao.encodePassword(newPassword));
 		securityDao.update(user);
 	}
 
 	public void newUser(ArgeoUser user) {
-		user.getUserNatures().clear();
 		argeoSecurity.beforeCreate(user);
+		// normalize password
+		if (user instanceof SimpleArgeoUser) {
+			if (user.getPassword() == null || user.getPassword().equals(""))
+				((SimpleArgeoUser) user).setPassword(securityDao
+						.encodePassword(user.getUsername()));
+			else if (!user.getPassword().startsWith("{"))
+				((SimpleArgeoUser) user).setPassword(securityDao
+						.encodePassword(user.getPassword()));
+		}
 		securityDao.create(user);
 	}
 
 	public void updateUser(ArgeoUser user) {
-		String password = securityDao.getUserWithPassword(user.getUsername())
-				.getPassword();
+		String password = user.getPassword();
+		if (password == null)
+			password = securityDao.getUserWithPassword(user.getUsername())
+					.getPassword();
+		if (!password.startsWith("{"))
+			password = securityDao.encodePassword(user.getPassword());
 		SimpleArgeoUser simpleArgeoUser = new SimpleArgeoUser(user);
 		simpleArgeoUser.setPassword(password);
 		securityDao.update(simpleArgeoUser);
@@ -115,6 +130,19 @@ public class DefaultSecurityService implements ArgeoSecurityService {
 		};
 	}
 
+	public List<ArgeoUser> listUsersInRole(String role) {
+		List<ArgeoUser> lst = securityDao.listUsersInRole(role);
+		Iterator<ArgeoUser> it = lst.iterator();
+		while (it.hasNext()) {
+			if (it.next().getUsername()
+					.equals(argeoSecurity.getSuperUsername())) {
+				it.remove();
+				break;
+			}
+		}
+		return lst;
+	}
+
 	public void setArgeoSecurity(ArgeoSecurity argeoSecurity) {
 		this.argeoSecurity = argeoSecurity;
 	}