From cedb32b6b7a799ef4142b418e64d3538cf604af1 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Thu, 5 Jun 2014 14:13:37 +0200
Subject: Recreate old Authenticator interface as 'ProxyLogin' Server boots
 with new lookup interface.

---
 src/main/java/com/c2kernel/process/Bootstrap.java            |  9 ++++++---
 src/main/java/com/c2kernel/process/ClientShell.java          |  4 ++--
 src/main/java/com/c2kernel/process/Gateway.java              | 10 ++++++----
 src/main/java/com/c2kernel/process/UserCodeProcess.java      |  8 ++++----
 src/main/java/com/c2kernel/process/auth/ConsoleAuth.java     |  4 ++--
 src/main/java/com/c2kernel/process/auth/ProxyLogin.java      | 12 ++++++++++++
 src/main/java/com/c2kernel/process/module/Module.java        |  9 +++++----
 src/main/java/com/c2kernel/process/module/ModuleManager.java | 12 +++++++++---
 src/main/java/com/c2kernel/process/module/ModuleScript.java  | 11 +----------
 9 files changed, 47 insertions(+), 32 deletions(-)
 create mode 100644 src/main/java/com/c2kernel/process/auth/ProxyLogin.java

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

diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java
index 25ea512..bcc5e68 100644
--- a/src/main/java/com/c2kernel/process/Bootstrap.java
+++ b/src/main/java/com/c2kernel/process/Bootstrap.java
@@ -10,6 +10,7 @@ import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 
 import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.entity.proxy.AgentProxy;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.events.Event;
 import com.c2kernel.events.History;
@@ -47,6 +48,7 @@ public class Bootstrap
 {
     static DomainPath thisServerPath;
     static HashMap<String, ResourceImportHandler> resHandlerCache = new HashMap<String, ResourceImportHandler>();
+    static HashMap<String, AgentProxy> systemAgents = new HashMap<String, AgentProxy>();
 
 	/**
 	 * Run everything without timing-out the service wrapper
@@ -71,7 +73,7 @@ public class Bootstrap
 					Logger.msg("Bootstrap.run() - Initialising Server Item Workflow");
 					initServerItemWf();
 					
-		            // register modules
+					Gateway.getModuleManager().setUser(systemAgents.get("system"));
 		            Gateway.getModuleManager().registerModules();
 
 					Logger.msg("Bootstrap.run() - Bootstrapping complete");
@@ -279,7 +281,7 @@ public class Bootstrap
          Logger.msg(1, "Bootstrap.checkAgent() - Checking for existence of '"+name+"' user.");
          Lookup lookup = Gateway.getLookup();
          try {
-             lookup.getAgentPath(name);
+             systemAgents.put(name, Gateway.getProxyManager().getAgentProxy(lookup.getAgentPath(name)));
              Logger.msg(3, "Bootstrap.checkAgent() - User '"+name+"' found.");
              return;
          } catch (ObjectNotFoundException ex) { }
@@ -304,6 +306,7 @@ public class Bootstrap
              rolePath.addAgent(agentPath);
              Gateway.getStorage().put(agentPath.getSysKey(), new Property("Name", name, true), null);
              Gateway.getStorage().put(agentPath.getSysKey(), new Property("Type", "Agent", false), null);
+             systemAgents.put(name, Gateway.getProxyManager().getAgentProxy(agentPath));
              Logger.msg("Bootstrap.checkAgent() - Done");
          } catch (Exception ex) {
              Logger.error("Unable to create "+name+" user.");
@@ -359,7 +362,7 @@ public class Bootstrap
         PredefinedStepContainer predef = (PredefinedStepContainer)wf.search("workflow/predefined");
         wf.getChildGraphModel().removeVertex(predef);
         wf.addChild(new ServerPredefinedStepContainer(), predef.getCentrePoint());
-        wf.initialise(thisServerPath.getSysKey(), Gateway.getLookup().getAgentPath("system"));
+        wf.initialise(thisServerPath.getSysKey(), systemAgents.get("system").getPath());
         Gateway.getStorage().put(thisServerPath.getSysKey(), wf, null);
     }
 }
diff --git a/src/main/java/com/c2kernel/process/ClientShell.java b/src/main/java/com/c2kernel/process/ClientShell.java
index 6a620d8..b6afb2c 100644
--- a/src/main/java/com/c2kernel/process/ClientShell.java
+++ b/src/main/java/com/c2kernel/process/ClientShell.java
@@ -3,7 +3,7 @@ package com.c2kernel.process;
 import java.util.Scanner;
 
 import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.process.auth.Authenticator;
+import com.c2kernel.process.auth.ProxyLogin;
 import com.c2kernel.scripting.Script;
 
 public class ClientShell extends StandardClient {
@@ -40,7 +40,7 @@ public class ClientShell extends StandardClient {
 		Gateway.init(readC2KArgs(args));
 		String authClassName = Gateway.getProperties().getProperty("cli.auth");
 		Class<?> authClass = Gateway.getResource().getClassForName(authClassName);
-		Authenticator auth = (Authenticator)authClass.newInstance();
+		ProxyLogin auth = (ProxyLogin)authClass.newInstance();
 		AgentProxy user = auth.authenticate(Gateway.getProperties().getProperty("Name"));
 		ClientShell shell = new ClientShell(user);
 		shell.run();
diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java
index 0c97a77..af24fe2 100644
--- a/src/main/java/com/c2kernel/process/Gateway.java
+++ b/src/main/java/com/c2kernel/process/Gateway.java
@@ -136,9 +136,6 @@ public class Gateway
             Language.isTranlated=true;
             Language.mTableOfTranslation = FileStringUtility.loadLanguageFile(languageFile);
         }
-        
-        // if client, run module startup scripts. Otherwise bootstrap will do it after all imports
-        if (!AbstractMain.runningAsWrapper) mModules.runScripts("startup");
     }
 
     /**
@@ -215,7 +212,7 @@ public class Gateway
             
     	} catch (Exception ex) {
             Logger.error(ex);
-            throw new InvalidDataException("Cannot authenticate. Name and/or password invalid.", "");
+            throw new InvalidDataException("Cannot connect server process. Please check config.", "");
         }
 
 
@@ -250,6 +247,11 @@ public class Gateway
         AgentPath agentPath = mLookup.getAgentPath(agentName);
         AgentProxy userProxy = (AgentProxy) mProxyManager.getProxy(agentPath);
         userProxy.setAuthObj(auth);
+        
+        // Run module startup scripts. Server does this during bootstrap
+        mModules.setUser(userProxy);
+        mModules.runScripts("startup");
+        
 		return userProxy;
     }
 
diff --git a/src/main/java/com/c2kernel/process/UserCodeProcess.java b/src/main/java/com/c2kernel/process/UserCodeProcess.java
index 47742aa..0d35025 100644
--- a/src/main/java/com/c2kernel/process/UserCodeProcess.java
+++ b/src/main/java/com/c2kernel/process/UserCodeProcess.java
@@ -9,8 +9,8 @@ import com.c2kernel.common.InvalidTransitionException;
 import com.c2kernel.entity.C2KLocalObject;
 import com.c2kernel.entity.agent.Job;
 import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.entity.proxy.ProxyObserver;
 import com.c2kernel.entity.proxy.MemberSubscription;
+import com.c2kernel.entity.proxy.ProxyObserver;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.scripting.ErrorInfo;
 import com.c2kernel.scripting.ScriptErrorException;
@@ -38,12 +38,12 @@ public class UserCodeProcess extends StandardClient implements ProxyObserver<Job
     HashMap<String, ErrorInfo> errors = new HashMap<String, ErrorInfo>();
     HashMap<String, C2KLocalObject> jobs;
 
-    public UserCodeProcess(String agentName, String agentPass) {
+    public UserCodeProcess(String agentName, String agentPass, String resource) {
         // login - try for a while in case server hasn't imported our user yet
         for (int i=1;i<6;i++) {
             try {
                 Logger.msg("Login attempt "+i+" of 5");
-                agent = Gateway.connect(agentName, agentPass);
+                agent = Gateway.connect(agentName, agentPass, resource);
                 break;
             } catch (Exception ex) {
                 Logger.error("Could not log in.");
@@ -209,7 +209,7 @@ public class UserCodeProcess extends StandardClient implements ProxyObserver<Job
     }
 
     public static UserCodeProcess getInstance() throws UnknownHostException {
-        return new UserCodeProcess(InetAddress.getLocalHost().getHostName(), "uc");
+        return new UserCodeProcess(InetAddress.getLocalHost().getHostName(), "uc", Gateway.getProperties().getProperty("AuthResource", "Cristal"));
     }
 
     static public void main(String[] args)
diff --git a/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java b/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java
index a6af253..96d2196 100644
--- a/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java
+++ b/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java
@@ -6,7 +6,7 @@ import java.util.Scanner;
 import com.c2kernel.entity.proxy.AgentProxy;
 import com.c2kernel.process.Gateway;
 
-public class ConsoleAuth implements Authenticator {
+public class ConsoleAuth implements ProxyLogin {
 
 	public ConsoleAuth() {
 	}
@@ -27,7 +27,7 @@ public class ConsoleAuth implements Authenticator {
 			System.out.print("Password:");
 			String pass = scan.nextLine();
 			try {
-				user = Gateway.connect(username, pass);
+				user = Gateway.connect(username, pass, "Pandora");
 			} catch (Exception ex) {
 				System.err.println(ex.getMessage());
 			}
diff --git a/src/main/java/com/c2kernel/process/auth/ProxyLogin.java b/src/main/java/com/c2kernel/process/auth/ProxyLogin.java
new file mode 100644
index 0000000..94416cf
--- /dev/null
+++ b/src/main/java/com/c2kernel/process/auth/ProxyLogin.java
@@ -0,0 +1,12 @@
+package com.c2kernel.process.auth;
+
+import java.util.Properties;
+
+import com.c2kernel.entity.proxy.AgentProxy;
+
+public interface ProxyLogin {
+
+		public void initialize(Properties props) throws Exception;
+		public AgentProxy authenticate(String resource) throws Exception;
+		
+}
diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java
index 9c52fee..dae5711 100644
--- a/src/main/java/com/c2kernel/process/module/Module.java
+++ b/src/main/java/com/c2kernel/process/module/Module.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Properties;
 
 import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.entity.proxy.AgentProxy;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.lifecycle.instance.predefined.entitycreation.Dependency;
 import com.c2kernel.lifecycle.instance.predefined.entitycreation.DependencyMember;
@@ -33,11 +34,11 @@ public class Module {
 		super();
 	}
 	
-	public void runScript(String event, boolean isServer) throws ScriptingEngineException {
+	public void runScript(String event, AgentProxy user, boolean isServer) throws ScriptingEngineException {
 		for (ModuleScript script : scripts) {
 			if (script.shouldRun(event, isServer)) {
 				Logger.msg("Running "+script.event+" "+script.target+" script from "+name);
-				Object result = script.getScript(ns).execute();
+				Object result = script.getScript(ns, user).execute();
 				if (result instanceof ErrorInfo) {
 					ErrorInfo error = (ErrorInfo) result;
 					Logger.error(error.toString());
@@ -73,9 +74,9 @@ public class Module {
 		imports.list.add(moduleItem);
 	}
 	
-	public void importAll(ItemProxy serverEntity, String moduleXML, boolean reset) throws Exception {
+	public void importAll(ItemProxy serverEntity, AgentProxy systemAgent, String moduleXML, boolean reset) throws Exception {
+		int systemAgentId = systemAgent.getSystemKey();
 		addModuleItem(moduleXML);
-		int systemAgentId = Gateway.getLookup().getAgentPath("system").getSysKey();
 		
 		for (ModuleResource thisRes : imports.getResources()) {
 			try {
diff --git a/src/main/java/com/c2kernel/process/module/ModuleManager.java b/src/main/java/com/c2kernel/process/module/ModuleManager.java
index 0afe3af..6a69ff8 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleManager.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleManager.java
@@ -9,6 +9,7 @@ import java.util.Properties;
 
 import com.c2kernel.common.InvalidDataException;
 import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.entity.proxy.AgentProxy;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.lookup.DomainPath;
 import com.c2kernel.persistency.outcome.OutcomeValidator;
@@ -22,6 +23,7 @@ public class ModuleManager {
 	ArrayList<Module> modules = new ArrayList<Module>();
 	HashMap<String, String> modulesXML = new HashMap<String, String>();
 	Properties props = new Properties();
+	AgentProxy user;
 	boolean isServer;
 	OutcomeValidator moduleValidator;
 
@@ -110,6 +112,10 @@ public class ModuleManager {
 		if (!allDepsPresent) Logger.die("Unmet module dependencies. Cannot continue");
 	}
 
+	public void setUser(AgentProxy user) {
+		this.user = user;
+	}
+
 	public String getModuleVersions() {
 		StringBuffer ver = new StringBuffer();
 		for (Module thisMod : modules) {
@@ -127,7 +133,7 @@ public class ModuleManager {
 	public void runScripts(String event) {
 		for (Module thisMod : modules) {
 			try {
-				thisMod.runScript(event, isServer);
+				thisMod.runScript(event, user, isServer);
 			} catch (ScriptingEngineException e) {
 				Logger.error(e);
 				Logger.die(e.getMessage());
@@ -152,7 +158,7 @@ public class ModuleManager {
 			try {
 				String nsReset = Gateway.getProperties().getProperty("Module."+thisMod.ns+".reset");
 				boolean thisReset = nsReset == null?reset:nsReset.equals("true");
-				thisMod.importAll(serverEntity, modulesXML.get(thisMod.ns), thisReset);
+				thisMod.importAll(serverEntity, user, modulesXML.get(thisMod.ns), thisReset);
 			} catch (Exception e) {
 				Logger.error(e);
 				throw new ModuleException("Error importing items for module "+thisMod.getName());
@@ -160,7 +166,7 @@ public class ModuleManager {
 			Logger.msg("Module "+thisMod.getName()+" registered");
 			
 			try {
-				thisMod.runScript("startup", true);
+				thisMod.runScript("startup", user, true);
 			} catch (ScriptingEngineException e) {
 				Logger.error(e);
 				throw new ModuleException("Error in startup script for module "+thisMod.getName());
diff --git a/src/main/java/com/c2kernel/process/module/ModuleScript.java b/src/main/java/com/c2kernel/process/module/ModuleScript.java
index e948996..f16f390 100644
--- a/src/main/java/com/c2kernel/process/module/ModuleScript.java
+++ b/src/main/java/com/c2kernel/process/module/ModuleScript.java
@@ -1,7 +1,6 @@
 package com.c2kernel.process.module;
 
 import com.c2kernel.entity.proxy.AgentProxy;
-import com.c2kernel.process.Gateway;
 import com.c2kernel.scripting.Script;
 import com.c2kernel.scripting.ScriptingEngineException;
 
@@ -23,16 +22,8 @@ public class ModuleScript {
 		this.script = script;
 	}
 	
-	public Script getScript(String ns) throws ScriptingEngineException {
-		AgentProxy user = Gateway.getCurrentUser();
-        try {
-        	if (user == null) user = (AgentProxy)Gateway.getProxyManager().getProxy(
-        		Gateway.getLookup().getAgentPath("system"));
-    		} catch (Exception ex) {
-    			throw new ScriptingEngineException("System agent unavailable");
-    		}
+	public Script getScript(String ns, AgentProxy user) throws ScriptingEngineException {
         return new Script(lang, ns+" "+target+" "+event, script, user);
-
 	}
 
 	public boolean shouldRun(String event, boolean isServer) {
-- 
cgit v1.2.3