Add Brave shields

BUILD.gn

@@ -8,6 +8,7 @@ group("child_dependencies") {
 group("browser_dependencies") {
   public_deps = [
     "//brave/browser",
+    "//brave/common/extensions/api"
   ]
 }
 

DEPS

@@ -1,10 +1,11 @@
 use_relative_paths = True
 
 deps = {
-  "vendor/ad-block": "https://github.com/brave/ad-block.git@b74f508be52931604199195905d3113bf450c851",
-  "vendor/tracking-protection": "https://github.com/brave/tracking-protection.git@f4e56becfc197b76cbb726b6813afe1c9dd55b88",
-  "vendor/hashset-cpp": "https://github.com/bbondy/hashset-cpp.git@728fd67bc269765f5a566fb1d2fd9b04b632e68a",
-  "vendor/bloom-filter-cpp": "https://github.com/bbondy/bloom-filter-cpp.git@b5509def04d1ecf60fdad62457a3bd09c457df90",
+  "vendor/ad-block": "https://github.com/brave/ad-block.git@9b1ff3275a2f4ce76ad3aaa749e4a01f32a9dabf",
+  "vendor/tracking-protection": "https://github.com/brave/tracking-protection.git@0931529eba33109c6b3946a83295577fea540045",
+  "vendor/hashset-cpp": "https://github.com/bbondy/hashset-cpp.git@f427324d667d7188a9e0975cca7f3a8c06226b4d",
+  "vendor/bloom-filter-cpp": "https://github.com/bbondy/bloom-filter-cpp.git@6faa14ececa33badad149c40f94ff9867159681c",
+  "vendor/brave-extension": "https://github.com/brave/brave-extension.git@4e7c8782e6d8c0f07b626d8f36c86093bcc7b687",
   "vendor/requests": "https://github.com/kennethreitz/requests@e4d59bedfd3c7f4f254f4f5d036587bcd8152458",
   "vendor/boto": "https://github.com/boto/boto@f7574aa6cc2c819430c1f05e9a1a1a666ef8169b",
   "vendor/python-patch": "https://github.com/svn2github/python-patch@a336a458016ced89aba90dfc3f4c8222ae3b1403",

browser/BUILD.gn

@@ -4,6 +4,8 @@ source_set("browser_process") {
   sources = [
     "brave_browser_process_impl.cc",
     "brave_browser_process_impl.h",
+    "brave_tab_helpers.cc",
+    "brave_tab_helpers.h",
   ]
 
   deps = [
@@ -20,4 +22,9 @@ source_set("browser") {
   public_deps = [
     "//chrome/browser",
   ]
+
+  deps = [
+    "//brave/components/brave_shields/browser:brave_shields",
+    "net",
+  ]
 }

browser/brave_browser_process_impl.cc

@@ -4,9 +4,49 @@
 
 #include "brave/browser/brave_browser_process_impl.h"
 
+#include "brave/components/brave_shields/browser/ad_block_service.h"
+#include "brave/components/brave_shields/browser/https_everywhere_service.h"
+#include "brave/components/brave_shields/browser/tracking_protection_service.h"
+
+BraveBrowserProcessImpl* g_brave_browser_process = nullptr;
+
+
+BraveBrowserProcessImpl::~BraveBrowserProcessImpl() {
+}
+
 BraveBrowserProcessImpl::BraveBrowserProcessImpl(
     base::SequencedTaskRunner* local_state_task_runner,
     const base::CommandLine& command_line)
     : BrowserProcessImpl(local_state_task_runner, command_line) {
   g_browser_process = this;
+  g_brave_browser_process = this;
+}
+
+brave_shields::BaseBraveShieldsService*
+BraveBrowserProcessImpl::ad_block_service() {
+  if (ad_block_service_)
+    return ad_block_service_.get();
+
+  ad_block_service_ = brave_shields::AdBlockServiceFactory();
+  return ad_block_service_.get();
+}
+
+brave_shields::BaseBraveShieldsService*
+BraveBrowserProcessImpl::tracking_protection_service() {
+  if (tracking_protection_service_)
+    return tracking_protection_service_.get();
+
+  tracking_protection_service_ =
+    brave_shields::TrackingProtectionServiceFactory();
+  return tracking_protection_service_.get();
+}
+
+brave_shields::HTTPSEverywhereService*
+BraveBrowserProcessImpl::https_everywhere_service() {
+  if (https_everywhere_service_)
+    return https_everywhere_service_.get();
+
+  https_everywhere_service_ =
+    brave_shields::HTTPSEverywhereServiceFactory();
+  return https_everywhere_service_.get();
 }

browser/brave_browser_process_impl.h

@@ -7,13 +7,34 @@
 
 #include "chrome/browser/browser_process_impl.h"
 
+namespace brave_shields {
+class BaseBraveShieldsService;
+class HTTPSEverywhereService;
+}
+
 class BraveBrowserProcessImpl : public BrowserProcessImpl {
  public:
   BraveBrowserProcessImpl(base::SequencedTaskRunner* local_state_task_runner,
                      const base::CommandLine& command_line);
+  ~BraveBrowserProcessImpl() override;
+
+
+  brave_shields::BaseBraveShieldsService* ad_block_service();
+  brave_shields::BaseBraveShieldsService*
+      tracking_protection_service();
+  brave_shields::HTTPSEverywhereService*
+      https_everywhere_service();
 
  private:
+  std::unique_ptr<brave_shields::BaseBraveShieldsService> ad_block_service_;
+  std::unique_ptr<brave_shields::BaseBraveShieldsService>
+      tracking_protection_service_;
+  std::unique_ptr<brave_shields::HTTPSEverywhereService>
+      https_everywhere_service_;
+
   DISALLOW_COPY_AND_ASSIGN(BraveBrowserProcessImpl);
 };
 
+extern BraveBrowserProcessImpl* g_brave_browser_process;
+
 #endif  // BRAVE_BROWSER_BRAVE_BROWSER_PROCESS_IMPL_H_

browser/brave_tab_helpers.cc

@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/brave_tab_helpers.h"
+
+#include "brave/components/brave_shields/browser/brave_shields_web_contents_observer.h"
+#include "content/public/browser/web_contents.h"
+
+namespace brave {
+
+void AttachTabHelpers(content::WebContents* web_contents) {
+  brave_shields::BraveShieldsWebContentsObserver::CreateForWebContents(
+      web_contents);
+}
+
+}  // namespace brave

browser/brave_tab_helpers.h

@@ -0,0 +1,19 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_BRAVE_TAB_HELPERS_H_
+#define BRAVE_BROWSER_BRAVE_TAB_HELPERS_H_
+
+namespace content {
+class WebContents;
+}
+
+namespace brave {
+
+void AttachTabHelpers(content::WebContents* web_contents);
+
+}  // namespace brave
+
+#endif  // BRAVE_BROWSER_BRAVE_TAB_HELPERS_H_
+

browser/net/BUILD.gn

@@ -0,0 +1,17 @@
+import("//build/config/features.gni")
+
+source_set("net") {
+  sources = [
+    "brave_network_delegate.cc",
+    "brave_network_delegate.h",
+    "brave_httpse_network_delegate.cc",
+    "brave_httpse_network_delegate.h",
+    "url_context.cc",
+    "url_context.h"
+  ]
+  public_deps = [
+    "//chrome/browser",
+    "//content/public/browser",
+    "//net",
+  ]
+}

browser/net/brave_httpse_network_delegate.cc

@@ -0,0 +1,98 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "brave/browser/net/brave_network_delegate.h"
+
+#include "brave/browser/brave_browser_process_impl.h"
+#include "brave/browser/net/brave_httpse_network_delegate.h"
+#include "brave/browser/net/url_context.h"
+#include "brave/components/brave_shields/browser/brave_shields_util.h"
+#include "brave/components/brave_shields/browser/https_everywhere_service.h"
+#include "net/url_request/url_request.h"
+
+using content::BrowserThread;
+
+namespace brave {
+
+void OnBeforeURLRequest_HttpseFileWork(
+    net::URLRequest* request,
+    GURL* new_url,
+    std::shared_ptr<OnBeforeURLRequestContext> ctx) {
+  base::ThreadRestrictions::AssertIOAllowed();
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+  DCHECK(ctx->request_identifier != 0);
+  g_brave_browser_process->https_everywhere_service()->
+    GetHTTPSURL(&ctx->request_url, ctx->request_identifier, ctx->new_url_spec);
+}
+
+void OnBeforeURLRequest_HttpsePostFileWork(
+    net::URLRequest* request,
+    GURL* new_url,
+    const ResponseCallback& next_callback,
+    std::shared_ptr<OnBeforeURLRequestContext> ctx) {
+
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  if (!ctx->new_url_spec.empty() &&
+    ctx->new_url_spec != request->url().spec()) {
+    *new_url = GURL(ctx->new_url_spec);
+    brave_shields::DispatchBlockedEventFromIO(request, "httpsEverywhere");
+  }
+
+  next_callback.Run();
+}
+
+int OnBeforeURLRequest_HttpsePreFileWork(
+  net::URLRequest* request,
+  GURL* new_url,
+  const ResponseCallback& next_callback,
+  std::shared_ptr<OnBeforeURLRequestContext> ctx) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  GURL tab_origin = request->site_for_cookies().GetOrigin();
+  bool allow_https_everywhere = brave_shields::IsAllowContentSettingFromIO(
+      request, tab_origin, CONTENT_SETTINGS_TYPE_PLUGINS, "https-everywhere");
+  if (!allow_https_everywhere) {
+    return net::OK;
+  }
+
+  bool is_valid_url = true;
+  if (request) {
+    is_valid_url = request->url().is_valid();
+    std::string scheme = request->url().scheme();
+    if (scheme.length()) {
+      std::transform(scheme.begin(), scheme.end(), scheme.begin(), ::tolower);
+      if ("http" != scheme && "https" != scheme) {
+        is_valid_url = false;
+      }
+    }
+  }
+
+  if (is_valid_url) {
+    if (!g_brave_browser_process->https_everywhere_service()->
+        GetHTTPSURLFromCacheOnly(&request->url(), request->identifier(),
+          ctx->new_url_spec)) {
+      ctx->request_url = request->url();
+      BrowserThread::PostTaskAndReply(
+        BrowserThread::FILE, FROM_HERE,
+        base::Bind(OnBeforeURLRequest_HttpseFileWork,
+            base::Unretained(request), new_url, ctx),
+        base::Bind(base::IgnoreResult(
+            &OnBeforeURLRequest_HttpsePostFileWork),
+            base::Unretained(request),
+            new_url, next_callback, ctx)
+          );
+      return net::ERR_IO_PENDING;
+    } else {
+      if (!ctx->new_url_spec.empty()) {
+        *new_url = GURL(ctx->new_url_spec);
+        brave_shields::DispatchBlockedEventFromIO(request, "httpsEverywhere");
+      }
+    }
+  }
+
+  return net::OK;
+}
+
+}  // namespace brave

browser/net/brave_httpse_network_delegate.h

@@ -0,0 +1,27 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef BRAVE_BROWSER_NET_BRAVE_HTTPSE_NETWORK_DELEGATE_H_
+#define BRAVE_BROWSER_NET_BRAVE_HTTPSE_NETWORK_DELEGATE_H_
+
+#include "chrome/browser/net/chrome_network_delegate.h"
+#include "brave/browser/net/url_context.h"
+
+struct OnBeforeURLRequestContext;
+
+namespace net {
+class URLRequest;
+}
+
+namespace brave {
+
+int OnBeforeURLRequest_HttpsePreFileWork(
+    net::URLRequest* request,
+    GURL* new_url,
+    const ResponseCallback& next_callback,
+    std::shared_ptr<OnBeforeURLRequestContext> ctx);
+
+}  // namespace brave
+
+#endif  // BRAVE_BROWSER_NET_BRAVE_NETWORK_DELEGATE_H_