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

Side by Side Diff: lib/whitelisting.js

Issue 6346177440120832: Added abstraction for frames, to fix domain-based rules, whitelisting and ad counter on Safari (Closed)
Patch Set: Addressed another comment Created Jan. 20, 2014, 8:50 a.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 | « lib/stats.js ('k') | metadata.common » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2013 Eyeo GmbH
4 *
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
7 * published by the Free Software Foundation.
8 *
9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18 let {defaultMatcher} = require("matcher");
19 let {WhitelistFilter} = require("filterClasses");
20
21 let tabsWithKeyException = new TabMap(true);
22
23 let isWhitelisted = exports.isWhitelisted = function(url, parentUrl, type)
24 {
25 let filter = defaultMatcher.matchesAny(
26 stripFragmentFromURL(url),
27 type || "DOCUMENT",
28 extractHostFromURL(parentUrl || url),
29 false
30 );
31
32 return (filter instanceof WhitelistFilter ? filter : null);
33 };
34
35 let isFrameWhitelisted = exports.isFrameWhitelisted = function(tab, frame, type)
36 {
37 let urlsWithKeyException = tabsWithKeyException.get(tab);
38
39 for (; frame != null; frame = frame.parent)
40 {
41 if (urlsWithKeyException && stripFragmentFromURL(frame.url) in urlsWithKeyEx ception)
42 return true;
43 if (isWhitelisted(frame.url, (frame.parent || {}).url, type))
44 return true;
45 }
46
47 return false;
48 };
49
50 let verifyKeyException = function(token, url, docDomain)
51 {
52 let match = token.match(/((.*?)=*)_(.*)/);
53 if (!match)
54 return false; // invalid format
55
56 let strippedKey = match[2];
57 if (!defaultMatcher.matchesByKey(url, strippedKey, docDomain))
58 return false; // unknown key
59
60 let uri = new URI(url);
61 let params = [
62 uri.path, // REQUEST_URI
63 uri.asciiHost + (uri.port != -1 ? ":" + uri.port : ""), // HTTP_HOST
64 window.navigator.userAgent // HTTP_USER_AGENT
65 ];
66
67 let key = match[1];
68 let signature = match[3];
69 return verifySignature(key, signature, params.join("\0"));
70 };
71
72 let recordKeyException = function(tab, url)
73 {
74 let urlsWithKeyException = tabsWithKeyException.get(tab);
75
76 if (!urlsWithKeyException)
77 {
78 urlsWithKeyException = {__proto__: null};
79 tabsWithKeyException.set(tab, urlsWithKeyException);
80 }
81
82 urlsWithKeyException[url] = null;
83 };
84
85 let processKeyException = exports.processKeyException = function(token, tab, fra me)
86 {
87 let url = stripFragmentFromURL(frame.url);
88 let docDomain = extractHostFromURL((frame.parent || frame).url);
89
90 if (verifyKeyException(token, url, docDomain))
91 recordKeyException(tab, url);
92 };
OLDNEW
« no previous file with comments | « lib/stats.js ('k') | metadata.common » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld