-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[mv3] Add ability to handle entity-based CSS and scriptlet injection …
…filters This commit adds the ability to inject entity-based plain CSS filters and also a set of the most commonly used entity-based scriptlet injection filters. Since the scripting API is not compatible with entity patterns, the entity-related content scripts are injected in all documents and the entity-matching is done by the content script themselves. Given this, entity-based content scripts are enabled only when working in the Complete filtering mode, there won't be any entity-based filters injected in lower modes. Also, since there is no way to reasonably have access to the Public Suffix List in the content scripts, the entity-matching algorithm is an approximation, though I expect false positives to be rare (time will tell). In the event of such false positive, simply falling back to Optimal mode will fix the issue. The following issues have been fixed at the same time: Fixed the no-filtering mode related rules having lower priority then redirect rules, i.e. redirect rules would still be applied despite disabling all filtering on a site. Fixed improper detection of changes to the generic-related CSS content script, potentially causing undue delays when for example trying to access the popup panel while working in Complete mode. The scripting MV3 can be quite slow when registering/updating large content scripts, so uBOL does its best to call the API only if really needed, but there had been a regression in the recent builds preventing uBO from properly detecting unchanged content script parameters.
- Loading branch information
Showing
15 changed files
with
1,546 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
platform/mv3/extension/js/scripting/css-specific.entity.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /******************************************************************************* | ||
| uBlock Origin - a browser extension to block requests. | ||
| Copyright (C) 2019-present Raymond Hill | ||
| This program is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
| This program is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
| You should have received a copy of the GNU General Public License | ||
| along with this program. If not, see {http://www.gnu.org/licenses/}. | ||
| Home: /~https://github.com/gorhill/uBlock | ||
| */ | ||
|
|
||
| /* jshint esversion:11 */ | ||
|
|
||
| 'use strict'; | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| // Important! | ||
| // Isolate from global scope | ||
| (function uBOL_cssSpecificEntity() { | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| // $rulesetId$ | ||
|
|
||
| const specificEntityImports = self.specificEntityImports || []; | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| const lookupSelectors = (hn, entity, out) => { | ||
| for ( const { argsList, entitiesMap } of specificEntityImports ) { | ||
| let argsIndices = entitiesMap.get(entity); | ||
| if ( argsIndices === undefined ) { continue; } | ||
| if ( typeof argsIndices === 'number' ) { argsIndices = [ argsIndices ]; } | ||
| for ( const argsIndex of argsIndices ) { | ||
| const details = argsList[argsIndex]; | ||
| if ( details.n && details.n.includes(hn) ) { continue; } | ||
| out.push(details.a); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| let hn = ''; | ||
| try { hn = document.location.hostname; } catch(ex) { } | ||
| const selectors = []; | ||
| const hnparts = hn.split('.'); | ||
| const hnpartslen = hnparts.length - 1; | ||
| for ( let i = 0; i < hnpartslen; i++ ) { | ||
| for ( let j = hnpartslen; j > i; j-- ) { | ||
| lookupSelectors( | ||
| hnparts.slice(i).join('.'), | ||
| hnparts.slice(i,j).join('.'), | ||
| selectors | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| self.specificEntityImports = undefined; | ||
|
|
||
| if ( selectors.length === 0 ) { return; } | ||
|
|
||
| try { | ||
| const sheet = new CSSStyleSheet(); | ||
| sheet.replace(`@layer{${selectors.join(',')}{display:none!important;}}`); | ||
| document.adoptedStyleSheets = [ | ||
| ...document.adoptedStyleSheets, | ||
| sheet | ||
| ]; | ||
| } catch(ex) { | ||
| } | ||
|
|
||
| /******************************************************************************/ | ||
|
|
||
| })(); | ||
|
|
||
| /******************************************************************************/ |
Oops, something went wrong.