]> git.argeo.org Git - lgpl/argeo-commons.git/blobdiff - org.argeo.security.core/src/org/argeo/osgi/useradmin/LdifUserAdmin.java
Improve user admin configuration
[lgpl/argeo-commons.git] / org.argeo.security.core / src / org / argeo / osgi / useradmin / LdifUserAdmin.java
index b1e9ceb49808a26f88ede1b0c56c004575fb731b..9bf558b313b274a035d272a4db62d0f87db01381 100644 (file)
@@ -1,10 +1,13 @@
 package org.argeo.osgi.useradmin;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Dictionary;
+import java.util.Hashtable;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -16,51 +19,81 @@ import javax.naming.NamingEnumeration;
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapName;
 
+import org.apache.commons.io.IOUtils;
 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. */
-public class LdifUserAdmin extends AbstractLdapUserAdmin {
-       SortedMap<LdapName, LdifUser> users = new TreeMap<LdapName, LdifUser>();
-       SortedMap<LdapName, LdifGroup> groups = new TreeMap<LdapName, LdifGroup>();
+public class LdifUserAdmin extends AbstractUserDirectory {
+       SortedMap<LdapName, DirectoryUser> users = new TreeMap<LdapName, DirectoryUser>();
+       SortedMap<LdapName, DirectoryGroup> groups = new TreeMap<LdapName, DirectoryGroup>();
 
-       private Map<String, Map<String, LdifUser>> userIndexes = new LinkedHashMap<String, Map<String, LdifUser>>();
+       private Map<String, Map<String, DirectoryUser>> userIndexes = new LinkedHashMap<String, Map<String, DirectoryUser>>();
 
-       public LdifUserAdmin(String uri) {
-               this(uri, true);
+       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 ArgeoUserAdminException("Invalid URI " + uri, e);
-               }
+       public LdifUserAdmin(Dictionary<String, ?> properties) {
+               super(properties);
+       }
+
+       public LdifUserAdmin(InputStream in) {
+               super(new Hashtable<String, Object>());
+               load(in);
+               setReadOnly(true);
+               setUri(null);
+       }
 
-               if (!isReadOnly && !getUri().getScheme().equals("file:"))
-                       throw new UnsupportedOperationException(getUri().getScheme()
-                                       + "not supported read-write.");
+       private static Dictionary<String, Object> fromUri(String uri, String baseDn) {
+               Hashtable<String, Object> res = new Hashtable<String, Object>();
+               res.put(LdapProperties.uri.getFullName(), uri);
+               res.put(LdapProperties.baseDn.getFullName(), 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 ArgeoUserAdminException("Cannot open URL " + getUri(), e);
+                       throw new UserDirectoryException("Cannot open URL " + getUri(), e);
                }
        }
 
-       public LdifUserAdmin(InputStream in) {
-               load(in);
-               setReadOnly(true);
-               setUri(null);
+       public void save() {
+               if (getUri() == null || isReadOnly())
+                       throw new UserDirectoryException("Cannot save LDIF user admin");
+               try (FileOutputStream out = new FileOutputStream(new File(getUri()))) {
+                       save(out);
+               } catch (IOException e) {
+                       throw new UserDirectoryException("Cannot save user admin to "
+                                       + getUri(), e);
+               }
+       }
+
+       public void save(OutputStream out) throws IOException {
+               try {
+                       LdifWriter ldifWriter = new LdifWriter(out);
+                       for (LdapName name : groups.keySet())
+                               ldifWriter.writeEntry(name, groups.get(name).getAttributes());
+                       for (LdapName name : users.keySet())
+                               ldifWriter.writeEntry(name, users.get(name).getAttributes());
+               } finally {
+                       IOUtils.closeQuietly(out);
+               }
        }
 
        protected void load(InputStream in) {
                try {
+                       users.clear();
+                       groups.clear();
+
                        LdifParser ldifParser = new LdifParser();
                        SortedMap<LdapName, Attributes> allEntries = ldifParser.read(in);
                        for (LdapName key : allEntries.keySet()) {
@@ -70,32 +103,32 @@ public class LdifUserAdmin extends AbstractLdapUserAdmin {
                                objectClasses: while (objectClasses.hasMore()) {
                                        String objectClass = objectClasses.next().toString();
                                        if (objectClass.equals("inetOrgPerson")) {
-                                               users.put(key, new LdifUser(key, attributes));
+                                               users.put(key, new LdifUser(this, key, attributes));
                                                break objectClasses;
                                        } else if (objectClass.equals("groupOfNames")) {
-                                               groups.put(key, new LdifGroup(key, attributes));
+                                               groups.put(key, new LdifGroup(this, key, attributes));
                                                break objectClasses;
                                        }
                                }
                        }
 
                        // optimise
-                       for (LdifGroup group : groups.values())
-                               group.loadMembers(this);
+                       // for (LdifGroup group : groups.values())
+                       // loadMembers(group);
 
                        // indexes
                        for (String attr : getIndexedUserProperties())
-                               userIndexes.put(attr, new TreeMap<String, LdifUser>());
+                               userIndexes.put(attr, new TreeMap<String, DirectoryUser>());
 
-                       for (LdifUser user : users.values()) {
+                       for (DirectoryUser user : users.values()) {
                                Dictionary<String, Object> properties = user.getProperties();
                                for (String attr : getIndexedUserProperties()) {
                                        Object value = properties.get(attr);
                                        if (value != null) {
-                                               LdifUser otherUser = userIndexes.get(attr).put(
+                                               DirectoryUser otherUser = userIndexes.get(attr).put(
                                                                value.toString(), user);
                                                if (otherUser != null)
-                                                       throw new ArgeoUserAdminException("User " + user
+                                                       throw new UserDirectoryException("User " + user
                                                                        + " and user " + otherUser
                                                                        + " both have property " + attr
                                                                        + " set to " + value);
@@ -103,7 +136,7 @@ public class LdifUserAdmin extends AbstractLdapUserAdmin {
                                }
                        }
                } catch (Exception e) {
-                       throw new ArgeoUserAdminException(
+                       throw new UserDirectoryException(
                                        "Cannot load user admin service from LDIF", e);
                }
        }
@@ -115,17 +148,7 @@ public class LdifUserAdmin extends AbstractLdapUserAdmin {
                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))
@@ -133,70 +156,122 @@ public class LdifUserAdmin extends AbstractLdapUserAdmin {
                return null;
        }
 
-       @Override
-       public Authorization getAuthorization(User user) {
-               return new LdifAuthorization((LdifUser) user);
-       }
-
-       @Override
-       public Role createRole(String name, int type) {
-               throw new UnsupportedOperationException();
+       protected Boolean daoHasRole(LdapName dn) {
+               return users.containsKey(dn) || groups.containsKey(dn);
        }
 
-       @Override
-       public boolean removeRole(String name) {
-               throw new UnsupportedOperationException();
-       }
+       // @Override
+       // public boolean removeRole(String name) {
+       // LdapName dn = toDn(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.getAttributes().get(getMemberAttributeId())
+       // .remove(dn.toString());
+       // }
+       // return true;
+       // }
 
-       @Override
-       public Role[] getRoles(String filter) throws InvalidSyntaxException {
-               ArrayList<Role> res = new ArrayList<Role>();
-               if (filter == null) {
+       protected List<DirectoryUser> doGetRoles(Filter f) {
+               ArrayList<DirectoryUser> res = new ArrayList<DirectoryUser>();
+               if (f == null) {
                        res.addAll(users.values());
                        res.addAll(groups.values());
                } else {
-                       Filter f = FrameworkUtil.createFilter(filter);
-                       for (LdifUser user : users.values())
+                       // Filter f = FrameworkUtil.createFilter(filter);
+                       for (DirectoryUser user : users.values())
                                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;
+       }
+
+       protected void doGetUser(String key, String value,
+                       List<DirectoryUser> collectedUsers) {
+               assert key != null;
+               DirectoryUser user = userIndexes.get(key).get(value);
+               if (user != null)
+                       collectedUsers.add(user);
        }
 
        @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);
+       protected List<DirectoryGroup> 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<DirectoryGroup> directGroups = new ArrayList<DirectoryGroup>();
+               for (LdapName name : groups.keySet()) {
+                       DirectoryGroup group = groups.get(name);
+                       if (group.getMemberNames().contains(dn))
+                               directGroups.add(group);
                }
+               return directGroups;
+       }
 
-               // Try all indexes
-               List<LdifUser> collectedUsers = new ArrayList<LdifUser>(
-                               getIndexedUserProperties().size());
-               // try dn
-               LdifUser user = null;
-               try {
-                       user = (LdifUser) getRole(value);
-                       if (user != null)
-                               collectedUsers.add(user);
-               } catch (Exception e) {
-                       // silent
+       @Override
+       protected void prepare(WorkingCopy 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 no found "
+                                               + dn);
+               }
+               // add
+               for (LdapName dn : wc.getNewUsers().keySet()) {
+                       DirectoryUser user = wc.getNewUsers().get(dn);
+                       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);
                }
-               for (String attr : userIndexes.keySet()) {
-                       user = userIndexes.get(attr).get(value);
-                       if (user != null)
-                               collectedUsers.add(user);
+               // 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);
                }
+       }
 
-               if (collectedUsers.size() == 1)
-                       return collectedUsers.get(0);
-               return null;
-               // throw new UnsupportedOperationException();
+       @Override
+       protected void commit(WorkingCopy wc) {
+               save();
+       }
+
+       @Override
+       protected void rollback(WorkingCopy wc) {
+               init();
        }
 
 }