From 4ab1b1afc571d97fe00650e23c4db327118f6185 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Fri, 8 May 2015 08:59:15 +0000
Subject: [PATCH] * login and store only the MD5 password

---
 source/net/filebot/WebServices.java           | 21 +++++++++++--------
 .../net/filebot/web/OpenSubtitlesClient.java  |  5 ++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/source/net/filebot/WebServices.java b/source/net/filebot/WebServices.java
index 5eb419a8..557d9fae 100644
--- a/source/net/filebot/WebServices.java
+++ b/source/net/filebot/WebServices.java
@@ -4,9 +4,11 @@ import static java.util.Arrays.*;
 import static java.util.Collections.*;
 import static net.filebot.Settings.*;
 import static net.filebot.media.MediaDetection.*;
+import static net.filebot.util.FileUtilities.*;
 
 import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -261,17 +263,20 @@ public final class WebServices {
 		throw new UnsupportedOperationException();
 	}
 
+	public static final String LOGIN_SEPARATOR = ":";
+	public static final String LOGIN_OPENSUBTITLES = "osdb.user";
+
 	/**
 	 * Initialize client settings from system properties
 	 */
 	static {
-		String[] osdbLogin = getLogin("osdb.user");
+		String[] osdbLogin = getLogin(LOGIN_OPENSUBTITLES);
 		OpenSubtitles.setUser(osdbLogin[0], osdbLogin[1]);
 	}
 
 	public static String[] getLogin(String key) {
 		try {
-			String[] values = Settings.forPackage(WebServices.class).get(key, ":").split(":", 2); // empty username/password by default
+			String[] values = Settings.forPackage(WebServices.class).get(key, LOGIN_SEPARATOR).split(LOGIN_SEPARATOR, 2); // empty username/password by default
 			if (values != null && values.length == 2 && values[0] != null && values[1] != null) {
 				return values;
 			}
@@ -282,16 +287,14 @@ public final class WebServices {
 	}
 
 	public static void setLogin(String id, String user, String password) {
-		if (user == null || password == null || user.contains(":") || (user.isEmpty() && !password.isEmpty()) || (!user.isEmpty() && password.isEmpty())) {
+		if (user == null || password == null || user.contains(LOGIN_SEPARATOR) || (user.isEmpty() && !password.isEmpty()) || (!user.isEmpty() && password.isEmpty())) {
 			throw new IllegalArgumentException(String.format("Illegal login: %s:%s", user, password));
 		}
 
-		Settings settings = Settings.forPackage(WebServices.class);
-		String value = user.isEmpty() && password.isEmpty() ? null : user + ":" + password;
-
-		if (id.equals("osdb.user")) {
-			settings.put(id, value);
-			OpenSubtitles.setUser(user, password);
+		if (LOGIN_OPENSUBTITLES.equals(id)) {
+			String password_md5 = md5(StandardCharsets.UTF_8.encode(password));
+			OpenSubtitles.setUser(user, password_md5);
+			Settings.forPackage(WebServices.class).put(id, String.join(LOGIN_SEPARATOR, user, password_md5));
 		} else {
 			throw new IllegalArgumentException();
 		}
diff --git a/source/net/filebot/web/OpenSubtitlesClient.java b/source/net/filebot/web/OpenSubtitlesClient.java
index 25ed8bbd..31d3effc 100644
--- a/source/net/filebot/web/OpenSubtitlesClient.java
+++ b/source/net/filebot/web/OpenSubtitlesClient.java
@@ -9,7 +9,6 @@ import static net.filebot.web.OpenSubtitlesHasher.*;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -57,12 +56,12 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
 		this.xmlrpc = new OpenSubtitlesXmlRpcWithRetryAndFloodLimit(String.format("%s v%s", name, version), 2, 3000);
 	}
 
-	public synchronized void setUser(String username, String password) {
+	public synchronized void setUser(String username, String password_md5) {
 		// cancel previous session
 		this.logout();
 
 		this.username = username;
-		this.password = md5(StandardCharsets.UTF_8.encode(password));
+		this.password = password_md5;
 	}
 
 	public boolean isAnonymous() {