Merge branch 'android' into supportForOtherApplications

Conflicts: canvasblocker.xpi install.rdf
2024-12-22 12:50:36 +01:00 · 2016-01-29 01:02:05 +01:00 · 2016-01-29 01:02:05 +01:00 · 4299db357c
commit 4299db357c
parent 1c7b5bad80 286952ddf5
14 changed files with 278 additions and 162 deletions
--- a/README.md
+++ b/README.md
@ -0,0 +1,15 @@
+This add-on allows users to prevent websites from using the Javascript &lt;canvas&gt; API to fingerprint them. Users can choose to block the &lt;canvas&gt; API entirely on some or all websites (which may break some websites) or just block or fake its fingerprinting-friendly readout API. More information on &lt;canvas&gt; fingerprinting can be found at http://www.browserleaks.com/canvas.
+
+The different block modes are:
+<ul>
+<li>block readout API: All websites not on the white list or black list can use the &lt;canvas&gt; API to display something on the page, but the readout API is not allowed to return values to the website.</li>
+<li>fake readout API: Canvas Blocker's default setting, and my favorite! All websites not on the white list or black list can use the &lt;canvas&gt; API to display something on the page, but the readout API is forced to return a new random value each time it is called.</li>
+<li>ask for readout API permission: All websites not on the white list or black list can use the &lt;canvas&gt; API to display something on the page, but the user will be asked if the website should be allowed to use the readout API each time it is called.</li>
+<li>block everything: Ignore all lists and block the &lt;canvas&gt; API on all websites.</li>
+<li>allow only white list: Only websites in the white list are allowed to use the &lt;canvas&gt; API.</li>
+<li>ask for permission: If a website is not listed on the white list or black list, the user will be asked if the website should be allowed to use the &lt;canvas&gt; API each time it is called.</li>
+<li>block only black list: Block the &lt;canvas&gt; API only for websites on the black list.</li>
+<li>allow everything: Ignore all lists and allow the &lt;canvas&gt; API on all websites.</li>
+</ul>
+
+At present, only my domain (kkapsner.de) is whitelisted by default.
--- a/canvasblocker.xpi
+++ b/canvasblocker.xpi
--- a/data/options.css
+++ b/data/options.css
@ -14,3 +14,7 @@ setting[pref-name="showCompleteCallingStack"]{
 	border-top: 0px transparent none;
 	padding-bottom: 0.5em;
 }
+setting[pref-name="stackList"]{
+	border-top: 0px transparent none;
+	padding-bottom: 0.5em;
+}
--- a/install.rdf
+++ b/install.rdf
@ -1,19 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. --><RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+<?xml version="1.0" encoding="utf-8"?>
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 	<Description about="urn:mozilla:install-manifest">
 		<em:id>CanvasBlocker@kkapsner.de</em:id>
-		<em:version>0.2.0-Development</em:version>
 		<em:type>2</em:type>
 		<em:bootstrap>true</em:bootstrap>
 		<em:unpack>false</em:unpack>
+		<em:version>0.2.3-Development</em:version>
+		<em:name>CanvasBlocker</em:name>
+		<em:description>Changes the JS-API for modifying &lt;canvas&gt; to prevent Canvas-Fingerprinting.</em:description>
+		<em:creator>Korbinian Kapsner</em:creator>
+		<em:homepageURL>https://github.com/kkapsner/CanvasBlocker/</em:homepageURL>
+		<em:optionsURL>data:text/xml,&lt;placeholder/&gt;</em:optionsURL>
+		<em:optionsType>2</em:optionsType>

 		<!-- Firefox -->
 		<em:targetApplication>
 			<Description>
 				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-				<em:minVersion>38.0</em:minVersion>
-				<em:maxVersion>40.*</em:maxVersion>
+				<em:minVersion>40.0</em:minVersion>
+				<em:maxVersion>46.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 		
@ -39,18 +44,9 @@
 		<em:targetApplication>
 			<Description>
 				<em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id>
-				<em:minVersion>26.0</em:minVersion>
-				<em:maxVersion>30.0a1</em:maxVersion>
+				<em:minVersion>40.0</em:minVersion>
+				<em:maxVersion>46.*</em:maxVersion>
 			</Description>
 		</em:targetApplication>
