close FileInputStream in MTM. fixes #1150

src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java

@@ -26,18 +26,18 @@
  */
 package eu.siacs.conversations.services;
 
-import android.support.v7.app.AppCompatActivity ;
 import android.app.Application;
 import android.app.NotificationManager;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.Handler;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Base64;
 import android.util.Log;
 import android.util.SparseArray;
-import android.os.Handler;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -52,19 +52,24 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.*;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.MessageDigest;
-import java.util.ArrayList;
+import java.security.NoSuchAlgorithmException;
-import java.util.logging.Level;
+import java.security.cert.Certificate;
-import java.util.logging.Logger;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.X509Certificate;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
 import javax.net.ssl.HostnameVerifier;
@@ -77,6 +82,7 @@ import javax.net.ssl.X509TrustManager;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.DomainHostnameVerifier;
 import eu.siacs.conversations.entities.MTMDecision;
+import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.ui.MemorizingActivity;
 
 /**
@@ -92,32 +98,26 @@ import eu.siacs.conversations.ui.MemorizingActivity;
 public class MemorizingTrustManager {
 
 
+    final static String DECISION_INTENT = "de.duenndns.ssl.DECISION";
+    public final static String DECISION_INTENT_ID = DECISION_INTENT + ".decisionId";
+    public final static String DECISION_INTENT_CERT = DECISION_INTENT + ".cert";
+    public final static String DECISION_TITLE_ID = DECISION_INTENT + ".titleId";
+    final static String DECISION_INTENT_CHOICE = DECISION_INTENT + ".decisionChoice";
+    final static String NO_TRUST_ANCHOR = "Trust anchor for certification path not found.";
     private static final Pattern PATTERN_IPV4 = Pattern.compile("\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
     private static final Pattern PATTERN_IPV6_HEX4DECCOMPRESSED = Pattern.compile("\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::((?:[0-9A-Fa-f]{1,4}:)*)(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
     private static final Pattern PATTERN_IPV6_6HEX4DEC = Pattern.compile("\\A((?:[0-9A-Fa-f]{1,4}:){6,6})(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
     private static final Pattern PATTERN_IPV6_HEXCOMPRESSED = Pattern.compile("\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)\\z");
     private static final Pattern PATTERN_IPV6 = Pattern.compile("\\A(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\\z");
-
-	final static String DECISION_INTENT = "de.duenndns.ssl.DECISION";
-	public final static String DECISION_INTENT_ID     = DECISION_INTENT + ".decisionId";
-	public final static String DECISION_INTENT_CERT   = DECISION_INTENT + ".cert";
-	final static String DECISION_INTENT_CHOICE = DECISION_INTENT + ".decisionChoice";
-
     private final static Logger LOGGER = Logger.getLogger(MemorizingTrustManager.class.getName());
-	public final static String DECISION_TITLE_ID      = DECISION_INTENT + ".titleId";
     private final static int NOTIFICATION_ID = 100509;
-
-	final static String NO_TRUST_ANCHOR = "Trust anchor for certification path not found.";
-	
     static String KEYSTORE_DIR = "KeyStore";
     static String KEYSTORE_FILE = "KeyStore.bks";
-
+    private static int decisionId = 0;
+    private static SparseArray<MTMDecision> openDecisions = new SparseArray<MTMDecision>();
     Context master;
     AppCompatActivity foregroundAct;
     NotificationManager notificationManager;
-	private static int decisionId = 0;
-	private static SparseArray<MTMDecision> openDecisions = new SparseArray<MTMDecision>();
-
     Handler masterHandler;
     private File keyStoreFile;
     private KeyStore appKeyStore;
@@ -125,13 +125,14 @@ public class MemorizingTrustManager {
     private X509TrustManager appTrustManager;
     private String poshCacheDir;
 
-	/** Creates an instance of the MemorizingTrustManager class that falls back to a custom TrustManager.
+    /**
-	 *
+     * Creates an instance of the MemorizingTrustManager class that falls back to a custom TrustManager.
+     * <p>
      * You need to supply the application context. This has to be one of:
      * - Application
      * - Activity
      * - Service
-	 *
+     * <p>
      * The context is used for file management, to display the dialog /
      * notification and for obtaining translated strings.
      *
@@ -144,13 +145,14 @@ public class MemorizingTrustManager {
         this.defaultTrustManager = defaultTrustManager;
     }
 
-	/** Creates an instance of the MemorizingTrustManager class using the system X509TrustManager.
+    /**
-	 *
+     * Creates an instance of the MemorizingTrustManager class using the system X509TrustManager.
+     * <p>
      * You need to supply the application context. This has to be one of:
      * - Application
      * - Activity
      * - Service
-	 *
+     * <p>
      * The context is used for file management, to display the dialog /
      * notification and for obtaining translated strings.
      *
@@ -162,6 +164,78 @@ public class MemorizingTrustManager {
         this.defaultTrustManager = getTrustManager(null);
     }
 
+    /**
+     * Changes the path for the KeyStore file.
+     * <p>
+     * The actual filename relative to the app's directory will be
+     * <code>app_<i>dirname</i>/<i>filename</i></code>.
+     *
+     * @param dirname  directory to store the KeyStore.
+     * @param filename file name for the KeyStore.
+     */
+    public static void setKeyStoreFile(String dirname, String filename) {
+        KEYSTORE_DIR = dirname;
+        KEYSTORE_FILE = filename;
+    }
+
+    private static boolean isIp(final String server) {
+        return server != null && (
+                PATTERN_IPV4.matcher(server).matches()
+                        || PATTERN_IPV6.matcher(server).matches()
+                        || PATTERN_IPV6_6HEX4DEC.matcher(server).matches()
+                        || PATTERN_IPV6_HEX4DECCOMPRESSED.matcher(server).matches()
+                        || PATTERN_IPV6_HEXCOMPRESSED.matcher(server).matches());
+    }
+
+    private static String getBase64Hash(X509Certificate certificate, String digest) throws CertificateEncodingException {
+        MessageDigest md;
+        try {
+            md = MessageDigest.getInstance(digest);
+        } catch (NoSuchAlgorithmException e) {
+            return null;
+        }
+        md.update(certificate.getEncoded());
+        return Base64.encodeToString(md.digest(), Base64.NO_WRAP);
+    }
+
+    private static String hexString(byte[] data) {
+        StringBuffer si = new StringBuffer();
+        for (int i = 0; i < data.length; i++) {
+            si.append(String.format("%02x", data[i]));
+            if (i < data.length - 1)
+                si.append(":");
+        }
+        return si.toString();
+    }
+
+    private static String certHash(final X509Certificate cert, String digest) {
+        try {
+            MessageDigest md = MessageDigest.getInstance(digest);
+            md.update(cert.getEncoded());
+            return hexString(md.digest());
+        } catch (java.security.cert.CertificateEncodingException e) {
+            return e.getMessage();
+        } catch (java.security.NoSuchAlgorithmException e) {
+            return e.getMessage();
+        }
+    }
+
+    public static void interactResult(int decisionId, int choice) {
+        MTMDecision d;
+        synchronized (openDecisions) {
+            d = openDecisions.get(decisionId);
+            openDecisions.remove(decisionId);
+        }
+        if (d == null) {
+            LOGGER.log(Level.SEVERE, "interactResult: aborting due to stale decision reference!");
+            return;
+        }
+        synchronized (d) {
+            d.state = choice;
+            d.notify();
+        }
+    }
+
     void init(Context m) {
         master = m;
         masterHandler = new Handler(m.getMainLooper());
@@ -174,7 +248,8 @@ public class MemorizingTrustManager {
             app = ((Service) m).getApplication();
         } else if (m instanceof AppCompatActivity) {
             app = ((AppCompatActivity) m).getApplication();
-		} else throw new ClassCastException("MemorizingTrustManager context must be either Activity or Service!");
+        } else
+            throw new ClassCastException("MemorizingTrustManager context must be either Activity or Service!");
 
         File dir = app.getDir(KEYSTORE_DIR, Context.MODE_PRIVATE);
         keyStoreFile = new File(dir + File.separator + KEYSTORE_FILE);
