X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fldap%2FArgeoSecurityDaoLdap.java;fp=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fldap%2FArgeoSecurityDaoLdap.java;h=807875db617328c879d311f6586feff66dffd16c;hb=c95922edc1d65ef4ef568d66e29ab0bd679693ef;hp=3d6d8ff9949dd9c22664abb6788ae508e5a55a73;hpb=5fdef8bfcf058d698a9be5bcc1ae8cdcbe4ce0f0;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java
index 3d6d8ff99..807875db6 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/ldap/ArgeoSecurityDaoLdap.java
@@ -18,8 +18,11 @@ package org.argeo.security.ldap;
 
 import static org.argeo.security.core.ArgeoUserDetails.createSimpleArgeoUser;
 
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 import javax.naming.Name;
 import javax.naming.NamingException;
@@ -44,6 +47,7 @@ import org.springframework.security.ldap.LdapUtils;
 import org.springframework.security.ldap.populator.DefaultLdapAuthoritiesPopulator;
 import org.springframework.security.ldap.search.FilterBasedLdapUserSearch;
 import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
+import org.springframework.security.providers.ldap.authenticator.LdapShaPasswordEncoder;
 import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.UserDetailsManager;
 import org.springframework.security.userdetails.UserDetailsService;
@@ -74,6 +78,19 @@ public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean
 	private LdapUserDetailsService ldapUserDetailsService;
 	private List<UserNatureMapper> userNatureMappers;
 
+	private LdapShaPasswordEncoder ldapShaPasswordEncoder = new LdapShaPasswordEncoder();
+	private Random random;
+
+	public ArgeoSecurityDaoLdap(BaseLdapPathContextSource contextSource) {
+		this.contextSource = contextSource;
+		ldapTemplate = new LdapTemplate(this.contextSource);
+		try {
+			random = SecureRandom.getInstance("SHA1PRNG");
+		} catch (NoSuchAlgorithmException e) {
+			random = new Random(System.currentTimeMillis());
+		}
+	}
+
 	public void afterPropertiesSet() throws Exception {
 		if (usernameMapper == null)
 			usernameMapper = new DefaultLdapUsernameToDnMapper(userBase,
@@ -113,11 +130,6 @@ public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean
 		}
 	}
 
-	public ArgeoSecurityDaoLdap(BaseLdapPathContextSource contextSource) {
-		this.contextSource = contextSource;
-		ldapTemplate = new LdapTemplate(this.contextSource);
-	}
-
 	public synchronized void create(ArgeoUser user) {
 		userDetailsManager.createUser(new ArgeoUserDetails(user));
 	}
@@ -132,14 +144,14 @@ public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean
 		return createSimpleArgeoUser(getDetails(uname));
 	}
 
-//	public ArgeoUser getCurrentUser() {
-//		ArgeoUser argeoUser = ArgeoUserDetails.securityContextUser();
-//		if (argeoUser == null)
-//			return null;
-//		if (argeoUser.getRoles().contains(defaultRole))
-//			argeoUser.getRoles().remove(defaultRole);
-//		return argeoUser;
-//	}
+	// public ArgeoUser getCurrentUser() {
+	// ArgeoUser argeoUser = ArgeoUserDetails.securityContextUser();
+	// if (argeoUser == null)
+	// return null;
+	// if (argeoUser.getRoles().contains(defaultRole))
+	// argeoUser.getRoles().remove(defaultRole);
+	// return argeoUser;
+	// }
 
 	@SuppressWarnings("unchecked")
 	public synchronized List<ArgeoUser> listUsers() {
@@ -220,6 +232,18 @@ public class ArgeoSecurityDaoLdap implements ArgeoSecurityDao, InitializingBean
 		ldapTemplate.unbind(dn);
 	}
 
+	public Boolean isPasswordValid(String encoded, String raw) {
+		return ldapShaPasswordEncoder.isPasswordValid(encoded, raw, null);
+	}
+
+	public String encodePassword(String raw) {
+		byte[] salt = null;
+		// TODO: check that Linux auth supports SSHA
+		// byte[] salt = new byte[16];
+		// random.nextBytes(salt);
+		return ldapShaPasswordEncoder.encodePassword(raw, salt);
+	}
+
 	protected String convertRoleToGroup(String role) {
 		String group = role;
 		if (group.startsWith(rolePrefix)) {