Change keystore validation to throw exceptions directly instead of returning the exception message.

Author: Jarrod Ribble

src/main/java/com/netiq/websockify/Websockify.java

@@ -100,9 +100,13 @@ public void doMain(String[] args) throws Exception {
             	keystoreKeyPassword = keystorePassword;
             }
 
-            String invalidMsg = WebsockifySslContext.validateKeystore(keystore, keystorePassword, keystoreKeyPassword);
-            if ( invalidMsg != null ) {
-            	System.err.println("Error validating keystore: " + invalidMsg );
+            try
+            {
+            	WebsockifySslContext.validateKeystore(keystore, keystorePassword, keystoreKeyPassword);
+            }
+            catch ( Exception e )
+            {
+            	System.err.println("Error validating keystore: " + e.getMessage() );
             	printUsage(System.err);
             	System.exit(2);
             }

src/main/java/com/netiq/websockify/WebsockifyServer.java

@@ -6,7 +6,13 @@
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
+import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.security.KeyManagementException;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
@@ -88,8 +94,10 @@ public Channel getChannel ( )
 	 * @param keyPassword - password to the private key in the keystore file
 	 * @return null if valid, otherwise a string describing the error.
 	 */
-	public String validateKeystore ( String keystore, String password, String keyPassword ) {
-		return WebsockifySslContext.validateKeystore(keystore, password, keyPassword);
+	public void validateKeystore ( String keystore, String password, String keyPassword )
+		throws KeyManagementException, UnrecoverableKeyException, IOException, NoSuchAlgorithmException, CertificateException, KeyStoreException
+	{
+		WebsockifySslContext.validateKeystore(keystore, password, keyPassword);
 	}
 
 }

src/main/java/com/netiq/websockify/WebsockifySslContext.java

@@ -106,14 +106,18 @@ private static SSLContext getSSLContext ( String keyStoreFilePath, String passwo
         context.init(kmf.getKeyManagers(), null, null);
         return context;
     }
-	
-	public static String validateKeystore ( String keystore, String password, String keyPassword ) {
-        try {
-        	getSSLContext(keystore, password, keyPassword);
-        } catch (Exception e) {
-    		Logger.getLogger(WebsockifySslContext.class.getName()).severe("Error validating SSL context for keystore " + keystore + ": " + e.getMessage());
-            return e.getMessage();
-        }
-		return null;
+
+	/**
+	 * Validates that a keystore with the given parameters exists and can be used for an SSL context.
+	 * @param keystore - path to the keystore file
+	 * @param password - password to the keystore file
+	 * @param keyPassword - password to the private key in the keystore file
+	 * @return null if valid, otherwise a string describing the error.
+	 */
+	public static void validateKeystore ( String keystore, String password, String keyPassword )
+		throws KeyManagementException, UnrecoverableKeyException, IOException, NoSuchAlgorithmException, CertificateException, KeyStoreException
+	{
+        
+        getSSLContext(keystore, password, keyPassword);
 	}
 }