From 910899c960a32c4fcb5b8b4bfdd5529258f78e9b Mon Sep 17 00:00:00 2001 From: Anton Lazarev Date: Fri, 9 Jul 2021 14:18:17 -0700 Subject: [PATCH] remove legacy cosmetic filter migration code --- browser/extensions/api/brave_shields_api.cc | 16 ---------- browser/extensions/api/brave_shields_api.h | 12 -------- common/extensions/api/brave_shields.json | 29 ------------------ .../background/api/cosmeticFilterAPI.ts | 27 ----------------- .../ad_block_custom_filters_service.cc | 30 ------------------- .../browser/ad_block_custom_filters_service.h | 2 -- components/definitions/chromel.d.ts | 1 - 7 files changed, 117 deletions(-) diff --git a/browser/extensions/api/brave_shields_api.cc b/browser/extensions/api/brave_shields_api.cc index c2979f5687f..1fb86f13668 100644 --- a/browser/extensions/api/brave_shields_api.cc +++ b/browser/extensions/api/brave_shields_api.cc @@ -131,22 +131,6 @@ void BraveShieldsHiddenClassIdSelectorsFunction::GetHiddenClassIdSelectorsOnUI( Respond(ArgumentList(std::move(selectors))); } -ExtensionFunction::ResponseAction -BraveShieldsMigrateLegacyCosmeticFiltersFunction::Run() { - std::unique_ptr params( - brave_shields::MigrateLegacyCosmeticFilters::Params::Create(*args_)); - EXTENSION_FUNCTION_VALIDATE(params.get()); - - const bool success = - g_brave_browser_process->ad_block_custom_filters_service() - ->MigrateLegacyCosmeticFilters( - params->legacy_filters.additional_properties); - - auto callback_args = std::make_unique(); - callback_args->Append(base::Value(success)); - return RespondNow(ArgumentList(std::move(callback_args))); -} - ExtensionFunction::ResponseAction BraveShieldsAddSiteCosmeticFilterFunction::Run() { std::unique_ptr params( diff --git a/browser/extensions/api/brave_shields_api.h b/browser/extensions/api/brave_shields_api.h index 2c105a13ba1..e833527194c 100644 --- a/browser/extensions/api/brave_shields_api.h +++ b/browser/extensions/api/brave_shields_api.h @@ -48,18 +48,6 @@ class BraveShieldsHiddenClassIdSelectorsFunction : public ExtensionFunction { std::unique_ptr selectors); }; -class BraveShieldsMigrateLegacyCosmeticFiltersFunction - : public ExtensionFunction { - public: - DECLARE_EXTENSION_FUNCTION("braveShields.migrateLegacyCosmeticFilters", - UNKNOWN) - - protected: - ~BraveShieldsMigrateLegacyCosmeticFiltersFunction() override {} - - ResponseAction Run() override; -}; - class BraveShieldsAddSiteCosmeticFilterFunction : public ExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("braveShields.addSiteCosmeticFilter", UNKNOWN) diff --git a/common/extensions/api/brave_shields.json b/common/extensions/api/brave_shields.json index a25710b546d..0d3af73864a 100644 --- a/common/extensions/api/brave_shields.json +++ b/common/extensions/api/brave_shields.json @@ -140,35 +140,6 @@ } ] }, - { - "name": "migrateLegacyCosmeticFilters", - "type": "function", - "description": "Appends the provided legacy cosmetic filters to the custom filters of brave://adblock", - "parameters": [ - { - "name": "legacyFilters", - "type": "object", - "description": "Mapping from hostnames with stored legacy cosmetic filter rules to the corresponding lists of rules", - "additionalProperties": { - "type": "array", - "items": { - "type": "string" - } - } - }, - { - "type": "function", - "name": "callback", - "description": "Returns true if the filters were successfully stored, signifying that the old filters should be removed", - "parameters": [ - { - "name": "success", - "type": "boolean" - } - ] - } - ] - }, { "name": "addSiteCosmeticFilter", "type": "function", diff --git a/components/brave_extension/extension/brave_extension/background/api/cosmeticFilterAPI.ts b/components/brave_extension/extension/brave_extension/background/api/cosmeticFilterAPI.ts index 19a395b0760..abf3e6d5b2a 100644 --- a/components/brave_extension/extension/brave_extension/background/api/cosmeticFilterAPI.ts +++ b/components/brave_extension/extension/brave_extension/background/api/cosmeticFilterAPI.ts @@ -71,29 +71,6 @@ export const applyAdblockCosmeticFilters = (tabId: number, frameId: number, url: }) } -// A very early implementation of cosmetic filtering used extension-local -// storage to store CSS selectors of elements to apply hide rules to on a -// per-site basis. -// -// If any of these legacy cosmetic filters are still present, this function -// will migrate them to share the adblock-rust infrastructure used by the -// custom filters engine from brave://adblock. -const tryMigratingLegacyCosmeticFilters = () => { - chrome.storage.local.get('cosmeticFilterList', (storeData = {}) => { - if (storeData.cosmeticFilterList !== undefined) { - const cosmeticFilterList = storeData.cosmeticFilterList - console.error(JSON.stringify(cosmeticFilterList)) - chrome.braveShields.migrateLegacyCosmeticFilters(cosmeticFilterList, (success) => { - if (success) { - chrome.storage.local.remove('cosmeticFilterList') - } else { - console.error('Legacy cosmetic filter migration failed!') - } - }) - } - }) -} - export const addSiteCosmeticFilter = (host: string, cssSelector: string) => { chrome.braveShields.addSiteCosmeticFilter(host, cssSelector) } @@ -101,7 +78,3 @@ export const addSiteCosmeticFilter = (host: string, cssSelector: string) => { export const openFilterManagementPage = () => { chrome.braveShields.openFilterManagementPage() } - -// Attempt to run the legacy filters migration during brave_extension -// initialization. -tryMigratingLegacyCosmeticFilters() diff --git a/components/brave_shields/browser/ad_block_custom_filters_service.cc b/components/brave_shields/browser/ad_block_custom_filters_service.cc index 510588a3157..ac8b7f80a45 100644 --- a/components/brave_shields/browser/ad_block_custom_filters_service.cc +++ b/components/brave_shields/browser/ad_block_custom_filters_service.cc @@ -51,36 +51,6 @@ bool AdBlockCustomFiltersService::UpdateCustomFilters( return true; } -bool AdBlockCustomFiltersService::MigrateLegacyCosmeticFilters( - const std::map> legacyFilters) { - DCHECK_CURRENTLY_ON(content::BrowserThread::UI); - PrefService* local_state = delegate()->local_state(); - if (!local_state) - return false; - std::string filters_update = - local_state->GetString(prefs::kAdBlockCustomFilters); - - filters_update += - "\n\n! Filters migrated from " - "'Right click > Brave > Block element via selector'"; - for (const auto& hostEntry : legacyFilters) { - const std::string& host = hostEntry.first; - const std::vector& hostSelectors = hostEntry.second; - - for (const auto& selector : hostSelectors) { - if (selector.empty()) { - continue; - } - - const std::string rule = '\n' + host + "##" + selector; - - filters_update += rule; - } - } - - return UpdateCustomFilters(filters_update); -} - void AdBlockCustomFiltersService::UpdateCustomFiltersOnFileTaskRunner( const std::string& custom_filters) { DCHECK(GetTaskRunner()->RunsTasksInCurrentSequence()); diff --git a/components/brave_shields/browser/ad_block_custom_filters_service.h b/components/brave_shields/browser/ad_block_custom_filters_service.h index 7d094c3a9b7..eaf8482d468 100644 --- a/components/brave_shields/browser/ad_block_custom_filters_service.h +++ b/components/brave_shields/browser/ad_block_custom_filters_service.h @@ -28,8 +28,6 @@ class AdBlockCustomFiltersService : public AdBlockBaseService { std::string GetCustomFilters(); bool UpdateCustomFilters(const std::string& custom_filters); - bool MigrateLegacyCosmeticFilters( - const std::map> legacyFilters); protected: bool Init() override; diff --git a/components/definitions/chromel.d.ts b/components/definitions/chromel.d.ts index 27de1eb8076..53b0a9ad909 100644 --- a/components/definitions/chromel.d.ts +++ b/components/definitions/chromel.d.ts @@ -334,7 +334,6 @@ declare namespace chrome.braveShields { } const urlCosmeticResources: (url: string, callback: (resources: UrlSpecificResources) => void) => void const hiddenClassIdSelectors: (classes: string[], ids: string[], exceptions: string[], callback: (selectors: string[], forceHideSelectors: string[]) => void) => void - const migrateLegacyCosmeticFilters: (legacyFilters: any, callback: (success: boolean) => void) => void const addSiteCosmeticFilter: (origin: string, cssSelector: string) => void const openFilterManagementPage: () => void