external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-13 10:17:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix handling of non-punycodable Unicode characters

Browse source 
Related feedback:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1118#issuecomment-650730158
This commit is contained in:
Raymond Hill 2020-06-28 08:28:29 -04:00
parent 13ded677f6
commit c6397e3d30
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/js/static-filtering-parser.js
View file

@ -628,7 +628,12 @@ const Parser = class {
catch (ex) { catch (ex) {
this.markSpan(this.patternSpan, BITError); this.markSpan(this.patternSpan, BITError);
} }
} else if ( this.patternIsDubious() ) { } else if (
this.patternIsDubious() || (
this.patternHasUnicode() &&
this.toPunycode(true) === false
)
) {
this.markSpan(this.patternSpan, BITError); this.markSpan(this.patternSpan, BITError);
} }
this.netOptionsIterator.init(); this.netOptionsIterator.init();
@ -1040,19 +1045,24 @@ const Parser = class {
return this.raw; return this.raw;
} }
toPunycode() { // https://github.com/uBlockOrigin/uBlock-issues/issues/1118#issuecomment-650730158
// Be ready to deal with non-punycode-able Unicode characters.
toPunycode(dryrun = false) {
if ( this.patternHasUnicode() === false ) { return true; } if ( this.patternHasUnicode() === false ) { return true; }
const { i, len } = this.patternSpan; const { i, len } = this.patternSpan;
if ( len === 0 ) { return true; } if ( len === 0 ) { return true; }
let pattern = this.getNetPattern(); let pattern = this.getNetPattern();
const match = this.reHostname.exec(this.pattern); const match = this.reHostname.exec(this.pattern);
if ( match === null ) { return; } if ( match === null ) { return true; }
try { try {
this.punycoder.hostname = match[0].replace(/\*/g, '__asterisk__'); this.punycoder.hostname = match[0].replace(/\*/g, '__asterisk__');
} catch(ex) { } catch(ex) {
return false; return false;
} }
const punycoded = this.punycoder.hostname.replace(/__asterisk__/g, '*'); const hn = this.punycoder.hostname;
if ( hn === '' ) { return false; }
if ( dryrun ) { return true; }
const punycoded = hn.replace(/__asterisk__/g, '*');
pattern = punycoded + this.pattern.slice(match.index + match[0].length); pattern = punycoded + this.pattern.slice(match.index + match[0].length);
const beg = this.slices[i+1]; const beg = this.slices[i+1];
const end = this.slices[i+len+1]; const end = this.slices[i+len+1];