From 40d528627efc309681496b47d66558e15eb3fe5e Mon Sep 17 00:00:00 2001
From: Nils Schwabe
Date: Fri, 25 Apr 2014 14:28:56 +0200
Subject: Finally: Add _real_ server authentication. (this challengeresponse
 thing)

---
 src/main/java/org/openslx/imagemaster/Globals.java | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'src/main/java/org/openslx/imagemaster/Globals.java')

diff --git a/src/main/java/org/openslx/imagemaster/Globals.java b/src/main/java/org/openslx/imagemaster/Globals.java
index 717cb1e..166e629 100644
--- a/src/main/java/org/openslx/imagemaster/Globals.java
+++ b/src/main/java/org/openslx/imagemaster/Globals.java
@@ -7,7 +7,6 @@ import java.util.Properties;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
-import org.openslx.imagemaster.server.MasterFtpServer;
 
 public class Globals
 {
@@ -23,7 +22,7 @@ public class Globals
 
 	public static enum PropString
 	{
-		IMAGEDIR, KEYSTORE, LDAPHOST, LDAPBINDQUERY, LDAPSEARCHBASEDN, LDAPSEARCHFILTER, FTPBASEDIR
+		IMAGEDIR, KEYSTOREFILE, KEYSTOREALIAS, KEYSTOREPASSWORD, LDAPHOST, LDAPBINDQUERY, LDAPSEARCHBASEDN, LDAPSEARCHFILTER, FTPBASEDIR
 	}
 
 	public static enum PropBool
@@ -64,8 +63,12 @@ public class Globals
 				|| Globals.getPropertyString( PropString.LDAPSEARCHFILTER ).isEmpty()
 				|| Globals.getPropertyString( PropString.FTPBASEDIR ) == null
 				|| Globals.getPropertyString( PropString.FTPBASEDIR ).isEmpty()
-				|| Globals.getPropertyString( PropString.KEYSTORE ) == null
-				|| Globals.getPropertyString( PropString.KEYSTORE ).isEmpty()
+				|| Globals.getPropertyString( PropString.KEYSTOREFILE ) == null
+				|| Globals.getPropertyString( PropString.KEYSTOREFILE ).isEmpty()
+				|| Globals.getPropertyString( PropString.KEYSTOREALIAS ) == null
+				|| Globals.getPropertyString( PropString.KEYSTOREALIAS ).isEmpty()
+				|| Globals.getPropertyString( PropString.KEYSTOREPASSWORD ) == null
+				|| Globals.getPropertyString( PropString.KEYSTOREPASSWORD ).isEmpty()
 
 				|| Globals.getPropertyInt( PropInt.LDAPPORT ) == 0
 				|| Globals.getPropertyInt( PropInt.SESSIONTIMEOUTUSER ) == 0
@@ -88,7 +91,7 @@ public class Globals
 		}
 		
 		// check keystore
-		if ( !Globals.getPropertyString( PropString.KEYSTORE ).endsWith( ".jks" )) {
+		if ( !Globals.getPropertyString( PropString.KEYSTOREFILE ).endsWith( ".jks" )) {
 			log.error( "Keystore is not in jks format." );
 			return false;
 		}
@@ -146,6 +149,15 @@ public class Globals
 		case IMAGEDIR:
 			result = properties.getProperty( "image_dir" );
 			break;
+		case KEYSTOREFILE:
+			result = properties.getProperty( "keystore_file" );
+			break;
+		case KEYSTOREALIAS:
+			result = properties.getProperty( "keystore_alias" );
+			break;
+		case KEYSTOREPASSWORD:
+			result = properties.getProperty( "keystore_password" );
+			break;
 		case LDAPHOST:
 			result = properties.getProperty( "ldap_host" );
 			break;
-- 
cgit v1.2.3-55-g7522