Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: abp2blocklist.js

Issue 29336525: Issue 3584 - Work around WebKit uppercase ID matching bug (Closed)
Patch Set: Addressed nit I missed before Created Feb. 17, 2016, 3:25 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 "use strict"; 1 "use strict";
2 2
3 let readline = require("readline"); 3 let readline = require("readline");
4 let punycode = require("punycode"); 4 let punycode = require("punycode");
5 let tldjs = require("tldjs"); 5 let tldjs = require("tldjs");
6 let filterClasses = require("./adblockplus.js"); 6 let filterClasses = require("./adblockplus.js");
7 7
8 let typeMap = filterClasses.RegExpFilter.typeMap; 8 let typeMap = filterClasses.RegExpFilter.typeMap;
9 9
10 const selectorLimit = 5000; 10 const selectorLimit = 5000;
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 return true; 247 return true;
248 248
249 for (let name of Object.getOwnPropertyNames(obj)) 249 for (let name of Object.getOwnPropertyNames(obj))
250 if (hasNonASCI(obj[name])) 250 if (hasNonASCI(obj[name]))
251 return true; 251 return true;
252 } 252 }
253 253
254 return false; 254 return false;
255 } 255 }
256 256
257 function convertIDSelectorsToAttributeSelectors(selector)
258 {
259 // First we figure out where all the IDs are
260 let sep = "";
261 let start = null;
262 let positions = [];
263 for (let i = 0; i < selector.length; i++)
264 {
265 let chr = selector[i];
266
267 if (chr == "\\") // ignore escaped characters
268 i++;
269 else if (chr == sep) // don't split within quoted text
270 sep = ""; // e.g. [attr=","]
271 else if (sep == "")
272 {
273 if (chr == '"' || chr == "'")
274 sep = chr;
275 else if (start == null) // look for the start of an ID
276 {
277 if (chr == "#")
278 start = i;
279 }
280 else if (chr != "-" && chr != "_" &&
281 (chr < "0" ||
282 chr > "9" && chr < "A" ||
283 chr > "Z" && chr < "a" ||
284 chr > "z" && chr < "\x80")) // look for the end of the ID
285 {
286 positions.push({start: start, end: i});
287 start = null;
288 }
289 }
290 }
291 if (start != null)
292 positions.push({start: start, end: selector.length});
293
294 // Now replace them all with the [id="someID"] form
295 let newSelector = "";
296 let position = 0;
297 for (let ID of positions)
298 {
299 newSelector += selector.substring(position, ID.start);
300 newSelector += '[id=' + selector.substring(ID.start + 1, ID.end) + ']';
301 position = ID.end;
302 }
303 newSelector += selector.substring(position);
304
305 return newSelector;
306 }
307
257 function logRules() 308 function logRules()
258 { 309 {
259 let rules = []; 310 let rules = [];
260 311
261 function addRule(rule) 312 function addRule(rule)
262 { 313 {
263 if (!hasNonASCI(rule)) 314 if (!hasNonASCI(rule))
264 rules.push(rule); 315 rules.push(rule);
265 } 316 }
266 317
(...skipping 12 matching lines...) Expand all
279 let group = groupedElemhideFilters.get(matchDomain) || []; 330 let group = groupedElemhideFilters.get(matchDomain) || [];
280 group.push(result.selector); 331 group.push(result.selector);
281 groupedElemhideFilters.set(matchDomain, group); 332 groupedElemhideFilters.set(matchDomain, group);
282 } 333 }
283 } 334 }
284 335
285 groupedElemhideFilters.forEach((selectors, matchDomain) => 336 groupedElemhideFilters.forEach((selectors, matchDomain) =>
286 { 337 {
287 while (selectors.length) 338 while (selectors.length)
288 { 339 {
340 let selector = selectors.splice(0, selectorLimit).join(", ");
341
342 // As of Safari 9.0 element IDs are matched as lowercase. We work around
343 // this by converting to the attribute format [id="elementID"]
344 selector = convertIDSelectorsToAttributeSelectors(selector);
345
289 addRule({ 346 addRule({
290 trigger: {"url-filter": matchDomain}, 347 trigger: {"url-filter": matchDomain},
291 action: {type: "css-display-none", 348 action: {type: "css-display-none",
292 selector: selectors.splice(0, selectorLimit).join(", ")} 349 selector: selector}
293 }); 350 });
294 } 351 }
295 }); 352 });
296 353
297 for (let filter of elemhideExceptions) 354 for (let filter of elemhideExceptions)
298 addRule(convertFilter(filter, "ignore-previous-rules", false)); 355 addRule(convertFilter(filter, "ignore-previous-rules", false));
299 356
300 for (let filter of requestFilters) 357 for (let filter of requestFilters)
301 addRule(convertFilter(filter, "block", true)); 358 addRule(convertFilter(filter, "block", true));
302 for (let filter of requestExceptions) 359 for (let filter of requestExceptions)
303 addRule(convertFilter(filter, "ignore-previous-rules", true)); 360 addRule(convertFilter(filter, "ignore-previous-rules", true));
304 361
305 console.log(JSON.stringify(rules, null, "\t")); 362 console.log(JSON.stringify(rules, null, "\t"));
306 } 363 }
307 364
308 let rl = readline.createInterface({input: process.stdin, terminal: false}); 365 let rl = readline.createInterface({input: process.stdin, terminal: false});
309 rl.on("line", parseFilter); 366 rl.on("line", parseFilter);
310 rl.on("close", logRules); 367 rl.on("close", logRules);
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld