[Cronet] Surface SSL cert error through CronetURLRequestAdapter::OnSSLCertificateError

components/cronet/android/cronet_url_request_adapter.cc

Index: components/cronet/android/cronet_url_request_adapter.cc
diff --git a/components/cronet/android/cronet_url_request_adapter.cc b/components/cronet/android/cronet_url_request_adapter.cc
index ff8e70392dd73ea60b774286811db088709c41c8..c450e6cd16f7a702b441e6608cd615c2c4e0adef 100644
--- a/components/cronet/android/cronet_url_request_adapter.cc
+++ b/components/cronet/android/cronet_url_request_adapter.cc
@@ -15,9 +15,11 @@
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/request_priority.h"
+#include "net/cert/cert_status_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/http/http_util.h"
+#include "net/ssl/ssl_info.h"
 #include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request_context.h"
 
@@ -95,7 +97,8 @@ CronetURLRequestAdapter::CronetURLRequestAdapter(
       initial_url_(url),
       initial_priority_(priority),
       initial_method_("GET"),
-      load_flags_(context->default_load_flags()) {
+      load_flags_(context->default_load_flags()),
+      has_ssl_cert_error_(false) {
   DCHECK(!context_->IsOnNetworkThread());
   owner_.Reset(env, jurl_request);
 }
@@ -273,13 +276,30 @@ void CronetURLRequestAdapter::OnReceivedRedirect(
 
 void CronetURLRequestAdapter::OnResponseStarted(net::URLRequest* request) {
   DCHECK(context_->IsOnNetworkThread());
-  if (MaybeReportError(request))
+  // If any ssl cert error is present,
+  // CronetURLRequesAdapter::OnSSLCertificateError has propagated the error
+  // to the embedder, so do not report again.
+  if (has_ssl_cert_error_ || MaybeReportError(request))

[mmenke, 2015/07/15 22:03:43]

Why is this needed?  OnSSLCertificateError calls CronetUrlRequest::onError which
calls CronetUrlRequest::failWithException, which calls
CronetUrlRequest::destroyRequestAdapter.

So then when this code calls MaybeReportError, which calls
CronetUrlRequest::onError again, it notices the request already fails, and does
nothing...Right?

That was done to solve a previous problem where we were also double-reporting
errors.

     return;
   JNIEnv* env = base::android::AttachCurrentThread();
   cronet::Java_CronetUrlRequest_onResponseStarted(env, owner_.obj(),
                                                   request->GetResponseCode());
 }
 
+void CronetURLRequestAdapter::OnSSLCertificateError(
+    net::URLRequest* request,
+    const net::SSLInfo& ssl_info,
+    bool fatal) {
+  has_ssl_cert_error_ = true;
+  request->Cancel();
+  int ssl_cert_net_error = net::MapCertStatusToNetError(ssl_info.cert_status);
+  JNIEnv* env = base::android::AttachCurrentThread();
+  cronet::Java_CronetUrlRequest_onError(
+      env, owner_.obj(), ssl_cert_net_error,
+      ConvertUTF8ToJavaString(env, net::ErrorToString(ssl_cert_net_error))
+          .obj());
+}
+
 void CronetURLRequestAdapter::OnReadCompleted(net::URLRequest* request,
                                               int bytes_read) {
   DCHECK(context_->IsOnNetworkThread());