X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.ldap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fldap%2FArgeoLdapUserDetailsManager.java;h=392ac4a27edcea9d2ef911097e3a83659f03dc0c;hb=8b8ee149b20e2578a55e17413fa5f7399ff7ba14;hp=54ef836a077bde2d852cb346bb6f95127b756868;hpb=2745f0c8c57d9468855179d56f858fb2448f779c;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java b/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java
index 54ef836a0..392ac4a27 100644
--- a/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java
+++ b/security/runtime/org.argeo.security.ldap/src/main/java/org/argeo/security/ldap/ArgeoLdapUserDetailsManager.java
@@ -2,14 +2,30 @@ package org.argeo.security.ldap;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Random;
+import java.util.Set;
+import java.util.TreeSet;
 
+import org.argeo.ArgeoException;
+import org.argeo.security.UserAdminDao;
+import org.argeo.security.UserAdminService;
 import org.springframework.ldap.core.ContextSource;
+import org.springframework.security.Authentication;
+import org.springframework.security.GrantedAuthority;
+import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.providers.encoding.PasswordEncoder;
+import org.springframework.security.userdetails.UserDetails;
 import org.springframework.security.userdetails.ldap.LdapUserDetailsManager;
 
 /** Extends {@link LdapUserDetailsManager} by adding password encoding support. */
-public class ArgeoLdapUserDetailsManager extends LdapUserDetailsManager {
+public class ArgeoLdapUserDetailsManager extends LdapUserDetailsManager
+		implements UserAdminService {
+	private String superUsername = "root";
+	private UserAdminDao userAdminDao;
 	private PasswordEncoder passwordEncoder;
 	private final Random random;
 
@@ -28,7 +44,66 @@ public class ArgeoLdapUserDetailsManager extends LdapUserDetailsManager {
 
 	@Override
 	public void changePassword(String oldPassword, String newPassword) {
-		super.changePassword(oldPassword, encodePassword(newPassword));
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		if (authentication == null)
+			throw new ArgeoException(
+					"Cannot change password without authentication");
+		String username = authentication.getName();
+		UserDetails userDetails = loadUserByUsername(username);
+		String currentPassword = userDetails.getPassword();
+		if (currentPassword == null)
+			throw new ArgeoException("Cannot access current password");
+		if (!passwordEncoder
+				.isPasswordValid(currentPassword, oldPassword, null))
+			throw new ArgeoException("Old password invalid");
+		// Spring Security LDAP 2.0 is buggy when used with OpenLDAP and called
+		// with oldPassword argument
+		super.changePassword(null, encodePassword(newPassword));
+	}
+
+	public void newRole(String role) {
+		userAdminDao.createRole(role, superUsername);
+	}
+
+	public void synchronize() {
+		for (String username : userAdminDao.listUsers())
+			loadUserByUsername(username);
+		// TODO: find a way to remove from JCR
+	}
+
+	public void deleteRole(String role) {
+		userAdminDao.deleteRole(role);
+	}
+
+	public Set<String> listUsers() {
+		return userAdminDao.listUsers();
+	}
+
+	public Set<String> listUsersInRole(String role) {
+		Set<String> lst = new TreeSet<String>(
+				userAdminDao.listUsersInRole(role));
+		Iterator<String> it = lst.iterator();
+		while (it.hasNext()) {
+			if (it.next().equals(superUsername)) {
+				it.remove();
+				break;
+			}
+		}
+		return lst;
+	}
+
+	public List<String> listUserRoles(String username) {
+		UserDetails userDetails = loadUserByUsername(username);
+		List<String> roles = new ArrayList<String>();
+		for (GrantedAuthority ga : userDetails.getAuthorities()) {
+			roles.add(ga.getAuthority());
+		}
+		return Collections.unmodifiableList(roles);
+	}
+
+	public Set<String> listEditableRoles() {
+		return userAdminDao.listEditableRoles();
 	}
 
 	protected String encodePassword(String password) {
@@ -45,4 +120,12 @@ public class ArgeoLdapUserDetailsManager extends LdapUserDetailsManager {
 		this.passwordEncoder = passwordEncoder;
 	}
 
+	public void setSuperUsername(String superUsername) {
+		this.superUsername = superUsername;
+	}
+
+	public void setUserAdminDao(UserAdminDao userAdminDao) {
+		this.userAdminDao = userAdminDao;
+	}
+
 }