[or-cvs] r14024: Make pref for blocking network access from file urls (workar (in torbutton/trunk/src: chrome/content chrome/locale/de-AT chrome/locale/de-CH chrome/locale/de-DE chrome/locale/el-GR chrome/locale/en-US chrome/locale/es-AR chrome/locale/fr-FR chrome/locale/hr-HR chrome/locale/it-IT chrome/locale/nl-NL chrome/locale/pl-PL chrome/locale/pt-BR chrome/locale/ru-RU chrome/locale/sl-SI chrome/locale/zh-CN chrome/locale/zh-TW components defaults/preferences)
mikeperry at seul.org
mikeperry at seul.org
Fri Mar 14 07:04:12 UTC 2008
Author: mikeperry
Date: 2008-03-14 03:04:11 -0400 (Fri, 14 Mar 2008)
New Revision: 14024
Modified:
torbutton/trunk/src/chrome/content/preferences.js
torbutton/trunk/src/chrome/content/preferences.xul
torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
torbutton/trunk/src/components/cssblocker.js
torbutton/trunk/src/defaults/preferences/preferences.js
Log:
Make pref for blocking network access from file urls
(workaround for Firefox Content-Disposition file stealing bug
reported by Greg).
Modified: torbutton/trunk/src/chrome/content/preferences.js
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.js 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/content/preferences.js 2008-03-14 07:04:11 UTC (rev 14024)
@@ -214,6 +214,7 @@
doc.getElementById('torbutton_spoofEnglish').checked = o_torprefs.getBoolPref('spoof_english');
doc.getElementById('torbutton_clearHttpAuth').checked = o_torprefs.getBoolPref('clear_http_auth');
doc.getElementById('torbutton_blockJSHistory').checked = o_torprefs.getBoolPref('block_js_history');
+ doc.getElementById('torbutton_blockFileNet').checked = o_torprefs.getBoolPref('block_file_net');
torbutton_prefs_set_field_attributes(doc);
}
@@ -266,6 +267,7 @@
o_torprefs.setBoolPref('disable_domstorage', doc.getElementById('torbutton_noDomStorage').checked);
o_torprefs.setBoolPref('clear_http_auth', doc.getElementById('torbutton_clearHttpAuth').checked);
o_torprefs.setBoolPref('block_js_history', doc.getElementById('torbutton_blockJSHistory').checked);
+ o_torprefs.setBoolPref('block_file_net', doc.getElementById('torbutton_blockFileNet').checked);
if(doc.getElementById('torbutton_shutdownGroup').selectedItem ==
doc.getElementById('torbutton_noShutdown')) {
Modified: torbutton/trunk/src/chrome/content/preferences.xul
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.xul 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/content/preferences.xul 2008-03-14 07:04:11 UTC (rev 14024)
@@ -134,6 +134,8 @@
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<checkbox id="torbutton_noSearch" label="&torbutton.prefs.no_search;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
+ <checkbox id="torbutton_blockFileNet" label="&torbutton.prefs.block_file_net;"
+ oncommand="torbutton_prefs_set_field_attributes(document)"/>
<checkbox id="torbutton_closeTor" label="&torbutton.prefs.close_tor;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<checkbox id="torbutton_closeNonTor" label="&torbutton.prefs.close_nontor;"
Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 50px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd 2008-03-14 07:04:11 UTC (rev 14024)
@@ -71,3 +71,4 @@
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.block_file_net "Block access to network from file:// urls (recommended)">
Modified: torbutton/trunk/src/components/cssblocker.js
===================================================================
--- torbutton/trunk/src/components/cssblocker.js 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/components/cssblocker.js 2008-03-14 07:04:11 UTC (rev 14024)
@@ -119,6 +119,7 @@
this.isolate_content = this._prefs.getBoolPref("extensions.torbutton.isolate_content");
this.tor_enabled = this._prefs.getBoolPref("extensions.torbutton.tor_enabled");
+ this.block_file_net = this._prefs.getBoolPref("extensions.torbutton.block_file_net");
this.no_tor_plugins = this._prefs.getBoolPref("extensions.torbutton.no_tor_plugins");
return;
@@ -199,7 +200,7 @@
contentLocation.spec);
return ok;
} else {
- if (this.tor_enabled) {
+ if (this.block_file_net) {
this.logger.eclog(3, "Blocking remote request from: " +
requestOrigin.spec + " for: " +
contentLocation.spec);
@@ -374,6 +375,9 @@
case "extensions.torbutton.tor_enabled":
this.tor_enabled = this._prefs.getBoolPref("extensions.torbutton.tor_enabled");
break;
+ case "extensions.torbutton.block_file_net":
+ this.block_file_net = this._prefs.getBoolPref("extensions.torbutton.block_file_net");
+ break;
case "extensions.torbutton.no_tor_plugins":
this.no_tor_plugins = this._prefs.getBoolPref("extensions.torbutton.no_tor_plugins");
break;
Modified: torbutton/trunk/src/defaults/preferences/preferences.js
===================================================================
--- torbutton/trunk/src/defaults/preferences/preferences.js 2008-03-14 06:29:07 UTC (rev 14023)
+++ torbutton/trunk/src/defaults/preferences/preferences.js 2008-03-14 07:04:11 UTC (rev 14024)
@@ -87,3 +87,4 @@
pref("extensions.torbutton.useragent_vendor", "");
pref("extensions.torbutton.useragent_vendorSub","");
pref("extensions.torbutton.banned_ports","8118,8123,9050,9051");
+pref("extensions.torbutton.block_file_net",true);
More information about the tor-commits
mailing list