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.

---
 src/main/java/com/c2kernel/process/Bootstrap.java | 24 ++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/main/java/com/c2kernel/process/Bootstrap.java')

diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java
index f32764c..bc93676 100644
--- a/src/main/java/com/c2kernel/process/Bootstrap.java
+++ b/src/main/java/com/c2kernel/process/Bootstrap.java
@@ -23,7 +23,7 @@ import com.c2kernel.lifecycle.instance.stateMachine.Transition;
 import com.c2kernel.lookup.AgentPath;
 import com.c2kernel.lookup.DomainPath;
 import com.c2kernel.lookup.ItemPath;
-import com.c2kernel.lookup.Lookup;
+import com.c2kernel.lookup.LookupManager;
 import com.c2kernel.lookup.Path;
 import com.c2kernel.lookup.RolePath;
 import com.c2kernel.persistency.ClusterStorage;
@@ -117,6 +117,7 @@ public class Bootstrap
                 
      public static DomainPath verifyResource(String ns, String itemName, Integer version, String itemType, String dataLocation, int layer, boolean reset) throws Exception {
     	 	if (version == null) version = 0;
+    	 	LookupManager lookupManager = Gateway.getLookupManager();
             ResourceImportHandler typeImpHandler = getHandler(itemType);
     	 	Logger.msg(1, "Bootstrap.verifyResource() - Verifying version "+version+" of "+typeImpHandler.getName()+" "+itemName);
             
@@ -163,8 +164,8 @@ public class Bootstrap
 	            	Logger.msg("Module item "+itemName+" found with path "+path.toString()+". Moving to "+modDomPath.toString());
 	            	modDomPath.setEntity(new ItemPath(thisProxy.getSystemKey()));
 	            	if (!modDomPath.exists())
-	            		Gateway.getLookup().add(modDomPath);
-	            	Gateway.getLookup().delete(path);
+	            		lookupManager.add(modDomPath);
+	            	lookupManager.delete(path);
 	            }
             }
             
@@ -252,6 +253,8 @@ public class Bootstrap
         // create props
         PropertyDescriptionList pdList = impHandler.getPropDesc();
         PropertyArrayList props = new PropertyArrayList();
+        LookupManager lookupManager = Gateway.getLookupManager();
+        
         for (int i = 0; i < pdList.list.size(); i++) {
             PropertyDescription pd = pdList.list.get(i);
             String propName = pd.getName();
@@ -275,10 +278,10 @@ public class Bootstrap
 
         ItemPath entityPath = Gateway.getNextKeyManager().generateNextEntityKey();
         Gateway.getCorbaServer().createEntity(entityPath);
-        Gateway.getLookup().add(entityPath);
+        lookupManager.add(entityPath);
         DomainPath newDomPath = impHandler.getPath(itemName, ns);
         newDomPath.setEntity(entityPath);
-        Gateway.getLookup().add(newDomPath);
+        lookupManager.add(newDomPath);
         ItemProxy newItemProxy = Gateway.getProxyManager().getProxy(entityPath);
         newItemProxy.initialise( 1, props, ca, null);
         return newItemProxy;
@@ -289,12 +292,14 @@ public class Bootstrap
      **************************************************************************/
      private static void checkAgent(String name, String pass, String role, boolean joblist) throws Exception {
          Logger.msg(1, "Bootstrap.checkAgent() - Checking for existence of '"+name+"' user.");
-         Lookup lookup = Gateway.getLookup();
+         LookupManager lookup = Gateway.getLookupManager();
+         
          try {
              systemAgents.put(name, Gateway.getProxyManager().getAgentProxy(lookup.getAgentPath(name)));
              Logger.msg(3, "Bootstrap.checkAgent() - User '"+name+"' found.");
              return;
          } catch (ObjectNotFoundException ex) { }
+         
          Logger.msg("Bootstrap.checkAgent() - User '"+name+"' not found. Creating.");
 
          RolePath rolePath;
@@ -309,7 +314,7 @@ public class Bootstrap
              AgentPath agentPath = new AgentPath(entityPath.getSysKey(), name);
              agentPath.setPassword(pass);
              Gateway.getCorbaServer().createEntity(agentPath);
-             Gateway.getLookup().add(agentPath);
+             lookup.add(agentPath);
 
              // assign admin role
              Logger.msg("Bootstrap.checkAgent() - Assigning role '"+role+"'");
@@ -341,6 +346,7 @@ public class Bootstrap
     }
 
     public static void createServerItem() throws Exception {
+    	LookupManager lookupManager = Gateway.getLookupManager();
         String serverName = Gateway.getProperties().getProperty("ItemServer.name");
         thisServerPath = new DomainPath("/servers/"+serverName);
         ItemPath serverEntity;
@@ -350,9 +356,9 @@ public class Bootstrap
             Logger.msg("Creating server item "+thisServerPath);
             serverEntity = Gateway.getNextKeyManager().generateNextEntityKey();
             Gateway.getCorbaServer().createEntity(serverEntity);
-            Gateway.getLookup().add(serverEntity);
+            lookupManager.add(serverEntity);
             thisServerPath.setEntity(serverEntity);
-            Gateway.getLookup().add(thisServerPath);
+            lookupManager.add(thisServerPath);
         }
         Gateway.getStorage().put(serverEntity.getSysKey(), new Property("Name", serverName, false), null);
         Gateway.getStorage().put(serverEntity.getSysKey(), new Property("Type", "Server", false), null);
-- 
cgit v1.2.3