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

components/cronet/android/cronet_url_request_adapter.cc

 // Copyright 2014 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 "cronet_url_request_adapter.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "components/cronet/android/cronet_url_request_context_adapter.h"
 #include "jni/CronetUrlRequest_jni.h"
 #include "net/base/io_buffer.h"
 #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"
 
 using base::android::ConvertUTF8ToJavaString;
 
 namespace cronet {
 
 // Explicitly register static JNI functions.
 bool CronetUrlRequestAdapterRegisterJni(JNIEnv* env) {
   return RegisterNativesImpl(env);
@@ skipping 242 matching lines @@
 
 void CronetURLRequestAdapter::OnResponseStarted(net::URLRequest* request) {
   DCHECK(context_->IsOnNetworkThread());
   if (MaybeReportError(request))
     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) {
+  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());
   if (MaybeReportError(request))
     return;
   if (bytes_read != 0) {
     JNIEnv* env = base::android::AttachCurrentThread();
     cronet::Java_CronetUrlRequest_onReadCompleted(
         env, owner_.obj(), read_buffer_->byte_buffer(), bytes_read,
         read_buffer_->initial_position());
@@ skipping 61 matching lines @@
   delete this;
 }
 
 bool CronetURLRequestAdapter::MaybeReportError(net::URLRequest* request) const {
   DCHECK_NE(net::URLRequestStatus::IO_PENDING, url_request_->status().status());
   DCHECK_EQ(request, url_request_);
   if (url_request_->status().is_success())
     return false;
   int net_error = url_request_->status().error();
   VLOG(1) << "Error " << net::ErrorToString(net_error)
           << " on chromium request: " << initial_url_.possibly_invalid_spec();

[xunjieli, 2015/07/15 22:21:14]

You are totally right! Sorry I was confused by this log message here that I
thought the second error (ERR_ABORTED) was being reported. Since we are
reporting error in OnSSLCertificateError as well, should we remove this log
message in case more people get confused by it? 

[mmenke, 2015/07/16 14:48:30]

I'm fine with removing it.  Worth noting I mostly do breakpoint debugging (Don't
do much with Android, don't do much with printf/LOG), so others may disagree.

[xunjieli, 2015/07/16 18:36:47]

Hmm.. I guess I will leave it for now, since the java side does not log  the
error.

   JNIEnv* env = base::android::AttachCurrentThread();
   cronet::Java_CronetUrlRequest_onError(
       env, owner_.obj(), net_error,
       ConvertUTF8ToJavaString(env, net::ErrorToString(net_error)).obj());
   return true;
 }
 
 }  // namespace cronet