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=e9718035148db27b8f3aafd706fdc07516664ebd;hpb=814f2e01731aca304d826d070922d51fd84efa29;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 e97180351..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
@@ -59,7 +59,7 @@ 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);
 	}
 
@@ -72,14 +72,26 @@ public class DefaultSecurityService implements ArgeoSecurityService {
 	}
 
 	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);