July 2011 - tor-commits - lists.torproject.org

[torbutton/master] Remove SafeCache preferences.
by mikeperry＠torproject.org 30 Jun '11

30 Jun '11

commit 271ec324139946124be8df5faf2900c48d60882c Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 30 11:22:23 2011 -0700 Remove SafeCache preferences. We're going to trim down our prefs soon. We want safecache always-on. --- src/chrome/content/pref-privacy.xul | 31 ------------------------------- src/chrome/content/preferences.js | 32 +------------------------------- src/chrome/content/preferences.xul | 16 ---------------- src/chrome/locale/en/pref-privacy.dtd | 1 - src/chrome/locale/en/torbutton.dtd | 5 ----- 5 files changed, 1 insertions(+), 84 deletions(-) diff --git a/src/chrome/content/pref-privacy.xul b/src/chrome/content/pref-privacy.xul deleted file mode 100644 index afa304e..0000000 --- a/src/chrome/content/pref-privacy.xul +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE window [ -<!ENTITY % SSH_prefPrivacyDTD SYSTEM "chrome://torbutton/locale/pref-privacy.dtd"> -%SSH_prefPrivacyDTD; -]> -<overlay id="SafeCacheConfigOverlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - <prefwindow id="BrowserPreferences"> - <prefpane id="panePrivacy"> - <preferences id="privacyPreferences"> - <preference id="stanford-safecache.enabled" - name="stanford-safecache.enabled" type="bool"/> - </preferences> - <groupbox id="historyGroup" /> - <groupbox id="cookiesGroup" /> - <groupbox id="privateDataGroup"> - <hbox id="safeCacheContainer"> - <image - src="chrome://torbutton/skin/stanford-safecache.png"/> - <checkbox - preference="stanford-safecache.enabled" - id="enableSafeCache" - label="&safeCache.label;"/> - </hbox> - </groupbox> - </prefpane> - </prefwindow> - -</overlay> - diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 3a7f99f..a926f36 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -208,24 +208,6 @@ function torbutton_prefs_init(doc) { o_torprefs.setBoolPref('block_cache', true); o_torprefs.setBoolPref('clear_cache', false); } - - switch(o_torprefs.getIntPref('safecache')) { - case 0: // always - doc.getElementById("torbutton_safecacheGroup").selectedItem = - doc.getElementById('torbutton_safecacheAlways'); - break; - case 1: // during tor - doc.getElementById("torbutton_safecacheGroup").selectedItem = - doc.getElementById('torbutton_safecacheDuringTor'); - break; - case 2: // never - doc.getElementById("torbutton_safecacheGroup").selectedItem = - doc.getElementById('torbutton_safecacheNever'); - break; - } - - doc.getElementById('torbutton_cookie_js_allow').checked = - o_torprefs.getBoolPref('cookie_js_allow'); if(o_torprefs.getBoolPref('clear_cookies')) { doc.getElementById('torbutton_cookieGroup').selectedItem = @@ -519,19 +501,7 @@ function torbutton_prefs_save(doc) { o_torprefs.setBoolPref('clear_cache', doc.getElementById('torbutton_clearCache').selected); o_torprefs.setBoolPref('block_cache', doc.getElementById('torbutton_blockCache').selected); - - if(doc.getElementById('torbutton_safecacheGroup').selectedItem == - doc.getElementById('torbutton_safecacheAlways')) { - o_torprefs.setIntPref('safecache', 0); - } else if(doc.getElementById('torbutton_safecacheGroup').selectedItem == - doc.getElementById('torbutton_safecacheDuringTor')) { - o_torprefs.setIntPref('safecache', 1); - } else { - o_torprefs.setIntPref('safecache', 2); - } - - o_torprefs.setBoolPref('cookie_js_allow', doc.getElementById('torbutton_cookie_js_allow').checked); - + o_torprefs.setBoolPref('clear_cookies', doc.getElementById('torbutton_clearCookies').selected); o_torprefs.setBoolPref('cookie_jars', doc.getElementById('torbutton_cookieJars').selected); o_torprefs.setBoolPref('dual_cookie_jars', doc.getElementById('torbutton_dualCookieJars').selected || doc.getElementById('torbutton_cookieProtections').selected); diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index b7c2d33..1795fc1 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -238,22 +238,6 @@ label="&torbutton.prefs.block_cache;" oncommand="torbutton_prefs_set_field_attributes(document)"/> </radiogroup> - <hbox> - <label value="&torbutton.prefs.safecache;" control="torbutton_safecacheGroup"/> - <radiogroup align="center" orient="horizontal" id="torbutton_safecacheGroup"> - <radio id="torbutton_safecacheAlways" - label="&torbutton.prefs.always;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> - <radio id="torbutton_safecacheDuringTor" - label="&torbutton.prefs.during_tor;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> - <radio id="torbutton_safecacheNever" - label="&torbutton.prefs.never;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> - </radiogroup> - </hbox> - <checkbox id="torbutton_cookie_js_allow" label="&torbutton.prefs.cookie_js_allow;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> </vbox> </tabpanel> <tabpanel id="cookies"> diff --git a/src/chrome/locale/en/pref-privacy.dtd b/src/chrome/locale/en/pref-privacy.dtd deleted file mode 100644 index 93aac71..0000000 --- a/src/chrome/locale/en/pref-privacy.dtd +++ /dev/null @@ -1 +0,0 @@ -<!ENTITY safeCache.label "Use SafeCache to impose cookie policy on cache"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 9416ac0..998eb76 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -136,8 +136,3 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries"> <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> -<!ENTITY torbutton.prefs.safecache "Enforce same-origin policy on cookies and cache:"> -<!ENTITY torbutton.prefs.always "Always"> -<!ENTITY torbutton.prefs.during_tor "During Tor"> -<!ENTITY torbutton.prefs.never "Never"> -<!ENTITY torbutton.prefs.cookie_js_allow "Allow cookies set with Javascript (unknown origin)">

1 0

[torbutton/master] Remove redundant overlay.
by mikeperry＠torproject.org 30 Jun '11

30 Jun '11

commit 90675cd622c9e0bb1df95c8c9084be1fb585fb17 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 30 11:35:40 2011 -0700 Remove redundant overlay. --- src/chrome/content/stanford-safecache-overlay.xul | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/stanford-safecache-overlay.xul b/src/chrome/content/stanford-safecache-overlay.xul deleted file mode 100644 index a51432b..0000000 --- a/src/chrome/content/stanford-safecache-overlay.xul +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> - -<overlay id="stanford-safecache-overlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - -<script src="chrome://torbutton/content/stanford-safecache.js" /> -<script src="chrome://torbutton/content/md5.js" /> - -</overlay>

1 0

[torbutton/master] Decouple SafeCache from browser cookie prefs.
by mikeperry＠torproject.org 30 Jun '11

30 Jun '11

commit 75b7efe1a9d0faf6b824d2394175bf1b3970ce20 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 30 11:53:37 2011 -0700 Decouple SafeCache from browser cookie prefs. Make it always on. Also, give 'SafeCookie' its own pref and make it off by default. --- src/chrome/content/stanford-safecache.js | 61 ++++++++++++------------------ src/defaults/preferences/preferences.js | 3 +- 2 files changed, 26 insertions(+), 38 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index 4c6c155..e739656 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -24,9 +24,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND // Constants const kSSC_ENABLED_PREF = "extensions.torbutton.safecache"; +const kSSC_SC_ENABLED_PREF = "extensions.torbutton.dual_key_cookies"; const kSSC_TORBUTTON_PREF = "extensions.torbutton.tor_enabled"; const kSSC_COOKIE_JS_PREF = "extensions.torbutton.cookie_js_allow"; -const kSSC_COOKIE_BEHAVIOR_PREF = "network.cookie.cookieBehavior"; //////////////////////////////////////////////////////////////////////////// // Debug stuff @@ -96,18 +96,18 @@ SSC_RequestListener.prototype = }, onModifyRequest: function(channel) { - var parent = window.content.location; if (channel.documentURI && channel.documentURI == channel.URI) { parent = null; // first party interaction } - - var cookie; - try{ - cookie = channel.getRequestHeader("Cookie"); - //SSC_dump("Cookie: " + cookie); - } catch(e) {cookie = null;} + var cookie = null; + if (this.controller.getSafeCookieEnabled()) { + try{ + cookie = channel.getRequestHeader("Cookie"); + //SSC_dump("Cookie: " + cookie); + } catch(e) {cookie = null;} + } // Same-origin policy var referrer; @@ -188,24 +188,10 @@ SSC_RequestListener.prototype = channel.setRequestHeader("Cookie", newHeader, false); } - // Third-party blocking policy - switch(this.controller.getCookieBehavior()) { - case this.controller.ACCEPT_COOKIES: - break; - case this.controller.NO_FOREIGN_COOKIES: - if(parent && parent.hostname != channel.URI.host) { - //SSC_dump("Third party cache blocked for " + channel.URI.spec + - //" content loaded by " + parent.spec); - this.bypassCache(channel); - } - break; - case this.controller.REJECT_COOKIES: + if(parent && parent.hostname != channel.URI.host) { + //SSC_dump("Third party cache blocked for " + channel.URI.spec + + //" content loaded by " + parent.spec); this.bypassCache(channel); - break; - default: - SSC_dump(controller.getCookieBehavior() + - " is not a valid cookie behavior."); - break; } }, @@ -298,6 +284,12 @@ SSC_Controller.prototype = { .getIntPref(kSSC_ENABLED_PREF)); }, + getSafeCookieEnabled: function() { + return (Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefService) + .getBoolPref(kSSC_SC_ENABLED_PREF)); + }, + getTorButton: function() { return (Components.classes["@mozilla.org/preferences-service;1"] .getService(Components.interfaces.nsIPrefBranch) @@ -310,22 +302,15 @@ SSC_Controller.prototype = { .getBoolPref(kSSC_COOKIE_JS_PREF)); }, - // Returns the value of the network.cookie.cookieBehavior pref - ACCEPT_COOKIES: 0, - NO_FOREIGN_COOKIES: 1, - REJECT_COOKIES: 2, - getCookieBehavior: function() { - return Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService) - .getIntPref(kSSC_COOKIE_BEHAVIOR_PREF); - }, - addListener: function(listener) { var observerService = Components.classes["@mozilla.org/observer-service;1"] .getService(Components.interfaces.nsIObserverService); observerService.addObserver(listener, "http-on-modify-request", false); - observerService.addObserver(listener, "http-on-examine-response", false); + // XXX: We need an observer to add this listener when the pref gets set + if (this.getSafeCookieEnabled()) { + observerService.addObserver(listener, "http-on-examine-response", false); + } }, removeListener: function(listener) { @@ -333,7 +318,9 @@ SSC_Controller.prototype = { Components.classes["@mozilla.org/observer-service;1"] .getService(Components.interfaces.nsIObserverService); observerService.removeObserver(listener, "http-on-modify-request"); - observerService.removeObserver(listener, "http-on-examine-response"); + if (this.getSafeCookieEnabled()) { + observerService.removeObserver(listener, "http-on-examine-response"); + } }, } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index a6d565a..efca607 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -214,4 +214,5 @@ pref("extensions.torbutton.useragent_vendor", ""); pref("extensions.torbutton.useragent_vendorSub",""); pref("extensions.torbutton.safecache",1); // 0=always, 1=during tor, 2=never -pref("extensions.torbutton.cookie_js_allow", true); \ No newline at end of file +pref("extensions.torbutton.dual_key_cookies",false); +pref("extensions.torbutton.cookie_js_allow", true);

1 0

[torbutton/master] Move SafeCache listener to our global window.
by mikeperry＠torproject.org 30 Jun '11

30 Jun '11

commit 44a9060727d3b8e33be09ae748117500b602a658 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 30 16:45:23 2011 -0700 Move SafeCache listener to our global window. They were registering way too many redundant listeners and incorrectly referencing window.content.location. --- src/chrome/content/stanford-safecache.js | 73 +++++++++++++++++++----------- src/chrome/content/torbutton.js | 6 +++ 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index e739656..d9447cb 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -34,7 +34,7 @@ const kSSC_COOKIE_JS_PREF = "extensions.torbutton.cookie_js_allow"; /** * Dump information to the console? */ -var SSC_debug = false; +var SSC_debug = true; /** * Sends data to the console if we're in debug mode @@ -42,7 +42,7 @@ var SSC_debug = false; */ function SSC_dump(msg) { if (SSC_debug) - dump("|||||||||| SSC: " + msg + "\n"); + torbutton_log(3, "SSC: " + msg); } //////////////////////////////////////////////////////////////////////////// @@ -84,29 +84,32 @@ SSC_RequestListener.prototype = channel.loadFlags |= channel.LOAD_BYPASS_CACHE; // INHIBIT_PERSISTENT_CACHING instead? channel.cacheKey = this.newCacheKey(0); - SSC_dump("Bypassed cache for " + channel.URI.spec + "\n"); + SSC_dump("Bypassed cache for " + channel.URI.spec); }, setCacheKey: function(channel, str) { var oldData = this.readCacheKey(channel.cacheKey); var newKey = this.newCacheKey(this.getHash(str) + oldData); channel.cacheKey = newKey; - //SSC_dump("Set cache key to hash(" + str + ") = " + - //newKey.data + "\n for " + channel.URI.spec + "\n"); + SSC_dump("Set cache key to hash(" + str + ") = " + + newKey.data + " for " + channel.URI.spec); }, onModifyRequest: function(channel) { - var parent = window.content.location; - if (channel.documentURI && channel.documentURI == channel.URI) { - parent = null; // first party interaction + var parent = null; + if (channel.notificationCallbacks) { + try { + var wind = channel.notificationCallbacks.QueryInterface( + Components.interfaces.nsIInterfaceRequestor).getInterface( + Components.interfaces.nsIDOMWindow); + parent = wind.window.top.location; + } catch(e) { + } + SSC_dump("Parent "+parent+" for "+ channel.URI.spec); } - var cookie = null; - if (this.controller.getSafeCookieEnabled()) { - try{ - cookie = channel.getRequestHeader("Cookie"); - //SSC_dump("Cookie: " + cookie); - } catch(e) {cookie = null;} + if (channel.documentURI && channel.documentURI == channel.URI) { + parent = null; // first party interaction } // Same-origin policy @@ -124,7 +127,22 @@ SSC_RequestListener.prototype = // SSC_dump("Existing cache key detected; leaving it unchanged."); } } - + + // Always apply policy + if(parent && parent.hostname != channel.URI.host) { + //SSC_dump("Third party cache blocked for " + channel.URI.spec + + //" content loaded by " + parent.spec); + this.bypassCache(channel); + } + + var cookie = null; + if (this.controller.getSafeCookieEnabled()) { + try{ + cookie = channel.getRequestHeader("Cookie"); + //SSC_dump("Cookie: " + cookie); + } catch(e) {cookie = null;} + } + if(cookie) { //Strip the secondary key from every referrer-matched cookie var newHeader = ""; @@ -188,11 +206,6 @@ SSC_RequestListener.prototype = channel.setRequestHeader("Cookie", newHeader, false); } - if(parent && parent.hostname != channel.URI.host) { - //SSC_dump("Third party cache blocked for " + channel.URI.spec + - //" content loaded by " + parent.spec); - this.bypassCache(channel); - } }, onExamineResponse: function(channel) { @@ -202,7 +215,14 @@ SSC_RequestListener.prototype = } catch(e) {setCookie = null;} if(setCookie) { - var parent = window.content.location; + var parent = null; + if (channel.notificationCallbacks) { + var wind = channel.notificationCallbacks.QueryInterface( + Components.interfaces.nsIInterfaceRequestor).getInterface( + Components.interfaces.nsIDOMWindow); + parent = wind.window.top.location; + } + if (channel.documentURI && channel.documentURI == channel.URI) { parent = null; // first party interaction } @@ -303,6 +323,7 @@ SSC_Controller.prototype = { }, addListener: function(listener) { + this.listener = listener; var observerService = Components.classes["@mozilla.org/observer-service;1"] .getService(Components.interfaces.nsIObserverService); @@ -313,13 +334,13 @@ SSC_Controller.prototype = { } }, - removeListener: function(listener) { + removeListener: function() { var observerService = Components.classes["@mozilla.org/observer-service;1"] .getService(Components.interfaces.nsIObserverService); - observerService.removeObserver(listener, "http-on-modify-request"); + observerService.removeObserver(this.listener, "http-on-modify-request"); if (this.getSafeCookieEnabled()) { - observerService.removeObserver(listener, "http-on-examine-response"); + observerService.removeObserver(this.listener, "http-on-examine-response"); } }, } @@ -330,9 +351,7 @@ SSC_Controller.prototype = { var SSC_controller; -function SSC_startup(event) { +function SSC_startup() { if(!SSC_controller) SSC_controller = new SSC_Controller(); SSC_dump("Loaded controller"); } - -window.addEventListener("load", SSC_startup, false); diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index efd2dfc..4a70b66 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3406,6 +3406,9 @@ function torbutton_do_main_window_startup() torbutton_http_observer.register(); torbutton_cookie_observer.register(); torbutton_proxyservice.register(); + + // XXX: We should fold this into our code + SSC_startup(); } function torbutton_set_initial_state() { @@ -3751,6 +3754,9 @@ function torbutton_close_window(event) { torbutton_cookie_observer.unregister(); torbutton_proxyservice.unregister(); + // XXX: We should fold this into our code.. + SSC_controller.removeListener(); + if(m_tb_is_main_window) { // main window not reset above // This happens on Mac OS because they allow firefox // to still persist without a navigator window

1 0

[torbutton/master] Remove use of md5.js.
by mikeperry＠torproject.org 30 Jun '11

30 Jun '11

commit 9913b970541341d316bba24d51ba3299449749dc Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 30 17:18:25 2011 -0700 Remove use of md5.js. Use browsers internal MD5 instead. --- src/chrome/content/md5.js | 256 ------------------------------ src/chrome/content/stanford-safecache.js | 22 +++- src/chrome/content/torbutton.xul | 1 - 3 files changed, 20 insertions(+), 259 deletions(-) diff --git a/src/chrome/content/md5.js b/src/chrome/content/md5.js deleted file mode 100644 index 46d2aab..0000000 --- a/src/chrome/content/md5.js +++ /dev/null @@ -1,256 +0,0 @@ -/* - * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message - * Digest Algorithm, as defined in RFC 1321. - * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002. - * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet - * Distributed under the BSD License - * See http://pajhome.org.uk/crypt/md5 for more info. - */ - -/* - * Configurable variables. You may need to tweak these to be compatible with - * the server-side, but the defaults work in most cases. - */ -var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */ -var b64pad = ""; /* base-64 pad character. "=" for strict RFC compliance */ -var chrsz = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */ - -/* - * These are the functions you'll usually want to call - * They take string arguments and return either hex or base-64 encoded strings - */ -function hex_md5(s){ return binl2hex(core_md5(str2binl(s), s.length * chrsz));} -function b64_md5(s){ return binl2b64(core_md5(str2binl(s), s.length * chrsz));} -function str_md5(s){ return binl2str(core_md5(str2binl(s), s.length * chrsz));} -function hex_hmac_md5(key, data) { return binl2hex(core_hmac_md5(key, data)); } -function b64_hmac_md5(key, data) { return binl2b64(core_hmac_md5(key, data)); } -function str_hmac_md5(key, data) { return binl2str(core_hmac_md5(key, data)); } - -/* - * Perform a simple self-test to see if the VM is working - */ -function md5_vm_test() -{ - return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72"; -} - -/* - * Calculate the MD5 of an array of little-endian words, and a bit length - */ -function core_md5(x, len) -{ - /* append padding */ - x[len >> 5] |= 0x80 << ((len) % 32); - x[(((len + 64) >>> 9) << 4) + 14] = len; - - var a = 1732584193; - var b = -271733879; - var c = -1732584194; - var d = 271733878; - - for(var i = 0; i < x.length; i += 16) - { - var olda = a; - var oldb = b; - var oldc = c; - var oldd = d; - - a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936); - d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586); - c = md5_ff(c, d, a, b, x[i+ 2], 17, 606105819); - b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330); - a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897); - d = md5_ff(d, a, b, c, x[i+ 5], 12, 1200080426); - c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341); - b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983); - a = md5_ff(a, b, c, d, x[i+ 8], 7 , 1770035416); - d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417); - c = md5_ff(c, d, a, b, x[i+10], 17, -42063); - b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162); - a = md5_ff(a, b, c, d, x[i+12], 7 , 1804603682); - d = md5_ff(d, a, b, c, x[i+13], 12, -40341101); - c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290); - b = md5_ff(b, c, d, a, x[i+15], 22, 1236535329); - - a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510); - d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632); - c = md5_gg(c, d, a, b, x[i+11], 14, 643717713); - b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302); - a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691); - d = md5_gg(d, a, b, c, x[i+10], 9 , 38016083); - c = md5_gg(c, d, a, b, x[i+15], 14, -660478335); - b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848); - a = md5_gg(a, b, c, d, x[i+ 9], 5 , 568446438); - d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690); - c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961); - b = md5_gg(b, c, d, a, x[i+ 8], 20, 1163531501); - a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467); - d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784); - c = md5_gg(c, d, a, b, x[i+ 7], 14, 1735328473); - b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734); - - a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558); - d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463); - c = md5_hh(c, d, a, b, x[i+11], 16, 1839030562); - b = md5_hh(b, c, d, a, x[i+14], 23, -35309556); - a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060); - d = md5_hh(d, a, b, c, x[i+ 4], 11, 1272893353); - c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632); - b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640); - a = md5_hh(a, b, c, d, x[i+13], 4 , 681279174); - d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222); - c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979); - b = md5_hh(b, c, d, a, x[i+ 6], 23, 76029189); - a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487); - d = md5_hh(d, a, b, c, x[i+12], 11, -421815835); - c = md5_hh(c, d, a, b, x[i+15], 16, 530742520); - b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651); - - a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844); - d = md5_ii(d, a, b, c, x[i+ 7], 10, 1126891415); - c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905); - b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055); - a = md5_ii(a, b, c, d, x[i+12], 6 , 1700485571); - d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606); - c = md5_ii(c, d, a, b, x[i+10], 15, -1051523); - b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799); - a = md5_ii(a, b, c, d, x[i+ 8], 6 , 1873313359); - d = md5_ii(d, a, b, c, x[i+15], 10, -30611744); - c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380); - b = md5_ii(b, c, d, a, x[i+13], 21, 1309151649); - a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070); - d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379); - c = md5_ii(c, d, a, b, x[i+ 2], 15, 718787259); - b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551); - - a = safe_add(a, olda); - b = safe_add(b, oldb); - c = safe_add(c, oldc); - d = safe_add(d, oldd); - } - return Array(a, b, c, d); - -} - -/* - * These functions implement the four basic operations the algorithm uses. - */ -function md5_cmn(q, a, b, x, s, t) -{ - return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b); -} -function md5_ff(a, b, c, d, x, s, t) -{ - return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t); -} -function md5_gg(a, b, c, d, x, s, t) -{ - return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t); -} -function md5_hh(a, b, c, d, x, s, t) -{ - return md5_cmn(b ^ c ^ d, a, b, x, s, t); -} -function md5_ii(a, b, c, d, x, s, t) -{ - return md5_cmn(c ^ (b | (~d)), a, b, x, s, t); -} - -/* - * Calculate the HMAC-MD5, of a key and some data - */ -function core_hmac_md5(key, data) -{ - var bkey = str2binl(key); - if(bkey.length > 16) bkey = core_md5(bkey, key.length * chrsz); - - var ipad = Array(16), opad = Array(16); - for(var i = 0; i < 16; i++) - { - ipad[i] = bkey[i] ^ 0x36363636; - opad[i] = bkey[i] ^ 0x5C5C5C5C; - } - - var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * chrsz); - return core_md5(opad.concat(hash), 512 + 128); -} - -/* - * Add integers, wrapping at 2^32. This uses 16-bit operations internally - * to work around bugs in some JS interpreters. - */ -function safe_add(x, y) -{ - var lsw = (x & 0xFFFF) + (y & 0xFFFF); - var msw = (x >> 16) + (y >> 16) + (lsw >> 16); - return (msw << 16) | (lsw & 0xFFFF); -} - -/* - * Bitwise rotate a 32-bit number to the left. - */ -function bit_rol(num, cnt) -{ - return (num << cnt) | (num >>> (32 - cnt)); -} - -/* - * Convert a string to an array of little-endian words - * If chrsz is ASCII, characters >255 have their hi-byte silently ignored. - */ -function str2binl(str) -{ - var bin = Array(); - var mask = (1 << chrsz) - 1; - for(var i = 0; i < str.length * chrsz; i += chrsz) - bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32); - return bin; -} - -/* - * Convert an array of little-endian words to a string - */ -function binl2str(bin) -{ - var str = ""; - var mask = (1 << chrsz) - 1; - for(var i = 0; i < bin.length * 32; i += chrsz) - str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask); - return str; -} - -/* - * Convert an array of little-endian words to a hex string. - */ -function binl2hex(binarray) -{ - var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef"; - var str = ""; - for(var i = 0; i < binarray.length * 4; i++) - { - str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) + - hex_tab.charAt((binarray[i>>2] >> ((i%4)*8 )) & 0xF); - } - return str; -} - -/* - * Convert an array of little-endian words to a base-64 string - */ -function binl2b64(binarray) -{ - var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - var str = ""; - for(var i = 0; i < binarray.length * 4; i += 3) - { - var triplet = (((binarray[i >> 2] >> 8 * ( i %4)) & 0xFF) << 16) - | (((binarray[i+1 >> 2] >> 8 * ((i+1)%4)) & 0xFF) << 8 ) - | ((binarray[i+2 >> 2] >> 8 * ((i+2)%4)) & 0xFF); - for(var j = 0; j < 4; j++) - { - if(i * 8 + j * 6 > binarray.length * 32) str += b64pad; - else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F); - } - } - return str; -} diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index d9447cb..fe5e087 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -279,10 +279,28 @@ SSC_RequestListener.prototype = return cacheKey; }, + strMD5: function(str) { + var converter = + Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]. + createInstance(Components.interfaces.nsIScriptableUnicodeConverter); + + // nsIURI.host is UTF-8 + converter.charset = "UTF-8"; + // result.value will contain the array length + var result = {}; + // data is an array of bytes + var data = converter.convertToByteArray(str, result); + var ch = Components.classes["@mozilla.org/security/hash;1"] + .createInstance(Components.interfaces.nsICryptoHash); + ch.init(ch.MD5); + ch.update(data, data.length); + return ch.finish(false); + }, + // Get an integer hash of a string getHash: function(str) { - var hash = str_md5(str); - var intHash = 0; + var hash = this.strMD5(str); + var intHash = 0; for(var i = 0; i < hash.length && i < 8; i++) intHash += hash.charCodeAt(i) << (i << 3); return intHash; diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index c17ca91..df42e6b 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -9,7 +9,6 @@  <script src="chrome://torbutton/content/stanford-safecache.js" /> - <script src="chrome://torbutton/content/md5.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/torbutton_util.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/torbutton.js" />

1 0

[torbutton/master] Demote safecache logging.
by mikeperry＠torproject.org 30 Jun '11

30 Jun '11

commit 5153669f97a2fb51034b86bc43c3a2063156b10b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 30 17:55:31 2011 -0700 Demote safecache logging. --- src/chrome/content/stanford-safecache.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js index bd67652..3daed58 100644 --- a/src/chrome/content/stanford-safecache.js +++ b/src/chrome/content/stanford-safecache.js @@ -42,7 +42,7 @@ var SSC_debug = true; */ function SSC_dump(msg) { if (SSC_debug) - torbutton_log(3, "SSC: " + msg); + torbutton_log(2, "SSC: " + msg); } ////////////////////////////////////////////////////////////////////////////

1 0

[torbutton/master] Bug #3506: Try to avoid shrinking windows..
by mikeperry＠torproject.org 30 Jun '11

30 Jun '11

commit 347690b821898b8ac5a2bed63344e42eebcb90b1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 30 11:05:26 2011 -0700 Bug #3506: Try to avoid shrinking windows.. --- src/chrome/content/torbutton.js | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index e086a8d..efd2dfc 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3563,7 +3563,7 @@ function torbutton_new_tab(event) // Returns true if the window wind is neither maximized, full screen, // ratpoisioned/evilwmed, nor minimized. function torbutton_is_windowed(wind) { - torbutton_log(2, "Window: ("+wind.outerHeight+","+wind.outerWidth+") ?= (" + torbutton_log(3, "Window: ("+wind.outerHeight+","+wind.outerWidth+") ?= (" +wind.screen.availHeight+","+wind.screen.availWidth+")"); if(wind.windowState == Components.interfaces.nsIDOMChromeWindow.STATE_MINIMIZED || wind.windowState == Components.interfaces.nsIDOMChromeWindow.STATE_MAXIMIZED) { @@ -3623,14 +3623,15 @@ function torbutton_check_round(browser) && m_tb_prefs.getBoolPref("extensions.torbutton.tor_enabled") && m_tb_prefs.getBoolPref("extensions.torbutton.resize_on_toggle")) { var bWin = browser.contentWindow; - torbutton_log(2, "About to resize load window: "+bWin.innerWidth+"x"+bWin.innerHeight+" in state "+window.windowState); + var height = Math.round((bWin.innerHeight)/50.0)*50; + var width = Math.round((bWin.innerWidth)/50.0)*50; - var height = Math.round(bWin.innerHeight/50.0)*50; - var width = Math.round(bWin.innerWidth/50.0)*50; + torbutton_log(3, "About to resize load window: "+bWin.innerWidth + +"x"+bWin.innerHeight+" -> "+width+"x"+height+" in state " + +window.windowState); - // This is fun. any attempt to resize the inner window actually resizes the outer width first. - // This hack seems to do the trick: - bWin.resizeTo(width,height); + // This is fun. any attempt to directly set the inner window actually resizes the outer width + // to that value instead. Must use resizeBy() instead of assignment or resizeTo() bWin.resizeBy(width-bWin.innerWidth,height-bWin.innerHeight); torbutton_log(3, "Resized window on load to: "+bWin.innerWidth+"x"+bWin.innerHeight+" in state "+window.windowState); @@ -3658,8 +3659,9 @@ function torbutton_set_window_size(bWin) { // at this point... bWin.innerWidth = 200; bWin.innerHeight = 200; - torbutton_log(2, "About to resize new window: "+window.outerWidth+"x"+window.outerHeight - +" in state "+window.windowState+" Have "+availWidth.value+"x"+availHeight.value); + torbutton_log(3, "About to resize new window: "+window.outerWidth+"x"+window.outerHeight + +" inner: "+bWin.innerWidth+"x"+bWin.innerHeight+ + " in state "+window.windowState+" Have "+availWidth.value+"x"+availHeight.value); var maxHeight = availHeight.value - (window.outerHeight - bWin.innerHeight) - 101; var maxWidth = availWidth.value - (window.outerWidth - bWin.innerWidth); @@ -3675,9 +3677,8 @@ function torbutton_set_window_size(bWin) { height = Math.floor(maxHeight/100.0)*100; - // This is fun. any attempt to resize the inner window actually resizes the outer width first. - // This hack seems to do the trick: - bWin.resizeTo(width,height); + // This is fun. any attempt to directly set the inner window actually resizes the outer width + // to that value instead. Must use resizeBy() instead of assignment or resizeTo() bWin.resizeBy(width-bWin.innerWidth,height-bWin.innerHeight); torbutton_log(3, "Resized new window from: "+bWin.innerWidth+"x"+bWin.innerHeight+" to "+width+"x"+height+" in state "+window.windowState); }

1 0

[torbutton/master] Squelch exception from app launcher in error console.
by mikeperry＠torproject.org 30 Jun '11

30 Jun '11

commit 81624d96f2427bf2f1be7893d0bd08c1f9b38f61 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Jun 30 14:49:39 2011 -0700 Squelch exception from app launcher in error console. --- src/components/external-app-blocker.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index f8f7ea5..a83f50c 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -107,7 +107,7 @@ ExternalWrapper.prototype = var call; if(params.length) call = "("+params.join().replace(/(?:)/g,function(){return "p"+(++x)})+")"; else call = "()"; - if(method == "getTypeFromFile" || method == "getTypeFromExtension") { + if(method == "getTypeFromFile" || method == "getTypeFromExtension" || method == "getTypeFromURI") { // XXX: Due to https://developer.mozilla.org/en/Exception_logging_in_JavaScript // this is necessary to prevent error console noise on the return to C++ code. // It is not technically correct, but as far as I can tell, returning null

1 0