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

code review: stricter interpretation of `^`

This commit is contained in:
gorhill 2015-12-05 12:25:18 -05:00
parent 94e4a95f9b
commit a3c8e6b37e
2 changed files with 89 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/js/logger-ui.js
View File

@ -283,8 +283,9 @@ var filterDecompiler = (function() {
return filter;
};
var reEscape = /[.+?^${}()|[\]\\]/g;
var reEscape = /[.+?${}()|[\]\\]/g;
var reWildcards = /\*+/g;
var reSeparator = /\^/g;
var toRegex = function(compiled) {
var vfields = compiled.split('\v');
@ -302,6 +303,10 @@ var filterDecompiler = (function() {
case '0ah':
case '1a':
case '1ah':
case '|a':
case '|ah':
case 'a|':
case 'a|h':
case '_':
case '_h':
case '||a':
@ -309,20 +314,9 @@ var filterDecompiler = (function() {
case '||_':
case '||_h':
reStr = tfields[0]
.replace(reEscape, '\\$&')
.replace(reWildcards, '.*');
break;
case '|a':
case '|ah':
reStr = '^' + tfields[0].
replace(reEscape, '\\$&')
.replace(reWildcards, '.*');
break;
case 'a|':
case 'a|h':
reStr = tfields[0]
.replace(reEscape, '\\$&')
.replace(reWildcards, '.*') + '$';
.replace(reEscape, '\\$&')
.replace(reWildcards, '.*')
.replace(reSeparator, '[^%.0-9a-z_-]');
break;
case '//':
case '//h':
@ -332,6 +326,14 @@ var filterDecompiler = (function() {
break;
}
// Anchored?
var s = fid.slice(0, 2);
if ( s === '|a' ) {
reStr = '^' + reStr;
} else if ( s === 'a|' ) {
reStr += '$';
}
if ( reStr === undefined) {
return null;
}

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

@ -208,7 +208,8 @@ var strToRegex = function(s, anchor, flags) {
// https://www.loggly.com/blog/five-invaluable-techniques-to-improve-regex-performance/
// https://developer.mozilla.org/en/docs/Web/JavaScript/Guide/Regular_Expressions
var reStr = s.replace(/[.+?^${}()|[\]\\]/g, '\\$&')
var reStr = s.replace(/[.+?${}()|[\]\\]/g, '\\$&')
.replace(/\^/g, '[^%.0-9a-z_-]')
.replace(/\*/g, '[^ ]*?');
if ( anchor < 0 ) {
@ -1279,71 +1280,6 @@ FilterBucket.fromSelfie = function() {
/******************************************************************************/
var getFilterClass = function(details) {
if ( details.domainOpt.length !== 0 ) {
return getHostnameBasedFilterClass(details);
}
if ( details.isRegex ) {
return FilterRegex;
}
var s = details.f;
if ( s.indexOf('*') !== -1 || details.token === '*' ) {
if ( details.hostnameAnchored ) {
return FilterGenericHnAnchored;
}
return FilterGeneric;
}
if ( details.anchor < 0 ) {
return FilterPlainLeftAnchored;
}
if ( details.anchor > 0 ) {
return FilterPlainRightAnchored;
}
if ( details.hostnameAnchored ) {
return FilterPlainHnAnchored;
}
if ( details.tokenBeg === 0 ) {
return FilterPlainPrefix0;
}
if ( details.tokenBeg === 1 ) {
return FilterPlainPrefix1;
}
return FilterPlain;
};
/******************************************************************************/
var getHostnameBasedFilterClass = function(details) {
if ( details.isRegex ) {
return FilterRegexHostname;
}
var s = details.f;
if ( s.indexOf('*') !== -1 || details.token === '*' ) {
if ( details.hostnameAnchored ) {
return FilterGenericHnAnchoredHostname;
}
return FilterGenericHostname;
}
if ( details.anchor < 0 ) {
return FilterPlainLeftAnchoredHostname;
}
if ( details.anchor > 0 ) {
return FilterPlainRightAnchoredHostname;
}
if ( details.hostnameAnchored ) {
return FilterPlainHnAnchoredHostname;
}
if ( details.tokenBeg === 0 ) {
return FilterPlainPrefix0Hostname;
}
if ( details.tokenBeg === 1 ) {
return FilterPlainPrefix1Hostname;
}
return FilterPlainHostname;
};
/******************************************************************************/
// Trim leading/trailing char "c"
var trimChar = function(s, c) {
@ -1622,10 +1558,15 @@ FilterParser.prototype.parse = function(raw) {
// TODO: transforming `^` into `*` is not a strict interpretation of
// ABP syntax.
if ( this.reHasWildcard.test(s) ) {
s = s.replace(/^\*+([^%0-9a-z])/, '$1') // remove pointless leading *
.replace(/([^%0-9a-z])\*+$/, '$1'); // remove pointless trailing *
// remove pointless leading *
if ( s.charAt(0) === '*' ) {
s = s.replace(/^\*+([^%0-9a-z])/, '$1');
}
// remove pointless trailing *
if ( s.slice(-1) === '*' ) {
s = s.replace(/([^%0-9a-z])\*+$/, '$1');
}
s = trimChar(s, '^');
s = s.replace(/\^/g, '*').replace(/\*\*+/g, '*');
}
// nothing left?
@ -1731,6 +1672,7 @@ var TokenEntry = function() {
var FilterContainer = function() {
this.reAnyToken = /[%0-9a-z]+/g;
this.reIsGeneric = /[\^\*]/;
this.tokens = [];
this.filterParser = new FilterParser();
this.reset();
@ -1899,6 +1841,66 @@ FilterContainer.prototype.fromSelfie = function(selfie) {
/******************************************************************************/
FilterContainer.prototype.getFilterClass = function(details) {
var s = details.f;
if ( details.domainOpt.length !== 0 ) {
if ( details.isRegex ) {
return FilterRegexHostname;
}
if ( this.reIsGeneric.test(s) ) {
if ( details.hostnameAnchored ) {
return FilterGenericHnAnchoredHostname;
}
return FilterGenericHostname;
}
if ( details.anchor < 0 ) {
return FilterPlainLeftAnchoredHostname;
}
if ( details.anchor > 0 ) {
return FilterPlainRightAnchoredHostname;
}
if ( details.hostnameAnchored ) {
return FilterPlainHnAnchoredHostname;
}
if ( details.tokenBeg === 0 ) {
return FilterPlainPrefix0Hostname;
}
if ( details.tokenBeg === 1 ) {
return FilterPlainPrefix1Hostname;
}
return FilterPlainHostname;
}
if ( details.isRegex ) {
return FilterRegex;
}
if ( this.reIsGeneric.test(s) ) {
if ( details.hostnameAnchored ) {
return FilterGenericHnAnchored;
}
return FilterGeneric;
}
if ( details.anchor < 0 ) {
return FilterPlainLeftAnchored;
}
if ( details.anchor > 0 ) {
return FilterPlainRightAnchored;
}
if ( details.hostnameAnchored ) {
return FilterPlainHnAnchored;
}
if ( details.tokenBeg === 0 ) {
return FilterPlainPrefix0;
}
if ( details.tokenBeg === 1 ) {
return FilterPlainPrefix1;
}
return FilterPlain;
};
/******************************************************************************/
FilterContainer.prototype.compile = function(raw, out) {
// ORDER OF TESTS IS IMPORTANT!
@ -1993,7 +1995,7 @@ FilterContainer.prototype.compileFilter = function(parsed, out) {
party = parsed.firstParty ? FirstParty : ThirdParty;
}
var filterClass = getFilterClass(parsed);
var filterClass = this.getFilterClass(parsed);
if ( filterClass === null ) {
return false;
}