[client] Use TLS to talk to master and satellite

1 files changed, 19 insertions, 1 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
index 29e6d961..4be5a34d 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
@@ -8,11 +8,13 @@ import java.awt.event.ComponentEvent;
 import java.awt.event.ContainerEvent;
 import java.io.File;
 import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.net.ssl.SSLContext;
 import javax.swing.SwingUtilities;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
@@ -35,6 +37,12 @@ public class App {
 	// Logger
 	private final static Logger LOGGER = Logger.getLogger(App.class);
 
+	public static final int THRIFT_PORT = 9090;
+
+	public static final int THRIFT_SSL_PORT = THRIFT_PORT + 1;
+
+	public static final int THRIFT_TIMEOUT_MS = 15000;
+
 	private static Thread proxyThread = null;
 
 	private static void setupLogger() {
@@ -141,7 +149,17 @@ public class App {
 
 		// setup global thrift connection error handler before anything else
 		// Set master server to use (TODO: make configurable via command line)
-		ThriftManager.setMasterServerAddress("bwlp-masterserver.ruf.uni-freiburg.de");
+		try {
+			ThriftManager.setMasterServerAddress(SSLContext.getDefault(), "bwlp-masterserver.ruf.uni-freiburg.de", THRIFT_SSL_PORT,
+					THRIFT_TIMEOUT_MS);
+		} catch (final NoSuchAlgorithmException e1) {
+			SwingUtilities.invokeLater(new Runnable() {
+				@Override
+				public void run() {
+					Gui.showMessageBox(null, "SSL nicht verfügbar", MessageType.ERROR, LOGGER, e1);
+				}
+			});
+		}
 
 		SwingUtilities.invokeLater(new Runnable() {
 			@Override