- tor-commits - lists.torproject.org

[torspec/master] Clarify that the client- and server-versions fields
by arma＠torproject.org 17 Apr '11

17 Apr '11

commit 9a7bc15df331fe4eb5567193c7de62066ad03c6b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Apr 17 02:01:54 2011 +0200 Clarify that the client- and server-versions fields We only mean Tor versions there --- dir-spec.txt | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 3b8465f..589b0e9 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1129,16 +1129,18 @@ [At most once.] - A comma-separated list of recommended client versions, in - ascending order. If absent, no opinion is held about client + A comma-separated list of recommended Tor versions for client + usage, in ascending order. The versions are given as defined by + version-spec.txt. If absent, no opinion is held about client versions. "server-versions" SP VersionList NL [At most once.] - A comma-separated list of recommended server versions, in - ascending order. If absent, no opinion is held about server + A comma-separated list of recommended Tor versions for server + usage, in ascending order. The versions are given as defined by + version-spec.txt. If absent, no opinion is held about server versions. "known-flags" SP FlagList NL

1 0

[torbutton/master] Move JS hooks to new JS1.8.5 hooking support.
by mikeperry＠torproject.org 17 Apr '11

17 Apr '11

commit a090ed22b28dd460661f97529378a73aa97009f7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Apr 15 00:51:04 2011 -0700 Move JS hooks to new JS1.8.5 hooking support. The new JS1.8.5 hooking method appear more stable than the old ways, but they're not perfect... --- src/chrome/content/jshooks4.js | 264 +++++++++++++++++++++++++++++++++++++++ src/chrome/content/torbutton.js | 9 ++- 2 files changed, 272 insertions(+), 1 deletions(-) diff --git a/src/chrome/content/jshooks4.js b/src/chrome/content/jshooks4.js new file mode 100644 index 0000000..60a4e1c --- /dev/null +++ b/src/chrome/content/jshooks4.js @@ -0,0 +1,264 @@ +window.__HookObjects = function() { + if (typeof(window.__tb_hooks_ran) === "boolean") { + return false; + } + + // No pref for this.. Should be mostly harmless.. + if(true) { + // Wrap in anonymous function to protect scr variables just in case. + (function () { + var origHeight = window.innerHeight; + var origWidth = window.innerWidth; + + Object.defineProperty(window.__proto__, "innerWidth", + {get: function() { return Math.round(origWidth/50.0)*50;}, + configurable: false}); + Object.defineProperty(window.__proto__, "innerHeight", + {get: function() { return Math.round(origHeight/50.0)*50;}, + configurable: false}); + Object.defineProperty(window.__proto__, "outerWidth", + {get: function() { return Math.round(origWidth/50.0)*50;}, + configurable: false}); + Object.defineProperty(window.__proto__, "outerHeight", + {get: function() { return Math.round(origHeight/50.0)*50;}, + configurable: false}); + Object.defineProperty(window.__proto__, "screenX", + {get: function() { return 0;}, + configurable: false}); + Object.defineProperty(window.__proto__, "screenY", + {get: function() { return 0;}, + configurable: false}); + Object.defineProperty(window.__proto__, "pageXOffset", + {get: function() { return 0;}, + configurable: false}); + Object.defineProperty(window.__proto__, "pageYOffset", + {get: function() { return 0;}, + configurable: false}); + + // We can't define individual getters/setters for window.screen + // for some reason. works in html but not in these hooks.. No idea why + + var scr = new Object(); + var origScr = window.screen; + scr.__defineGetter__("height", function() { return window.innerHeight; }); + scr.__defineGetter__("width", function() { return window.innerWidth; }); + + scr.__defineGetter__("availTop", function() { return 0;}); + scr.__defineGetter__("availLeft", function() { return 0;}); + + scr.__defineGetter__("top", function() { return 0;}); + scr.__defineGetter__("left", function() { return 0;}); + + scr.__defineGetter__("availHeight", function() { return window.innerHeight;}); + scr.__defineGetter__("availWidth", function() { return window.innerWidth;}); + + scr.__defineGetter__("colorDepth", function() { return origScr.colorDepth;}); + scr.__defineGetter__("pixelDepth", function() { return origScr.pixelDepth;}); + + scr.__defineGetter__("availTop", function() { return 0;}); + scr.__defineGetter__("availLeft", function() { return 0;}); + + Object.defineProperty(window.__proto__, "screen", + {get: function() { return scr;}, + configurable: false}); + + })(); + + } + + if(window.__tb_hook_date == true) { // don't feel like indenting this + // XXX: events should not have timeStamp, unless they are of type MozBeforePaint? + + /* Timezone fix for http://gemal.dk/browserspy/css.html */ + var reparseDate = function(d, str) { + /* Rules: + * - If they specify a timezone, it is converted to local + * time. All getter fucntions then convert properly to + * UTC. No mod needed. + * - If they specify UTC timezone, then it is converted + * to local time. All getter functions then convert back. + * No mod needed. + * - If they specify NO timezone, it is local time. + * The UTC conversion then reveals the offset. Fix. + */ + + /* Step 1: Remove everything inside ()'s (they are "comments") */ + var s = str.toLowerCase(); + var re = new RegExp('\$.*\$', "gm"); + s = s.replace(re, ""); + + /* Step 2: Look for +/-. If found, do nothing */ + if(s.indexOf("+") == -1 && s.indexOf("-") == -1) { + /* Step 3: Look for timezone string from + * http://lxr.mozilla.org/seamonkey/source/js/src/jsdate.c + */ + if(s.indexOf(" gmt") == -1 && s.indexOf(" ut") == -1 && + s.indexOf(" est") == -1 && s.indexOf(" edt") == -1 && + s.indexOf(" cst") == -1 && s.indexOf(" cdt") == -1 && + s.indexOf(" mst") == -1 && s.indexOf(" mdt") == -1 && + s.indexOf(" pst") == -1 && s.indexOf(" pdt")) { + /* No timezone specified. Adjust. */ + d.setTime(d.getTime()-(d.getTimezoneOffset()*60000)); + } + } + } + + // XXX: Each origin should have its own unique offset from the real date + // XXX: Subsequent calls to the ms timer should be monotonically increasing, but randomized + + var origDate = window.Date; + var newDate = function() { + /* DO NOT make 'd' a member! EvilCode will use it! */ + var d; + var a = arguments; + /* apply doesn't seem to work for constructors :( */ + if(arguments.length == 0) d=new origDate(); + if(arguments.length == 1) d=new origDate(a[0]); + if(arguments.length == 3) d=new origDate(a[0],a[1],a[2]); + if(arguments.length == 4) d=new origDate(a[0],a[1],a[2],a[3]); + if(arguments.length == 5) d=new origDate(a[0],a[1],a[2],a[3],a[4]); + if(arguments.length == 6) d=new origDate(a[0],a[1],a[2],a[3],a[4],a[5]); + if(arguments.length == 7) d=new origDate(a[0],a[1],a[2],a[3],a[4],a[5],a[6]); + if(arguments.length > 7) d=new origDate(); + + if(arguments.length > 0) { + if((arguments.length == 1) && typeof(a[0]) == "string") { + reparseDate(d,a[0]); + } else if(arguments.length > 1) { + /* Numerical value. No timezone given, adjust. */ + d.setTime(d.getTime()-(d.getTimezoneOffset()*60000)); + } + } + + // XXX: the native valueOf seems to sometimes return toString and + // sometimes return getTime depending on context (which we can't detect) + // It seems as though we can't win here.. + window.Date.prototype.valueOf=function(){return d.getTime()}; + window.Date.prototype.getTime=function(){return d.getTime();} /* UTC already */ + window.Date.prototype.getFullYear=function(){return d.getUTCFullYear();} + window.Date.prototype.getYear=function() {return d.getYear();} + window.Date.prototype.getMonth=function(){return d.getUTCMonth();} + window.Date.prototype.getDate=function() {return d.getUTCDate();} + window.Date.prototype.getDay=function() {return d.getUTCDay();} + window.Date.prototype.getHours=function(){return d.getUTCHours();} + window.Date.prototype.getMinutes=function(){return d.getUTCMinutes();} + window.Date.prototype.getSeconds=function(){return d.getUTCSeconds();} + window.Date.prototype.getMilliseconds=function(){return d.getUTCMilliseconds();} + window.Date.prototype.getTimezoneOffset=function(){return 0;} + + window.Date.prototype.setTime = + function(x) {return d.setTime(x);} + window.Date.prototype.setFullYear=function(x){return d.setUTCFullYear(x);} + window.Date.prototype.setYear=function(x){return d.setYear(x);} + window.Date.prototype.setMonth=function(x){return d.setUTCMonth(x);} + window.Date.prototype.setDate=function(x){return d.setUTCDate(x);} + window.Date.prototype.setDay=function(x){return d.setUTCDay(x);} + window.Date.prototype.setHours=function(x){return d.setUTCHours(x);} + window.Date.prototype.setMinutes=function(x){return d.setUTCMinutes(x);} + window.Date.prototype.setSeconds=function(x){return d.setUTCSeconds(x);} + window.Date.prototype.setMilliseconds= + function(x) {return d.setUTCMilliseconds(x);} + + window.Date.prototype.getUTCFullYear=function(){return d.getUTCFullYear();} + window.Date.prototype.getUTCMonth=function(){return d.getUTCMonth();} + window.Date.prototype.getUTCDate=function() {return d.getUTCDate();} + window.Date.prototype.getUTCDay=function() {return d.getUTCDay();} + window.Date.prototype.getUTCHours=function(){return d.getUTCHours();} + window.Date.prototype.getUTCMinutes=function(){return d.getUTCMinutes();} + window.Date.prototype.getUTCSeconds=function(){return d.getUTCSeconds();} + window.Date.prototype.getUTCMilliseconds= + function(){return d.getUTCMilliseconds();} + + window.Date.prototype.setUTCFullYear=function(x){return d.setUTCFullYear(x);} + window.Date.prototype.setUTCMonth=function(x){return d.setUTCMonth(x);} + window.Date.prototype.setUTCDate=function(x){return d.setUTCDate(x);} + window.Date.prototype.setUTCDay=function(x){return d.setUTCDay(x);} + window.Date.prototype.setUTCHours=function(x){return d.setUTCHours(x);} + window.Date.prototype.setUTCMinutes=function(x){return d.setUTCMinutes(x);} + window.Date.prototype.setUTCSeconds=function(x){return d.setUTCSeconds(x);} + window.Date.prototype.setUTCMilliseconds= + function(x) {return d.setUTCMilliseconds(x);} + + window.Date.prototype.toUTCString=function(){return d.toUTCString();} + window.Date.prototype.toGMTString=function(){return d.toGMTString();} + window.Date.prototype.toString=function(){return d.toUTCString();} + window.Date.prototype.toLocaleString=function(){return d.toUTCString();} + + /* Fuck 'em if they can't take a joke: */ + window.Date.prototype.toLocaleTimeString=function(){return d.toUTCString();} + window.Date.prototype.toLocaleDateString=function(){return d.toUTCString();} + window.Date.prototype.toDateString=function(){return d.toUTCString();} + window.Date.prototype.toTimeString=function(){return d.toUTCString();} + + /* Hack to solve the problem of multiple date objects + * all sharing the same lexically scoped d every time a new one is + * created. This hack creates a fresh new prototype reference for + * the next object to use with a different d binding. + * It doesn't break stuff because at the start of this function, + * the interpreter grabbed a reference to Date.prototype. During + * this function we modified Date.prototype to create the new methods + * with the lexically scoped d reference. + */ + + // valueOf gets called for implicit string conversion?? + window.Date.prototype = window.eval(window.Object.prototype.toSource()); + return d.toUTCString(); + } + + // Need to do this madness so that we use the window's notion of Function + // for the constructor. If this is not done, then changes to Function + // and Object in the real window are not propogated to Date (for example, + // to extend the Date class with extra functions via a generic inheritance + // framework added onto Object - this is done by livejournal and others) + var newWrappedDate = window.eval("function() { return newDate(); }"); + + newWrappedDate.parse=function(s) { + var d = new origDate(s); + if(typeof(s) == "string") reparseDate(d, s); + return d.getTime(); + } + + newWrappedDate.now=function(){return origDate.now();} + newWrappedDate.UTC=function(){return origDate.apply(origDate, arguments); } + + // d = new Date(); + // d.__proto__ === Date.prototype + // d.constructor === Date + // d.__proto__ === d.constructor.prototype + // Date.prototype.__proto__ === Date.prototype.constructor.prototype + // window.__proto__ === Window.prototypea + + Object.defineProperty(window.__proto__, "Date", + {get: function() { return newWrappedDate;}, + configurable: false}); + + } // window.__tb_hook_date == true + + //Object.defineProperty(window.Components.__proto__, "lookupMethod", + // {get: function() { return function (a,b) { return function() { return a[b]; }; };}, + // configurable: false}); + + return true; +} + +if (typeof(window.__HookObjects) != "undefined") { + var res = 23; + + if(!window.__HookObjects()) { + res = 13; + } + + window.__HookObjects = undefined; + delete window['__HookObjects']; + delete window['__CheckFlag']; + delete window['__tb_set_uagent']; + delete window['__tb_oscpu']; + delete window['__tb_platform']; + delete window['__tb_productSub']; + + window.__tb_hooks_ran = true; + + res; // Secret result code. +} else { + 42; +} diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 676c311..9f5c5fe 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -3431,6 +3431,7 @@ function torbutton_do_startup() } var tor_enabled = torbutton_check_status(); + // XXX: There is a timer at startup. this is not enough.. if(m_tb_ff35 && m_tb_prefs.getBoolPref("extensions.torbutton.disable_livemarks")) { var livemarks = Cc["@mozilla.org/browser/livemark-service;2"]. @@ -3668,8 +3669,14 @@ function torbutton_init_jshooks() { torbutton_log(2, "torbutton_init_jshooks()"); var nsio = Components.classes["@mozilla.org/network/io-service;1"] .getService(Components.interfaces.nsIIOService); - var chan = nsio.newChannel("chrome://torbutton/content/jshooks.js", + var chan = null; + if (m_tb_ff4) { + chan = nsio.newChannel("chrome://torbutton/content/jshooks4.js", null, null); + } else { + chan = nsio.newChannel("chrome://torbutton/content/jshooks.js", + null, null); + } var istream = Components.classes["@mozilla.org/scriptableinputstream;1"]. createInstance(Components.interfaces.nsIScriptableInputStream);

