Skip to content

Don't block fingerprinting in extension pages #15931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2022
Merged

Don't block fingerprinting in extension pages #15931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 39 additions & 6 deletions browser/farbling/brave_screen_farbling_browsertest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@

#include <algorithm>

#include "base/files/file_path.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/test/scoped_feature_list.h"
#include "brave/browser/brave_content_browser_client.h"
#include "brave/components/brave_shields/browser/brave_shields_util.h"
#include "brave/components/constants/brave_paths.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/chrome_test_extension_loader.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/common/chrome_content_client.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/test/browser_test.h"
#include "net/dns/mock_host_resolver.h"
Expand Down Expand Up @@ -62,6 +65,14 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
content_client_.reset();
}

std::string LoadExtension(const base::FilePath& path) {
extensions::ChromeTestExtensionLoader loader(browser()->profile());
scoped_refptr<const extensions::Extension> extension =
loader.LoadExtension(path);
EXPECT_TRUE(extension);
return extension->id();
}

HostContentSettingsMap* ContentSettings() {
return HostContentSettingsMapFactory::GetForProfile(browser()->profile());
}
Expand Down Expand Up @@ -99,13 +110,13 @@ class BraveScreenFarblingBrowserTest : public InProcessBrowserTest {
return browser()->window()->GetBounds();
}

void FarbleScreenSize() {
void FarbleScreenSize(const GURL& url, bool content_scheme) {
for (int j = 0; j < static_cast<int>(std::size(kTestWindowBounds)); ++j) {
SetBounds(kTestWindowBounds[j]);
for (bool allow_fingerprinting : {false, true}) {
SetFingerprintingSetting(allow_fingerprinting);
NavigateToURLUntilLoadStop(FarblingUrl());
if (!allow_fingerprinting && !IsFlagDisabled()) {
NavigateToURLUntilLoadStop(url);
if (!allow_fingerprinting && !IsFlagDisabled() && content_scheme) {
EXPECT_GE(
8, EvalJs(Contents(), "window.outerWidth - window.innerWidth"));
EXPECT_GE(
Expand Down Expand Up @@ -274,12 +285,12 @@ class BraveScreenFarblingBrowserTest_DisableFlag

IN_PROC_BROWSER_TEST_F(BraveScreenFarblingBrowserTest_EnableFlag,
FarbleScreenSize_EnableFlag) {
FarbleScreenSize();
FarbleScreenSize(FarblingUrl(), true);
}

IN_PROC_BROWSER_TEST_F(BraveScreenFarblingBrowserTest_DisableFlag,
FarbleScreenSize_DisableFlag) {
FarbleScreenSize();
FarbleScreenSize(FarblingUrl(), true);
}

IN_PROC_BROWSER_TEST_F(BraveScreenFarblingBrowserTest_EnableFlag,
Expand Down Expand Up @@ -345,3 +356,25 @@ IN_PROC_BROWSER_TEST_F(BraveScreenFarblingBrowserTest_DisableFlag,
FarbleScreenPopupPosition_DisableFlag_3) {
FarbleScreenPopupPosition(3);
}

IN_PROC_BROWSER_TEST_F(BraveScreenFarblingBrowserTest_EnableFlag,
FarbleScreenSize_Schemes) {
// chrome: URI (don't farble)
FarbleScreenSize(GURL("chrome:version"), false);

// chrome-extension: URI (don't farble)
base::FilePath test_data_dir;
base::PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
std::string extension_id =
LoadExtension(test_data_dir.AppendASCII("extensions")
.AppendASCII("ui")
.AppendASCII("browser_action_popup"));
base::RunLoop().RunUntilIdle(); // Ensure the extension is fully loaded.
const GURL extension_url("chrome-extension://" + extension_id +
"/popup.html");
FarbleScreenSize(extension_url, false);

// devtools: URI (don't farble)
const GURL devtools_url("devtools://devtools/bundled/devtools_app.html");
FarbleScreenSize(devtools_url, false);
}
7 changes: 4 additions & 3 deletions third_party/blink/renderer/core/farbling/brave_session_cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "third_party/blink/renderer/platform/language.h"
#include "third_party/blink/renderer/platform/network/network_utils.h"
#include "third_party/blink/renderer/platform/supplementable.h"
#include "third_party/blink/renderer/platform/weborigin/scheme_registry.h"
#include "third_party/blink/renderer/platform/weborigin/security_origin.h"
#include "third_party/blink/renderer/platform/wtf/casting.h"
#include "third_party/blink/renderer/platform/wtf/text/string_builder.h"
Expand Down Expand Up @@ -80,10 +81,10 @@ blink::WebContentSettingsClient* GetContentSettingsClientFor(
blink::WebContentSettingsClient* settings = nullptr;
if (!context)
return settings;
// Avoid blocking fingerprinting in WebUI pages.
// Avoid blocking fingerprinting in WebUI, extensions, etc.
const String protocol = context->GetSecurityOrigin()->Protocol();
if (protocol == url::kAboutScheme || protocol == "chrome" ||
protocol == "brave") {
if (protocol == url::kAboutScheme || protocol == "chrome-extension" ||
blink::SchemeRegistry::ShouldTreatURLSchemeAsDisplayIsolated(protocol)) {
return settings;
}
if (auto* window = blink::DynamicTo<blink::LocalDOMWindow>(context)) {
Expand Down