March 2012 - tor-commits - lists.torproject.org

[flashproxy/js] Better handling of null in JS tests.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit 341de85c4475b47bc7d53c4896d9b325792f641a Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 12 22:28:43 2012 -0700 Better handling of null in JS tests. I read somewhere that (typeof null) is null, but that seems not to be the case (I get "object"). --- flashproxy-test.js | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index e4a59b9..ca68f85 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -10,6 +10,8 @@ load("flashproxy.js"); function objects_equal(a, b) { + if ((a === null) != (b === null)) + return false; if (typeof a != typeof b) return false; if (typeof a != "object") @@ -42,7 +44,7 @@ function maybe_quote(s) function repr(x) { - if (typeof x === null) { + if (x === null) { return "null"; } else if (typeof x == "undefined") { return "undefined";

1 0

[flashproxy/js] Add parse_addr_spec and tests.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit 627cd6044c22a3e27c709f55b137caacaf47736f Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 10:22:39 2012 -0700 Add parse_addr_spec and tests. --- flashproxy-test.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ flashproxy.js | 32 +++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index ca68f85..2c786ee 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -123,7 +123,64 @@ function test_parse_query_string() } } +function test_parse_addr_spec() +{ + var TESTS = [ + { spec: "", + expected: null }, + { spec: "3.3.3.3:4444", + expected: { host: "3.3.3.3", port: 4444 } }, + { spec: "3.3.3.3", + expected: null }, + { spec: "3.3.3.3:0x1111", + expected: null }, + { spec: "3.3.3.3:-4444", + expected: null }, + { spec: "3.3.3.3:65536", + expected: null }, + ]; + + for (var i = 0; i < TESTS.length; i++) { + var test = TESTS[i]; + var actual; + + actual = parse_addr_spec(test.spec); + if (objects_equal(actual, test.expected)) + pass(test.spec); + else + fail(test.spec, test.expected, actual); + } +} + +function test_get_query_param_addr() +{ + var DEFAULT = { host: "1.1.1.1", port: 2222 }; + var TESTS = [ + { query: { }, + expected: DEFAULT }, + { query: { addr: "3.3.3.3:4444" }, + expected: { host: "3.3.3.3", port: 4444 } }, + { query: { x: "3.3.3.3:4444" }, + expected: DEFAULT }, + { query: { addr: "---" }, + expected: null }, + ]; + + for (var i = 0; i < TESTS.length; i++) { + var test = TESTS[i]; + var actual; + + actual = get_query_param_addr(test.query, "addr", DEFAULT); + if (objects_equal(actual, test.expected)) + pass(test.query); + else + fail(test.query, test.expected, actual); + } +} + test_parse_query_string(); +test_parse_addr_spec(); +test_get_query_param_addr(); if (num_failed == 0) quit(0); diff --git a/flashproxy.js b/flashproxy.js index b68da1f..f45fd1d 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -43,6 +43,38 @@ function parse_query_string(qs) return result; } +/* Get a query string parameter and parse it as an address spec. Returns + default_val if param is not defined in the query string. Returns null on a + parsing error. */ +function get_query_param_addr(query, param, default_val) +{ + var val; + + val = query[param]; + if (val === undefined) + return default_val; + else + return parse_addr_spec(val); +} + +/* Parse an address in the form "host:port". Returns an Object with + keys "host" (String) and "port" (int). Returns null on error. */ +function parse_addr_spec(spec) +{ + var groups; + var host, port; + + groups = spec.match(/^([^:]+):(\d+)$/); + if (!groups) + return null; + host = groups[1]; + port = parseInt(groups[2], 10); + if (isNaN(port) || port < 0 || port > 65535) + return null; + + return { host: host, port: port } +} + function format_addr(addr) { return addr.host + ":" + addr.port;

1 0

[flashproxy/js] Add parse_query_string.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit cc8507d12cfd162e29114e999ba94d84abcbd4c6 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 09:53:01 2012 -0700 Add parse_query_string. It's strange that this is not built in. The Note at http://dev.w3.org/html5/spec/Overview.html#url-encoded-form-data is worth reading. --- flashproxy.js | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index e4c7319..b68da1f 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -3,9 +3,44 @@ var DEFAULT_FACILITATOR_ADDR = { port: 9002 }; +/* Parse a URL query string or application/x-www-form-urlencoded body. The + return type is an object mapping string keys to string values. By design, + this function doesn't support multiple values for the same named parameter, + for example "a=1&a=2&a=3"; the first definition always wins. Returns null on + error. + + Always decodes from UTF-8, not any other encoding. + + http://dev.w3.org/html5/spec/Overview.html#url-encoded-form-data */ function parse_query_string(qs) { - return {}; + var strings; + var result; + + result = {}; + if (qs) + strings = qs.split("&"); + else + strings = {} + for (var i = 0; i < strings.length; i++) { + var string = strings[i]; + var j, name, value; + + j = string.indexOf("="); + if (j == -1) { + name = string; + value = ""; + } else { + name = string.substr(0, j); + value = string.substr(j + 1); + } + name = decodeURIComponent(name.replace(/\+/, " ")); + value = decodeURIComponent(value.replace(/\+/, " ")); + if (!(name in result)) + result[name] = value; + } + + return result; } function format_addr(addr)

1 0

[flashproxy/js] Show headings for test names.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit 0a058879f0bb51ae717528e6245c791f48e4c806 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 10:24:43 2012 -0700 Show headings for test names. --- flashproxy-test.js | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index 2c786ee..43f23b3 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -60,6 +60,15 @@ function repr(x) } } +var top = true; +function announce(test_name) +{ + if (!top) + print(); + top = false; + print(test_name); +} + function pass(test) { num_tests++; @@ -111,6 +120,7 @@ function test_parse_query_string() expected: { "": "", a: "b", c: "d" } }, ]; + announce("test_parse_query_string"); for (var i = 0; i < TESTS.length; i++) { var test = TESTS[i]; var actual; @@ -140,6 +150,7 @@ function test_parse_addr_spec() expected: null }, ]; + announce("test_parse_addr_spec"); for (var i = 0; i < TESTS.length; i++) { var test = TESTS[i]; var actual; @@ -166,6 +177,7 @@ function test_get_query_param_addr() expected: null }, ]; + announce("test_get_query_param_addr"); for (var i = 0; i < TESTS.length; i++) { var test = TESTS[i]; var actual;

1 0

[flashproxy/js] Add the "facilitator" query string param.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit 9e8a38af3f5109812d6762103b9ff5bafa9ac927 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 10:38:39 2012 -0700 Add the "facilitator" query string param. --- flashproxy.js | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 263b6e3..ff9b1e6 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -1,3 +1,12 @@ +/* Query string parameters. These change how the program runs from the outside. + * For example: + * http://www.example.com/embed.html?facilitator=127.0.0.1:9002&debug=1 + * + * facilitator=<HOST>:<PORT> + * The address of the facilitator to use. By default it is + * DEFAULT_FACILITATOR_ADDR. Both <HOST> and <PORT> must be present. + */ + var DEFAULT_FACILITATOR_ADDR = { host: "tor-facilitator.bamsoftware.com", port: 9002 @@ -96,12 +105,15 @@ function FlashProxy() }; this.start = function() { + var query; var fac_addr, fac_url; var xhr; - fac_addr = DEFAULT_FACILITATOR_ADDR; + query = parse_query_string(window.location.search.substr(1)); + + fac_addr = get_query_param_addr(query, "facilitator", DEFAULT_FACILITATOR_ADDR); if (!fac_addr) { - puts("Error: Facilitator spec must be in the form \"host:port\"."); + this.puts("Error: Facilitator spec must be in the form \"host:port\"."); return; }

1 0

[flashproxy/js] Break out a proxy_main function for after argument parsing.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit cace7b86e8a3d21c6705368d9bdae4b559884b5d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 10:42:22 2012 -0700 Break out a proxy_main function for after argument parsing. --- flashproxy.js | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index ff9b1e6..05674c4 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -106,8 +106,7 @@ function FlashProxy() this.start = function() { var query; - var fac_addr, fac_url; - var xhr; + var fac_addr; query = parse_query_string(window.location.search.substr(1)); @@ -117,6 +116,13 @@ function FlashProxy() return; } + this.proxy_main(fac_addr); + }; + + this.proxy_main = function(fac_addr) { + var fac_url; + var xhr; + this.puts("Using facilitator " + format_addr(fac_addr) + "."); fac_url = "http://" + encodeURIComponent(fac_addr.host)

1 0

[flashproxy/master] The MIME type is application/x-www-form-urlencoded.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit 5dcc14f7655ffd16df31d6ffe60fd5c4242af13d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 09:21:34 2012 -0700 The MIME type is application/x-www-form-urlencoded. Previously the "application/" was left off. --- facilitator.py | 2 +- swfcat.as | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/facilitator.py b/facilitator.py index f028ae3..3e7ca09 100755 --- a/facilitator.py +++ b/facilitator.py @@ -296,7 +296,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): # "server not found." client_str = "" self.send_response(200) - self.send_header("Content-Type", "x-www-form-urlencoded") + self.send_header("Content-Type", "application/x-www-form-urlencoded") self.send_header("Cache-Control", "no-cache") # Allow XMLHttpRequest from any domain. http://www.w3.org/TR/cors/. self.send_header("Access-Control-Allow-Origin", "*") diff --git a/swfcat.as b/swfcat.as index 76b35c4..7ec9a5b 100644 --- a/swfcat.as +++ b/swfcat.as @@ -260,7 +260,7 @@ package } loader = new URLLoader(); - /* Get the x-www-form-urlencoded values. */ + /* Get the application/x-www-form-urlencoded values. */ loader.dataFormat = URLLoaderDataFormat.VARIABLES; loader.addEventListener(Event.COMPLETE, fac_complete); loader.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void {

1 0

[flashproxy/js] Move repr to flashproxy.js from flashproxy-test.js.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit 24fdd3b2d83328a1a0ba5e7991eca657407ec33d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 10:29:35 2012 -0700 Move repr to flashproxy.js from flashproxy-test.js. --- flashproxy-test.js | 31 ------------------------------- flashproxy.js | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index 43f23b3..1073bab 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -29,37 +29,6 @@ function objects_equal(a, b) return true; } -function quote(s) -{ - return "\"" + s.replace(/([\\\"])/, "\\$1") + "\""; -} - -function maybe_quote(s) -{ - if (!/^[a-zA-Z_]\w*$/.test(s)) - return quote(s); - else - return s; -} - -function repr(x) -{ - if (x === null) { - return "null"; - } else if (typeof x == "undefined") { - return "undefined"; - } else if (typeof x == "object") { - var elems = []; - for (var k in x) - elems.push(maybe_quote(k) + ": " + repr(x[k])); - return "{ " + elems.join(", ") + " }"; - } else if (typeof x == "string") { - return quote(x); - } else { - return x.toString(); - } -} - var top = true; function announce(test_name) { diff --git a/flashproxy.js b/flashproxy.js index f45fd1d..263b6e3 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -151,6 +151,37 @@ function DummyFlashProxy() }; } +function quote(s) +{ + return "\"" + s.replace(/([\\\"])/, "\\$1") + "\""; +} + +function maybe_quote(s) +{ + if (!/^[a-zA-Z_]\w*$/.test(s)) + return quote(s); + else + return s; +} + +function repr(x) +{ + if (x === null) { + return "null"; + } else if (typeof x == "undefined") { + return "undefined"; + } else if (typeof x == "object") { + var elems = []; + for (var k in x) + elems.push(maybe_quote(k) + ": " + repr(x[k])); + return "{ " + elems.join(", ") + " }"; + } else if (typeof x == "string") { + return quote(x); + } else { + return x.toString(); + } +} + /* Are circumstances such that we should self-disable and not be a proxy? We take a best-effort guess as to whether this device runs on a battery or the data transfer might be expensive.

1 0

[flashproxy/js] Better connection failure diagnostics.
by dcf＠torproject.org 13 Mar '12

13 Mar '12

commit bc95aca58e2f615f2fb2d014d422e6e1d78087f1 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 10:45:33 2012 -0700 Better connection failure diagnostics. --- flashproxy.js | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 05674c4..e7d60c8 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -128,7 +128,17 @@ function FlashProxy() fac_url = "http://" + encodeURIComponent(fac_addr.host) + ":" + encodeURIComponent(fac_addr.port) + "/"; xhr = new XMLHttpRequest(); - xhr.open("GET", fac_url); + try { + xhr.open("GET", fac_url); + } catch (err) { + /* An exception happens here when, for example, NoScript allows the + domain on which the proxy badge runs, but not the domain to which + it's trying to make the HTTP request. The exception message is + like "Component returned failure code: 0x805e0006 + [nsIXMLHttpRequest.open]" on Firefox. */ + this.puts("Facilitator: exception while connecting: " + repr(err.message) + "."); + return; + } xhr.responseType = "text"; xhr.onreadystatechange = function() { /* Status 0 is UNSENT. 4 is DONE. */ @@ -137,10 +147,8 @@ function FlashProxy() } else if (xhr.readyState == 4) { if (xhr.status == 200) this.fac_complete(xhr.responseText); - else if (xhr.readyState == 4) - this.puts("Facilitator: got status " + xhr.status + "."); else - this.puts("Facilitator: unknown error."); + this.puts("Facilitator: can't connect: got response code " + xhr.status + "."); } }.bind(this); this.puts("Facilitator: connecting to " + fac_url + ".");

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 13 Mar '12

13 Mar '12

commit 26fa570674cba85ac95233b72b2dc4d4056424dc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 13 17:45:15 2012 +0000 Update translations for vidalia_completed --- eu/vidalia_eu.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 30c6b11..63ef4da 100644 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-03-08 11:49+0000\n" +"PO-Revision-Date: 2012-03-13 17:21+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -247,11 +247,11 @@ msgstr "Berrabiarazi" msgctxt "BandwidthGraph" msgid "Receive Rate" -msgstr "Abiadura jaso" +msgstr "Jasotze abiadura" msgctxt "BandwidthGraph" msgid "Send Rate" -msgstr "Abiadura bidali" +msgstr "Bidaltze abiadura" msgctxt "BandwidthGraph" msgid "Always on Top" @@ -2284,7 +2284,7 @@ msgstr "Ktrl+F" msgctxt "MessageLog" msgid "Time" -msgstr "Denbora" +msgstr "Data" msgctxt "MessageLog" msgid "Type"

1 0