Adding printouts and checks to the API keys so that nulls are detected

early and dealt with without exceltion

Author: madhephaestus

src/main/java/eu/mihosoft/vrl/v3d/CSGClient.java

@@ -27,10 +27,17 @@ class CSGClient {
 	public CSGClient(String hostname, int port, File f) throws Exception {
 		this.hostname = hostname;
 		this.port = port;
-		if (f != null)
-			if(f.exists())
-				key = Files.readAllLines(f.toPath()).toArray(new String[0])[0];
-
+		if (f == null)
+			throw new NullPointerException("API key file can not be null");
+		if(f.exists())
+			key = Files.readAllLines(f.toPath()).toArray(new String[0])[0];
+		else {
+			System.err.println("Error! API key file does not exist! "+f.getAbsolutePath());
+		}
+		if(key==null || key.length()==0)
+			System.err.println("Key error, no key provided by "+f.getAbsolutePath());
+		else
+			System.out.println("API Key Loaded from "+f.getAbsolutePath());
 		Socket socket = new Socket(hostname, port);
 		socket.close();
 

src/main/java/eu/mihosoft/vrl/v3d/CSGServer.java

@@ -44,12 +44,16 @@ public class CSGServer {
 	public CSGServer(int port, File APIKEYS) throws IOException {
 		this.port = port;
 		this.threadPool = Executors.newCachedThreadPool();
-		if (APIKEYS != null) {
-			if(APIKEYS.exists())
-				lines = Files.readAllLines(APIKEYS.toPath()).toArray(new String[0]);
+		
+		if (APIKEYS == null) {
+			throw new NullPointerException("API Key file can not be null");
 		}
+		if(APIKEYS.exists())
+			lines = Files.readAllLines(APIKEYS.toPath()).toArray(new String[0]);
 		if(lines!=null) {
-			System.out.println("Starting server with "+lines.length+" keys");
+			System.out.println("Starting server with "+lines.length+" keys from "+APIKEYS.getAbsolutePath());
+		}else {
+			System.err.println("NO API KEYFILE Provided: "+APIKEYS.getAbsolutePath());
 		}
 	}
 

src/main/java/eu/mihosoft/vrl/v3d/CSGServerHandler.java

@@ -29,14 +29,16 @@ public void run() {
 			CSGRequest request = (CSGRequest) ois.readObject();
 			System.out.println("Received request: " + request.getOperation());
 			boolean APIPass = true;
+			String apiKey2 = request.getAPIKey();
 			if (getAPIKEYs() != null) {
 				APIPass = false;
-				for (int i = 0; i < getAPIKEYs().length; i++)
-					if (request.getAPIKey().contentEquals(getAPIKEYs()[i])) {
-						APIPass = true;
-						System.out.println("API Key Match");
-						break;
-					}
+				if (apiKey2!=null)
+					for (int i = 0; i < getAPIKEYs().length; i++)
+						if (apiKey2.contentEquals(getAPIKEYs()[i])) {
+							APIPass = true;
+							System.out.println("API Key Match");
+							break;
+						}
 			}
 
 			// Process the request
@@ -53,7 +55,7 @@ public void run() {
 			} else {
 				response = new CSGResponse();
 				response.setState(ServerActionState.BADAPIKEY);
-				response.setMessage("Your API key " + request.getAPIKey() + " Does not match server's key");
+				response.setMessage("Your API key " + apiKey2 + " Does not match server's key");
 			}
 			// Send back the response
 			oos.writeObject(response);