webcompat exceptions user interface (#24554)

Author: arthuredelstein

browser/about_flags.cc

@@ -37,7 +37,7 @@
 #include "brave/components/request_otr/common/buildflags/buildflags.h"
 #include "brave/components/skus/common/features.h"
 #include "brave/components/speedreader/common/buildflags/buildflags.h"
-#include "brave/components/webcompat/features.h"
+#include "brave/components/webcompat/core/common/features.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/ui_features.h"
 #include "components/content_settings/core/common/features.h"

browser/brave_browser_process_impl.cc

@@ -43,8 +43,8 @@
 #include "brave/components/p3a/histograms_braveizer.h"
 #include "brave/components/p3a/p3a_config.h"
 #include "brave/components/p3a/p3a_service.h"
-#include "brave/components/webcompat/features.h"
-#include "brave/components/webcompat/webcompat_exceptions_service.h"
+#include "brave/components/webcompat/content/browser/webcompat_exceptions_service.h"
+#include "brave/components/webcompat/core/common/features.h"
 #include "brave/services/network/public/cpp/system_request_handler.h"
 #include "build/build_config.h"
 #include "chrome/browser/component_updater/component_updater_utils.h"

browser/brave_shields/brave_shields_tab_helper.cc

@@ -159,6 +159,11 @@ std::vector<GURL> BraveShieldsTabHelper::GetFingerprintsList() {
   return fingerprints_list;
 }
 
+const base::flat_set<ContentSettingsType>&
+BraveShieldsTabHelper::GetInvokedWebcompatFeatures() {
+  return webcompat_features_invoked_;
+}
+
 bool BraveShieldsTabHelper::GetBraveShieldsEnabled() {
   return brave_shields::GetBraveShieldsEnabled(
       GetHostContentSettingsMap(web_contents()), GetCurrentSiteURL());
@@ -475,6 +480,43 @@ void BraveShieldsTabHelper::HandleItemAllowedOnce(
   }
 }
 
+void BraveShieldsTabHelper::HandleWebcompatFeatureInvoked(
+    ContentSettingsType webcompat_content_settings) {
+  if (webcompat_content_settings > ContentSettingsType::BRAVE_WEBCOMPAT_NONE &&
+      webcompat_content_settings < ContentSettingsType::BRAVE_WEBCOMPAT_ALL) {
+    webcompat_features_invoked_.insert(webcompat_content_settings);
+  }
+
+  for (Observer& obs : observer_list_) {
+    obs.OnResourcesChanged();
+  }
+}
+
+void BraveShieldsTabHelper::SetWebcompatEnabled(
+    ContentSettingsType webcompat_settings_type,
+    bool enabled) {
+  brave_shields::SetWebcompatEnabled(
+      GetHostContentSettingsMap(web_contents()), webcompat_settings_type,
+      enabled, GetCurrentSiteURL(), g_browser_process->local_state());
+  ReloadWebContents();
+}
+
+base::flat_map<ContentSettingsType, bool>
+BraveShieldsTabHelper::GetWebcompatSettings() {
+  auto* map = GetHostContentSettingsMap(web_contents());
+  const GURL& current_site_url = GetCurrentSiteURL();
+  base::flat_map<ContentSettingsType, bool> result;
+  for (auto webcompat_settings_type = ContentSettingsType::BRAVE_WEBCOMPAT_NONE;
+       webcompat_settings_type != ContentSettingsType::BRAVE_WEBCOMPAT_ALL;
+       webcompat_settings_type = static_cast<ContentSettingsType>(
+           static_cast<int32_t>(webcompat_settings_type) + 1)) {
+    const bool enabled = brave_shields::IsWebcompatEnabled(
+        map, webcompat_settings_type, current_site_url);
+    result[webcompat_settings_type] = enabled;
+  }
+  return result;
+}
+
 WEB_CONTENTS_USER_DATA_KEY_IMPL(BraveShieldsTabHelper);
 
 }  // namespace brave_shields

browser/brave_shields/brave_shields_tab_helper.h

@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "base/containers/flat_set.h"
 #include "base/observer_list.h"
 #include "base/observer_list_types.h"
 #include "base/scoped_observation.h"
@@ -51,6 +52,8 @@ class BraveShieldsTabHelper
                          const std::string& subresource);
   void HandleItemAllowedOnce(const std::string& allowed_once_type,
                              const std::string& subresource);
+  void HandleWebcompatFeatureInvoked(
+      ContentSettingsType webcompat_content_settings);
   void ClearAllResourcesList();
   int GetTotalBlockedCount();
   std::vector<GURL> GetBlockedAdsList();
@@ -62,6 +65,7 @@ class BraveShieldsTabHelper
   void SetBraveShieldsEnabled(bool is_enabled);
   GURL GetCurrentSiteURL();
   GURL GetFaviconURL(bool refresh);
+  const base::flat_set<ContentSettingsType>& GetInvokedWebcompatFeatures();
 
   AdBlockMode GetAdBlockMode();
   FingerprintMode GetFingerprintMode();
@@ -79,6 +83,9 @@ class BraveShieldsTabHelper
   void SetForgetFirstPartyStorageEnabled(bool is_enabled);
   void AllowScriptsOnce(const std::vector<std::string>& origins);
   void BlockAllowedScripts(const std::vector<std::string>& origins);
+  void SetWebcompatEnabled(ContentSettingsType webcompat_settings_type,
+                           bool enabled);
+  base::flat_map<ContentSettingsType, bool> GetWebcompatSettings();
 
   void AddObserver(Observer* obs);
   void RemoveObserver(Observer* obs);
@@ -115,6 +122,7 @@ class BraveShieldsTabHelper
   std::set<GURL> resource_list_blocked_js_;
   std::set<GURL> resource_list_allowed_once_js_;
   std::set<GURL> resource_list_blocked_fingerprints_;
+  base::flat_set<ContentSettingsType> webcompat_features_invoked_;
   base::ScopedObservation<HostContentSettingsMap, content_settings::Observer>
       observation_{this};
 

browser/brave_shields/brave_shields_web_contents_observer.cc

@@ -194,6 +194,23 @@ void BraveShieldsWebContentsObserver::DispatchAllowedOnceEventForWebContents(
   }
   shields_data_ctrlr->HandleItemAllowedOnce(block_type, subresource);
 }