-
-
-		<!-- Front End MetaData -->
-		<em:name>CanvasBlocker</em:name>
-		<em:description>Changes the JS-API for modifying &lt;canvas&gt; to prevent Canvas-Fingerprinting.</em:description>
-		<em:creator>Korbinian Kapsner</em:creator>
-		<em:homepageURL>https://github.com/kkapsner/CanvasBlocker/</em:homepageURL>
-		<em:optionsType>2</em:optionsType>
-		
 	</Description>
 </RDF>
--- a/lib/lists.js
+++ b/lib/lists.js
@ -51,7 +51,7 @@ function getDomainRegExpList(domainList){

 var lists = {
 	white: [],
-	ignore: [],
+	"ignore": [],
 	black: []
 };

@ -69,6 +69,32 @@ Object.keys(lists).forEach(function(type){
 	updateList(type);
 });

+function updateStackList(){
+	try {
+		var data = JSON.parse(prefs.stackList);
+		if (!Array.isArray(data)){
+			data = [data];
+		}
+		var list = data.filter(function(entry){
+			return typeof entry === "object" && typeof entry.url === "string";
+		});
+	}
+	catch(e){
+		var list = [];
+	}
+	list.match = function(stack){
+		return this.some(function(stackRule){
+			return stack.match(stackRule);
+		});
+	};
+	lists.stack = list;
+}
+lists.stack = [];
+preferences.on("stackList", function(){
+	updateStackList();
+});
+updateStackList();
+
 exports.get = function getList(type){
 	"use strict";
 	
@ -78,7 +104,7 @@ exports.appendTo = function appendToList(type, entry){
 	"use strict";
 	
 	prefs[type + "List"] += (prefs[type + "List"]? ",": "") + entry;
-	prefService.set("extensions.CanvasBlocker@kkapsner.de.whiteList", prefs[type + "List"]);
+	prefService.set("extensions.CanvasBlocker@kkapsner.de." + type + "List", prefs[type + "List"]);
 	updateList(type);
 };
 exports.update = updateList;
--- a/lib/main.js
+++ b/lib/main.js
@ -18,8 +18,8 @@
 	const preferences = require("sdk/simple-prefs");
 	const prefs = preferences.prefs;
 	
-	function checkURL(url){
-		var match = sharedFunctions.checkURL(url, prefs.blockMode).match(/^(block|allow|fake|ask)(|Readout|Everything|Context)$/);
+	function check(callingStack, url){
+		var match = sharedFunctions.check(callingStack, url, prefs.blockMode).match(/^(block|allow|fake|ask)(|Readout|Everything|Context)$/);
 		if (match){
 			return {
 				type: (match[2] === "Everything" || match[2] === "")?
@ -53,17 +53,17 @@
 					enumerable: true,
 					configureable: false,
 					get: function(){
-						var status = checkURL(window.location);
+						var callingStack = sharedFunctions.errorToCallingStack(new Error());
+						var status = check(callingStack, window.location);
 						if (status.type.indexOf(changedFunction.type) !== -1){
-							var callingStackMsg = sharedFunctions.errorToCallingStackMsg(new Error());
 							if (status.mode === "ask"){
-								status.mode = ask(window, changedFunction.type, this, callingStackMsg);
+								status.mode = ask(window, changedFunction.type, this, callingStack);
 							}
 							switch (status.mode){
 								case "allow":
 									return original;
 								case "fake":
-									notify(window, callingStackMsg);
+									notify(window, callingStack);
 									return changedFunction.fake || undef;
 								//case "block":
 								default:
--- a/lib/notifications.js
+++ b/lib/notifications.js
@ -55,21 +55,40 @@ exports.notify = function(window, callingStackMsg){
 					label: _("ignorelistDomain"),
 					accessKey: "",
 					callback: function(){
-						lists.appendTo("ignore", notification.domain);
+						var domain = browser.contentWindow.prompt(
+							_("inputIgnoreDomain"),
+							notification.domain
+						);
+						if (domain){
+							lists.appendTo("ignore", domain);
+						}
 					}
 				},
 				{
 					label: _("whitelistURL"),
 					accessKey: "",
 					callback: function(){
-						lists.appendTo("white", "^" + notification.url.replace(/([\\\+\*\?\[\^\]\$\(\)\{\}\=\!\|\.])/g, "\\$1") + "$");
+						var url = browser.contentWindow.prompt(
+							_("inputWhitelistDomain"),
+							"^" + notification.url.replace(/([\\\+\*\?\[\^\]\$\(\)\{\}\=\!\|\.])/g, "\\$1") + "$"
+						);
+						if (url){
+							lists.appendTo("white", url);
+						}
 					}
 				},
 				{
 					label: _("whitelistDomain"),
 					accessKey: "",
 					callback: function(){
-						lists.appendTo("white", notification.domain);
+						var domain = browser.contentWindow.prompt(
+							_("inputWhitelistURL"),
+							notification.domain
+						);
+						if (domain){
+							lists.appendTo("white", domain);
+						}
+						
 					}
 				},
 				{
--- a/lib/sharedFunctions.js
+++ b/lib/sharedFunctions.js
@ -23,12 +23,25 @@ var _ = function(name, replace){
 	return str;
 };

+function check(stack, url, blockMode){
+	if (prefs.enableStackList && checkStack(stack)){
+		return "allow";
+	}
+	else {
+		return checkURL(url, blockMode);
+	}
+}

 function checkURL(url, blockMode){
 	"use strict";
 	
-	if (url.protocol === "about:" || url.protocol === "chrome:") {
-		return "allow";
+	switch (url.protocol){
+		case "about:":
+			if (url.href === "about:blank"){
+				break;
+			}
+		case "chrome:":
+			return "allow";
 	}
 	
 	var mode = "block";
@ -67,6 +80,11 @@ function checkURL(url, blockMode){
 	return mode;
 }

+function checkStack(stack){
+	"use strict";
+	
+	return lists.get("stack").match(stack);
+}

 // Stack parsing
 function parseStackEntry(entry){
@ -75,17 +93,32 @@ function parseStackEntry(entry){
 	var m = /@(.*):(\d*):(\d*)$/.exec(entry) || ["", entry, "--", "--"];
 	return {
 		url: m[1],
-		line: m[2],
-		column: m[3],
+		line: parseInt(m[2], 10),
+		column: parseInt(m[3], 10),
 		raw: entry
 	};
 }

+function stackRuleMatch(stackEntry, stackRule){
+	if (!stackEntry){
+		return false;
+	}
+	if (stackEntry.url !== stackRule.url){
+		return false;
+	}
+	if ((typeof stackRule.line) !== "undefined" && stackEntry.line !== stackRule.line){
+		return false;
+	}
+	if ((typeof stackRule.column) !== "undefined" && stackEntry.column !== stackRule.column){
+		return false;
+	}
+	return true;
+}
+
 // parse calling stack
-function errorToCallingStackMsg(error){
+function errorToCallingStack(error){
 	"use strict";
 	
-	var msg = "";
 	var callers = error.stack.trim().split("\n");
 	//console.log(callers);
 	var findme = callers.shift(); // Remove us from the stack
@ -96,20 +129,39 @@ function errorToCallingStackMsg(error){
 		var doubleStackStart = caller.search(findme) !== -1;
 		inDoubleStack = inDoubleStack || doubleStackStart;
 		return !inDoubleStack;
-	});
-	msg += "\n\n" + _("sourceOutput") + ": ";
-	if (prefs.showCompleteCallingStack){
-		msg += callers.reduce(function(stack, c){
-			return stack + "\n\t" + _("stackEntryOutput", parseStackEntry(c));
-		}, "");
-	}
-	else{
-		msg += _("stackEntryOutput", parseStackEntry(callers[0]));
-	}
+	}).map(parseStackEntry);
+	return {
+		toString: function(){
+			var msg = "";
+			msg += "\n\n" + _("sourceOutput") + ": ";
+			if (prefs.showCompleteCallingStack){
+				msg += callers.reduce(function(stack, c){
+					return stack + "\n\t" + _("stackEntryOutput", c);
+				}, "");
+			}
+			else{
+				msg += _("stackEntryOutput", callers[0]);
+			}
 			
-	return msg;
+			return msg;
+		},
+		match: function(stackRule){
+			if (typeof stackRule.stackPosition !== "undefined"){
+				var pos = stackRule.stackPosition;
+				if (pos < 0){
+					pos += callers.length;
+				}
+				return stackRuleMatch(callers[pos], stackRule);
+			}
+			else {
+				return callers.some(function(stackEntry){
+					return stackRuleMatch(stackEntry, stackRule);
+				});
+			}
+		}
+	};
 }

-exports.checkURL = checkURL;
+exports.check = check;
 exports.parseStackEntry = parseStackEntry;
-exports.errorToCallingStackMsg = errorToCallingStackMsg;
+exports.errorToCallingStack = errorToCallingStack;
--- a/locale/de-DE.json
+++ b/locale/de-DE.json
@ -0,0 +1,52 @@
+{
+ "allowPDFCanvas_description": "Die native pdf.js verwendet <canvas> um den Inhalt von PDFs anzuzeigen. Wenn viele Nachfragedialoge erscheinen oder die PDF-Ansicht nicht funktioniert, müssen diese erlaubt werden.", 
+ "allowPDFCanvas_title": "<canvas> in PDFs erlauben", 
+ "askForInvisiblePermission": "Wollen Sie unsichtbare <canvas> erlauben?", 
+ "askForInvisibleReadoutPermission": "Wollen Sie das Auslesen von unsichtbaren <canvas> erlauben?", 
+ "askForPermission": "Wollen Sie <canvas> erlauben?", 
+ "askForReadoutPermission": "Wollen Sie das Auslesen von <canvas> erlauben?", 
+ "askForVisiblePermission": "Wollen Sie das rot umrandete <canvas> erlauben?", 
+ "askForVisibleReadoutPermission": "Wollen Sie das Auslesen des rot umrandeten <canvas> erlauben?", 
+ "askOnlyOnce_description": "Wenn der Blockiermodus des Canvas Blockers auf \"um Erlaubnis fragen\" oder \"bei Auslese-API um Erlaubnis fragen\" gesetzt ist, erscheint jedes mal ein Abfragedialog, wenn eine Seite versucht, die (Auslese-)API aufzurufen. Diese Einstellung versucht diese Abfrage nur einmal pro Seite anzuzeigen, unabhängig davon wie oft die API aufgerufen wird. Es können trotzdem mehrere Dialoge pro Seite erscheinen.", 
+ "askOnlyOnce_title": "Nur einmal nachfragen", 
+ "blackList_description": "Domänen oder URLs, die die <canvas>-API niemals verwenden dürfen. Mehrere Einträge müssen durch ein Komma getrennt werden.", 
+ "blackList_title": "Blacklist", 
+ "blockMode_description": "", 
+ "blockMode_options.allow everything": "alles erlauben", 
+ "blockMode_options.allow only white list": "nur Einträge der Whitelist erlauben", 
+ "blockMode_options.ask for permission": "um Erlaubnis fragen", 
+ "blockMode_options.ask for readout API permission": "bei Auslese-API um Erlaubnis fragen", 
+ "blockMode_options.block everything": "alles blockieren", 
+ "blockMode_options.block only black list": "nur Einträge der Blacklist blockieren", 
+ "blockMode_options.block readout API": "Auslese-API blockieren", 
+ "blockMode_options.fake readout API": "Auslese-API vortäuschen", 
+ "blockMode_title": "Blockiermodus", 
+ "disableNotifications": "Benachrichtigungen deaktivieren", 
+ "displayCallingStack": "Aufrufestack anzeigen", 
+ "displayFullURL": "URL anzeigen", 
+ "enableStackList_description": "", 
+ "enableStackList_title": "Dateispezifische Whitelist verwenden", 
+ "fakedReadout": "Auslese vorgetäuscht auf {url}", 
+ "ignoreList_description": "Domänen oder URLs, bei denen keine Benachrichtigung angezeigt werden. Mehrere Einträge müssen durch ein Komma getrennt werden.", 
+ "ignoreList_title": "Ignorierliste", 
+ "ignorelistDomain": "ignoriere Domain", 
+ "ignorelistURL": "ignoriere URL", 
+ "inputIgnoreDomain": "Geben Sie die Domain ein, die ignoriert werden soll:", 
+ "inputWhitelistDomain": "Geben Sie die URL RegExp ein, die erlaubt werden soll:", 
+ "inputWhitelistURL": "Geben Sie die Domain ein, die erlaubt werden soll:", 
+ "settings": "Einstellungen", 
+ "showCallingFile_description": "", 
+ "showCallingFile_title": "Aufrufende Datei anzeigen", 
+ "showCompleteCallingStack_description": "", 
+ "showCompleteCallingStack_title": "Kompletten Aufrufestack anzeigen", 
+ "showNotifications_description": "Benachrichtigungen anzeigen, wenn der Blockiermodus auf \"Auslese-API vortäuschen\" gesetzt ist.", 
+ "showNotifications_title": "Benachrichtigungen anzeigen", 
+ "sourceOutput": "Aufrufende Datei", 
+ "stackEntryOutput": "{url} Zeile {line} Spalte {column}", 
+ "stackList_description": "JS-Dateien, die die <canvas>-API verwenden dürfen. Die Angabe muss hier im JSON-Format vorliegen. Beispiel: [{\"url\": \"http://domain/datei1.js\"}, {\"url\": \"http://domain/datei2.js\", \"line\": 1, \"column\": 4, \"stackPosition\": -3}]", 
+ "stackList_title": "Dateispezifische Whitelist", 
+ "whiteList_description": "Domänen oder URLs, die die <canvas>-API verwenden dürfen. Mehrere Einträge müssen durch ein Komma getrennt werden.", 
+ "whiteList_title": "Whitelist", 
+ "whitelistDomain": "erlaube Domain", 
+ "whitelistURL": "erlaube URL"
+}
--- a/locale/de-DE.properties
+++ b/locale/de-DE.properties
@ -1,56 +0,0 @@
-whiteList_title= Whitelist
-whiteList_description= Domänen oder URLs, die die <canvas>-API verwenden dürfen. Mehrere Einträge müssen durch ein Komma getrennt weren.
-
-blackList_title= Blacklist
-blackList_description= Domänen oder URLs, die die <canvas>-API niemals verwenden dürfen. Mehrere Einträge müssen durch ein Komma getrennt weren.
-
-ignoreList_title= Ignorierliste
-ignoreList_description= Domänen oder URLs, bei denen keine Benachrichtgung angezeigt werden. Mehrere Einträge müssen durch ein Komma getrennt weren.
-
-blockMode_title= Blockiermodus
-blockMode_description=
-
-blockMode_options.block everything= alles blockieren
-blockMode_options.allow only white list= nur Einträge der Whitelist erlauben
-blockMode_options.ask for permission= um Erlaubnis fragen
-blockMode_options.block readout API= Auslese-API blockieren
-blockMode_options.fake readout API= Auslese-API vortäuschen
-blockMode_options.ask for readout API permission= bei Auslese-API um Erlaubnis fragen
-blockMode_options.block only black list= nur Einträge der Blacklist blockieren
-blockMode_options.allow everything= alles erlauben
-
-askOnlyOnce_title= Nur einmal nachfragen
-askOnlyOnce_description= Wenn der Blockiermodus des Canvas Blockers auf "um Erlaubnis fragen" oder "bei Auslese-API um Erlaubnis fragen" gesetzt ist, erscheint jedes mal ein Abfragedialog, wenn eine Seite versucht, die (Auslese-)API aufzurufen. Diese Einstellung versucht diese Abfrage nur einmal pro Seite anzuzeigen, unabhängig davon wie oft die API aufgerufen wird. Es können trotzudem mehrere Dialoge pro Seite erscheinen.
-
-showNotifications_title= Benachrichtigungen anzeiten
-showNotifications_description= Benachrichtigungen anzeigen, wenn der Blockiermodus auf "Auslese-API vortäuschen" gesetzt ist.
-
-showCallingFile_title= Aufrufende Datei anzeigen
-showCallingFile_description=
-
-showCompleteCallingStack_title= Kompletten Aufrufestack anzeigen
-showCompleteCallingStack_description=
-
-allowPDFCanvas_title= <canvas> in PDFs erlauben
-allowPDFCanvas_description= Die native pdf.js verwendet <canvas> um den Inhalt von PDFs anzuzeigen. Wenn viele Nachfragedialoge erscheinen oder die PDF-Ansicht nicht funktioniert, müssen diese erlaubt werden.
-
-askForPermission= Wollen Sie <canvas> erlauben?
-askForVisiblePermission= Wollen Sie das rot umrandete <canvas> erlauben?
-askForInvisiblePermission= Wollen Sie unsichtbare <canvas> erlauben?
-askForReadoutPermission= Wollen Sie das Auslesen von <canvas> erlauben?
-askForVisibleReadoutPermission= Wollen Sie das Auslesen des rot umrandeten <canvas> erlauben?
-askForInvisibleReadoutPermission= Wollen Sie das Auslesen von unsichtbaren <canvas> erlauben?
-
-sourceOutput= Aufrufende Datei
-stackEntryOutput= {url} Zeile {line} Spalte {column}
-
-fakedReadout = Auslese vorgetäuscht auf {url}
-settings = Einstellungen
-displayCallingStack = Aufrufestack anzeigen
-displayFullURL = URL anzeigen
-whitelistURL = erlaube URL
-whitelistDomain = erlaube Domain
-disableNotifications = Benachrichtigungen deaktivieren
-
-ignorelistURL = ignoriere URL
-ignorelistDomain = ignoriere Domain
--- a/locale/en-US.json
+++ b/locale/en-US.json
@ -0,0 +1,53 @@
+{
+ "allowPDFCanvas_description": "Firefox's native PDF reader uses the API to display PDF content. If too many ask dialogs appear or the PDF reader does not work at all, these have to be allowed.", 
+ "allowPDFCanvas_title": "Allow canvas in PDFs", 
+ "askForInvisiblePermission": "Do you want to allow invisible <canvas>?", 
+ "askForInvisibleReadoutPermission": "Do you want to allow invisible <canvas> readout?", 
+ "askForPermission": "Do you want to allow <canvas>?", 
+ "askForReadoutPermission": "Do you want to allow <canvas> readout?", 
+ "askForVisiblePermission": "Do you want to allow the red bordered <canvas>?", 
+ "askForVisibleReadoutPermission": "Do you want to allow the readout of the red bordered <canvas>?", 
+ "askOnlyOnce_description": "When Canvas Blocker's Block mode is set to 'ask permission' or 'ask permission for readout API', a confirm message will appear every time a page tries to access the API or readout API. This setting tries to display the confirm message only once for each page regardless of how many times the page tries to access the API. Nevertheless, multiple confirm messages may still be displayed on some pages.", 
+ "askOnlyOnce_title": "Ask only once", 
+ "blackList_description": "Domains or URLs where the <canvas>-API should always be blocked. To add multiple entries, separate them by commas.", 
+ "blackList_title": "Black list", 
+ "blockMode_description": "", 
+ "blockMode_options.allow everything": "allow everything", 
+ "blockMode_options.allow only white list": "allow only white list", 
+ "blockMode_options.ask for permission": "ask for permission", 
+ "blockMode_options.ask for readout API permission": "ask for readout API permission", 
+ "blockMode_options.block everything": "block everything", 
+ "blockMode_options.block only black list": "block only black list", 
+ "blockMode_options.block readout API": "block readout API", 
+ "blockMode_options.fake readout API": "fake readout API", 
+ "blockMode_title": "Block mode", 
+ "disableNotifications": "disable notifications", 
+ "displayCallingStack": "display calling stack", 
+ "displayFullURL": "display full URL", 
+ "enableStackList_description": "", 
+ "enableStackList_title": "Use file specific white list", 
+ "fakedReadout": "Faked readout on {url}", 
+ "ignoreList_description": "Domains or URLs where no notification will be shown. To add multiple entries, separate them by commas.", 
+ "ignoreList_title": "Ignore list", 
+ "ignorelistDomain": "ignore domain", 
+ "ignorelistURL": "ignore URL", 
+ "inputIgnoreDomain": "Input domain to add to ignore list:", 
+ "inputWhitelistDomain": "Input URL RegExp to add to white list:", 
+ "inputWhitelistURL": "Input domain to add to white list:", 
+ "settings": "settings", 
+ "showCallingFile_description": "", 
+ "showCallingFile_title": "Show calling file", 
+ "showCompleteCallingStack_description": "", 
+ "showCompleteCallingStack_title": "Display complete calling stack", 
+ "showNotifications_description": "Show a notification when the block mode is set to \"fake readout API\".", 
+ "showNotifications_title": "Show notifications", 
+ "sourceOutput": "Calling file", 
+ "stackEntryOutput": "{url} line {line} column {column}", 
+ "stackList_description": "JS files which are allowed to use the <canvas>-API. The input has to be in JSON format. Example: [{\"url\": \"http://domain/file1.js\"}, {\"url\": \"http://domain/file2.js\", \"line\": 1, \"column\": 4, \"stackPosition\": -3}]", 
+ "stackList_title": "File specific white list", 
+ "whilteList_title": "White list", 
+ "whiteList_description": "Domains or URLs where the <canvas>-API should not be blocked. To add multiple entries, separate them by commas.", 
+ "whitelist": "whitelist", 
+ "whitelistDomain": "whitelist domain", 
+ "whitelistURL": "whitelist URL"
+}
--- a/locale/en-US.properties
+++ b/locale/en-US.properties
@ -1,57 +0,0 @@
-whilteList_title= White list
-whiteList_description= Domains or URLs where the <canvas>-API should not be blocked. To add multiple entries, separate them by commas.
-
-blackList_title= Black list
-blackList_description= Domains or URLs where the <canvas>-API should always be blocked. To add multiple entries, separate them by commas.
-
-ignoreList_title= Ignore list
-ignoreList_description= Domains or URLs where no notification will be shown. To add multiple entries, separate them by commas.
-
-blockMode_title= Block mode
-blockMode_description=
-
-blockMode_options.block everything= block everything
-blockMode_options.allow only white list= allow only white list
-blockMode_options.ask for permission= ask for permission
-blockMode_options.block readout API= block readout API
-blockMode_options.fake readout API= fake readout API
-blockMode_options.ask for readout API permission= ask for readout API permission
-blockMode_options.block only black list= block only black list
-blockMode_options.allow everything= allow everything
-
-askOnlyOnce_title= Ask only once
-askOnlyOnce_description= When Canvas Blocker's Block mode is set to 'ask permission' or 'ask permission for readout API', a confirm message will appear every time a page tries to access the API or readout API. This setting tries to display the confirm message only once for each page regardless of how many times the page tries to access the API. Nevertheless, multiple confirm messages may still be displayed on some pages.
-
-showNotifications_title= Show notifications
-showNotifications_description= Show a notification when the block mode is set to "fake readout API".
-
-showCallingFile_title= Show calling file
-showCallingFile_description=
-
-showCompleteCallingStack_title= Display complete calling stack
-showCompleteCallingStack_description=
-
-allowPDFCanvas_title= Allow canvas in PDFs
-allowPDFCanvas_description= Firefox's native PDF reader uses the API to display PDF content. If too many ask dialogs appear or the PDF reader does not work at all, these have to be allowed.
-
-askForPermission= Do you want to allow <canvas>?
-askForVisiblePermission= Do you want to allow the red bordered <canvas>?
-askForInvisiblePermission= Do you want to allow invisible <canvas>?
-askForReadoutPermission= Do you want to allow <canvas> readout?
-askForVisibleReadoutPermission= Do you want to allow the readout of the red bordered <canvas>?
-askForInvisibleReadoutPermission= Do you want to allow invisible <canvas> readout?
-
-sourceOutput= Calling file
-stackEntryOutput= {url} line {line} column {column}
-
-fakedReadout = Faked readout on {url}
-settings = settings
-displayCallingStack = display calling stack
-displayFullURL = display full URL
-whitelist = whitelist
-whitelistURL = whitelist URL
-whitelistDomain = whitelist domain
-disableNotifications = disable notifications
-
-ignorelistURL = ignore URL
-ignorelistDomain = ignore domain
--- a/locales.json
+++ b/locales.json
@ -0,0 +1 @@
+{"locales": ["de-DE", "en-US"]}
--- a/package.json
+++ b/package.json
@ -91,11 +91,22 @@
 			"title": "Display complete calling stack",
 			"type": "bool",
 			"value": false
+		},{
+			"name": "enableStackList",
+			"title": "Use file specific scoped white list",
+			"type": "bool",
+			"value": false
+		},
+		{
+			"name": "stackList",
+			"title": "File specific white list",
+			"type": "string",
+			"value": ""
 		}
 	],
 	"main": "lib/main.js",
 	"author": "Korbinian Kapsner",
 	"license": "MPL 2.0",
-	"version": "0.2.1-Development",
+	"version": "0.2.3-Development",
 	"permissions": {"private-browsing": true}
 }