1 0

[torspec/master] Cleared up example. Fixed two small errors.
by arma＠torproject.org 16 Apr '11

16 Apr '11

commit 71609c11e48086a341e9248b7bc8cd30bd08878b Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Apr 12 22:02:57 2011 +0200 Cleared up example. Fixed two small errors. --- proposals/180-pluggable-transport.txt | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index 5e9e5b1..f51a9ff 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -145,7 +145,7 @@ Specifications: Client behavior bridge method address:port [[keyid=]id-fingerprint] [k=v] [k=v] [k=v] To connect to such a bridge, the Tor program needs to know which - local SOCKS proxy will support the transport called "method". It + SOCKS proxy will support the transport called "method". It then connects to this proxy, and asks it to connect to address:port. If [id-fingerprint] is provided, Tor should expect the public identity key on the TLS connection to match the digest @@ -156,8 +156,7 @@ Specifications: Client behavior as necessary. If a key or value value must contain a semicolon or a backslash, it is escaped with a backslash. - The "id-fingerprint" field is always provided in a field named - "keyid", if it was given. Method names must be C identifiers. + Method names must be C identifiers. For reference, the old bridge format was bridge address[:port] [id-fingerprint] @@ -168,11 +167,11 @@ Specifications: Client behavior optionally include whitespace in the old format, whitespace in the id-fingerprint is not permitted in the new format. - Example: if the bridge line is "bridge trebuchet www.example.com:3333 - rocks=20 height=5.6m" AND if the Tor client knows that the - 'trebuchet' method is provided by a SOCKS5 proxy on - 127.0.0.1:19999, the client should connect to that proxy, ask it to - connect to www.example.com, and provide the string + Example: if the bridge line is "bridge trebuchet www.example.com:3333 + keyid=09F911029D74E35BD84156C5635688C009F909F9 rocks=20 height=5.6m" + AND if the Tor client knows that the 'trebuchet' method is supported, + the client should connect to the proxy that provides the 'trebuchet' + method, ask it to connect to www.example.com, and provide the string "rocks=20;height=5.6m" as the username, the password, or split across the username and password.