@@ -184,14 +259,13 @@ public class MemorizingTrustManager {
         appKeyStore = loadAppKeyStore();
     }
 
-
     /**
      * Binds an Activity to the MTM for displaying the query dialog.
-	 *
+     * <p>
      * This is useful if your connection is run from a service that is
      * triggered by user interaction -- in such cases the activity is
      * visible and the user tends to ignore the service notification.
-	 *
+     * <p>
      * You should never have a hidden activity bound to MTM! Use this
      * function in onResume() and @see unbindDisplayActivity in onPause().
      *
@@ -203,7 +277,7 @@ public class MemorizingTrustManager {
 
     /**
      * Removes an Activity from the MTM display stack.
-	 *
+     * <p>
      * Always call this function when the Activity added with
      * {@link #bindDisplayActivity(AppCompatActivity)} is hidden.
      *
@@ -215,20 +289,6 @@ public class MemorizingTrustManager {
             foregroundAct = null;
     }
 
-	/**
-	 * Changes the path for the KeyStore file.
-	 *
-	 * The actual filename relative to the app's directory will be
-	 * <code>app_<i>dirname</i>/<i>filename</i></code>.
-	 *
-	 * @param dirname directory to store the KeyStore.
-	 * @param filename file name for the KeyStore.
-	 */
-	public static void setKeyStoreFile(String dirname, String filename) {
-		KEYSTORE_DIR = dirname;
-		KEYSTORE_FILE = filename;
-	}
-
     /**
      * Get a list of all certificate aliases stored in MTM.
      *
@@ -247,7 +307,6 @@ public class MemorizingTrustManager {
      * Get a certificate for a given alias.
      *
      * @param alias the certificate's alias as returned by {@link #getCertificates()}.
-	 *
      * @return the certificate associated with the alias or <tt>null</tt> if none found.
      */
     public Certificate getCertificate(String alias) {
@@ -268,8 +327,8 @@ public class MemorizingTrustManager {
      * (b) new connections are created using TLS renegotiation, without a new cert
      * check.
      * </p>
-	 * @param alias the certificate's alias as returned by {@link #getCertificates()}.
      *
+     * @param alias the certificate's alias as returned by {@link #getCertificates()}.
      * @throws KeyStoreException if the certificate could not be deleted.
      */
     public void deleteCertificate(String alias) throws KeyStoreException {
@@ -284,7 +343,7 @@ public class MemorizingTrustManager {
      * the given instance of {@link MemorizingTrustManager}, and leverages an
      * existing {@link HostnameVerifier}. The returned verifier performs the
      * following steps, returning as soon as one of them succeeds:
-	 *  </p>
+     * /p>
      * <ol>
      * <li>Success, if the wrapped defaultVerifier accepts the certificate.</li>
      * <li>Success, if the server certificate is stored in the keystore under the given hostname.</li>
@@ -294,7 +353,6 @@ public class MemorizingTrustManager {
      *
      * @param defaultVerifier the {@link HostnameVerifier} that should perform the actual check
      * @return a new hostname verifier using the MTM's key store
-	 *
      * @throws IllegalArgumentException if the defaultVerifier parameter is null
      */
     public DomainHostnameVerifier wrapHostnameVerifier(final HostnameVerifier defaultVerifier, final boolean interactive) {
@@ -330,13 +388,17 @@ public class MemorizingTrustManager {
             LOGGER.log(Level.SEVERE, "getAppKeyStore()", e);
             return null;
         }
+        FileInputStream fileInputStream = null;
         try {
             ks.load(null, null);
-			ks.load(new java.io.FileInputStream(keyStoreFile), "MTM".toCharArray());
+            fileInputStream = new FileInputStream(keyStoreFile);
+            ks.load(fileInputStream, "MTM".toCharArray());
         } catch (java.io.FileNotFoundException e) {
             LOGGER.log(Level.INFO, "getAppKeyStore(" + keyStoreFile + ") - file does not exist");
         } catch (Exception e) {
             LOGGER.log(Level.SEVERE, "getAppKeyStore(" + keyStoreFile + ")", e);
+        } finally {
+            FileBackend.close(fileInputStream);
         }
         return ks;
     }
@@ -396,8 +458,7 @@ public class MemorizingTrustManager {
     }
 
     public void checkCertTrusted(X509Certificate[] chain, String authType, String domain, boolean isServer, boolean interactive)
-		throws CertificateException
+            throws CertificateException {
-	{
         LOGGER.log(Level.FINE, "checkCertTrusted(" + chain + ", " + authType + ", " + isServer + ")");
         try {
             LOGGER.log(Level.FINE, "checkCertTrusted: trying appTrustManager");
@@ -568,26 +629,6 @@ public class MemorizingTrustManager {
         }
     }
 
-	private static boolean isIp(final String server) {
-		return server != null && (
-				PATTERN_IPV4.matcher(server).matches()
-						|| PATTERN_IPV6.matcher(server).matches()
-						|| PATTERN_IPV6_6HEX4DEC.matcher(server).matches()
-						|| PATTERN_IPV6_HEX4DECCOMPRESSED.matcher(server).matches()
-						|| PATTERN_IPV6_HEXCOMPRESSED.matcher(server).matches());
-	}
-
-	private static String getBase64Hash(X509Certificate certificate, String digest) throws CertificateEncodingException {
-		MessageDigest md;
-		try {
-			md = MessageDigest.getInstance(digest);
-		} catch (NoSuchAlgorithmException e) {
-			return null;
-		}
-		md.update(certificate.getEncoded());
-		return Base64.encodeToString(md.digest(),Base64.NO_WRAP);
-	}
-
     private X509Certificate[] getAcceptedIssuers() {
         LOGGER.log(Level.FINE, "getAcceptedIssuers()");
         return defaultTrustManager.getAcceptedIssuers();
@@ -603,28 +644,6 @@ public class MemorizingTrustManager {
         return myId;
     }
 
-	private static String hexString(byte[] data) {
-		StringBuffer si = new StringBuffer();
-		for (int i = 0; i < data.length; i++) {
-			si.append(String.format("%02x", data[i]));
-			if (i < data.length - 1)
-				si.append(":");
-		}
-		return si.toString();
-	}
-
-	private static String certHash(final X509Certificate cert, String digest) {
-		try {
-			MessageDigest md = MessageDigest.getInstance(digest);
-			md.update(cert.getEncoded());
-			return hexString(md.digest());
-		} catch (java.security.cert.CertificateEncodingException e) {
-			return e.getMessage();
-		} catch (java.security.NoSuchAlgorithmException e) {
-			return e.getMessage();
-		}
-	}
-
     private void certDetails(StringBuffer si, X509Certificate c) {
         SimpleDateFormat validityDateFormater = new SimpleDateFormat("yyyy-MM-dd");
         si.append("\n");
@@ -699,6 +718,7 @@ public class MemorizingTrustManager {
         certDetails(si, cert);
         return si.toString();
     }
+
     /**
      * Returns the top-most entry of the activity stack.
      *
@@ -734,7 +754,9 @@ public class MemorizingTrustManager {
 
         LOGGER.log(Level.FINE, "openDecisions: " + openDecisions + ", waiting on " + myId);
         try {
-			synchronized(choice) { choice.wait(); }
+            synchronized (choice) {
+                choice.wait();
+            }
         } catch (InterruptedException e) {
             LOGGER.log(Level.FINER, "InterruptedException", e);
         }
@@ -743,8 +765,7 @@ public class MemorizingTrustManager {
     }
 
     void interactCert(final X509Certificate[] chain, String authType, CertificateException cause)
-			throws CertificateException
+            throws CertificateException {
-	{
         switch (interact(certChainMessage(chain, cause), R.string.mtm_accept_cert)) {
             case MTMDecision.DECISION_ALWAYS:
                 storeCert(chain[0]); // only store the server cert, not the whole chain
@@ -755,8 +776,7 @@ public class MemorizingTrustManager {
         }
     }
 
-	boolean interactHostname(X509Certificate cert, String hostname)
+    boolean interactHostname(X509Certificate cert, String hostname) {
-	{
         switch (interact(hostNameMessage(cert, hostname), R.string.mtm_accept_servername)) {
             case MTMDecision.DECISION_ALWAYS:
                 storeCert(hostname, cert);
@@ -767,20 +787,20 @@ public class MemorizingTrustManager {
         }
     }
 
-	public static void interactResult(int decisionId, int choice) {
+    public X509TrustManager getNonInteractive(String domain) {
-		MTMDecision d;
+        return new NonInteractiveMemorizingTrustManager(domain);
-		synchronized(openDecisions) {
-			 d = openDecisions.get(decisionId);
-			 openDecisions.remove(decisionId);
     }
-		if (d == null) {
+
-			LOGGER.log(Level.SEVERE, "interactResult: aborting due to stale decision reference!");
+    public X509TrustManager getInteractive(String domain) {
-			return;
+        return new InteractiveMemorizingTrustManager(domain);
     }
-		synchronized(d) {
+
-			d.state = choice;
+    public X509TrustManager getNonInteractive() {
-			d.notify();
+        return new NonInteractiveMemorizingTrustManager(null);
     }
+
+    public X509TrustManager getInteractive() {
+        return new InteractiveMemorizingTrustManager(null);
     }
 
     class MemorizingHostnameVerifier implements DomainHostnameVerifier {
@@ -834,23 +854,6 @@ public class MemorizingTrustManager {
         }
     }
 
-	
-	public X509TrustManager getNonInteractive(String domain) {
-		return new NonInteractiveMemorizingTrustManager(domain);
-	}
-
-	public X509TrustManager getInteractive(String domain) {
-		return new InteractiveMemorizingTrustManager(domain);
-	}
-
-	public X509TrustManager getNonInteractive() {
-		return new NonInteractiveMemorizingTrustManager(null);
-	}
-
-	public X509TrustManager getInteractive() {
-		return new InteractiveMemorizingTrustManager(null);
-	}
-	
     private class NonInteractiveMemorizingTrustManager implements X509TrustManager {
 
         private final String domain;