Merge branch 'master' of ssh://dev.cccs.uwe.ac.uk:22/var/git/cristal-kernel

7 files changed, 359 insertions, 0 deletions

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
new file mode 100644
index 0000000..a931143
--- /dev/null
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
@@ -0,0 +1,48 @@
+package com.c2kernel.lifecycle.instance.predefined.server;

+

+import java.util.Stack;

+

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectAlreadyExistsException;

+import com.c2kernel.common.ObjectCannotBeUpdated;

+import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

+import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.lookup.DomainPath;

+import com.c2kernel.process.Gateway;

+import com.c2kernel.utils.Logger;

+

+public class AddDomainContext extends PredefinedStep {

+	

+	public AddDomainContext() {

+        super();

+	}

+	

+	@Override

+	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+			int transitionID, String requestData) throws InvalidDataException {

+	

+		Logger.msg(1, "AddDomainContext::request() - Starting.");

+		

+		DomainPath pathToAdd = new DomainPath(getDataList(requestData)[0]);

+		if (pathToAdd.exists())

+			throw new InvalidDataException("Context "+pathToAdd+" already exists", "");

+		// collect parent paths if they don't exist

+		Stack<DomainPath> pathsToAdd = new Stack<DomainPath>();

+		while(pathToAdd!= null && !pathToAdd.exists()) { 

+			pathsToAdd.push(pathToAdd);

+			pathToAdd = pathToAdd.getParent();

+		}

+		while(!pathsToAdd.empty()) {

+			pathToAdd = pathsToAdd.pop();

+			try {

+				Gateway.getLookup().add(pathToAdd);

+			} catch (ObjectAlreadyExistsException e) {

+				Logger.error("Context "+pathToAdd+" inconsistently exists.");

+			} catch (ObjectCannotBeUpdated e) {

+				Logger.error(e);

+				throw new InvalidDataException("Exception adding path "+pathToAdd+": "+e.getMessage(), "");

+			}

+		}

+		return requestData;

+	}

+}

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
new file mode 100644
index 0000000..f2396da
--- /dev/null
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewAgent.java
@@ -0,0 +1,43 @@
+/**************************************************************************

+ * CreateNewAgent.java

+ *

+ * Copyright (C) 2001 CERN - European Organization for Nuclear Research

+ * All rights reserved.

+ **************************************************************************/

+

+package com.c2kernel.lifecycle.instance.predefined.server;

+

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.entity.imports.ImportAgent;

+import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

+import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.process.Gateway;

+import com.c2kernel.utils.Logger;

+

+public class CreateNewAgent extends PredefinedStep

+{

+    public CreateNewAgent()

+    {

+        super();

+		getProperties().put("SchemaType", "Agent");

+    }

+

+	//requestdata is xmlstring

+    @Override

+	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+			int transitionID, String requestData) throws InvalidDataException {

+    	

+        String redactedRequestData;

+        try {

+            ImportAgent newAgent = (ImportAgent)Gateway.getMarshaller().unmarshall(requestData);

+            newAgent.create(agent.getSysKey());

+            newAgent.password = "REDACTED";

+            redactedRequestData = Gateway.getMarshaller().marshall(newAgent);

+            return redactedRequestData;

+        } catch (Exception ex) {

+            Logger.error(ex);

+            throw new InvalidDataException("Error creating agent", "");

+        }

+

+    }

+}

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
new file mode 100644
index 0000000..19fd80a
--- /dev/null
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/CreateNewItem.java
@@ -0,0 +1,42 @@
+/**************************************************************************

+ * CreateNewItem

+ *

+ * Copyright (C) 2005 CERN - European Organization for Nuclear Research

+ * All rights reserved.

+ **************************************************************************/

+

+package com.c2kernel.lifecycle.instance.predefined.server;

+

+

+

+

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.entity.imports.ImportItem;

+import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

+import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.process.Gateway;

+import com.c2kernel.utils.Logger;

+

+public class CreateNewItem extends PredefinedStep

+{

+    public CreateNewItem()

+    {

+        super();

+		getProperties().put("SchemaType", "Item");

+    }

+

+	//requestdata is xmlstring

+    @Override

+	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+			int transitionID, String requestData) throws InvalidDataException {

+    	

+        try {

+            ImportItem item = (ImportItem)Gateway.getMarshaller().unmarshall(requestData);

+            item.create(agent.getSysKey(), false);

+            return requestData;

+        } catch (Exception ex) {

+            Logger.error(ex);

+            throw new InvalidDataException("Error creating item", "");

+        }

+    }

+}

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveAgent.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveAgent.java
new file mode 100644
index 0000000..19641fe
--- /dev/null
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveAgent.java
@@ -0,0 +1,61 @@
+package com.c2kernel.lifecycle.instance.predefined.server;

+

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectCannotBeUpdated;

+import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

+import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.lookup.RolePath;

+import com.c2kernel.persistency.ClusterStorageException;

+import com.c2kernel.process.Gateway;

+import com.c2kernel.utils.Logger;

+

+public class RemoveAgent extends PredefinedStep {

+

+	public RemoveAgent() {

+        super();

+	}

+	

+	@Override

+	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+			int transitionID, String requestData) throws InvalidDataException {

+	

+		Logger.msg(1, "RemoveAgent::request() - Starting.");

+		

+		String[] params = getDataList(requestData);

+		AgentPath targetAgent;

+		try {

+			targetAgent = Gateway.getLookup().getAgentPath(params[0]);

+		} catch (ObjectNotFoundException e) {

+			throw new InvalidDataException("Agent "+params[0]+" not found", "");

+		}

+		//remove from roles

+		for (RolePath role: targetAgent.getRoles()) {

+			try {

+				role.removeAgent(targetAgent);

+			} catch (ObjectCannotBeUpdated e) {

+				Logger.error(e);

+				throw new InvalidDataException("Error removing "+params[0]+" from Role "+role.getName(), "");

+			} catch (ObjectNotFoundException e) {

+				Logger.error(e);

+				throw new InvalidDataException("Tried to remove "+params[0]+" from Role "+role.getName()+" that doesn't exist.", "");

+			}

+		}

+		//clear out all storages

+        try {

+			Gateway.getStorage().removeCluster(targetAgent.getSysKey(), "", null);

+		} catch (ClusterStorageException e) {

+			Logger.error(e);

+			throw new InvalidDataException("Error deleting storage for  "+params[0], "");

+		}

+        //remove entity path

+        try {

+			Gateway.getLookup().delete(targetAgent);

+		} catch (ObjectCannotBeUpdated e) {

+			throw new InvalidDataException("Error deleting AgentPath for  "+params[0], "");

+		}

+        return requestData;

+

+	}

+

+}

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
new file mode 100644
index 0000000..a55f7dd
--- /dev/null
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
@@ -0,0 +1,41 @@
+package com.c2kernel.lifecycle.instance.predefined.server;

+

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectCannotBeUpdated;

+import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

+import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.lookup.DomainPath;

+import com.c2kernel.process.Gateway;

+import com.c2kernel.utils.Logger;

+

+public class RemoveDomainContext extends PredefinedStep {

+	public RemoveDomainContext() {

+        super();

+	}

+	

+	@Override

+	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+			int transitionID, String requestData) throws InvalidDataException {

+	

+		Logger.msg(1, "RemoveDomainContext::request() - Starting.");

+		

+		DomainPath pathToDelete = new DomainPath(getDataList(requestData)[0]);

+		if (!pathToDelete.exists())

+			throw new InvalidDataException("Context "+pathToDelete+" does not exist", "");

+		try {

+			pathToDelete.getEntity();

+			throw new InvalidDataException("Path "+pathToDelete+" is an Entity. Use its own Erase step instead, or RemoveAgent.", "");

+		} catch (ObjectNotFoundException ex) { }

+		if (Gateway.getLookup().getChildren(pathToDelete).hasNext())

+			throw new InvalidDataException("Context "+pathToDelete+" is not empty. Cannot delete.", "");

+		

+		try {

+			Gateway.getLookup().delete(pathToDelete);

+		} catch (ObjectCannotBeUpdated e) {

+			Logger.error(e);

+			throw new InvalidDataException("Exception deleting path"+pathToDelete+": "+e.getMessage(), "");

+		}

+		return requestData;

+	}

+}

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentPassword.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentPassword.java
new file mode 100644
index 0000000..8a2863a
--- /dev/null
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentPassword.java
@@ -0,0 +1,52 @@
+package com.c2kernel.lifecycle.instance.predefined.server;

+

+import java.security.NoSuchAlgorithmException;

+

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectCannotBeUpdated;

+import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

+import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.process.Gateway;

+import com.c2kernel.utils.Logger;

+

+public class SetAgentPassword extends PredefinedStep {

+	

+	public SetAgentPassword() {

+        super();

+	}

+	

+	@Override

+	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+			int transitionID, String requestData) throws InvalidDataException {

+    

+		Logger.msg(1, "SetAgentPassword::request() - Starting.");

+		

+		String[] params = getDataList(requestData);

+		if (params.length!=2)

+			throw new InvalidDataException("Requires 2 params: agent name and new password", "");

+		AgentPath targetAgent;

+		try {

+			targetAgent = Gateway.getLookup().getAgentPath(params[0]);

+		} catch (ObjectNotFoundException e) {

+			throw new InvalidDataException("Agent "+params[0]+" not found", "");

+		}

+		

+		try {

+			Gateway.getLookup().setAgentPassword(targetAgent, params[1]);

+		} catch (ObjectNotFoundException e) {

+			Logger.error(e);

+            throw new InvalidDataException("Agent "+params[0]+" not found.", "");

+		} catch (ObjectCannotBeUpdated e) {

+			Logger.error(e);

+            throw new InvalidDataException("Error updating LDAP entry.", "");

+		} catch (NoSuchAlgorithmException e) {

+			Logger.error(e);

+            throw new InvalidDataException("Cryptographic libraries for password hashing not found.", "");

+		}

+		

+		params[1] = "REDACTED"; // censor user's password from outcome

+		return bundleData(params);

+	}

+	

+}

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentRoles.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentRoles.java
new file mode 100644
index 0000000..19c6bd8
--- /dev/null
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/SetAgentRoles.java
@@ -0,0 +1,72 @@
+package com.c2kernel.lifecycle.instance.predefined.server;

+

+import java.util.ArrayList;

+

+import com.c2kernel.common.InvalidDataException;

+import com.c2kernel.common.ObjectNotFoundException;

+import com.c2kernel.lifecycle.instance.predefined.PredefinedStep;

+import com.c2kernel.lookup.AgentPath;

+import com.c2kernel.lookup.RolePath;

+import com.c2kernel.process.Gateway;

+import com.c2kernel.utils.Logger;

+

+public class SetAgentRoles extends PredefinedStep {

+

+	public SetAgentRoles() {

+        super();

+	}

+	

+	@Override

+	protected String runActivityLogic(AgentPath agent, int itemSysKey,

+			int transitionID, String requestData) throws InvalidDataException {

+	

+		Logger.msg(1, "SetAgentRoles::request() - Starting.");

+		

+		String[] params = getDataList(requestData);

+		AgentPath targetAgent;

+		try {

+			targetAgent = Gateway.getLookup().getAgentPath(params[0]);

+		} catch (ObjectNotFoundException e) {

+			throw new InvalidDataException("Agent "+params[0]+" not found", "");

+		}

+		

+		RolePath[] currentRoles = targetAgent.getRoles();

+		ArrayList<RolePath> requestedRoles = new ArrayList<RolePath>();

+		if (params.length>1)

+			for (int i=1; i<params.length; i++)

+				try {

+					requestedRoles.add(Gateway.getLookup().getRolePath(params[i]));

+				} catch (ObjectNotFoundException e) {

+					throw new InvalidDataException("Role "+params[i]+" not found", "");

+				}

+		

+		ArrayList<RolePath> rolesToRemove = new ArrayList<RolePath>();

+		for (RolePath existingRole : currentRoles) { //

+			if (requestedRoles.contains(existingRole)) // if we have it, and it's requested, then it will be kept

+				requestedRoles.remove(existingRole); // so remove it from request - this will be left with roles to be added

+			else

+				rolesToRemove.add(existingRole); // else this role will be removed

+		}

+		

+		// remove roles not in new list

+		for (RolePath roleToRemove : rolesToRemove)

+			try {

+				roleToRemove.removeAgent(targetAgent);

+			} catch (Exception e) {

+				Logger.error(e);

+				throw new InvalidDataException("Error removing role "+roleToRemove.getName(), "");

+			}

+		

+		// add requested roles we don't already have

+		for (RolePath roleToAdd : requestedRoles)

+			try {

+				roleToAdd.addAgent(targetAgent);

+			} catch (Exception e) {

+				Logger.error(e);

+				throw new InvalidDataException("Error adding role "+roleToAdd.getName(), "");

+			}

+		

+		return requestData;

+	}

+

+}