1 0

[torspec/master] Merge remote-tracking branch 'asn/gitorious'
by arma＠torproject.org 16 Apr '11

16 Apr '11

commit a8219b9406daa19b97ceb7e9975365659c805cc3 Merge: 0f11e4f 71609c1 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Apr 16 19:22:03 2011 -0400 Merge remote-tracking branch 'asn/gitorious' proposals/180-pluggable-transport.txt | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)

1 0

r24643: {} Delete pl_PL/ because we have pl/ (website/trunk/getinvolved)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 20:56:02 +0000 (Sat, 16 Apr 2011) New Revision: 24643 Removed: website/trunk/getinvolved/pl_PL/ Log: Delete pl_PL/ because we have pl/

1 0

r24642: {} Delete pl_PL/ because we already have pl/ (website/trunk/projects)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 20:55:15 +0000 (Sat, 16 Apr 2011) New Revision: 24642 Removed: website/trunk/projects/pl_PL/ Log: Delete pl_PL/ because we already have pl/

1 0

r24641: {} German translation of sidenav.wmi for projects/ (by Sacro) (in website/trunk/projects: . de)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 20:54:55 +0000 (Sat, 16 Apr 2011) New Revision: 24641 Added: website/trunk/projects/de/ website/trunk/projects/de/sidenav.wmi Log: German translation of sidenav.wmi for projects/ (by Sacro) Added: website/trunk/projects/de/sidenav.wmi =================================================================== --- website/trunk/projects/de/sidenav.wmi (rev 0) +++ website/trunk/projects/de/sidenav.wmi 2011-04-16 20:54:55 UTC (rev 24641) @@ -0,0 +1,56 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /projects pages +# and is the input for include/side.wmi + +# fields: +# +# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the +# page because at build-time it is used to determine what view of the +# navigation menu to generate +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'projects/projects', + 'txt' => 'Software & Services', + 'subelements' => [ + {'url' => 'torbutton/index', + 'txt' => 'TorButton', + }, + {'url' => 'projects/torbrowser', + 'txt' => 'Tor-Browser-Paket', + }, + {'url' => 'projects/vidalia', + 'txt' => 'Vidalia', + }, + {'url' => 'projects/arm', + 'txt' => 'Arm', + }, + {'url' => 'https://guardianproject.info/apps/orbot/', + 'txt' => 'Orbot', + }, + {'url' => 'https://tails.boum.org/', + 'txt' => 'Tails', + }, + {'url' => 'http://torstatus.blutmagie.de/', + 'txt' => 'TorStatus', + }, + {'url' => 'https://metrics.torproject.org/', + 'txt' => 'Messdaten Portal', + } + ] + }]; +:> +

