Skip to content

Add feature flag for injecting request blocking script into YouTube #24395

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

Open
cuba wants to merge 1 commit into
base: master
Choose a base branch
from
+35 −11
Open

Add feature flag for injecting request blocking script into YouTube #24395

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
5 changes: 5 additions & 0 deletions components/brave_shields/core/common/features.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ BASE_FEATURE(kBraveAdblockCookieListOptIn,
BASE_FEATURE(kBraveAdblockCosmeticFiltering,
"BraveAdblockCosmeticFiltering",
base::FEATURE_ENABLED_BY_DEFAULT);
// When disabled, the request blocking script will not be injected into YouTube
// This feature only applies to iOS applications.
BASE_FEATURE(kBraveAdblockYouTubeRequestBlockingScript,
"BraveAdblockYouTubeRequestBlockingScript",
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kBraveAdblockScriptletDebugLogs,
"BraveAdblockScriptletDebugLogs",
base::FEATURE_DISABLED_BY_DEFAULT);
Expand Down
1 change: 1 addition & 0 deletions components/brave_shields/core/common/features.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ BASE_DECLARE_FEATURE(kBraveAdblockCollapseBlockedElements);
BASE_DECLARE_FEATURE(kBraveAdblockCookieListDefault);
BASE_DECLARE_FEATURE(kBraveAdblockCookieListOptIn);
BASE_DECLARE_FEATURE(kBraveAdblockCosmeticFiltering);
BASE_DECLARE_FEATURE(kBraveAdblockYouTubeRequestBlockingScript);
BASE_DECLARE_FEATURE(kBraveAdblockCspRules);
BASE_DECLARE_FEATURE(kBraveAdblockDefault1pBlocking);
BASE_DECLARE_FEATURE(kBraveAdblockMobileNotificationsListDefault);
Expand Down
4 changes: 3 additions & 1 deletion ...e-ios/Sources/Brave/Frontend/Browser/BrowserViewController/BVC+WKNavigationDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,9 @@ extension BrowserViewController: WKNavigationDelegate {
// Add request blocking script
// This script will block certian `xhr` and `window.fetch()` requests
.requestBlocking: requestURL.isWebPage(includeDataURIs: false)
&& domainForMainFrame.isShieldExpected(.adblockAndTp, considerAllShieldsOption: true),
&& domainForMainFrame.isShieldExpected(.adblockAndTp, considerAllShieldsOption: true)
&& (FeatureList.kBraveAdblockYouTubeRequestBlockingScript.enabled
|| requestURL.baseDomain != "youtube.com"),

// The tracker protection script
// This script will track what is blocked and increase stats
Expand Down
1 change: 1 addition & 0 deletions ios/browser/api/features/features.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ OBJC_EXPORT
@property(class, nonatomic, readonly) Feature* kBraveAdblockCookieListDefault;
@property(class, nonatomic, readonly) Feature* kBraveAdblockCookieListOptIn;
@property(class, nonatomic, readonly) Feature* kBraveAdblockCosmeticFiltering;
@property(class, nonatomic, readonly) Feature* kBraveAdblockYouTubeRequestBlockingScript;
@property(class, nonatomic, readonly) Feature* kBraveAdblockCspRules;
@property(class, nonatomic, readonly) Feature* kBraveAdblockDefault1pBlocking;
@property(class, nonatomic, readonly)
Expand Down
5 changes: 5 additions & 0 deletions ios/browser/api/features/features.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ + (Feature*)kBraveAdblockCosmeticFiltering {
initWithFeature:&brave_shields::features::kBraveAdblockCosmeticFiltering];
}

+ (Feature*)kBraveAdblockYouTubeRequestBlockingScript {
return [[Feature alloc]
initWithFeature:&brave_shields::features::kBraveAdblockYouTubeRequestBlockingScript];
}

+ (Feature*)kBraveAdblockCspRules {
return [[Feature alloc]
initWithFeature:&brave_shields::features::kBraveAdblockCspRules];
Expand Down
30 changes: 20 additions & 10 deletions ios/browser/flags/about_flags.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,26 @@
kBraveWalletTransactionSimulationsFeature), \
})

#define BRAVE_SHIELDS_FEATURE_ENTRIES \
EXPAND_FEATURE_ENTRIES({ \
"brave-shred", \
"Enable Brave 'Shred' Feature", \
"Enable the Brave ‘Shred’ feature which will allow a user to " \
"easily delete all site data on demand or automatically when " \
"closing a site or terminating the application.", \
flags_ui::kOsIos, \
FEATURE_VALUE_TYPE(brave_shields::features::kBraveShredFeature), \
})
#define BRAVE_SHIELDS_FEATURE_ENTRIES \
EXPAND_FEATURE_ENTRIES( \
{ \
"brave-shred", \
"Enable Brave 'Shred' Feature", \
"Enable the Brave ‘Shred’ feature which will allow a user to " \
"easily delete all site data on demand or automatically when " \
"closing a site or terminating the application.", \
flags_ui::kOsIos, \
FEATURE_VALUE_TYPE(brave_shields::features::kBraveShredFeature), \
}, \
{ \
"brave-youtube-request-blocking-script", \
"Enable Request Blocking Script on YouTube", \
"Disabling this flag will not inject the request blocking script into youtube. " \
"Network blocking will still work though content blockers.", \
flags_ui::kOsIos, \
FEATURE_VALUE_TYPE( \
brave_shields::features::kBraveAdblockYouTubeRequestBlockingScript), \
})

#if BUILDFLAG(ENABLE_AI_CHAT)
#define BRAVE_AI_CHAT \
Expand Down