From 2495be9ecfa8aea47e285f63b5bb27b0c133b1f8 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 30 Jun 2014 23:03:03 +0200
Subject: Separated modifying Lookup methods into LookupManager, which is only
 present in a server process. This stops clients trying to write to the
 directory without relying on their permissions.

---
 .../lifecycle/instance/predefined/server/AddDomainContext.java       | 5 ++++-
 .../lifecycle/instance/predefined/server/RemoveDomainContext.java    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/c2kernel/lifecycle/instance/predefined/server')

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
index a931143..585f96f 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/AddDomainContext.java
@@ -2,6 +2,7 @@ package com.c2kernel.lifecycle.instance.predefined.server;
 
 import java.util.Stack;
 
+import com.c2kernel.common.CannotManageException;
 import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.ObjectAlreadyExistsException;
 import com.c2kernel.common.ObjectCannotBeUpdated;
@@ -35,12 +36,14 @@ public class AddDomainContext extends PredefinedStep {
 		while(!pathsToAdd.empty()) {
 			pathToAdd = pathsToAdd.pop();
 			try {
-				Gateway.getLookup().add(pathToAdd);
+				Gateway.getLookupManager().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(), "");
+			} catch (CannotManageException e) {
+				throw new InvalidDataException("Cannot alter directory in a non-server process", "");
 			}
 		}
 		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
index a55f7dd..956166a 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/server/RemoveDomainContext.java
@@ -1,5 +1,6 @@
 package com.c2kernel.lifecycle.instance.predefined.server;
 
+import com.c2kernel.common.CannotManageException;
 import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.ObjectCannotBeUpdated;
 import com.c2kernel.common.ObjectNotFoundException;
@@ -31,10 +32,12 @@ public class RemoveDomainContext extends PredefinedStep {
 			throw new InvalidDataException("Context "+pathToDelete+" is not empty. Cannot delete.", "");
 		
 		try {
-			Gateway.getLookup().delete(pathToDelete);
+			Gateway.getLookupManager().delete(pathToDelete);
 		} catch (ObjectCannotBeUpdated e) {
 			Logger.error(e);
 			throw new InvalidDataException("Exception deleting path"+pathToDelete+": "+e.getMessage(), "");
+		} catch (CannotManageException e) {
+			throw new InvalidDataException("Cannot alter directory in a non-server process", "");
 		}
 		return requestData;
 	}
-- 
cgit v1.2.3