1 0

r24640: {} Delete pl_PL/ because we already have pl/ (website/trunk/torbutton)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 20:54:05 +0000 (Sat, 16 Apr 2011) New Revision: 24640 Removed: website/trunk/torbutton/pl_PL/ Log: Delete pl_PL/ because we already have pl/

1 0

r24639: {} German translation of sidenav.wmi for torbutton/ (by Sacro) (in website/trunk/torbutton: . de)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 20:53:47 +0000 (Sat, 16 Apr 2011) New Revision: 24639 Added: website/trunk/torbutton/de/ website/trunk/torbutton/de/sidenav.wmi Log: German translation of sidenav.wmi for torbutton/ (by Sacro) Added: website/trunk/torbutton/de/sidenav.wmi =================================================================== --- website/trunk/torbutton/de/sidenav.wmi (rev 0) +++ website/trunk/torbutton/de/sidenav.wmi 2011-04-16 20:53:47 UTC (rev 24639) @@ -0,0 +1,37 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /torbutton pages +# and is the input for include/side.wmi + +# fields: +# +# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the +# page because at build-time it is used to determine what view of the +# navigation menu to generate +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'torbutton/index', + 'txt' => 'Torbutton', + 'subelements' => [ + {'url' => 'torbutton/torbutton-options', + 'txt' => 'Torbutton Optionen', + }, + {'url' => 'torbutton/torbutton-faq', + 'txt' => 'Torbutton FAQ', + }] + }] +:> +

1 0

r24638: {} German translation of info.wmi for press/ (by Sacro) (website/trunk/press/de)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 19:26:14 +0000 (Sat, 16 Apr 2011) New Revision: 24638 Added: website/trunk/press/de/info.wmi Log: German translation of info.wmi for press/ (by Sacro) Added: website/trunk/press/de/info.wmi =================================================================== --- website/trunk/press/de/info.wmi (rev 0) +++ website/trunk/press/de/info.wmi 2011-04-16 19:26:14 UTC (rev 24638) @@ -0,0 +1,18 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 2-medium +#!/usr/bin/env wml +<div class="img-shadow"> + <div class="infoblock"> + <h2 class="media">Presse-Kontakt</h2> + <p> + <b>Andrew Lewman</b><br> + Verantwortlicher Direktor<br> + execdir(a)torproject.org<br> + +1-406-356-6475<br> + </p> + </div> +  +</div> + +

1 0