chore: mv CertVerifierClient to separate header

electron · Aug 6, 2019 · 89d6ec0 · 89d6ec0
1 parent 703edd2
commit 89d6ec0
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 72 deletions.
diff --git a/filenames.gni b/filenames.gni
@@ -213,28 +213,20 @@ filenames = {
     "shell/browser/media/media_stream_devices_controller.h",
     "shell/browser/net/asar/asar_url_loader.cc",
     "shell/browser/net/asar/asar_url_loader.h",
-    "shell/browser/net/asar/url_request_asar_job.cc",
-    "shell/browser/net/asar/url_request_asar_job.h",
-    "shell/browser/net/atom_cert_verifier.cc",
-    "shell/browser/net/atom_cert_verifier.h",
-    "shell/browser/net/atom_network_delegate.cc",
-    "shell/browser/net/atom_network_delegate.h",
     "shell/browser/net/atom_url_loader_factory.cc",
     "shell/browser/net/atom_url_loader_factory.h",
     "shell/browser/net/atom_url_request_job_factory.cc",
     "shell/browser/net/atom_url_request_job_factory.h",
+    "shell/browser/net/cert_verifier_client.cc",
+    "shell/browser/net/cert_verifier_client.h",
     "shell/browser/net/proxying_url_loader_factory.cc",
     "shell/browser/net/proxying_url_loader_factory.h",
-    "shell/browser/net/js_asker.cc",
-    "shell/browser/net/js_asker.h",
     "shell/browser/net/network_context_service_factory.cc",
     "shell/browser/net/network_context_service_factory.h",
     "shell/browser/net/network_context_service.cc",
     "shell/browser/net/network_context_service.h",
     "shell/browser/net/node_stream_loader.cc",
     "shell/browser/net/node_stream_loader.h",
-    "shell/browser/net/require_ct_delegate.cc",
-    "shell/browser/net/require_ct_delegate.h",
     "shell/browser/net/resolve_proxy_helper.cc",
     "shell/browser/net/resolve_proxy_helper.h",
     "shell/browser/net/system_network_context_manager.cc",

diff --git a/shell/browser/api/atom_api_session.cc b/shell/browser/api/atom_api_session.cc
@@ -36,10 +36,6 @@
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_auth_preferences.h"
 #include "net/http/http_cache.h"
-#include "net/http/http_transaction_factory.h"
-#include "net/url_request/static_http_user_agent_settings.h"
-#include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_getter.h"
 #include "services/network/network_service.h"
 #include "services/network/public/cpp/features.h"
 #include "shell/browser/api/atom_api_cookies.h"
@@ -52,7 +48,7 @@
 #include "shell/browser/atom_permission_manager.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/media/media_device_id_salt.h"
-#include "shell/browser/net/atom_cert_verifier.h"
+#include "shell/browser/net/cert_verifier_client.h"
 #include "shell/browser/session_preferences.h"
 #include "shell/common/native_mate_converters/callback.h"
 #include "shell/common/native_mate_converters/content_converter.h"
@@ -141,19 +137,6 @@ struct Converter<ClearStorageDataOptions> {
   }
 };
 
-template <>
-struct Converter<electron::VerifyRequestParams> {
-  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   electron::VerifyRequestParams val) {
-    mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
-    dict.Set("hostname", val.hostname);
-    dict.Set("certificate", val.certificate);
-    dict.Set("verificationResult", val.default_result);
-    dict.Set("errorCode", val.error_code);
-    return dict.GetHandle();
-  }
-};
-
 }  // namespace mate
 
 namespace electron {
@@ -402,59 +385,17 @@ void Session::DisableNetworkEmulation() {
       network_emulation_token_, network::mojom::NetworkConditions::New());
 }
 
