Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-08 12:57:57 +02:00
Code Issues Releases Wiki Activity

code review re #2132

Browse Source
This commit is contained in:
gorhill 2016-11-09 09:47:44 -05:00
parent e046a967c2
commit 54508db9c4
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/js/cosmetic-filtering.js
View File

@ -1404,8 +1404,6 @@ FilterContainer.prototype.retrieveUserScripts = function(domain, hostname) {
return out.join('\n');
};
/******************************************************************************/
FilterContainer.prototype._lookupUserScript = function(dict, raw, reng, out) {
if ( dict.has(raw) ) { return; }
var token, args,
@ -1419,26 +1417,32 @@ FilterContainer.prototype._lookupUserScript = function(dict, raw, reng, out) {
var content = reng.resourceContentFromName(token, 'application/javascript');
if ( !content ) { return; }
if ( args ) {
var i = 1, arg;
while ( args !== '' ) {
pos = args.indexOf(',');
if ( pos === -1 ) { pos = args.length; }
arg = args.slice(0, pos).trim();
// Abort on invalid arguments.
if ( reArgValidator.test(arg) === false ) {
return;
}
content = content.replace('{{' + i + '}}', arg);
args = args.slice(pos + 1).trim();
i++;
}
content = this._fillupUserScript(content, args);
if ( !content ) { return; }
}
dict.set(raw, out.length);
out.push(content);
};
// Only accept plain word characters for now.
var reArgValidator = /^[\w\.]*$/;
// Fill template placeholders. Return falsy if:
// - At least one argument contains anything else than /\w/ and `.`
FilterContainer.prototype._fillupUserScript = function(content, args) {
var i = 1,
pos, arg;
while ( args !== '' ) {
pos = args.indexOf(',');
if ( pos === -1 ) { pos = args.length; }
arg = args.slice(0, pos).trim();
if ( this._reUserScriptBadArg.test(arg) ) { return; }
content = content.replace('{{' + i + '}}', arg);
args = args.slice(pos + 1).trim();
i++;
}
return content;
};
FilterContainer.prototype._reUserScriptBadArg = /[^\w\.]/;
/******************************************************************************/