X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.enterprise%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FAbstractUserDirectory.java;h=a3974389773ac0cc5123525fe2f543028dc2ce8e;hb=438237c2b8c995d4f9562d53bfe4ea63c4442054;hp=56f2f5c170bdc67719c2dcde9c28935065fa1a47;hpb=54e74b900b1c0f7b1de0def771de35e50a8d4071;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
index 56f2f5c17..a39743897 100644
--- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
+++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AbstractUserDirectory.java
@@ -31,8 +31,6 @@ import javax.transaction.SystemException;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.naming.LdapAttrs;
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkUtil;
@@ -47,13 +45,12 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 	static final String SHARED_STATE_USERNAME = "javax.security.auth.login.name";
 	static final String SHARED_STATE_PASSWORD = "javax.security.auth.login.password";
 
-	private final static Log log = LogFactory.getLog(AbstractUserDirectory.class);
-
 	private final Hashtable<String, Object> properties;
 	private final LdapName baseDn, userBaseDn, groupBaseDn;
 	private final String userObjectClass, userBase, groupObjectClass, groupBase;
 
 	private final boolean readOnly;
+	private final boolean disabled;
 	private final URI uri;
 
 	private UserAdmin externalRoles;
@@ -108,6 +105,11 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 			properties.put(UserAdminConf.readOnly.name(), Boolean.toString(readOnly));
 		} else
 			readOnly = new Boolean(readOnlyStr);
+		String disabledStr = UserAdminConf.disabled.getValue(properties);
+		if (disabledStr != null)
+			disabled = new Boolean(disabledStr);
+		else
+			disabled = false;
 	}
 
 	/** Returns the groups this user is a direct member of. */
@@ -181,8 +183,6 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 					LdapName groupDn = new LdapName(value.toString());
 					DirectoryUser group = doGetRole(groupDn);
 					allRoles.add(group);
-					if (log.isTraceEnabled())
-						log.trace("Add memberOf " + groupDn);
 				}
 			} catch (Exception e) {
 				throw new UserDirectoryException("Cannot get memberOf groups for " + user, e);
@@ -192,8 +192,6 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 				// TODO check for loops
 				DirectoryUser group = doGetRole(groupDn);
 				allRoles.add(group);
-				if (log.isTraceEnabled())
-					log.trace("Add direct group " + groupDn);
 				collectRoles(group, allRoles);
 			}
 		}
@@ -226,7 +224,6 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 		return user;
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public Role[] getRoles(String filter) throws InvalidSyntaxException {
 		UserDirectoryWorkingCopy wc = getWorkingCopy();
@@ -257,23 +254,14 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 			doGetUser(key, value, collectedUsers);
 		} else {
 			throw new UserDirectoryException("Key cannot be null");
-			// // try dn
-			// DirectoryUser user = null;
-			// try {
-			// user = (DirectoryUser) getRole(value);
-			// if (user != null)
-			// collectedUsers.add(user);
-			// } catch (Exception e) {
-			// // silent
-			// }
-			// // try all indexes
-			// for (String attr : getIndexedUserProperties())
-			// doGetUser(attr, value, collectedUsers);
 		}
-		if (collectedUsers.size() == 1)
+
+		if (collectedUsers.size() == 1) {
 			return collectedUsers.get(0);
-		else if (collectedUsers.size() > 1)
-			log.warn(collectedUsers.size() + " users for " + (key != null ? key + "=" : "") + value);
+		} else if (collectedUsers.size() > 1) {
+			// log.warn(collectedUsers.size() + " users for " + (key != null ? key + "=" :
+			// "") + value);
+		}
 		return null;
 	}
 
@@ -438,6 +426,10 @@ public abstract class AbstractUserDirectory implements UserAdmin, UserDirectory
 		return readOnly;
 	}
 
+	public boolean isDisabled() {
+		return disabled;
+	}
+
 	protected UserAdmin getExternalRoles() {
 		return externalRoles;
 	}