-class ElectronCertVerifierClient : public network::mojom::CertVerifierClient {
- public:
-  using CertVerifyProc =
-      base::RepeatingCallback<void(const VerifyRequestParams& request,
-                                   base::RepeatingCallback<void(int)>)>;
-  explicit ElectronCertVerifierClient(CertVerifyProc proc)
-      : cert_verify_proc_(proc) {}
-  ~ElectronCertVerifierClient() override = default;
-
-  // network::mojom::CertVerifierClient
-  void Verify(int default_error,
-              const net::CertVerifyResult& default_result,
-              const scoped_refptr<net::X509Certificate>& certificate,
-              const std::string& hostname,
-              int flags,
-              const base::Optional<std::string>& ocsp_response,
-              VerifyCallback callback) override {
-    VerifyRequestParams params;
-    params.hostname = hostname;
-    params.default_result = net::ErrorToString(default_error);
-    params.error_code = default_error;
-    params.certificate = certificate;
-    cert_verify_proc_.Run(
-        params,
-        base::AdaptCallbackForRepeating(base::BindOnce(
-            [](VerifyCallback callback, const net::CertVerifyResult& result,
-               int err) { std::move(callback).Run(err, result); },
-            std::move(callback), default_result)));
-  }
-
- private:
-  CertVerifyProc cert_verify_proc_;
-};
-
-void WrapVerifyProc(
-    base::RepeatingCallback<void(const VerifyRequestParams& request,
-                                 base::RepeatingCallback<void(int)>)> proc,
-    const VerifyRequestParams& request,
-    base::OnceCallback<void(int)> cb) {
-  proc.Run(request, base::AdaptCallbackForRepeating(std::move(cb)));
-}
-
 void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
                                 mate::Arguments* args) {
-  ElectronCertVerifierClient::CertVerifyProc proc;
+  CertVerifierClient::CertVerifyProc proc;
   if (!(val->IsNull() || mate::ConvertFromV8(args->isolate(), val, &proc))) {
     args->ThrowError("Must pass null or function");
     return;
   }
 
   network::mojom::CertVerifierClientPtr cert_verifier_client;
   if (proc) {
-    mojo::MakeStrongBinding(std::make_unique<ElectronCertVerifierClient>(proc),
+    mojo::MakeStrongBinding(std::make_unique<CertVerifierClient>(proc),
                             mojo::MakeRequest(&cert_verifier_client));
   }
   content::BrowserContext::GetDefaultStoragePartition(browser_context_.get())

diff --git a/shell/browser/net/cert_verifier_client.cc b/shell/browser/net/cert_verifier_client.cc
@@ -0,0 +1,42 @@
+// Copyright (c) 2019 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "shell/browser/net/cert_verifier_client.h"
+#include "shell/common/native_mate_converters/net_converter.h"
+
+namespace electron {
+
+VerifyRequestParams::VerifyRequestParams() = default;
+
+VerifyRequestParams::~VerifyRequestParams() = default;
+
+VerifyRequestParams::VerifyRequestParams(const VerifyRequestParams&) = default;
+
+CertVerifierClient::CertVerifierClient(CertVerifyProc proc)
+    : cert_verify_proc_(proc) {}
+
+CertVerifierClient::~CertVerifierClient() = default;
+
+void CertVerifierClient::Verify(
+    int default_error,
+    const net::CertVerifyResult& default_result,
+    const scoped_refptr<net::X509Certificate>& certificate,
+    const std::string& hostname,
+    int flags,
+    const base::Optional<std::string>& ocsp_response,
+    VerifyCallback callback) {
+  VerifyRequestParams params;
+  params.hostname = hostname;
+  params.default_result = net::ErrorToString(default_error);
+  params.error_code = default_error;
+  params.certificate = certificate;
+  cert_verify_proc_.Run(
+      params,
+      base::AdaptCallbackForRepeating(base::BindOnce(
+          [](VerifyCallback callback, const net::CertVerifyResult& result,
+             int err) { std::move(callback).Run(err, result); },
+          std::move(callback), default_result)));
+}
+
+}  // namespace electron
diff --git a/shell/browser/net/cert_verifier_client.h b/shell/browser/net/cert_verifier_client.h
@@ -0,0 +1,50 @@
+// Copyright (c) 2019 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef SHELL_BROWSER_NET_CERT_VERIFIER_CLIENT_H_
+#define SHELL_BROWSER_NET_CERT_VERIFIER_CLIENT_H_
+
+#include <string>
+
+#include "net/cert/x509_certificate.h"
+#include "services/network/public/mojom/network_context.mojom.h"
+
+namespace electron {
+
+struct VerifyRequestParams {
+  std::string hostname;
+  std::string default_result;
+  int error_code;
+  scoped_refptr<net::X509Certificate> certificate;
+
+  VerifyRequestParams();
+  VerifyRequestParams(const VerifyRequestParams&);
+  ~VerifyRequestParams();
+};
+
+class CertVerifierClient : public network::mojom::CertVerifierClient {
+ public:
+  using CertVerifyProc =
+      base::RepeatingCallback<void(const VerifyRequestParams& request,
+                                   base::RepeatingCallback<void(int)>)>;
+
+  explicit CertVerifierClient(CertVerifyProc proc);
+  ~CertVerifierClient() override;
+
+  // network::mojom::CertVerifierClient
+  void Verify(int default_error,
+              const net::CertVerifyResult& default_result,
+              const scoped_refptr<net::X509Certificate>& certificate,
+              const std::string& hostname,
+              int flags,
+              const base::Optional<std::string>& ocsp_response,
+              VerifyCallback callback) override;
+
+ private:
+  CertVerifyProc cert_verify_proc_;
+};
+
+}  // namespace electron
+
+#endif  // SHELL_BROWSER_NET_CERT_VERIFIER_CLIENT_H_
diff --git a/shell/common/native_mate_converters/net_converter.cc b/shell/common/native_mate_converters/net_converter.cc
@@ -22,6 +22,7 @@
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 #include "services/network/public/cpp/resource_request.h"
+#include "shell/browser/net/cert_verifier_client.h"
 #include "shell/common/native_mate_converters/gurl_converter.h"
 #include "shell/common/native_mate_converters/string16_converter.h"
 #include "shell/common/native_mate_converters/value_converter.h"
@@ -267,6 +268,18 @@ v8::Local<v8::Value> Converter<network::ResourceRequest>::ToV8(
   return dict.GetHandle();
 }
 
+// static
+v8::Local<v8::Value> Converter<electron::VerifyRequestParams>::ToV8(
+    v8::Isolate* isolate,
+    electron::VerifyRequestParams val) {
+  mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
+  dict.Set("hostname", val.hostname);
+  dict.Set("certificate", val.certificate);
+  dict.Set("verificationResult", val.default_result);
+  dict.Set("errorCode", val.error_code);
+  return dict.GetHandle();
+}
+
 }  // namespace mate
 
 namespace electron {

diff --git a/shell/common/native_mate_converters/net_converter.h b/shell/common/native_mate_converters/net_converter.h
@@ -13,6 +13,10 @@ class DictionaryValue;
 class ListValue;
 }  // namespace base
 
+namespace electron {
+struct VerifyRequestParams;
+}
+
 namespace net {
 class AuthChallengeInfo;
 class URLRequest;
@@ -65,6 +69,12 @@ struct Converter<network::ResourceRequest> {
                                    const network::ResourceRequest& val);
 };
 
+template <>
+struct Converter<electron::VerifyRequestParams> {
+  static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
+                                   electron::VerifyRequestParams val);
+};
+
 }  // namespace mate
 
 namespace electron {