From d4fa3bd9dd48f4d5e26850a23f5ba48a9c10ad64 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 5 Jun 2014 15:02:07 +0200
Subject: LDAP refactored behind interfaces. All functions of LDAP now hidden
 behind interfaces: Authenticator, Lookup and NextKeyManager (LDAP property
 storage was already a ClusterStorage). Gateway holds additional objects, and
 Fixes #26 #191. Refs #27 (needs additional work for read perms and auth
 tokens)

---
 .../java/com/c2kernel/lookup/ldap/LDAPLookup.java  | 775 +++++++++++++++++++++
 1 file changed, 775 insertions(+)
 create mode 100644 src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java

(limited to 'src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java')

diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java b/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java
new file mode 100644
index 0000000..a96a46b
--- /dev/null
+++ b/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java
@@ -0,0 +1,775 @@
+/*
+ * Directory Lookup Service *
+ * author: Florida Estrella
+*/
+
+package com.c2kernel.lookup.ldap;
+
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+
+import org.omg.CORBA.Object;
+
+import com.c2kernel.common.ObjectAlreadyExistsException;
+import com.c2kernel.common.ObjectCannotBeUpdated;
+import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.entity.TraceableEntity;
+import com.c2kernel.entity.agent.ActiveEntity;
+import com.c2kernel.entity.proxy.ProxyMessage;
+import com.c2kernel.lookup.AgentPath;
+import com.c2kernel.lookup.DomainPath;
+import com.c2kernel.lookup.InvalidItemPathException;
+import com.c2kernel.lookup.ItemPath;
+import com.c2kernel.lookup.Lookup;
+import com.c2kernel.lookup.Path;
+import com.c2kernel.lookup.RolePath;
+import com.c2kernel.process.Gateway;
+import com.c2kernel.process.auth.Authenticator;
+import com.c2kernel.property.PropertyDescription;
+import com.c2kernel.property.PropertyDescriptionList;
+import com.c2kernel.utils.Logger;
+import com.novell.ldap.LDAPAttribute;
+import com.novell.ldap.LDAPAttributeSet;
+import com.novell.ldap.LDAPConnection;
+import com.novell.ldap.LDAPDN;
+import com.novell.ldap.LDAPEntry;
+import com.novell.ldap.LDAPException;
+import com.novell.ldap.LDAPSearchConstraints;
+import com.novell.ldap.LDAPSearchResults;
+
+/**
+ * The LDAPLookup object, statically accessible through the Gateway, manages
+ * the LDAP connection for the cristal process. It provides:
+ * <ul>
+ * <li>Authentication - returning an AgentProxy object if a user has logged in
+ * <li>System key generation - through the NextKeyManager
+ * <li>Agent and Role lookup/modification - through the RoleManager
+ * <li>
+ * @version $Revision: 1.113 $ $Date: 2006/03/03 13:52:21 $
+ * @author  $Author: abranson $
+ */
+
+public class LDAPLookup implements Lookup
+
+{
+	private LDAPAuthManager mLDAPAuth;
+    private LDAPNextKeyManager mNextKeyManager;
+    private LDAPPropertyManager mPropManager;
+    
+    final String mItemTypeRoot, mDomainTypeRoot, mGlobalPath, mRootPath, mLocalPath, mRolePath;
+
+    /**
+     * Creates a new LDAPLookup manager with the properties supplied.
+     * This should be only done by the Gateway during initialisation.
+     *
+     * @param props The LDAP properties object that extracts LDAP connection properties from the global c2kprops
+     */
+    public LDAPLookup(LDAPProperties props)
+    {
+        Logger.msg(8,"LDAPLookup - initialising.");
+
+        mGlobalPath=props.mGlobalPath;
+        mRootPath=props.mRootPath;
+        mLocalPath=props.mLocalPath;
+
+        mItemTypeRoot = "cn=entity,"+props.mLocalPath;
+        mDomainTypeRoot = "cn=domain,"+props.mLocalPath;
+        mRolePath = "cn=agent,"+mDomainTypeRoot; 
+
+    }
+    
+    public LDAPLookup() {
+    	this(new LDAPProperties(Gateway.getProperties())); 
+    }
+    
+    @Override
+	public void open(Authenticator auth) {
+    	mLDAPAuth = (LDAPAuthManager)auth;
+    	mNextKeyManager = new LDAPNextKeyManager(mLDAPAuth, "cn=last,"+mItemTypeRoot);
+    	Gateway.getProperties().setProperty("NextKeyManager", mNextKeyManager);
+        Logger.msg(7, "LDAP.useOldProps="+Gateway.getProperties().getBoolean("LDAP.useOldProps", false));
+      	mPropManager = new LDAPPropertyManager(this, mLDAPAuth);
+    }
+
+    /**
+     * Gets the entity key generator, used to get a unique system key for new entities.
+     * @return the global NextKeyManager
+     */
+    public LDAPNextKeyManager getNextKeyManager()
+    {
+        return mNextKeyManager;
+    }
+
+    /**
+     * Gets the property manager, that is used to read and write cristal properties to the LDAP store.
+     * @return Returns the global LDAPPropertyManager.
+     */
+    public LDAPPropertyManager getPropManager() {
+        return mPropManager;
+    }
+
+    /**
+     * Disconnects the connection with the LDAP server during shutdown
+     */
+	@Override
+	public void close() {
+        Logger.msg(1, "LDAP Lookup: Shutting down LDAP connection.");
+        if (mLDAPAuth != null) {
+           	mLDAPAuth.disconnect();
+            mLDAPAuth = null;
+        }
+    }
+
+   /**
+    * Attempts to resolve the CORBA object for a Path, either directly or through an alias.
+    * @param path the path to resolve
+    * @return the CORBA object
+    * @throws ObjectNotFoundException When the path does not exist
+    */
+    public org.omg.CORBA.Object getIOR(Path path)
+    throws ObjectNotFoundException
+    {
+        return resolveObject(getFullDN(path));
+    }
+
+    /**
+     * Attempts to resolve the CORBA object from the IOR attribute of a DN, either directly or through an alias
+     * @param dn The String dn
+     * @throws ObjectNotFoundException when the dn or aliased dn does not exist
+     */
+    private org.omg.CORBA.Object resolveObject(String dn)
+        throws ObjectNotFoundException
+    {
+        Logger.msg(8,"LDAPLookup.resolveObject("+dn+")");
+        LDAPEntry anEntry = LDAPLookupUtils.getEntry(mLDAPAuth.getAuthObject(),dn,LDAPSearchConstraints.DEREF_NEVER);
+        if (anEntry != null)
+        {
+            String iorString;
+            try {
+                iorString = LDAPLookupUtils.getFirstAttributeValue(anEntry, "ior");
+                org.omg.CORBA.Object ior=Gateway.getORB().string_to_object(iorString);
+                if (ior!=null)
+                    return ior;
+                else
+                    throw new ObjectNotFoundException("LDAPLookup.resolveObject() - " + dn + " has no IOR", "");
+            } catch (ObjectNotFoundException ex) {
+                return resolveObject(LDAPLookupUtils.getFirstAttributeValue(anEntry,"aliasedObjectName"));
+            }
+        }
+        else
+            throw new ObjectNotFoundException("LDAPLookup.resolveObject() LDAP node " + dn + " is not in LDAP or has no IOR.", "");
+    }
+
+    /**
+     *
+     * @param domPath
+     * @return
+     * @throws InvalidItemPathException
+     * @throws ObjectNotFoundException
+     */
+    @Override
+	public ItemPath resolvePath(DomainPath domPath)
+        throws InvalidItemPathException, ObjectNotFoundException {
+        ItemPath referencedPath = null;
+        LDAPEntry domEntry = LDAPLookupUtils.getEntry(mLDAPAuth.getAuthObject(), 
+                getFullDN(domPath), LDAPSearchConstraints.DEREF_ALWAYS);
+        String entityKey = LDAPLookupUtils.getFirstAttributeValue(domEntry,
+                "intsyskey");
+        Logger.msg(7, "DomainPath " + domPath + " is a reference to "
+                + entityKey);
+        String objClass = LDAPLookupUtils.getFirstAttributeValue(domEntry,
+                "objectClass");
+        if (objClass.equals("cristalagent"))
+            referencedPath = new AgentPath(Integer.parseInt(entityKey));
+        else
+            referencedPath = new ItemPath(Integer.parseInt(entityKey));
+
+        return referencedPath;
+    }
+
+
+    @Override
+	public void add(Path path)
+        throws ObjectCannotBeUpdated, ObjectAlreadyExistsException
+    {
+        try {
+            checkLDAPContext(path);
+            LDAPAttributeSet attrSet = createAttributeSet(path);
+            LDAPEntry newEntry = new LDAPEntry(getFullDN(path),attrSet);
+            LDAPLookupUtils.addEntry(mLDAPAuth.getAuthObject(),newEntry);
+            if (path instanceof DomainPath)
+            	Gateway.getProxyServer().sendProxyEvent(new ProxyMessage(ProxyMessage.NA, path.toString(), ProxyMessage.ADDED));
+        } catch (LDAPException ex) {
+            if (ex.getResultCode() == LDAPException.ENTRY_ALREADY_EXISTS)
+                throw new ObjectAlreadyExistsException(ex.getLDAPErrorMessage(), "");
+            else
+                throw new ObjectCannotBeUpdated(ex.getLDAPErrorMessage(), "");
+        }
+     }
+
+    //deletes a node
+    //throws LDAPexception if node cannot be deleted (eg node is not a leaf)
+    @Override
+	public void delete(Path path) throws ObjectCannotBeUpdated
+    {
+        try {
+            LDAPLookupUtils.delete(mLDAPAuth.getAuthObject(),getDN(path)+mLocalPath);
+        } catch (LDAPException ex) {
+            throw new ObjectCannotBeUpdated(ex.getLDAPErrorMessage(), "");
+        }
+        if (path instanceof DomainPath) {
+        	Gateway.getProxyServer().sendProxyEvent(new ProxyMessage(ProxyMessage.NA, path.toString(), ProxyMessage.DELETED));
+        }
+    }
+
+	//change specs, add boolean alias leaf context
+    protected void checkLDAPContext(Path path)
+    {
+        String dn = getFullDN(path);
+        if (!LDAPLookupUtils.exists(mLDAPAuth.getAuthObject(),dn))
+        {
+            String listDN[] = path.getPath();
+            String name = "cn="+ path.getRoot() + "," + mLocalPath;
+            int i=0;
+            while (i<listDN.length-1)
+            {
+                name= "cn="+LDAPLookupUtils.escapeDN(listDN[i])+","+name;
+                if (!LDAPLookupUtils.exists(mLDAPAuth.getAuthObject(),name))
+                {
+                    try
+                    {
+                        //create cristalcontext
+                        Logger.msg(8,"LDAPLookup::addLDAPContext() context added " + name);
+                        LDAPLookupUtils.createCristalContext(mLDAPAuth.getAuthObject(), name);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.error("LDAPLookup::addContext() " + ex);
+                    }
+                }
+                i++;
+            }
+        }
+    }
+    public void createBootTree()
+    {
+        Logger.msg(8,"Initializing LDAP Boot tree");
+
+        //create org
+        LDAPLookupUtils.createOrganizationContext(mLDAPAuth.getAuthObject(), mGlobalPath);
+        //create root
+        LDAPLookupUtils.createCristalContext(mLDAPAuth.getAuthObject(), mRootPath);
+        //create local
+        LDAPLookupUtils.createCristalContext(mLDAPAuth.getAuthObject(), mLocalPath);
+    }
+
+    @Override
+	public void initializeDirectory() throws ObjectNotFoundException
+    {
+        createBootTree();
+        initTree( Gateway.getResource().getTextResource(null, "boot/LDAPboot.txt"));
+    }
+
+    public void initTree(String bootFile)
+    {
+        Logger.msg(8,"Verifying Cristal LDAP roots");
+        StringTokenizer strTokenizer = new StringTokenizer(bootFile, "\n\r");
+        while (strTokenizer.hasMoreTokens())
+        {
+            String line = strTokenizer.nextToken();
+            Logger.msg(8,"Checking " + line+mLocalPath);
+            LDAPLookupUtils.createCristalContext(mLDAPAuth.getAuthObject(), line+mLocalPath);
+        }
+
+    }
+
+ 	//typically search for cn=barcode
+    @Override
+	public LDAPPathSet search(Path start, String filter)
+    {
+    	Logger.msg(8,"LDAPLookup::search() From " + getDN(start) + " for cn=" + filter );
+        return search(getFullDN(start),"cn="+LDAPLookupUtils.escapeSearchFilter(filter));
+    }
+    
+    @Override
+	public LDAPPathSet search(Path start, String propname, String propvalue)
+    {
+    	String val = propname+":"+propvalue;
+    	Logger.msg(8,"LDAPLookup::search() From " + getDN(start) + " for cristalprop=" + val );
+        LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(0);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_SEARCHING);
+        return search(getFullDN(start),LDAPConnection.SCOPE_SUB,"cristalprop="+LDAPLookupUtils.escapeSearchFilter(val),searchCons);
+    }
+    
+    @Override
+	public LDAPPathSet search(Path start, PropertyDescriptionList props) {
+    	StringBuffer query = new StringBuffer();
+    	int propCount = 0;
+    	for (PropertyDescription propDesc: props.list) {
+    		if (propDesc.getIsClassIdentifier()) {
+    			String thisProp = LDAPLookupUtils.escapeSearchFilter(propDesc.getName()+(":")+propDesc.getDefaultValue());
+    			query.append("(cristalprop=").append(thisProp).append(")");
+    			propCount++;
+    		}
+    	}
+    	LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(0);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_SEARCHING);
+        if (propCount == 0)
+        	return search(getFullDN(start),LDAPConnection.SCOPE_SUB,"objectClass=cristalentity",searchCons);
+        else if (propCount == 1)
+        	return search(getFullDN(start),LDAPConnection.SCOPE_SUB,query.toString(),searchCons);
+        else
+        	return search(getFullDN(start),LDAPConnection.SCOPE_SUB,"(&"+query.toString()+")",searchCons);
+    }
+    
+    protected LDAPPathSet search(String startDN, int scope, String filter, LDAPSearchConstraints searchCons)
+    {
+        Logger.msg(8,"Searching for "+filter+" in "+startDN);
+        searchCons.setMaxResults(0);
+        String[] attr = { LDAPConnection.ALL_USER_ATTRS };
+        try
+        {
+            LDAPSearchResults res = mLDAPAuth.getAuthObject().search(startDN, scope,
+            		filter,attr,false,searchCons);
+            return new LDAPPathSet(res, this);
+        }
+        catch (LDAPException ex)
+        {
+            Logger.error("LDAPException::LDAPLookup::search() " + ex.toString());
+            return new LDAPPathSet(this);
+        }
+    }
+    //typically search for (any filter combination)
+    public LDAPPathSet search(String startDN,String filter)
+    {
+        LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(0);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_NEVER);
+        return search(startDN,LDAPConnection.SCOPE_SUB,filter,searchCons);
+    }
+
+    @Override
+	public LDAPPathSet searchEntities(Path start) {
+        LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(0);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_SEARCHING);
+        return search(getFullDN(start), LDAPConnection.SCOPE_SUB, "objectClass=cristalentity", searchCons);
+    }
+
+    @Override
+	public LDAPPathSet searchAliases(DomainPath start) {
+        LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(0);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_NEVER);
+        return search(getFullDN(start), LDAPConnection.SCOPE_SUB, "objectClass=aliasObject", searchCons);
+    }
+    
+    @Override
+	public LDAPPathSet searchAliases(ItemPath entity) {
+        LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(0);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_NEVER);
+        return search(getFullDN(new DomainPath()), LDAPConnection.SCOPE_SUB, "(&(objectClass=aliasObject)(aliasedObjectName="+
+        LDAPLookupUtils.escapeDN(getFullDN(entity))+"))", searchCons);
+    }
+
+    @Override
+	public boolean exists(Path path) {
+        return LDAPLookupUtils.exists(mLDAPAuth.getAuthObject(), getFullDN(path));
+    }
+
+    @Override
+	public Class<?> getItemClass(Path path) throws ObjectNotFoundException {
+        String[] attr = { LDAPConnection.ALL_USER_ATTRS };
+        try {
+            LDAPEntry anEntry=mLDAPAuth.getAuthObject().read(getDN(path)+mLocalPath,attr);
+            String type = LDAPLookupUtils.getFirstAttributeValue(anEntry, "objectClass");
+            if (type.equals("cristalentity"))
+                return TraceableEntity.class;
+            else if (type.equals("cristalagent"))
+                return ActiveEntity.class;
+            else
+                throw new ObjectNotFoundException("Not an entity", "");
+
+        } catch (LDAPException ex) {
+            if (ex.getResultCode() == LDAPException.NO_SUCH_OBJECT)
+                throw new ObjectNotFoundException("Entity does not exist", "");
+            Logger.error(ex);
+            throw new ObjectNotFoundException("Error getting entity class", "");
+        }
+    }
+
+    /** converts an LDAPentry to a Path object
+     *  Note that the search producing the entry should have retrieved the attrs
+     *  'ior' and 'uniquemember'
+     * @throws ObjectNotFoundException
+     * @throws ObjectNotFoundException
+     */
+    protected Path nodeToPath(LDAPEntry entry) throws InvalidItemPathException, ObjectNotFoundException
+    {
+        String dn = entry.getDN();
+
+        // extract syskey
+        int entityKey = -1;
+        try {
+            String entityKeyStr = LDAPLookupUtils.getFirstAttributeValue(entry,"intsyskey");
+            entityKey = Integer.parseInt(entityKeyStr);
+        } catch (Exception e) { }
+
+        // extract IOR
+        org.omg.CORBA.Object ior = null;
+        try {
+            String stringIOR = LDAPLookupUtils.getFirstAttributeValue(entry,"ior");
+            ior = Gateway.getORB().string_to_object(stringIOR);
+        } catch (ObjectNotFoundException e2) { }
+
+        /* Find the right path class */
+        Path thisPath;
+        if (LDAPLookupUtils.existsAttributeValue(entry,"objectclass","cristalagent"))
+        { //cristalagent
+            String agentID = LDAPLookupUtils.getFirstAttributeValue(entry,"uid");
+            thisPath = new AgentPath(entityKey, agentID);
+        }
+
+        else if (LDAPLookupUtils.existsAttributeValue(entry,"objectclass","cristalrole"))
+        { //cristalrole
+            thisPath = new RolePath(LDAPDN.explodeDN(dn,true)[0],
+                    LDAPLookupUtils.getFirstAttributeValue(entry, "jobList").equals("TRUE"));
+        }
+        else if (LDAPLookupUtils.existsAttributeValue(entry,"objectclass","aliasObject") ||
+                (LDAPLookupUtils.existsAttributeValue(entry,"objectclass","cristalcontext") && dn.endsWith(mDomainTypeRoot)))
+        {
+            DomainPath domainPath = new DomainPath();
+            domainPath.setPath(getPathComponents(dn.substring(0, dn.lastIndexOf(mDomainTypeRoot))));
+            thisPath = domainPath;
+        }
+        else if (LDAPLookupUtils.existsAttributeValue(entry,"objectclass","cristalentity") ||
+                (LDAPLookupUtils.existsAttributeValue(entry,"objectclass","cristalcontext") && dn.endsWith(mItemTypeRoot)))
+        {
+            if(dn.endsWith(mItemTypeRoot)) {
+                ItemPath entityPath;
+                if (entityKey != -1)
+                    entityPath = new ItemPath(entityKey);
+                else {
+                    entityPath = new ItemPath();
+                    entityPath.setPath(getPathComponents(dn.substring(0, dn.lastIndexOf(mItemTypeRoot))));
+                }
+                thisPath = entityPath;
+            }
+            else
+                throw new ObjectNotFoundException("Entity found outside entity tree");
+        }
+        else
+        {
+			throw new ObjectNotFoundException("Unrecognised LDAP entry. Not a cristal entry");
+        }
+
+        //set IOR if we have one
+        if (ior!=null) thisPath.setIOR(ior);
+        return thisPath;
+    }
+
+	public String getDN(Path path) {
+            StringBuffer dnBuffer = new StringBuffer();
+            String[] pathComp = path.getPath();
+            for (int i=pathComp.length-1; i>=0; i--)
+                dnBuffer.append("cn=").append(LDAPLookupUtils.escapeDN(pathComp[i])).append(",");
+            dnBuffer.append("cn="+path.getRoot()+",");
+            return dnBuffer.toString();
+    }
+
+    public String getFullDN(Path path) {
+        return getDN(path)+mLocalPath;
+    }
+    
+    public String[] getPathComponents(String dnFragment) {
+    	ArrayList<String> newPath = new ArrayList<String>();
+        StringTokenizer tok = new StringTokenizer(dnFragment, ",");
+        String[] path = new String[tok.countTokens()];
+        while (tok.hasMoreTokens()) {
+            String nextPath = tok.nextToken();
+            if (nextPath.indexOf("cn=") == 0)
+                newPath.add(0, LDAPLookupUtils.unescapeDN(nextPath.substring(3)));
+            else
+                break;
+        }
+        return newPath.toArray(path);
+    }
+
+	@Override
+	public Object resolve(Path path) throws ObjectNotFoundException {
+		return resolveObject(getFullDN(path));
+	}
+
+	@Override
+	public Iterator<Path> getChildren(Path path) {
+		if (path instanceof RolePath) return ((RolePath)path).getChildren();
+        String filter = "objectclass=*";
+        LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(10);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_FINDING );
+        return search(getFullDN(path), LDAPConnection.SCOPE_ONE,filter,searchCons);
+	}    
+	
+	public LDAPAttributeSet createAttributeSet(Path path) throws ObjectCannotBeUpdated {
+        LDAPAttributeSet attrs = new LDAPAttributeSet();
+		
+		if (path instanceof RolePath) {
+			RolePath rolePath = (RolePath)path;
+	        attrs.add(new LDAPAttribute("objectclass","cristalrole"));
+	        String jobListString = rolePath.hasJobList()?"TRUE":"FALSE";
+	        attrs.add(new LDAPAttribute("jobList",jobListString));
+	        attrs.add(new LDAPAttribute("cn", rolePath.getName()));
+		}
+		else if (path instanceof DomainPath) {
+			DomainPath domPath = (DomainPath)path;
+	        attrs.add(new LDAPAttribute("cn",domPath.getName()));
+            try {
+				attrs.add(new LDAPAttribute("aliasedObjectName",getFullDN(domPath.getEntity())));
+	            String objectclass_values[] = { "alias", "aliasObject" };
+	            attrs.add(new LDAPAttribute("objectclass",objectclass_values));
+			} catch (ObjectNotFoundException e) { // no entity - is a context
+				attrs.add(new LDAPAttribute("objectclass","cristalcontext"));
+			}
+		}
+		
+		else if (path instanceof ItemPath) {
+			ItemPath itemPath = (ItemPath)path;
+	        attrs.add(new LDAPAttribute("intsyskey",Integer.toString(itemPath.getSysKey())));
+	        attrs.add(new LDAPAttribute("cn", itemPath.getPath()[itemPath.getPath().length-1]));
+	        if (itemPath.getIOR() != null)
+	            attrs.add(new LDAPAttribute("ior", Gateway.getORB().object_to_string(itemPath.getIOR())));
+		
+	        if (path instanceof AgentPath) {
+	        	AgentPath agentPath = (AgentPath)path;
+	        	attrs.add(new LDAPAttribute("objectclass","cristalagent"));
+
+	        	String agentName = agentPath.getAgentName();
+	        	if (agentName != null && agentName.length() > 0)
+	        		attrs.add(new LDAPAttribute("uid", agentName));
+	        	else
+	        		throw new ObjectCannotBeUpdated("Cannot create agent. No userId specified", "");
+
+	        	String agentPass = agentPath.getPassword();
+	        	if (agentPass != null && agentPass.length() > 0)
+	        		try {
+	        			attrs.add(new LDAPAttribute("userPassword", AgentPath.generateUserPassword(agentPass, "SHA")));
+	        		} catch (NoSuchAlgorithmException ex) {
+	        			throw new ObjectCannotBeUpdated("Cryptographic libraries for password hashing not found.", "");
+	        		}
+	        	else
+	        		throw new ObjectCannotBeUpdated("Cannot create agent. No password given", "");
+	        }
+	        else {
+	        	attrs.add(new LDAPAttribute("objectclass","cristalentity"));
+	        }
+		}
+
+        return attrs;
+
+	}
+	
+	 //NOTE: A role must have at LEAST 1 userDN, cannot be empty...
+    //Creates a cristalRole
+    //CristalRole is-a specialized CristalContext which contains multi-valued uniqueMember attribute pointing to cristalagents
+    @Override
+	public RolePath createRole(String roleName, boolean jobList)
+        throws ObjectAlreadyExistsException, ObjectCannotBeUpdated
+    {
+
+        // create the role
+    	RolePath rolePath = new RolePath(roleName, jobList);
+    	String roleDN = getFullDN(rolePath);
+        LDAPEntry roleNode;
+        try
+        {
+        	roleNode = LDAPLookupUtils.getEntry(mLDAPAuth.getAuthObject(), getFullDN(rolePath));
+            throw new ObjectAlreadyExistsException();
+        } catch (ObjectNotFoundException ex) { }
+
+        //create CristalRole if it does not exist
+        roleNode = new LDAPEntry(roleDN, createAttributeSet(rolePath));
+        try {
+            LDAPLookupUtils.addEntry(mLDAPAuth.getAuthObject(),roleNode);
+        } catch (LDAPException e) {
+            throw new ObjectCannotBeUpdated(e.getLDAPErrorMessage(), "");
+        }
+        return rolePath;
+
+
+    }
+    public void deleteRole(RolePath role) throws ObjectNotFoundException, ObjectCannotBeUpdated {
+        try {
+            LDAPLookupUtils.delete(mLDAPAuth.getAuthObject(), getFullDN(role));
+        } catch (LDAPException ex) {
+            throw new ObjectCannotBeUpdated("Could not remove role");
+        }
+    }
+
+    @Override
+	public void addRole(AgentPath agent, RolePath role)
+            throws ObjectCannotBeUpdated, ObjectNotFoundException
+    {
+        LDAPEntry roleEntry = LDAPLookupUtils.getEntry(mLDAPAuth.getAuthObject(), getFullDN(role));
+        //add memberDN to uniqueMember if it is not yet a member
+        if (!LDAPLookupUtils.existsAttributeValue(roleEntry, "uniqueMember", getFullDN(agent)))
+            LDAPLookupUtils.addAttributeValue(mLDAPAuth.getAuthObject(), roleEntry, "uniqueMember", getFullDN(agent));
+        else
+            throw new ObjectCannotBeUpdated("Agent " + agent.getAgentName() + " already has role " + role.getName());
+    }
+
+    @Override
+	public void removeRole(AgentPath agent, RolePath role)
+        throws ObjectCannotBeUpdated, ObjectNotFoundException
+    {
+    	LDAPEntry roleEntry = LDAPLookupUtils.getEntry(mLDAPAuth.getAuthObject(), getFullDN(role));
+    	if (LDAPLookupUtils.existsAttributeValue(roleEntry, "uniqueMember", getFullDN(agent)))
+   			LDAPLookupUtils.removeAttributeValue(mLDAPAuth.getAuthObject(), roleEntry, "uniqueMember", getFullDN(agent));
+    	else
+    		throw new ObjectCannotBeUpdated("Agent did not have that role");
+    }
+
+    @Override
+	public boolean hasRole(AgentPath agent, RolePath role) {
+        String filter = "(&(objectclass=cristalrole)(uniqueMember="+getFullDN(agent)+")(cn="+role.getName()+"))";
+        LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(0);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_NEVER );
+        return search(mRolePath,LDAPConnection.SCOPE_SUB,filter,searchCons).hasNext();
+    }
+
+    @Override
+	public AgentPath[] getAgents(RolePath role)
+        throws ObjectNotFoundException
+    {
+    	//get the roleDN entry, and its uniqueMember entry pointing to
+    	LDAPEntry roleEntry;
+        try {
+            roleEntry = LDAPLookupUtils.getEntry(mLDAPAuth.getAuthObject(), getFullDN(role));
+        } catch (ObjectNotFoundException e) {
+            throw new ObjectNotFoundException("Role does not exist", "");
+        }
+
+    	String[] res = LDAPLookupUtils.getAllAttributeValues(roleEntry,"uniqueMember");
+    	ArrayList<AgentPath> agents = new ArrayList<AgentPath>();
+    	for (String userDN : res) {
+    		try {
+    			LDAPEntry userEntry = LDAPLookupUtils.getEntry(mLDAPAuth.getAuthObject(), userDN);
+    		    AgentPath path = (AgentPath)nodeToPath(userEntry);
+                agents.add(path);
+    		} catch (ObjectNotFoundException ex) {
+                Logger.error("Agent "+userDN+" does not exist");
+    		} catch (InvalidItemPathException ex) {
+                Logger.error("Agent "+userDN+" is not a valid entity");
+    		}
+    	}
+        AgentPath[] usersList = new AgentPath[0];
+        usersList = agents.toArray(usersList);
+    	return usersList;
+    }
+
+    //returns the role/s of a user
+    @Override
+	public RolePath[] getRoles(AgentPath agentPath)
+    {
+    	//search the mDomainPath tree uniqueMember=userDN
+    	//filter = objectclass=cristalrole AND uniqueMember=userDN
+        String filter = "(&(objectclass=cristalrole)(uniqueMember="+getFullDN(agentPath)+"))";
+        LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(0);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_NEVER );
+    	Iterator<?> roles = search(mRolePath,LDAPConnection.SCOPE_SUB,filter,searchCons);
+        ArrayList<RolePath> roleList = new ArrayList<RolePath>();
+
+    	while(roles.hasNext())
+    	{
+            RolePath path = (RolePath) roles.next();
+   			roleList.add(path);
+    	}
+        RolePath[] roleArr = new RolePath[roleList.size()];
+        roleArr = roleList.toArray(roleArr);
+        return roleArr;
+    }
+
+    /**
+     * Utility for looking up a login name
+     *
+     * @param ld
+     * @param agentName
+     * @param baseDN
+     * @return
+     * @throws ObjectNotFoundException
+     */
+    @Override
+	public AgentPath getAgentPath(String agentName) throws ObjectNotFoundException
+    {
+        //search to get the userDN equivalent of the userID
+        LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(0);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_NEVER );
+        String filter = "(&(objectclass=cristalagent)(uid="+agentName+"))";
+        Iterator<Path> res = search(mItemTypeRoot,LDAPConnection.SCOPE_SUB,filter,searchCons);
+        if (!res.hasNext())
+            throw new ObjectNotFoundException("Agent not found: "+agentName, "");
+        Path result = res.next();
+        if (result instanceof AgentPath)
+            return (AgentPath)result;
+        else
+            throw new ObjectNotFoundException("Entry was not an Agent");
+    }
+
+    @Override
+	public RolePath getRolePath(String roleName) throws ObjectNotFoundException
+    {
+        LDAPSearchConstraints searchCons = new LDAPSearchConstraints();
+        searchCons.setBatchSize(0);
+        searchCons.setDereference(LDAPSearchConstraints.DEREF_NEVER );
+        String filter = "(&(objectclass=cristalrole)(cn="+roleName+"))";
+		Iterator<Path> res = search(mRolePath,LDAPConnection.SCOPE_SUB,filter,searchCons);
+		if (!res.hasNext())
+            throw new ObjectNotFoundException("Role not found");
+        Path result = res.next();
+        if (result instanceof RolePath)
+            return (RolePath)result;
+        else
+            throw new ObjectNotFoundException("Entry was not a Role");
+    }
+
+	@Override
+	public void setHasJobList(RolePath role, boolean hasJobList) throws ObjectNotFoundException, ObjectCannotBeUpdated {
+		// get entry
+		LDAPEntry roleEntry;
+        try {
+            roleEntry = LDAPLookupUtils.getEntry(mLDAPAuth.getAuthObject(), getFullDN(role));
+        } catch (ObjectNotFoundException e) {
+            throw new ObjectNotFoundException("Role does not exist", "");
+        }
+		// set attribute
+        LDAPLookupUtils.setAttributeValue(mLDAPAuth.getAuthObject(), roleEntry, "jobList", hasJobList?"TRUE":"FALSE");
+	}
+	
+	@Override
+	public void setAgentPassword(AgentPath agent, String newPassword) throws ObjectNotFoundException, ObjectCannotBeUpdated, NoSuchAlgorithmException {
+		String encPasswd = AgentPath.generateUserPassword(newPassword, "SHA");
+		LDAPEntry agentEntry;
+        try {
+        	agentEntry = LDAPLookupUtils.getEntry(mLDAPAuth.getAuthObject(), getFullDN(agent));
+        } catch (ObjectNotFoundException e) {
+            throw new ObjectNotFoundException("Agent "+agent.getAgentName()+" does not exist", "");
+        }
+		LDAPLookupUtils.setAttributeValue(mLDAPAuth.getAuthObject(), agentEntry, "userPassword", encPasswd);
+		
+	}
+
+	@Override
+	public String getAgentName(AgentPath agentPath)
+			throws ObjectNotFoundException {
+        LDAPEntry agentEntry = LDAPLookupUtils.getEntry(mLDAPAuth.getAuthObject(), getFullDN(agentPath));
+        return LDAPLookupUtils.getFirstAttributeValue(agentEntry,"uid");
+	}
+
+}
-- 
cgit v1.2.3


From 8dbf947eb6e84ec6a3c6e9ba421c682d847a8b00 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 5 Jun 2014 16:13:23 +0200
Subject: Make LDAPNextKeyManager independent of the LDAPLookup. The
 authenticator is the only required common component.

---
 src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java       | 12 ------------
 .../java/com/c2kernel/lookup/ldap/LDAPNextKeyManager.java    | 11 ++++++++---
 2 files changed, 8 insertions(+), 15 deletions(-)

(limited to 'src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java')

diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java b/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java
index a96a46b..10c1830 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java
+++ b/src/main/java/com/c2kernel/lookup/ldap/LDAPLookup.java
@@ -55,7 +55,6 @@ public class LDAPLookup implements Lookup
 
 {
 	private LDAPAuthManager mLDAPAuth;
-    private LDAPNextKeyManager mNextKeyManager;
     private LDAPPropertyManager mPropManager;
     
     final String mItemTypeRoot, mDomainTypeRoot, mGlobalPath, mRootPath, mLocalPath, mRolePath;
@@ -87,21 +86,10 @@ public class LDAPLookup implements Lookup
     @Override
 	public void open(Authenticator auth) {
     	mLDAPAuth = (LDAPAuthManager)auth;
-    	mNextKeyManager = new LDAPNextKeyManager(mLDAPAuth, "cn=last,"+mItemTypeRoot);
-    	Gateway.getProperties().setProperty("NextKeyManager", mNextKeyManager);
         Logger.msg(7, "LDAP.useOldProps="+Gateway.getProperties().getBoolean("LDAP.useOldProps", false));
       	mPropManager = new LDAPPropertyManager(this, mLDAPAuth);
     }
 
-    /**
-     * Gets the entity key generator, used to get a unique system key for new entities.
-     * @return the global NextKeyManager
-     */
-    public LDAPNextKeyManager getNextKeyManager()
-    {
-        return mNextKeyManager;
-    }
-
     /**
      * Gets the property manager, that is used to read and write cristal properties to the LDAP store.
      * @return Returns the global LDAPPropertyManager.
diff --git a/src/main/java/com/c2kernel/lookup/ldap/LDAPNextKeyManager.java b/src/main/java/com/c2kernel/lookup/ldap/LDAPNextKeyManager.java
index 4db8a49..48f938e 100644
--- a/src/main/java/com/c2kernel/lookup/ldap/LDAPNextKeyManager.java
+++ b/src/main/java/com/c2kernel/lookup/ldap/LDAPNextKeyManager.java
@@ -8,6 +8,7 @@ import com.c2kernel.lookup.ItemPath;
 import com.c2kernel.persistency.ClusterStorageException;
 import com.c2kernel.persistency.NextKeyManager;
 import com.c2kernel.process.Gateway;
+import com.c2kernel.process.auth.Authenticator;
 import com.c2kernel.utils.Logger;
 import com.novell.ldap.LDAPEntry;
 
@@ -26,10 +27,14 @@ public class LDAPNextKeyManager implements NextKeyManager {
     LDAPAuthManager ldap;
     String lastKeyPath;
 
-    public LDAPNextKeyManager(LDAPAuthManager ldap, String lastKeyPath) {
+    public LDAPNextKeyManager() {
         super();
-        this.ldap = ldap;
-        this.lastKeyPath = lastKeyPath;
+        LDAPProperties props = new LDAPProperties(Gateway.getProperties());
+        this.lastKeyPath = "cn=last,cn=entity,"+props.mLocalPath;
+    }
+    
+    public void open(Authenticator auth) {
+   		this.ldap = (LDAPAuthManager)auth;
     }
 
     @Override
-- 
cgit v1.2.3