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

fix #2781

This commit is contained in:
gorhill 2017-07-11 12:21:08 -04:00
parent ecf7960c76
commit 2862368a99
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -693,23 +693,30 @@ registerFilterClass(FilterGenericHnAndRightAnchored);
/******************************************************************************/ /******************************************************************************/
var FilterRegex = function(s) { var FilterRegex = function(s) {
this.re = new RegExp(s, 'i'); this.re = s;
}; };
FilterRegex.prototype.match = function(url) { FilterRegex.prototype.match = function(url) {
if ( typeof this.re === 'string' ) {
this.re = new RegExp(this.re, 'i');
}
return this.re.test(url); return this.re.test(url);
}; };
FilterRegex.prototype.logData = function() { FilterRegex.prototype.logData = function() {
var s = typeof this.re === 'string' ? this.re : this.re.source;
return { return {
raw: '/' + this.re.source + '/', raw: '/' + s + '/',
regex: this.re.source, regex: s,
compiled: this.compile() compiled: this.compile()
}; };
}; };
FilterRegex.prototype.compile = function() { FilterRegex.prototype.compile = function() {
return [ this.fid, this.re.source ]; return [
this.fid,
typeof this.re === 'string' ? this.re : this.re.source
];
}; };
FilterRegex.compile = function(details) { FilterRegex.compile = function(details) {
@ -1794,6 +1801,7 @@ FilterParser.prototype.parse = function(raw) {
// Hostname-anchored with no wildcard always have a token index of 0. // Hostname-anchored with no wildcard always have a token index of 0.
var reHostnameToken = /^[0-9a-z]+/; var reHostnameToken = /^[0-9a-z]+/;
var reGoodToken = /[%0-9a-z]{2,}/g; var reGoodToken = /[%0-9a-z]{2,}/g;
var reRegexToken = /^[^([{?]*?([%0-9a-z]{2,})/;
var badTokens = new Set([ var badTokens = new Set([
'com', 'com',
@ -1835,12 +1843,31 @@ var findFirstGoodToken = function(s) {
/******************************************************************************/ /******************************************************************************/
FilterParser.prototype.makeToken = function() { // https://github.com/chrisaljoudi/uBlock/issues/1038
// https://github.com/chrisaljoudi/uBlock/issues/1038 // Single asterisk will match any URL.
// Single asterisk will match any URL.
if ( this.isRegex || this.f === '*' ) { return; }
var matches = null; // https://github.com/gorhill/uBlock/issues/2781
// For efficiency purpose, try to extract a token from a regex-based filter.
FilterParser.prototype.makeToken = function() {
var matches;
if ( this.isRegex ) {
matches = reRegexToken.exec(this.f);
if (
matches !== null &&
this.f.charAt(matches[0].length - matches[1].length - 1) !== '\\'
) {
this.token = matches[1];
this.tokenHash = µb.urlTokenizer.tokenHashFromString(this.token);
this.tokenBeg = matches[0].length - matches[1].length;
}
return;
}
if ( this.f === '*' ) { return; }
matches = null;
if ( (this.anchor & 0x4) !== 0 && this.f.indexOf('*') === -1 ) { if ( (this.anchor & 0x4) !== 0 && this.f.indexOf('*') === -1 ) {
matches = reHostnameToken.exec(this.f); matches = reHostnameToken.exec(this.f);
} }