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

Side by Side Diff: lib/abp2blocklist.js

Issue 29349989: Issue 4327 - Prevent generic document blocking (Closed)
Patch Set: Rebased. Created Aug. 22, 2016, 4:31 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 | test/abp2blocklist.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2016 Eyeo GmbH 3 * Copyright (C) 2006-2016 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 269
270 let included = []; 270 let included = [];
271 let excluded = []; 271 let excluded = [];
272 272
273 parseDomains(filter.domains, included, excluded); 273 parseDomains(filter.domains, included, excluded);
274 274
275 if (withResourceTypes) 275 if (withResourceTypes)
276 { 276 {
277 trigger["resource-type"] = getResourceTypes(filter); 277 trigger["resource-type"] = getResourceTypes(filter);
278 278
279 // Content Blocking rules can't differentiate between sub-document
280 // requests (iframes) and top-level document requests (redirects). So to
281 // avoid too many false-positives we stop generic rules (no hostname part)
282 // from blocking document requests.
283 if (action == "block" && !parsed.hostname)
284 {
285 let documentIndex = trigger["resource-type"].indexOf("document");
286 if (documentIndex > -1)
287 trigger["resource-type"].splice(documentIndex, 1);
288 }
289
279 if (trigger["resource-type"].length == 0) 290 if (trigger["resource-type"].length == 0)
280 return; 291 return;
281 } 292 }
282 293
283 if (filter.thirdParty != null) 294 if (filter.thirdParty != null)
284 trigger["load-type"] = [filter.thirdParty ? "third-party" : "first-party"]; 295 trigger["load-type"] = [filter.thirdParty ? "third-party" : "first-party"];
285 296
286 if (included.length > 0) 297 if (included.length > 0)
287 trigger["if-domain"] = addDomainPrefix(included); 298 trigger["if-domain"] = addDomainPrefix(included);
288 else if (excluded.length > 0) 299 else if (excluded.length > 0)
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 478
468 for (let filter of this.elemhideExceptions) 479 for (let filter of this.elemhideExceptions)
469 convertFilterAddRules(rules, filter, "ignore-previous-rules", false); 480 convertFilterAddRules(rules, filter, "ignore-previous-rules", false);
470 for (let filter of this.requestFilters) 481 for (let filter of this.requestFilters)
471 convertFilterAddRules(rules, filter, "block", true); 482 convertFilterAddRules(rules, filter, "block", true);
472 for (let filter of this.requestExceptions) 483 for (let filter of this.requestExceptions)
473 convertFilterAddRules(rules, filter, "ignore-previous-rules", true); 484 convertFilterAddRules(rules, filter, "ignore-previous-rules", true);
474 485
475 return rules.filter(rule => !hasNonASCI(rule)); 486 return rules.filter(rule => !hasNonASCI(rule));
476 }; 487 };
OLDNEW
« no previous file with comments | « no previous file | test/abp2blocklist.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld