OC-3212: Show appropiate error messages for SslError in SSL error dialog shown by...

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / SsoWebViewClient.java

diff --git a/src/com/owncloud/android/authentication/SsoWebViewClient.java b/src/com/owncloud/android/authentication/SsoWebViewClient.java
index 9d9bca1..e498d0d 100644 (file)
--- a/src/com/owncloud/android/authentication/SsoWebViewClient.java
+++ b/src/com/owncloud/android/authentication/SsoWebViewClient.java
@@ -18,17 +18,18 @@
 package com.owncloud.android.authentication;
 
 import java.io.ByteArrayInputStream;
 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 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.actionbarsherlock.app.SherlockFragmentActivity;
+import com.owncloud.android.R;
+import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
+import com.owncloud.android.ui.dialog.SslUntrustedCertDialogABSTRACT;
+import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;

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


@@ -38,6 +39,8 @@ import android.net.http.SslError;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;

+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;

 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.CookieManager;
 import android.view.KeyEvent;
 import android.view.View;
 import android.webkit.CookieManager;


@@ -65,12 +68,14 @@ public class SsoWebViewClient extends WebViewClient {
         public void onSsoFinished(String sessionCookie);
     }
     
         public void onSsoFinished(String sessionCookie);
     }
     

+    private Context mContext;

     private Handler mListenerHandler;
     private WeakReference<SsoWebViewClientListener> mListenerRef;
     private String mTargetUrl;
     private String mLastReloadedUrlAtError;
     
     private Handler mListenerHandler;
     private WeakReference<SsoWebViewClientListener> mListenerRef;
     private String mTargetUrl;
     private String mLastReloadedUrlAtError;
     

-    public SsoWebViewClient (Handler listenerHandler, SsoWebViewClientListener listener) {
+    public SsoWebViewClient (Context context, Handler listenerHandler, SsoWebViewClientListener listener) {
+        mContext = context;

         mListenerHandler = listenerHandler;
         mListenerRef = new WeakReference<SsoWebViewClient.SsoWebViewClientListener>(listener);
         mTargetUrl = "fake://url.to.be.set";
         mListenerHandler = listenerHandler;
         mListenerRef = new WeakReference<SsoWebViewClient.SsoWebViewClientListener>(listener);
         mTargetUrl = "fake://url.to.be.set";


@@ -148,17 +153,36 @@ public class SsoWebViewClient extends WebViewClient {
     }
     
     @Override
     }
     
     @Override

-    public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error) {
+    public void onReceivedSslError (final WebView view, final SslErrorHandler handler, SslError error) {

         Log_OC.d(TAG, "onReceivedSslError : " + error);
         // Test 1
         X509Certificate x509Certificate = getX509CertificateFromError(error);
         Log_OC.d(TAG, "onReceivedSslError : " + error);
         // Test 1
         X509Certificate x509Certificate = getX509CertificateFromError(error);

+        boolean isKnownServer = false;

         
         if (x509Certificate != null) {
             Log_OC.d(TAG, "------>>>>> x509Certificate " + x509Certificate.toString());
             
         
         if (x509Certificate != null) {
             Log_OC.d(TAG, "------>>>>> x509Certificate " + x509Certificate.toString());
             

+            try {
+                isKnownServer = NetworkUtils.isCertInKnownServersStore((Certificate) x509Certificate, mContext);
+            } catch (Exception e) {
+                Log_OC.e(TAG, "Exception: " + e.getMessage());
+            }

         }
         
         }
         

-        handler.proceed();
+         if (isKnownServer) {
+             handler.proceed();
+         } else if (x509Certificate != null) {
+             // Show a dialog with the certificate info
+             ((AuthenticatorActivity)mContext).showUntrustedCertDialog(x509Certificate, error);
+             handler.cancel();
+         } else {
+             // Show a dialog with the certificate information available in SslError (not full)
+             SslUntrustedCertDialogABSTRACT dialog = SslUntrustedCertDialogABSTRACT.newInstanceForEmptySslError(error, handler);
+             FragmentManager fm = ((SherlockFragmentActivity)mContext).getSupportFragmentManager();
+             FragmentTransaction ft = fm.beginTransaction();
+             dialog.show(ft, AuthenticatorActivity.DIALOG_UNTRUSTED_CERT);
+             // let's forward the handler, and see what happens...
+         }

     }
     
     /**
     }
     
     /**


@@ -180,12 +204,7 @@ public class SsoWebViewClient extends WebViewClient {
             } catch (CertificateException e) {
                 x509Certificate = null;
             }
             } catch (CertificateException e) {
                 x509Certificate = null;
             }

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

         return x509Certificate;
     }
     
         return x509Certificate;
     }