Merge 'parmegv/feature/authGui' into develop

1 files changed, 53 insertions, 40 deletions

diff --git a/src/se/leap/leapclient/LeapHttpClient.java b/src/se/leap/leapclient/LeapHttpClient.java
index d1908c34..42f9a523 100644
--- a/src/se/leap/leapclient/LeapHttpClient.java
+++ b/src/se/leap/leapclient/LeapHttpClient.java
@@ -9,50 +9,63 @@ import org.apache.http.conn.scheme.SchemeRegistry;
 import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.conn.SingleClientConnManager;
-
 import android.content.Context;
 
+/**
+ * Implements an HTTP client, enabling LEAP Android app to manage its own runtime keystore or bypass default Android security measures.
+ * 
+ * @author rafa
+ *
+ */
 public class LeapHttpClient extends DefaultHttpClient {
 	final Context context;
-	
+
 	private static LeapHttpClient client;
 
-	  public LeapHttpClient(Context context) {
-	      this.context = context;
-	  }
-
-	  @Override
-	  protected ClientConnectionManager createClientConnectionManager() {
-	      SchemeRegistry registry = new SchemeRegistry();
-	      registry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
-	      // Register for port 443 our SSLSocketFactory with our keystore
-	      // to the ConnectionManager
-	      registry.register(new Scheme("https", newSslSocketFactory(), 443));
-	      return new SingleClientConnManager(getParams(), registry);
-	  }
-
-	  private SSLSocketFactory newSslSocketFactory() {
-	      try {
-	          // Get an instance of the Bouncy Castle KeyStore format
-	          KeyStore trusted = ConfigHelper.getKeystore();
-	          
-	          // Pass the keystore to the SSLSocketFactory. The factory is responsible
-	          // for the verification of the server certificate.
-	          SSLSocketFactory sf = new SSLSocketFactory(trusted);
-	          
-	          // Hostname verification from certificate
-	          // http://hc.apache.org/httpcomponents-client-ga/tutorial/html/connmgmt.html#d4e506
-	          sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
-	          
-	          return sf;
-	      } catch (Exception e) {
-	          throw new AssertionError(e);
-	      }
-	  }
-	  
-	  public static LeapHttpClient getInstance(Context context) {
-		  if(client == null)
-			  client = new LeapHttpClient(context);
-		  return client;
-	  }
+	/**
+	 * If the class scope client is null, it creates one and imports, if existing, the main certificate from Shared Preferences. 
+	 * @param context
+	 * @return the new client.
+	 */
+	public static LeapHttpClient getInstance(Context context) {
+		if(client == null) {
+			client = new LeapHttpClient(context);
+			String cert_string = ConfigHelper.getStringFromSharedPref(ConfigHelper.MAIN_CERT_KEY);
+			if(cert_string != null) {
+				ConfigHelper.addTrustedCertificate("recovered_certificate", cert_string);
+			}
+		}
+		return client;
+	}
+
+	@Override
+	protected ClientConnectionManager createClientConnectionManager() {
+		SchemeRegistry registry = new SchemeRegistry();
+		registry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80));
+		registry.register(new Scheme("https", newSslSocketFactory(), 443));
+
+		return new SingleClientConnManager(getParams(), registry);
+	}
+
+	/**
+	 * Uses keystore from ConfigHelper for the SSLSocketFactory.
+	 * 
+	 * Sets hostname verifier to allow all hostname verifier.
+	 * @return
+	 */
+	private SSLSocketFactory newSslSocketFactory() {
+		try {
+			KeyStore trusted = ConfigHelper.getKeystore();
+			SSLSocketFactory sf = new SSLSocketFactory(trusted);
+			sf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+
+			return sf;
+		} catch (Exception e) {
+			throw new AssertionError(e);
+		}
+	}
+
+	public LeapHttpClient(Context context) {
+		this.context = context;
+	}
 }