Tag/1.0.0 beta06 (#92)

- Security updates

Author: Peter Joseph Olamit

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+[1.0.0-beta06](https://github.com/hyperwallet/hyperwallet-android-sdk/releases/tag/1.0.0-beta06)
+-------------------
+* Security updates
+
 [1.0.0-beta05](https://github.com/hyperwallet/hyperwallet-android-sdk/releases/tag/1.0.0-beta05)
 -------------------
 * Added support to list User Balance

README.md

@@ -21,7 +21,7 @@ We also provide an out-of-the-box  [Hyperwallet Android UI SDK](https://github.c
 To install Hyperwallet Core SDK, you just need to add the dependency into your build.gradle file in Android Studio (or Gradle). For example:
 
 ```bash
-api 'com.hyperwallet.android:core-sdk:1.0.0-beta05'
+api 'com.hyperwallet.android:core-sdk:1.0.0-beta06'
 ```
 
 ## Initialization

build.gradle

@@ -21,7 +21,7 @@ allprojects {
         mavenLocal()
     }
 
-    project.version = "1.0.0-beta05"
+    project.version = "1.0.0-beta06"
 }
 
 task clean(type: Delete) {

core/config/jacoco-settings.gradle

@@ -27,7 +27,8 @@ def fileFilter = ['**/R.class',
                   '**/Manifest*.*',
                   'android/**/*.*',
                   '**/com/hyperwallet/android/Hyperwallet.class',
-                  '**/com/hyperwallet/android/Hyperwallet$*.class']
+                  '**/com/hyperwallet/android/Hyperwallet$*.class',
+                  '**/com/hyperwallet/android/util/Tls12SocketFactory*']
 def debugClassPaths = [
         '**/intermediates/javac/debug/*/classes/**'
 ]

core/src/main/java/com/hyperwallet/android/util/HttpClient.java

@@ -34,6 +34,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.net.ssl.HttpsURLConnection;
+
 /**
  * {@code HttpClient} object represents routine on making HTTP calls to Hyperwallet Platforms' API
  */
@@ -242,6 +244,12 @@ public HttpClient build() throws IOException, URISyntaxException, HyperwalletInv
 
             url.append(buildQuery());
 
+            try {
+                HttpsURLConnection.setDefaultSSLSocketFactory(new Tls12SocketFactory());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
             URI uri = new URI(url.toString());
             mHttpUrlConnection = (HttpURLConnection) uri.toURL().openConnection();
             mHttpUrlConnection.setConnectTimeout(mConnectTimeout);

core/src/main/java/com/hyperwallet/android/util/Tls12SocketFactory.java

@@ -0,0 +1,72 @@
+package com.hyperwallet.android.util;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
+public class Tls12SocketFactory extends SSLSocketFactory {
+
+    private SSLSocketFactory internalSSLSocketFactory;
+
+    public Tls12SocketFactory() throws KeyManagementException, NoSuchAlgorithmException {
+        SSLContext context = SSLContext.getInstance("TLS");
+        context.init(null, null, null);
+        internalSSLSocketFactory = context.getSocketFactory();
+    }
+
+    @Override
+    public String[] getDefaultCipherSuites() {
+        return internalSSLSocketFactory.getDefaultCipherSuites();
+    }
+
+    @Override
+    public String[] getSupportedCipherSuites() {
+        return internalSSLSocketFactory.getSupportedCipherSuites();
+    }
+
+    @Override
+    public Socket createSocket() throws IOException {
+        return patch(internalSSLSocketFactory.createSocket());
+    }
+
+    @Override
+    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
+        return patch(internalSSLSocketFactory.createSocket(s, host, port, autoClose));
+    }
+
+    @Override
+    public Socket createSocket(String host, int port) throws IOException {
+        return patch(internalSSLSocketFactory.createSocket(host, port));
+    }
+
+    @Override
+    public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
+            throws IOException {
+        return patch(internalSSLSocketFactory.createSocket(host, port, localHost, localPort));
+    }
+
+    @Override
+    public Socket createSocket(InetAddress host, int port) throws IOException {
+        return patch(internalSSLSocketFactory.createSocket(host, port));
+    }
+
+    @Override
+    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
+            throws IOException {
+        return patch(internalSSLSocketFactory.createSocket(address, port, localAddress, localPort));
+    }
+
+    private Socket patch(Socket socket) {
+        if ((socket instanceof SSLSocket)) {
+            ((SSLSocket) socket).setEnabledProtocols(new String[]{"TLSv1.2"});
+        }
+        return socket;
+    }
+}