+// static
+void BraveShieldsWebContentsObserver::
+    DispatchWebcompatFeatureInvokedForWebContents(
+        ContentSettingsType webcompat_content_settings,
+        WebContents* web_contents) {
+  if (!web_contents) {
+    return;
+  }
+  auto* shields_data_ctrlr =
+      brave_shields::BraveShieldsTabHelper::FromWebContents(web_contents);
+  // |shields_data_ctrlr| can be null if the |web_contents| is generated in
+  // component layer - We don't attach any tab helpers in this case.
+  if (!shields_data_ctrlr) {
+    return;
+  }
+  shields_data_ctrlr->HandleWebcompatFeatureInvoked(webcompat_content_settings);
+}
 #endif
 
 void BraveShieldsWebContentsObserver::OnJavaScriptAllowedOnce(
@@ -209,6 +226,19 @@ void BraveShieldsWebContentsObserver::OnJavaScriptAllowedOnce(
 #endif
 }
 
+void BraveShieldsWebContentsObserver::OnWebcompatFeatureInvoked(
+    ContentSettingsType webcompat_settings_type) {
+#if !BUILDFLAG(IS_ANDROID)
+  WebContents* web_contents =
+      WebContents::FromRenderFrameHost(receivers_.GetCurrentTargetFrame());
+  if (!web_contents) {
+    return;
+  }
+  DispatchWebcompatFeatureInvokedForWebContents(webcompat_settings_type,
+                                                web_contents);
+#endif
+}
+
 void BraveShieldsWebContentsObserver::OnJavaScriptBlocked(
     const std::u16string& details) {
   WebContents* web_contents =

browser/brave_shields/brave_shields_web_contents_observer.h

@@ -14,6 +14,7 @@
 #include "base/containers/flat_map.h"
 #include "base/synchronization/lock.h"
 #include "brave/components/brave_shields/core/common/brave_shields.mojom.h"
+#include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/render_frame_host_receiver_set.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ -52,6 +53,9 @@ class BraveShieldsWebContentsObserver
       const std::string& block_type,
       const std::string& subresource,
       content::WebContents* web_contents);
+  static void DispatchWebcompatFeatureInvokedForWebContents(
+      ContentSettingsType webcompat_content_settings,
+      content::WebContents* web_contents);
   static void DispatchBlockedEvent(const GURL& request_url,
                                    int frame_tree_node_id,
                                    const std::string& block_type);
@@ -73,6 +77,8 @@ class BraveShieldsWebContentsObserver
   // brave_shields::mojom::BraveShieldsHost.
   void OnJavaScriptBlocked(const std::u16string& details) override;
   void OnJavaScriptAllowedOnce(const std::u16string& details) override;
+  void OnWebcompatFeatureInvoked(
+      ContentSettingsType webcompat_settings_type) override;
 
  private:
   friend class content::WebContentsUserData<BraveShieldsWebContentsObserver>;

browser/brave_shields/eventsource_pool_limit_browsertest.cc

@@ -9,6 +9,7 @@
 #include "base/path_service.h"
 #include "brave/components/brave_shields/content/browser/brave_shields_util.h"
 #include "brave/components/constants/brave_paths.h"
+#include "brave/components/webcompat/core/common/features.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -93,7 +94,10 @@ constexpr char kEventSourceCloseInSwScript[] = R"(
 
 class EventSourcePoolLimitBrowserTest : public InProcessBrowserTest {
  public:
-  EventSourcePoolLimitBrowserTest() = default;
+  EventSourcePoolLimitBrowserTest() {
+    scoped_feature_list_.InitAndEnableFeature(
+        webcompat::features::kBraveWebcompatExceptionsService);
+  }
 
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
@@ -204,6 +208,9 @@ class EventSourcePoolLimitBrowserTest : public InProcessBrowserTest {
   content::ContentMockCertVerifier mock_cert_verifier_;
   EmbeddedTestServer https_server_{EmbeddedTestServer::TYPE_HTTPS};
   GURL es_url_;
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(EventSourcePoolLimitBrowserTest,
@@ -356,11 +363,10 @@ IN_PROC_BROWSER_TEST_F(EventSourcePoolLimitBrowserTest,
   brave_shields::SetBraveShieldsEnabled(content_settings(), true, url);
 
   // Enable webcompat exception.
-  brave_shields::SetWebcompatFeatureSetting(
+  brave_shields::SetWebcompatEnabled(
       content_settings(),
-      ContentSettingsType::BRAVE_WEBCOMPAT_EVENT_SOURCE_POOL,
-      brave_shields::ControlType::ALLOW, https_server_.GetURL("a.com", "/"),
-      nullptr);
+      ContentSettingsType::BRAVE_WEBCOMPAT_EVENT_SOURCE_POOL, true,
+      https_server_.GetURL("a.com", "/"), nullptr);
 
   auto* a_com_rfh = ui_test_utils::NavigateToURLWithDisposition(
       browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,

browser/brave_shields/websockets_pool_limit_browsertest.cc

@@ -8,6 +8,7 @@
 #include "base/path_service.h"
 #include "brave/components/brave_shields/content/browser/brave_shields_util.h"
 #include "brave/components/constants/brave_paths.h"
+#include "brave/components/webcompat/core/common/features.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -91,7 +92,10 @@ constexpr char kWsCloseInSwScript[] = R"(
 
 class WebSocketsPoolLimitBrowserTest : public InProcessBrowserTest {
  public:
-  WebSocketsPoolLimitBrowserTest() = default;
+  WebSocketsPoolLimitBrowserTest() {
+    scoped_feature_list_.InitAndEnableFeature(
+        webcompat::features::kBraveWebcompatExceptionsService);
+  }
 
   void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
@@ -192,8 +196,10 @@ class WebSocketsPoolLimitBrowserTest : public InProcessBrowserTest {
   net::test_server::EmbeddedTestServer https_server_{
       net::test_server::EmbeddedTestServer::TYPE_HTTPS};
   std::unique_ptr<net::SpawnedTestServer> ws_server_;
-
   GURL ws_url_;
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(WebSocketsPoolLimitBrowserTest, PoolIsLimitedByDefault) {
@@ -328,10 +334,9 @@ IN_PROC_BROWSER_TEST_F(WebSocketsPoolLimitBrowserTest,
   // Enable shields.
   brave_shields::SetBraveShieldsEnabled(content_settings(), true, url);
   // Enable webcompat exception.
-  brave_shields::SetWebcompatFeatureSetting(
+  brave_shields::SetWebcompatEnabled(
       content_settings(), ContentSettingsType::BRAVE_WEBCOMPAT_WEB_SOCKETS_POOL,
-      brave_shields::ControlType::ALLOW, https_server_.GetURL("a.com", "/"),
-      nullptr);
+      true, https_server_.GetURL("a.com", "/"), nullptr);
 
   auto* a_com_rfh = ui_test_utils::NavigateToURLWithDisposition(
       browser(), url, WindowOpenDisposition::NEW_FOREGROUND_TAB,

browser/farbling/BUILD.gn

@@ -35,6 +35,7 @@ if (!is_android) {
       "//brave/components/brave_shields/content/browser",
       "//brave/components/brave_shields/core/common",
       "//brave/components/constants",
+      "//brave/components/webcompat/core/common",
       "//brave/third_party/blink/renderer",
       "//chrome/browser",
       "//chrome/browser/ui",

browser/farbling/brave_enumeratedevices_farbling_browsertest.cc

@@ -94,10 +94,10 @@ class BraveEnumerateDevicesFarblingBrowserTest : public InProcessBrowserTest {
   }
 
   void EnableWebcompatException() {
-    brave_shields::SetWebcompatFeatureSetting(
+    brave_shields::SetWebcompatEnabled(
         content_settings(),
-        ContentSettingsType::BRAVE_WEBCOMPAT_HARDWARE_CONCURRENCY,
-        ControlType::ALLOW, top_level_page_url_, nullptr);
+        ContentSettingsType::BRAVE_WEBCOMPAT_HARDWARE_CONCURRENCY, true,
+        top_level_page_url_, nullptr);
   }
 
  private:

browser/farbling/brave_navigator_devicememory_farbling_browsertest.cc

@@ -13,6 +13,7 @@
 #include "brave/components/brave_shields/content/browser/brave_shields_util.h"
 #include "brave/components/constants/brave_paths.h"
 #include "brave/components/constants/pref_names.h"
+#include "brave/components/webcompat/core/common/features.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
@@ -35,7 +36,10 @@ const char kDeviceMemoryScript[] = "navigator.deviceMemory * 1024";
 class BraveDeviceMemoryFarblingBrowserTest : public InProcessBrowserTest {
  public:
   BraveDeviceMemoryFarblingBrowserTest()
-      : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {}
+      : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {
+    scoped_feature_list_.InitAndEnableFeature(
+        webcompat::features::kBraveWebcompatExceptionsService);
+  }
 
   BraveDeviceMemoryFarblingBrowserTest(
       const BraveDeviceMemoryFarblingBrowserTest&) = delete;
@@ -83,6 +87,9 @@ class BraveDeviceMemoryFarblingBrowserTest : public InProcessBrowserTest {
   content::WebContents* contents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 // Tests results of farbling known values
@@ -123,15 +130,15 @@ IN_PROC_BROWSER_TEST_F(BraveDeviceMemoryFarblingBrowserTest,
 
   // Farbling level: default, but webcompat exception enabled
   SetFingerprintingDefault(domain1);
-  brave_shields::SetWebcompatFeatureSetting(
+  brave_shields::SetWebcompatEnabled(
       content_settings(), ContentSettingsType::BRAVE_WEBCOMPAT_DEVICE_MEMORY,
-      ControlType::ALLOW, url1, nullptr);
+      true, url1, nullptr);
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url1));
   EXPECT_EQ(true_value, EvalJs(contents(), kDeviceMemoryScript));
   SetFingerprintingDefault(domain2);
-  brave_shields::SetWebcompatFeatureSetting(
+  brave_shields::SetWebcompatEnabled(
       content_settings(), ContentSettingsType::BRAVE_WEBCOMPAT_DEVICE_MEMORY,
-      ControlType::ALLOW, url2, nullptr);
+      true, url2, nullptr);
   ASSERT_TRUE(ui_test_utils::NavigateToURL(browser(), url2));
   EXPECT_EQ(true_value, EvalJs(contents(), kDeviceMemoryScript));
 }

browser/farbling/brave_navigator_hardwareconcurrency_farbling_browsertest.cc

@@ -73,10 +73,10 @@ class BraveNavigatorHardwareConcurrencyFarblingBrowserTest
   }
 
   void EnableWebcompatException() {
-    brave_shields::SetWebcompatFeatureSetting(
+    brave_shields::SetWebcompatEnabled(
         content_settings(),
-        ContentSettingsType::BRAVE_WEBCOMPAT_HARDWARE_CONCURRENCY,
-        ControlType::ALLOW, top_level_page_url_, nullptr);
+        ContentSettingsType::BRAVE_WEBCOMPAT_HARDWARE_CONCURRENCY, true,
+        top_level_page_url_, nullptr);
   }
 
   content::WebContents* contents() {

browser/farbling/brave_navigator_keyboard_api_browsertest.cc

@@ -81,10 +81,10 @@ class BraveNavigatorKeyboardAPIBrowserTest : public InProcessBrowserTest {
   }
 
   void EnableWebcompatException() {
-    brave_shields::SetWebcompatFeatureSetting(
+    brave_shields::SetWebcompatEnabled(
         content_settings(),
-        ContentSettingsType::BRAVE_WEBCOMPAT_HARDWARE_CONCURRENCY,
-        ControlType::ALLOW, top_level_page_url_, nullptr);
+        ContentSettingsType::BRAVE_WEBCOMPAT_HARDWARE_CONCURRENCY, true,
+        top_level_page_url_, nullptr);
   }
 
  private: