From a3079c033e7923a4076a1cc148c74b5bb86c79a1 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 17 Jun 2013 22:46:37 +0200
Subject: Authentication plugin for Console

---
 .../java/com/c2kernel/process/ClientShell.java     | 30 ++++-----------
 .../com/c2kernel/process/auth/Authenticator.java   | 12 ++++++
 .../com/c2kernel/process/auth/ConsoleAuth.java     | 45 ++++++++++++++++++++++
 3 files changed, 65 insertions(+), 22 deletions(-)
 create mode 100644 src/main/java/com/c2kernel/process/auth/Authenticator.java
 create mode 100644 src/main/java/com/c2kernel/process/auth/ConsoleAuth.java

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

diff --git a/src/main/java/com/c2kernel/process/ClientShell.java b/src/main/java/com/c2kernel/process/ClientShell.java
index c20c1d4..f0c3a0d 100644
--- a/src/main/java/com/c2kernel/process/ClientShell.java
+++ b/src/main/java/com/c2kernel/process/ClientShell.java
@@ -3,6 +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.scripting.Script;
 
 public class ClientShell extends StandardClient {
@@ -10,8 +11,8 @@ public class ClientShell extends StandardClient {
 	AgentProxy user;
 	Script console;
 	
-	public ClientShell(String username, String pass) throws Exception {
-		user = Gateway.connect(username, pass);
+	public ClientShell(AgentProxy user) throws Exception {
+		this.user = user;
 		console = new Script("javascript", user, System.out);
 	}
 	
@@ -38,27 +39,12 @@ public class ClientShell extends StandardClient {
 
 	public static void main(String[] args) throws Exception {
 		Gateway.init(readC2KArgs(args));
-		@SuppressWarnings("resource") // closing the scanner closes system.in
-		Scanner scan = new Scanner(System.in);
-		int loginAttempts = 0;
-		ClientShell shell = null;
-		while (shell == null && loginAttempts++ < 3) {
-			System.out.print("User:");
-			String username = scan.nextLine();
-			System.out.print("Password:");
-			String pass = scan.nextLine();
-			try {
-				shell = new ClientShell(username, pass);
-			} catch (Exception ex) {
-				System.err.println(ex.getMessage());
-			}
-		}
-		if (shell == null) {
-			System.err.println("Bye");
-			System.exit(0);
-		}
+		String authClassName = Gateway.getProperty("cli.auth");
+		Class<?> authClass = Class.forName(authClassName);
+		Authenticator auth = (Authenticator)authClass.newInstance();
+		AgentProxy user = auth.authenticate(Gateway.getProperty("Name"));
+		ClientShell shell = new ClientShell(user);
 		shell.run();
-			
 	}
 
 }
diff --git a/src/main/java/com/c2kernel/process/auth/Authenticator.java b/src/main/java/com/c2kernel/process/auth/Authenticator.java
new file mode 100644
index 0000000..ae18474
--- /dev/null
+++ b/src/main/java/com/c2kernel/process/auth/Authenticator.java
@@ -0,0 +1,12 @@
+package com.c2kernel.process.auth;
+
+import java.util.Properties;
+
+import com.c2kernel.entity.proxy.AgentProxy;
+
+public interface Authenticator {
+
+	public void initialize(Properties props) throws Exception;
+	public AgentProxy authenticate(String resource) throws Exception;
+	
+}
diff --git a/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java b/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java
new file mode 100644
index 0000000..a3ea521
--- /dev/null
+++ b/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java
@@ -0,0 +1,45 @@
+package com.c2kernel.process.auth;
+
+import java.util.Properties;
+import java.util.Scanner;
+
+import com.c2kernel.entity.proxy.AgentProxy;
+import com.c2kernel.process.Gateway;
+
+public class ConsoleAuth implements Authenticator {
+
+	public ConsoleAuth() {
+	}
+
+	@Override
+	public void initialize(Properties props) throws Exception {
+		
+	}
+	@Override
+	public AgentProxy authenticate(String resource) throws Exception {
+		AgentProxy user = null;
+		if (resource!=null) System.out.println("Please log in"+(resource.length()>0?"to "+resource:""));
+		@SuppressWarnings("resource") // closing the scanner closes system.in
+		Scanner scan = new Scanner(System.in);
+		int loginAttempts = 0;
+		while (user == null && loginAttempts++ < 3) {
+			System.out.print("User:");
+			String username = scan.nextLine();
+			System.out.print("Password:");
+			String pass = scan.nextLine();
+			try {
+				user = Gateway.connect(username, pass);
+			} catch (Exception ex) {
+				System.err.println(ex.getMessage());
+			}
+		}
+		
+		if (user == null) {
+			System.err.println("Bye");
+			System.exit(0);
+		}
+		return user;
+			
+	}
+
+}
-- 
cgit v1.2.3