[Android WebView] Propagate Java exceptions thrown in OnReceivedSslError

android_webview/browser/aw_contents_client_bridge.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/aw_contents_client_bridge.h"
 
 #include <memory>
 #include <utility>
 
 #include "android_webview/browser/aw_contents.h"
@@ skipping 44 matching lines @@
                                 scoped_refptr<net::SSLPrivateKey> private_key) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   net::OpenSSLClientKeyStore::GetInstance()->RecordClientCertPrivateKey(
       client_cert, std::move(private_key));
 }
 
 }  // namespace
 
 AwContentsClientBridge::AwContentsClientBridge(JNIEnv* env,
                                                const JavaRef<jobject>& obj)
-    : java_ref_(env, obj) {
+    : java_ref_(env, obj), has_pending_java_exception_(false) {
   DCHECK(!obj.is_null());
   Java_AwContentsClientBridge_setNativeContentsClientBridge(
       env, obj, reinterpret_cast<intptr_t>(this));
 }
 
 AwContentsClientBridge::~AwContentsClientBridge() {
   JNIEnv* env = AttachCurrentThread();
 
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null()) {
@@ skipping 28 matching lines @@
       env, reinterpret_cast<const uint8_t*>(der_string.data()),
       der_string.length());
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, request_url.spec()));
   // We need to add the callback before making the call to java side,
   // as it may do a synchronous callback prior to returning.
   int request_id = pending_cert_error_callbacks_.Add(
       base::MakeUnique<CertErrorCallback>(callback));
   *cancel_request = !Java_AwContentsClientBridge_allowCertificateError(
       env, obj, cert_error, jcert, jurl, request_id);
+
+  if (HasException(env)) {
+    has_pending_java_exception_ = true;
+    // Tell the chromium message loop to not perform any tasks after the current
+    // one - we want to make sure we return to Java cleanly without first making
+    // any new JNI calls.
+    base::MessageLoopForUI::current()->Abort();
+    // If we crashed we don't want to continue the navigation.
+    return;
+  }
+
   // if the request is cancelled, then cancel the stored callback
   if (*cancel_request) {

[gsennton, 2017/05/17 13:19:18]

Selim: I guess if we post the Java-side of allowCertificateError as a new Java
task, we will have to explicitly remove this pending callback at the end of that
Java-task? (since we won't know here whether we should cancel or not).

[gsennton, 2017/05/17 14:45:07]

Aha, I see what's going on here now.
We remove this callback here and call the callback directly from
aw_content_browser_client.cc instead (passing
CERTIFICATE_REQUEST_RESULT_TYPE_DENY) if the java-side allowCertificateError()
call returns false.

So, what we could do is run the parts of the java-side allowCertificateError()
method that can return false (i.e. deny the ssl-error-ignoring) directly, and
then post only the onReceivedSslError() callback as a separate task.

In that way we shouldn't need to change any of the native code :)

[sgurun-gerrit only, 2017/05/17 15:23:58]

sounds reasonable and simpler.

     pending_cert_error_callbacks_.Remove(request_id);
   }
 }
 
 void AwContentsClientBridge::ProceedSslError(JNIEnv* env,
                                              const JavaRef<jobject>& obj,
                                              jboolean proceed,
                                              jint id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   CertErrorCallback* callback = pending_cert_error_callbacks_.Lookup(id);
@@ skipping 400 matching lines @@
   pending_client_cert_request_delegates_.Remove(request_id);
 
   delete delegate;
 }
 
 bool RegisterAwContentsClientBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview