refactor: move media/net from brightray to atom (#15288)

atom/browser/net/atom_cert_verifier.cc

@@ -7,10 +7,10 @@
 #include <utility>
 
 #include "atom/browser/browser.h"
+#include "atom/browser/net/require_ct_delegate.h"
 #include "atom/common/native_mate_converters/net_converter.h"
 #include "base/containers/linked_list.h"
 #include "base/memory/weak_ptr.h"
-#include "brightray/browser/net/require_ct_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_verify_result.h"
@@ -150,7 +150,7 @@ class CertVerifierRequest : public AtomCertVerifier::Request {
   base::WeakPtrFactory<CertVerifierRequest> weak_ptr_factory_;
 };
 
-AtomCertVerifier::AtomCertVerifier(brightray::RequireCTDelegate* ct_delegate)
+AtomCertVerifier::AtomCertVerifier(RequireCTDelegate* ct_delegate)
     : default_cert_verifier_(net::CertVerifier::CreateDefault()),
       ct_delegate_(ct_delegate) {}
 

atom/browser/net/atom_cert_verifier.h

@@ -11,15 +11,10 @@
 
 #include "net/cert/cert_verifier.h"
 
-namespace brightray {
-
-class RequireCTDelegate;
-
-}  // namespace brightray
-
 namespace atom {
 
 class CertVerifierRequest;
+class RequireCTDelegate;
 
 struct VerifyRequestParams {
   std::string hostname;
@@ -34,7 +29,7 @@ struct VerifyRequestParams {
 
 class AtomCertVerifier : public net::CertVerifier {
  public:
-  explicit AtomCertVerifier(brightray::RequireCTDelegate* ct_delegate);
+  explicit AtomCertVerifier(RequireCTDelegate* ct_delegate);
   ~AtomCertVerifier() override;
 
   using VerifyProc = base::Callback<void(const VerifyRequestParams& request,
@@ -43,7 +38,7 @@ class AtomCertVerifier : public net::CertVerifier {
   void SetVerifyProc(const VerifyProc& proc);
 
   const VerifyProc verify_proc() const { return verify_proc_; }
-  brightray::RequireCTDelegate* ct_delegate() const { return ct_delegate_; }
+  RequireCTDelegate* ct_delegate() const { return ct_delegate_; }
   net::CertVerifier* default_verifier() const {
     return default_cert_verifier_.get();
   }
@@ -66,7 +61,7 @@ class AtomCertVerifier : public net::CertVerifier {
   std::map<RequestParams, CertVerifierRequest*> inflight_requests_;
   VerifyProc verify_proc_;
   std::unique_ptr<net::CertVerifier> default_cert_verifier_;
-  brightray::RequireCTDelegate* ct_delegate_;
+  RequireCTDelegate* ct_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomCertVerifier);
 };

atom/browser/net/require_ct_delegate.cc

@@ -0,0 +1,36 @@
+// Copyright (c) 2017 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/net/require_ct_delegate.h"
+
+#include "content/public/browser/browser_thread.h"
+
+namespace atom {
+
+RequireCTDelegate::RequireCTDelegate() {}
+
+RequireCTDelegate::~RequireCTDelegate() {}
+
+void RequireCTDelegate::AddCTExcludedHost(const std::string& host) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+  ct_excluded_hosts_.insert(host);
+}
+
+void RequireCTDelegate::ClearCTExcludedHostsList() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+  ct_excluded_hosts_.clear();
+}
+
+RequireCTDelegate::CTRequirementLevel RequireCTDelegate::IsCTRequiredForHost(
+    const std::string& host,
+    const net::X509Certificate* chain,
+    const net::HashValueVector& hashes) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+  if (!ct_excluded_hosts_.empty() &&
+      (ct_excluded_hosts_.find(host) != ct_excluded_hosts_.end()))
+    return CTRequirementLevel::NOT_REQUIRED;
+  return CTRequirementLevel::DEFAULT;
+}
+
+}  // namespace atom

atom/browser/net/require_ct_delegate.h

@@ -0,0 +1,37 @@
+// Copyright (c) 2017 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#ifndef ATOM_BROWSER_NET_REQUIRE_CT_DELEGATE_H_
+#define ATOM_BROWSER_NET_REQUIRE_CT_DELEGATE_H_
+
+#include <set>
+#include <string>
+
+#include "net/http/transport_security_state.h"
+
+namespace atom {
+
+class RequireCTDelegate
+    : public net::TransportSecurityState::RequireCTDelegate {
+ public:
+  RequireCTDelegate();
+  ~RequireCTDelegate() override;
+
+  void AddCTExcludedHost(const std::string& host);
+  void ClearCTExcludedHostsList();
+
+  // net::TransportSecurityState::RequireCTDelegate:
+  CTRequirementLevel IsCTRequiredForHost(
+      const std::string& host,
+      const net::X509Certificate* chain,
+      const net::HashValueVector& hashes) override;
+
+ private:
+  std::set<std::string> ct_excluded_hosts_;
+  DISALLOW_COPY_AND_ASSIGN(RequireCTDelegate);
+};
+
+}  // namespace atom
+
+#endif  // ATOM_BROWSER_NET_REQUIRE_CT_DELEGATE_H_

atom/browser/net/url_request_context_getter.cc

@@ -17,10 +17,10 @@
 #include "atom/browser/net/atom_network_delegate.h"
 #include "atom/browser/net/atom_url_request_job_factory.h"
 #include "atom/browser/net/http_protocol_handler.h"
+#include "atom/browser/net/require_ct_delegate.h"
 #include "base/command_line.h"
 #include "base/strings/string_util.h"
 #include "base/task_scheduler/post_task.h"
-#include "brightray/browser/net/require_ct_delegate.h"
 #include "chrome/browser/net/chrome_mojo_proxy_resolver_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
@@ -317,7 +317,7 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
     network_delegate_ = network_delegate.get();
     builder->set_network_delegate(std::move(network_delegate));
 
-    ct_delegate_.reset(new brightray::RequireCTDelegate);
+    ct_delegate_.reset(new RequireCTDelegate);
     auto cert_verifier = std::make_unique<AtomCertVerifier>(ct_delegate_.get());
     builder->SetCertVerifier(std::move(cert_verifier));
 

atom/browser/net/url_request_context_getter.h

@@ -19,15 +19,12 @@
 #include "base/debug/leak_tracker.h"
 #endif
 
-namespace brightray {
-class RequireCTDelegate;
-}  // namespace brightray
-
 namespace atom {
 
 class AtomBrowserContext;
 class AtomNetworkDelegate;
 class AtomURLRequestJobFactory;
+class RequireCTDelegate;
 class ResourceContext;
 
 class URLRequestContextGetter : public net::URLRequestContextGetter {
@@ -96,7 +93,7 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
   base::debug::LeakTracker<URLRequestContextGetter> leak_tracker_;
 #endif
 
-  std::unique_ptr<brightray::RequireCTDelegate> ct_delegate_;
+  std::unique_ptr<RequireCTDelegate> ct_delegate_;
   std::unique_ptr<AtomURLRequestJobFactory> top_job_factory_;
   std::unique_ptr<network::mojom::NetworkContext> network_context_;