- tor-commits - lists.torproject.org

[flashproxy/master] Move non-declaration code from flashproxy.js to embed.html.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 1278df97b2d84bc26caf113993bd8133ee26b4f0 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 12 09:24:07 2012 -0700 Move non-declaration code from flashproxy.js to embed.html. This is for the purpose of including flashproxy.js for testing. --- embed.html | 3 +++ flashproxy.js | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/embed.html b/embed.html index de90209..1d6f290 100644 --- a/embed.html +++ b/embed.html @@ -20,6 +20,9 @@ body { </head> <body> <script type="text/javascript" src="flashproxy.js"></script> +<script type="text/javascript"> +flashproxy_badge_insert().start(); +</script> <noscript> <a href="https://crypto.stanford.edu/flashproxy/" target="_parent"><img src="badge.png" border="0" alt="I support Internet freedom"></a> </noscript> diff --git a/flashproxy.js b/flashproxy.js index 2052f5a..7bab9e9 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -119,7 +119,6 @@ function flashproxy_should_disable() function flashproxy_badge_insert() { - var fp; var e; if (flashproxy_should_disable()) { @@ -138,6 +137,3 @@ function flashproxy_badge_insert() return fp; } - -fp = flashproxy_badge_insert(); -fp.start();

1 0

[flashproxy/master] maybe_quote needs to quote anything that's not an identifier.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 021b7e0e23ae3621d22bad82a8ace5ce49d9a300 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 12 22:24:21 2012 -0700 maybe_quote needs to quote anything that's not an identifier. --- flashproxy-test.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index e90d4b1..e4a59b9 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -34,7 +34,7 @@ function quote(s) function maybe_quote(s) { - if (/[\\\"]/.test(s)) + if (!/^[a-zA-Z_]\w*$/.test(s)) return quote(s); else return s;

1 0

[flashproxy/master] Add parse_addr_spec and tests.
by dcf＠torproject.org 09 Apr '12

09 Apr '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/master] Add more parse_query_string test vectors.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit f884810df178f765cc783e1e89baf66aa9c4a03c Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 12 22:21:30 2012 -0700 Add more parse_query_string test vectors. --- flashproxy-test.js | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index 21ae756..e90d4b1 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -84,6 +84,29 @@ function test_parse_query_string() expected: { a: "b", c: "d" } }, { qs: "client=&relay=1.2.3.4%3A9001", expected: { client: "", relay: "1.2.3.4:9001" } }, + { qs: "a=b%26c=d", + expected: { a: "b&c=d" } }, + { qs: "a%3db=d", + expected: { "a=b": "d" } }, + { qs: "a=b+c%20d", + expected: { "a": "b c d" } }, + { qs: "a=b+c%2bd", + expected: { "a": "b c+d" } }, + { qs: "a+b=c", + expected: { "a b": "c" } }, + /* First appearance wins. */ + { qs: "a=b&c=d&a=e", + expected: { a: "b", c: "d" } }, + { qs: "a", + expected: { a: "" } }, + { qs: "=b", + expected: { "": "b" } }, + { qs: "&a=b", + expected: { "": "", a: "b" } }, + { qs: "a=b&", + expected: { "": "", a: "b" } }, + { qs: "a=b&&c=d", + expected: { "": "", a: "b", c: "d" } }, ]; for (var i = 0; i < TESTS.length; i++) {

1 0

[flashproxy/master] Add parse_query_string.
by dcf＠torproject.org 09 Apr '12

09 Apr '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/master] Better handling of null in JS tests.
by dcf＠torproject.org 09 Apr '12

09 Apr '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/master] Show headings for test names.
by dcf＠torproject.org 09 Apr '12

09 Apr '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/master] Move repr to flashproxy.js from flashproxy-test.js.
by dcf＠torproject.org 09 Apr '12

09 Apr '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/master] Add the "facilitator" query string param.
by dcf＠torproject.org 09 Apr '12

09 Apr '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/master] Replace all pluses in a query string with spaces.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 11b2a575d4e4ada56384b85b2b7b9918c10317e7 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 14 20:27:12 2012 -0700 Replace all pluses in a query string with spaces. The argument to replace is a regular expression, so unless you provide the 'g' flag it replaces only the first match. --- flashproxy-test.js | 2 ++ flashproxy.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flashproxy-test.js b/flashproxy-test.js index 1073bab..0f1ac3f 100755 --- a/flashproxy-test.js +++ b/flashproxy-test.js @@ -74,6 +74,8 @@ function test_parse_query_string() expected: { "a": "b c+d" } }, { qs: "a+b=c", expected: { "a b": "c" } }, + { qs: "a=b+c+d", + expected: { a: "b c d" } }, /* First appearance wins. */ { qs: "a=b&c=d&a=e", expected: { a: "b", c: "d" } }, diff --git a/flashproxy.js b/flashproxy.js index 65c6ea2..ae31484 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -43,8 +43,8 @@ function parse_query_string(qs) name = string.substr(0, j); value = string.substr(j + 1); } - name = decodeURIComponent(name.replace(/\+/, " ")); - value = decodeURIComponent(value.replace(/\+/, " ")); + name = decodeURIComponent(name.replace(/\+/g, " ")); + value = decodeURIComponent(value.replace(/\+/g, " ")); if (!(name in result)) result[name] = value; }

1 0