Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-05 11:37:01 +02:00
Code Issues Releases Wiki Activity

Don't match network filter-derived regexes against non-network URIs

Browse Source 
Context: element picker

Related issue:
https://github.com/uBlockOrigin/uBlock-issues/issues/3142
This commit is contained in:
Raymond Hill 2024-02-26 16:08:12 -05:00
parent f7e00e4223
commit 2262a129ec
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/js/scriptlets/epicker.js
View File

@ -619,6 +619,21 @@ const filterToDOMInterface = (( ) => {
const reCaret = '(?:[^%.0-9a-z_-]|$)';
const rePseudoElements = /:(?::?after|:?before|:[a-z-]+)$/;
const matchElemToRegex = (elem, re) => {
const srcProp = netFilter1stSources[elem.localName];
let src = elem[srcProp];
if ( src instanceof SVGAnimatedString ) {
src = src.baseVal;
}
if ( typeof src === 'string' && /^https?:\/\//.test(src) ) {
if ( re.test(src) ) { return srcProp; }
}
src = elem.currentSrc;
if ( typeof src === 'string' && /^https?:\/\//.test(src) ) {
if ( re.test(src) ) { return srcProp; }
}
};
// Net filters: we need to lookup manually -- translating into a foolproof
// CSS selector is just not possible.
//
@ -672,28 +687,21 @@ const filterToDOMInterface = (( ) => {
// Lookup by tag names.
// https://github.com/uBlockOrigin/uBlock-issues/issues/2260
// Maybe get to the actual URL indirectly.
//
// https://github.com/uBlockOrigin/uBlock-issues/issues/3142
// Don't try to match against non-network URIs.
const elems = document.querySelectorAll(
Object.keys(netFilter1stSources).join()
);
for ( const elem of elems ) {
const srcProp = netFilter1stSources[elem.localName];
let src = elem[srcProp];
if ( src instanceof SVGAnimatedString ) {
src = src.baseVal;
}
if (
typeof src === 'string' &&
reFilter.test(src) ||
typeof elem.currentSrc === 'string' &&
reFilter.test(elem.currentSrc)
) {
out.push({
elem,
src: srcProp,
opt: filterTypes[elem.localName],
style: vAPI.hideStyle,
});
}
const srcProp = matchElemToRegex(elem, reFilter);
if ( srcProp === undefined ) { continue; }
out.push({
elem,
src: srcProp,
opt: filterTypes[elem.localName],
style: vAPI.hideStyle,
});
}
// Find matching background image in current set of candidate elements.