X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifUserAdmin.java;h=521ae8bb6e89916c6b88ea490767658e8b3012fa;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=098243638a9cdba82c8f9f2bf2ede3e2988024e3;hpb=25071ab6bcb2df1fa4057c2c04137f2d606772e7;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java index 098243638..521ae8bb6 100644 --- a/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java +++ b/org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java @@ -1,98 +1,67 @@ package org.argeo.osgi.useradmin; +import static org.argeo.osgi.useradmin.LdifName.inetOrgPerson; +import static org.argeo.osgi.useradmin.LdifName.objectClass; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.URI; -import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Dictionary; -import java.util.LinkedHashMap; +import java.util.HashSet; +import java.util.Hashtable; import java.util.List; -import java.util.Map; +import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import javax.naming.InvalidNameException; import javax.naming.NamingEnumeration; import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttributes; import javax.naming.ldap.LdapName; -import javax.naming.ldap.Rdn; -import javax.transaction.xa.XAException; -import javax.transaction.xa.XAResource; -import javax.transaction.xa.Xid; +import javax.transaction.TransactionManager; -import org.apache.commons.io.IOUtils; +import org.argeo.util.naming.LdifParser; +import org.argeo.util.naming.LdifWriter; import org.osgi.framework.Filter; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.service.useradmin.Authorization; import org.osgi.service.useradmin.Role; -import org.osgi.service.useradmin.User; -/** User admin implementation using LDIF file(s) as backend. */ +/** + * A user admin based on a LDIF files. Requires a {@link TransactionManager} and + * an open transaction for write access. + */ public class LdifUserAdmin extends AbstractUserDirectory { - SortedMap users = new TreeMap(); - SortedMap groups = new TreeMap(); - - private Map> userIndexes = new LinkedHashMap>(); + private SortedMap users = new TreeMap(); + private SortedMap groups = new TreeMap(); - // private Map> directMemberOf = new - // TreeMap>(); - private XaRes xaRes = new XaRes(); - - public LdifUserAdmin(String uri) { - this(uri, readOnlyDefault(uri)); + public LdifUserAdmin(String uri, String baseDn) { + this(fromUri(uri, baseDn)); } - public LdifUserAdmin(String uri, boolean isReadOnly) { - setReadOnly(isReadOnly); - try { - setUri(new URI(uri)); - } catch (URISyntaxException e) { - throw new UserDirectoryException("Invalid URI " + uri, e); - } - - if (!isReadOnly && !getUri().getScheme().equals("file")) - throw new UnsupportedOperationException(getUri().getScheme() - + " not supported read-write."); - - } - - public LdifUserAdmin(URI uri, boolean isReadOnly) { - setReadOnly(isReadOnly); - setUri(uri); - if (!isReadOnly && !getUri().getScheme().equals("file")) - throw new UnsupportedOperationException(getUri().getScheme() - + " not supported read-write."); - + public LdifUserAdmin(Dictionary properties) { + super(properties); } public LdifUserAdmin(InputStream in) { + super(new Hashtable()); load(in); - setReadOnly(true); - setUri(null); } - private static boolean readOnlyDefault(String uriStr) { - URI uri; - try { - uri = new URI(uriStr); - } catch (Exception e) { - throw new UserDirectoryException("Invalid URI " + uriStr, e); - } - if (uri.getScheme().equals("file")) { - File file = new File(uri); - return !file.canWrite(); - } - return true; + private static Dictionary fromUri(String uri, String baseDn) { + Hashtable res = new Hashtable(); + res.put(UserAdminConf.uri.name(), uri); + res.put(UserAdminConf.baseDn.name(), baseDn); + return res; } public void init() { try { + if (getUri().getScheme().equals("file")) { + File file = new File(getUri()); + if (!file.exists()) + return; + } load(getUri().toURL().openStream()); } catch (Exception e) { throw new UserDirectoryException("Cannot open URL " + getUri(), e); @@ -100,13 +69,14 @@ public class LdifUserAdmin extends AbstractUserDirectory { } public void save() { - if (getUri() == null || isReadOnly()) - throw new UserDirectoryException("Cannot save LDIF user admin"); + if (getUri() == null) + throw new UserDirectoryException("Cannot save LDIF user admin: no URI is set"); + if (isReadOnly()) + throw new UserDirectoryException("Cannot save LDIF user admin: " + getUri() + " is read-only"); try (FileOutputStream out = new FileOutputStream(new File(getUri()))) { save(out); } catch (IOException e) { - throw new UserDirectoryException("Cannot save user admin to " - + getUri(), e); + throw new UserDirectoryException("Cannot save user admin to " + getUri(), e); } } @@ -118,77 +88,59 @@ public class LdifUserAdmin extends AbstractUserDirectory { for (LdapName name : users.keySet()) ldifWriter.writeEntry(name, users.get(name).getAttributes()); } finally { - IOUtils.closeQuietly(out); + out.close(); } } protected void load(InputStream in) { try { + users.clear(); + groups.clear(); + LdifParser ldifParser = new LdifParser(); SortedMap allEntries = ldifParser.read(in); for (LdapName key : allEntries.keySet()) { Attributes attributes = allEntries.get(key); - NamingEnumeration objectClasses = attributes.get( - "objectClass").getAll(); + // check for inconsistency + Set lowerCase = new HashSet(); + NamingEnumeration ids = attributes.getIDs(); + while (ids.hasMoreElements()) { + String id = ids.nextElement().toLowerCase(); + if (lowerCase.contains(id)) + throw new UserDirectoryException(key + " has duplicate id " + id); + lowerCase.add(id); + } + + // analyse object classes + NamingEnumeration objectClasses = attributes.get(objectClass.name()).getAll(); + // System.out.println(key); objectClasses: while (objectClasses.hasMore()) { String objectClass = objectClasses.next().toString(); - if (objectClass.equals("inetOrgPerson")) { + // System.out.println(" " + objectClass); + if (objectClass.equals(inetOrgPerson.name())) { users.put(key, new LdifUser(this, key, attributes)); break objectClasses; - } else if (objectClass.equals("groupOfNames")) { + } else if (objectClass.equals(getGroupObjectClass())) { groups.put(key, new LdifGroup(this, key, attributes)); break objectClasses; } } } - - // optimise - // for (LdifGroup group : groups.values()) - // loadMembers(group); - - // indexes - for (String attr : getIndexedUserProperties()) - userIndexes.put(attr, new TreeMap()); - - for (LdifUser user : users.values()) { - Dictionary properties = user.getProperties(); - for (String attr : getIndexedUserProperties()) { - Object value = properties.get(attr); - if (value != null) { - LdifUser otherUser = userIndexes.get(attr).put( - value.toString(), user); - if (otherUser != null) - throw new UserDirectoryException("User " + user - + " and user " + otherUser - + " both have property " + attr - + " set to " + value); - } - } - } } catch (Exception e) { - throw new UserDirectoryException( - "Cannot load user admin service from LDIF", e); + throw new UserDirectoryException("Cannot load user admin service from LDIF", e); } } public void destroy() { + if (users == null || groups == null) + throw new UserDirectoryException("User directory " + getBaseDn() + " is already destroyed"); users.clear(); users = null; groups.clear(); groups = null; } - @Override - public Role getRole(String name) { - LdapName key; - try { - key = new LdapName(name); - } catch (InvalidNameException e) { - // TODO implements default base DN - throw new IllegalArgumentException("Badly formatted role name: " - + name, e); - } - + protected DirectoryUser daoGetRole(LdapName key) { if (groups.containsKey(key)) return groups.get(key); if (users.containsKey(key)) @@ -196,238 +148,91 @@ public class LdifUserAdmin extends AbstractUserDirectory { return null; } - @Override - public Authorization getAuthorization(User user) { - return new LdifAuthorization((LdifUser) user, - getAllRoles((LdifUser) user)); - } - - @Override - public Role createRole(String name, int type) { - try { - LdapName dn = new LdapName(name); - if (users.containsKey(dn) || groups.containsKey(dn)) - throw new UserDirectoryException("Already a role " + name); - - BasicAttributes attrs = new BasicAttributes(); - attrs.put("dn", dn.toString()); - Rdn nameRdn = dn.getRdn(dn.size() - 1); - // TODO deal with multiple attr RDN - attrs.put(nameRdn.getType(), nameRdn.getValue()); - LdifUser newRole; - if (type == Role.USER) { - newRole = new LdifUser(this, dn, attrs); - users.put(dn, newRole); - } else if (type == Role.GROUP) { - newRole = new LdifGroup(this, dn, attrs); - groups.put(dn, (LdifGroup) newRole); - } else - throw new UserDirectoryException("Unsupported type " + type); - return newRole; - } catch (InvalidNameException e) { - throw new UserDirectoryException("Cannot create role " + name, e); - } - } - - @Override - public boolean removeRole(String name) { - try { - LdapName dn = new LdapName(name); - LdifUser role = null; - if (users.containsKey(dn)) - role = users.remove(dn); - else if (groups.containsKey(dn)) - role = groups.remove(dn); - else - throw new UserDirectoryException("There is no role " + name); - if (role == null) - return false; - for (LdifGroup group : getDirectGroups(role)) { - // group.directMembers.remove(role); - group.getAttributes().get(getMemberAttributeId()) - .remove(dn.toString()); - } - if (role instanceof LdifGroup) { - LdifGroup group = (LdifGroup) role; - // for (Role user : group.directMembers) { - // if (user instanceof LdifUser) - // directMemberOf.get(((LdifUser) user).getDn()).remove( - // group); - // } - } - return true; - } catch (InvalidNameException e) { - throw new UserDirectoryException("Cannot create role " + name, e); - } + protected Boolean daoHasRole(LdapName dn) { + return users.containsKey(dn) || groups.containsKey(dn); } - @Override - public Role[] getRoles(String filter) throws InvalidSyntaxException { - ArrayList res = new ArrayList(); - if (filter == null) { + @SuppressWarnings("unchecked") + protected List doGetRoles(Filter f) { + ArrayList res = new ArrayList(); + if (f == null) { res.addAll(users.values()); res.addAll(groups.values()); } else { - Filter f = FrameworkUtil.createFilter(filter); - for (LdifUser user : users.values()) + for (DirectoryUser user : users.values()) { + // System.out.println("\n" + user.getName()); + // Dictionary props = user.getProperties(); + // for (Enumeration keys = props.keys(); keys + // .hasMoreElements();) { + // String key = keys.nextElement(); + // System.out.println(" " + key + "=" + props.get(key)); + // } if (f.match(user.getProperties())) res.add(user); - for (LdifUser group : groups.values()) + } + for (DirectoryUser group : groups.values()) if (f.match(group.getProperties())) res.add(group); } - return res.toArray(new Role[res.size()]); + return res; } @Override - public User getUser(String key, String value) { - // TODO check value null or empty - if (key != null) { - if (!userIndexes.containsKey(key)) - return null; - return userIndexes.get(key).get(value); - } - - // Try all indexes - List collectedUsers = new ArrayList( - getIndexedUserProperties().size()); - // try dn - LdifUser user = null; - try { - user = (LdifUser) getRole(value); - if (user != null) - collectedUsers.add(user); - } catch (Exception e) { - // silent - } - for (String attr : userIndexes.keySet()) { - user = userIndexes.get(attr).get(value); - if (user != null) - collectedUsers.add(user); - } - - if (collectedUsers.size() == 1) - return collectedUsers.get(0); - return null; - // throw new UnsupportedOperationException(); - } - - // protected void loadMembers(LdifGroup group) { - // group.directMembers = new ArrayList(); - // for (LdapName ldapName : group.getMemberNames()) { - // LdifUser role = null; - // if (groups.containsKey(ldapName)) - // role = groups.get(ldapName); - // else if (users.containsKey(ldapName)) - // role = users.get(ldapName); - // else { - // if (getExternalRoles() != null) - // role = (LdifUser) getExternalRoles().getRole( - // ldapName.toString()); - // if (role == null) - // throw new ArgeoUserAdminException("No role found for " - // + ldapName); - // } - // // role.directMemberOf.add(group); - // // if (!directMemberOf.containsKey(role.getDn())) - // // directMemberOf.put(role.getDn(), new ArrayList()); - // // directMemberOf.get(role.getDn()).add(group); - // group.directMembers.add(role); - // } - // } - - @Override - protected List getDirectGroups(User user) { - LdapName dn; - if (user instanceof LdifUser) - dn = ((LdifUser) user).getDn(); - else - try { - dn = new LdapName(user.getName()); - } catch (InvalidNameException e) { - throw new UserDirectoryException("Badly formatted user name " - + user.getName(), e); - } - - List directGroups = new ArrayList(); + protected List getDirectGroups(LdapName dn) { + List directGroups = new ArrayList(); for (LdapName name : groups.keySet()) { - LdifGroup group = groups.get(name); + DirectoryGroup group = groups.get(name); if (group.getMemberNames().contains(dn)) - directGroups.add(group); + directGroups.add(group.getDn()); } return directGroups; - // if (directMemberOf.containsKey(dn)) - // return Collections.unmodifiableList(directMemberOf.get(dn)); - // else - // return Collections.EMPTY_LIST; } @Override - public XAResource getXAResource() { - return xaRes; - } - - private class XaRes implements XAResource { - - @Override - public void commit(Xid xid, boolean onePhase) throws XAException { - save(); - } - - @Override - public void end(Xid xid, int flags) throws XAException { - // TODO Auto-generated method stub - - } - - @Override - public void forget(Xid xid) throws XAException { - // TODO Auto-generated method stub - - } - - @Override - public int getTransactionTimeout() throws XAException { - // TODO Auto-generated method stub - return 0; - } - - @Override - public boolean isSameRM(XAResource xares) throws XAException { - // TODO Auto-generated method stub - return false; - } - - @Override - public int prepare(Xid xid) throws XAException { - // TODO Auto-generated method stub - return 0; - } - - @Override - public Xid[] recover(int flag) throws XAException { - // TODO Auto-generated method stub - return null; + protected void prepare(UserDirectoryWorkingCopy wc) { + // delete + for (LdapName dn : wc.getDeletedUsers().keySet()) { + if (users.containsKey(dn)) + users.remove(dn); + else if (groups.containsKey(dn)) + groups.remove(dn); + else + throw new UserDirectoryException("User to delete not found " + dn); } - - @Override - public void rollback(Xid xid) throws XAException { - // TODO Auto-generated method stub - + // add + for (LdapName dn : wc.getNewUsers().keySet()) { + DirectoryUser user = wc.getNewUsers().get(dn); + if (users.containsKey(dn) || groups.containsKey(dn)) + throw new UserDirectoryException("User to create found " + dn); + else if (Role.USER == user.getType()) + users.put(dn, user); + else if (Role.GROUP == user.getType()) + groups.put(dn, (DirectoryGroup) user); + else + throw new UserDirectoryException("Unsupported role type " + user.getType() + " for new user " + dn); } - - @Override - public boolean setTransactionTimeout(int seconds) throws XAException { - // TODO Auto-generated method stub - return false; + // modify + for (LdapName dn : wc.getModifiedUsers().keySet()) { + Attributes modifiedAttrs = wc.getModifiedUsers().get(dn); + DirectoryUser user; + if (users.containsKey(dn)) + user = users.get(dn); + else if (groups.containsKey(dn)) + user = groups.get(dn); + else + throw new UserDirectoryException("User to modify no found " + dn); + user.publishAttributes(modifiedAttrs); } + } - @Override - public void start(Xid xid, int flags) throws XAException { - // TODO Auto-generated method stub - - } + @Override + protected void commit(UserDirectoryWorkingCopy wc) { + save(); + } + @Override + protected void rollback(UserDirectoryWorkingCopy wc) { + init(); } }