Automatically enabling old TLS and closing connections if the server closed them.

Author: ExplodingBottle

src/io/github/explodingbottle/jmagicproxy/DisabledAlgorithmsWarner.java

@@ -19,6 +19,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.security.Security;
 
 import io.github.explodingbottle.explodingau.ExplodingAULib;
 import io.github.explodingbottle.jmagicproxy.api.PluginsManager;
@@ -166,16 +167,10 @@ public static void main(String[] args) {
 		lgp.openLogStream(new File(logsFolder, logPath));
 		pluginsManager = new PluginsManager(propsProvider.getAsString(PropertyKey.PROXY_PLUGINS));
 		pluginsManager.loadPlugins();
-		if (propsProvider.getAsBoolean(PropertyKey.PROXY_SSL_WARN_ALGORITHMS)) {
-			DisabledAlgorithmsWarner warner = new DisabledAlgorithmsWarner();
-			if (warner.mustWarn()) {
-				mainLogger.log(LoggingLevel.WARN,
-						"The system has detected that algorithms were present in the jdk.tls.disabledAlgorithms property of java.security. "
-								+ "This will cause issues with SSL and old algorithms.");
-			}
-		}
 		if (propsProvider.getAsBoolean(PropertyKey.PROXY_SSL_ENABLED)) {
 			mainLogger.log(LoggingLevel.INFO, "SSL is enabled, proceeding to SSL setup.");
+			mainLogger.log(LoggingLevel.WARN,
+					"Please note that every disabled protocols has been enabled again only during the use of this program.");
 			sslObjectsProvider = new SSLObjectsProvider(
 					new File(propsProvider.getAsString(PropertyKey.PROXY_SSL_KEYSTORE_PATH)),
 					propsProvider.getAsString(PropertyKey.PROXY_SSL_KEYSTORE_PASSWORD),
@@ -205,4 +200,8 @@ public static void main(String[] args) {
 
 	}
 
+	static {
+		Security.setProperty("jdk.tls.disabledAlgorithms", "");
+	}
+
 }

src/io/github/explodingbottle/jmagicproxy/ProxyMain.java

@@ -36,7 +36,6 @@ public enum PropertyKey {
 	PROXY_SSL_KEYSTORE_PATH("proxy.ssl.keystorepath", "certs/keystore.p12", String.class),
 	PROXY_SSL_KEYSTORE_PASSWORD("proxy.ssl.keystorepass", "Password", String.class),
 	PROXY_SSL_KEYSTORE_TYPE("proxy.ssl.keystoretype", "pkcs12", String.class),
-	PROXY_SSL_WARN_ALGORITHMS("proxy.ssl.warn.algorithms", false, Boolean.class),
 	PROXY_SSL_SORT_MODE("proxy.ssl.sortmode", "NONE", String.class),
 	PROXY_SSL_SORT_LIST("proxy.ssl.sortlist", "*", String.class),
 	WUPROXY_REDIRECT_WUCLIENT("proxy.plugins.wuproxy.redirwuclient", false, Boolean.class),

src/io/github/explodingbottle/jmagicproxy/properties/PropertyKey.java

@@ -98,10 +98,8 @@ public void startConnection() {
 				HttpResponse hrqh = new HttpResponse("HTTP/1.1", 200, "Connection Established",
 						new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER));
 				output.write((hrqh.toHttpResponseLine() + "\r\n\r\n").getBytes());
-				inputOutgoing = transferSocket.getInputStream();
-				outputOutgoing = transferSocket.getOutputStream();
 				if (transferSocket != null) {
-					transferPipeOutToIn = new SimpleTransferPipe(inputOutgoing, output);
+					transferPipeOutToIn = new SimpleTransferPipe(inputOutgoing, output, this);
 					transferPipeOutToIn.start();
 				}
 				logger.log(LoggingLevel.INFO, "Direct connection established.");

src/io/github/explodingbottle/jmagicproxy/proxy/ssl/SSLComunicator.java

@@ -42,6 +42,8 @@ class SimpleTransferPipe extends Thread {
 
 	private ProxyLogger logger;
 
+	private SSLComunicator communicator;
+
 	/**
 	 * This is the constructor of the transfer pipe.
 	 * 
@@ -55,6 +57,18 @@ public SimpleTransferPipe(InputStream input, OutputStream output) {
 		logger = ProxyMain.getLoggerProvider().createLogger();
 	}
 
+	/**
+	 * This is the constructor of the transfer pipe.
+	 * 
+	 * @param input        Represents the input that will feed the output.
+	 * @param output       Represents the output that will be feed.
+	 * @param communicator Represents the parent SSL communicator (if any).
+	 */
+	public SimpleTransferPipe(InputStream input, OutputStream output, SSLComunicator communicator) {
+		this(input, output);
+		this.communicator = communicator;
+	}
+
 	public void run() {
 		try {
 			int readedLength = input.read(buffer, 0, buffer.length);
@@ -63,8 +77,12 @@ public void run() {
 				readedLength = input.read(buffer, 0, buffer.length);
 			}
 		} catch (IOException e) {
-			if (!isInterrupted())
+			if (!isInterrupted()) {
 				logger.log(LoggingLevel.WARN, "A tranfer failed for SimpleTransferPipe.", e);
+			}
+		}
+		if (communicator != null) {
+			communicator.stopCommunicator();
 		}
 	}