OC-3111: Check in SsoWebViewClient#onReceivedSslError() if the failed X509Certificate...

diff --git a/src/com/owncloud/android/authentication/SsoWebViewClient.java b/src/com/owncloud/android/authentication/SsoWebViewClient.java
index 442ec73..9d9bca1 100644 (file)
--- a/src/com/owncloud/android/authentication/SsoWebViewClient.java
+++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java
@@ -17,12 +17,25 @@
 
 package com.owncloud.android.authentication;
 
 
 package com.owncloud.android.authentication;
 

+import java.io.ByteArrayInputStream;
+import java.io.IOException;

 import java.lang.ref.WeakReference;
 import java.lang.ref.WeakReference;

+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;

 
 

+import com.owncloud.android.lib.common.network.NetworkUtils;

 import com.owncloud.android.utils.Log_OC;
 
 import com.owncloud.android.utils.Log_OC;
 

+import android.content.Context;

 import android.graphics.Bitmap;
 import android.graphics.Bitmap;

+import android.net.http.SslCertificate;

 import android.net.http.SslError;
 import android.net.http.SslError;

+import android.os.Bundle;

 import android.os.Handler;
 import android.os.Message;
 import android.view.KeyEvent;
 import android.os.Handler;
 import android.os.Message;
 import android.view.KeyEvent;


@@ -137,9 +150,45 @@ public class SsoWebViewClient extends WebViewClient {
     @Override
     public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) {
         Log_OC.d(TAG, "onReceivedSslError : " + error);
     @Override
     public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) {
         Log_OC.d(TAG, "onReceivedSslError : " + error);

+        // Test 1
+        X509Certificate x509Certificate = getX509CertificateFromError(error);
+        
+        if (x509Certificate != null) {
+            Log_OC.d(TAG, "------>>>>> x509Certificate " + x509Certificate.toString());
+            
+        }
+        

         handler.proceed();
     }
     
         handler.proceed();
     }
     

+    /**
+     * Obtain the X509Certificate from SslError
+     * @param   error     SslError
+     * @return  X509Certificate from error
+     */
+    public X509Certificate getX509CertificateFromError (SslError error) {
+        Bundle bundle = SslCertificate.saveState(error.getCertificate());
+        X509Certificate x509Certificate;
+        byte[] bytes = bundle.getByteArray("x509-certificate");
+        if (bytes == null) {
+            x509Certificate = null;
+        } else {
+            try {
+                CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+                Certificate cert = certFactory.generateCertificate(new ByteArrayInputStream(bytes));
+                x509Certificate = (X509Certificate) cert;
+            } catch (CertificateException e) {
+                x509Certificate = null;
+            }
+        }
+
+//        if (x509Certificate != null) {
+//            Log_OC.d(TAG, "------>>>>> x509Certificate " + x509Certificate.toString());
+//        }
+        
+        return x509Certificate;
+    }
+    

     @Override
     public void onReceivedHttpAuthRequest (WebView view, HttpAuthHandler handler, String host, String realm) {
         Log_OC.d(TAG, "onReceivedHttpAuthRequest : " + host);
     @Override
     public void onReceivedHttpAuthRequest (WebView view, HttpAuthHandler handler, String host, String realm) {
         Log_OC.d(TAG, "onReceivedHttpAuthRequest : " + host);