Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#2781: code review, try a bit harder to find a good token

This commit is contained in:
gorhill 2017-07-11 15:04:25 -04:00
parent f0ea2b6f9a
commit 3aed25ff2c
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/js/static-net-filtering.js
View File

@ -1801,9 +1801,10 @@ FilterParser.prototype.parse = function(raw) {
// Hostname-anchored with no wildcard always have a token index of 0.
var reHostnameToken = /^[0-9a-z]+/;
var reGoodToken = /[%0-9a-z]{2,}/g;
var reRegexToken = /^[^([{?]*?[^([{?%0-9A-Za-z]([%0-9A-Za-z]{2,})/;
var reRegexBadPrefix = /(^|\\|[^\\]\.)$/;
var reRegexBadSuffix = /^([^\\]\.|\\[dw]|[([{?*]|$)/;
var reRegexToken = /[%0-9A-Za-z]{2,}/g;
var reRegexTokenAbort = /[([{]/;
var reRegexBadPrefix = /(^|\\|[^\\]\.|\*)$/;
var reRegexBadSuffix = /^(\*|[^\\]\.|\\[dw]|[([{?*]|$)/;
var badTokens = new Set([
'com',
@ -1845,16 +1846,23 @@ FilterParser.prototype.findFirstGoodToken = function() {
};
FilterParser.prototype.extractTokenFromRegex = function() {
reRegexToken.lastIndex = 0;
var s = this.f,
matches = reRegexToken.exec(s);
if ( matches === null ) { return; }
var tokenEnd = matches[0].length,
tokenBeg = tokenEnd - matches[1].length;
if ( reRegexBadPrefix.test(s.slice(0, tokenBeg)) ) { return; }
if ( reRegexBadSuffix.test(s.slice(tokenEnd)) ) { return; }
this.token = matches[1].toLowerCase();
this.tokenHash = µb.urlTokenizer.tokenHashFromString(this.token);
this.tokenBeg = tokenBeg;
matches, prefix;
while ( (matches = reRegexToken.exec(s)) !== null ) {
prefix = s.slice(0, matches.index);
if ( reRegexTokenAbort.test(prefix) ) { return; }
if (
reRegexBadPrefix.test(prefix) ||
reRegexBadSuffix.test(s.slice(reRegexToken.lastIndex))
) {
continue;
}
this.token = matches[0].toLowerCase();
this.tokenHash = µb.urlTokenizer.tokenHashFromString(this.token);
this.tokenBeg = matches.index;
if ( badTokens.has(this.token) === false ) { break; }
}
};
/******************************************************************************/