- tor-commits - lists.torproject.org

[flashproxy/master] It's an error if a cookie string is missing '='.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit d44ab0485cb7ae072c604a3a9fe29715f4cdbc0f Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 24 18:01:23 2012 -0800 It's an error if a cookie string is missing '='. --- proxy/flashproxy.js | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index cf22b8d..777fb0d 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -98,8 +98,9 @@ function puts(s) { } /* Parse a cookie data string (usually document.cookie). The return type - is an object mapping cookies names to values. For a description of the cookie - string format see http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038 */ + is an object mapping cookies names to values. Returns null on error. + + http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038 */ function parse_cookie_string(cookies) { var strings; var result; @@ -114,6 +115,9 @@ function parse_cookie_string(cookies) { var j, name, value; j = string.indexOf("="); + if (j === -1) { + return null; + } name = string.substr(0, j); value = string.substr(j + 1);

1 0

[flashproxy/master] Handle equal signs in cookie values correctly.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 4318c560e094f78cf94717502fbad737dc426ebb Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Fri Dec 21 19:11:17 2012 -0500 Handle equal signs in cookie values correctly. The previous version split on the "=" character, and took the second element in the split as the cookie value. This will truncate cookie values with equal signs in them. The correct approach is to take everything after the first "=" as the value. --- proxy/options.html | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proxy/options.html b/proxy/options.html index 1126850..59f0125 100644 --- a/proxy/options.html +++ b/proxy/options.html @@ -84,18 +84,18 @@ function set_cookie_disallowed() { /* Returns the value of the cookie, or undefined if the cookie is not present. */ function read_cookie() { - var split, name, value; + var str, j; var cookies = document.cookie.split(";"); for (i in cookies) { - split = cookies[i].split("="); - name = split[0]; - value = split[1]; + str = cookies[i]; - while (name[0] === " ") - name = name.substr(1); - if (COOKIE_NAME === name) - return value; + while (str[0] === " ") + str = str.substr(1); + + j = str.indexOf("="); + if (COOKIE_NAME === str.substr(0, j)) + return str.substr(j + 1); } return undefined; }

1 0

[flashproxy/master] Decode our cookie values.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit b90d85ca8dc669b77f052406939a26f9d722d176 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 25 10:42:38 2012 -0800 Decode our cookie values. The encoding is not part of the syntax of cookies, but it makes safe characters like whitespace. --- proxy/flashproxy.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index caa3a31..d6bcdab 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -118,8 +118,8 @@ function parse_cookie_string(cookies) { if (j === -1) { return null; } - name = string.substr(0, j).trim(); - value = string.substr(j + 1).trim(); + name = decodeURIComponent(string.substr(0, j).trim()); + value = decodeURIComponent(string.substr(j + 1).trim()); if (!(name in result)) result[name] = value;

1 0

[flashproxy/master] First cookie value wins, like parse_query_string.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit a41614bf46ad4093c448f891f6f9a2174539c33c Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 24 18:03:28 2012 -0800 First cookie value wins, like parse_query_string. --- proxy/flashproxy.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 86ecfab..caa3a31 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -121,7 +121,8 @@ function parse_cookie_string(cookies) { name = string.substr(0, j).trim(); value = string.substr(j + 1).trim(); - result[name] = value; + if (!(name in result)) + result[name] = value; } return result;

1 0

[flashproxy/master] Break up the cookie disable logic.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 6d6505aa84583806bb5cedfbe51430cc8079c272 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 25 13:38:39 2012 -0800 Break up the cookie disable logic. --- proxy/flashproxy.js | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 4aecc8c..795dac1 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -942,11 +942,15 @@ function flashproxy_should_disable() { return true; } - var setting = get_param_boolean(cookies, OPT_IN_COOKIE, undefined); - var opt_in = get_param_boolean(query, "cookierequired", false); - if (setting === undefined && opt_in || setting === false) { - /* User has opted-out, or opt-in is required and cookie is missing. */ - puts("Disable because of opt-out or required opt-in."); + var flashproxy_allow = get_param_boolean(cookies, OPT_IN_COOKIE); + var cookierequired = get_param_boolean(query, "cookierequired", false); + /* flashproxy_allow may be true, false, or undefined. If undefined, only + disable if the cookierequired param is also set. */ + if (flashproxy_allow === false) { + puts("Disable because of cookie opt-out."); + return true; + } else if (cookierequired && !flashproxy_allow) { + puts("Disable because of cookie required and no opt-in."); return true; }

1 0

[flashproxy/master] Use JavaScript trim method, and trim both name and value.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 5406ca86487f351efbfff6c11d6d90ac0dafa924 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 24 18:02:56 2012 -0800 Use JavaScript trim method, and trim both name and value. --- proxy/flashproxy.js | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 777fb0d..86ecfab 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -118,11 +118,8 @@ function parse_cookie_string(cookies) { if (j === -1) { return null; } - name = string.substr(0, j); - value = string.substr(j + 1); - - while (name[0] === " ") - name = name.substr(1); + name = string.substr(0, j).trim(); + value = string.substr(j + 1).trim(); result[name] = value; }

1 0

[flashproxy/master] Change get_query_param_* to get_param_* to match get_param_boolean.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 4b59296dc44cf6777c76989d52dcacb14fa3d9b3 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 25 11:24:23 2012 -0800 Change get_query_param_* to get_param_* to match get_param_boolean. --- proxy/flashproxy-test.js | 10 ++++---- proxy/flashproxy.js | 57 +++++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index 86c48d9..b411a9e 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -181,7 +181,7 @@ function test_get_param_boolean() expected: false }, ]; - announce("test_get_query_param_boolean"); + announce("test_get_param_boolean"); for (var i = 0; i < TESTS.length; i++) { var test = TESTS[i]; var actual; @@ -238,7 +238,7 @@ function test_parse_addr_spec() } } -function test_get_query_param_addr() +function test_get_param_addr() { var DEFAULT = { host: "1.1.1.1", port: 2222 }; var TESTS = [ @@ -252,12 +252,12 @@ function test_get_query_param_addr() expected: null }, ]; - announce("test_get_query_param_addr"); + announce("test_get_param_addr"); for (var i = 0; i < TESTS.length; i++) { var test = TESTS[i]; var actual; - actual = get_query_param_addr(test.query, "addr", DEFAULT); + actual = get_param_addr(test.query, "addr", DEFAULT); if (objects_equal(actual, test.expected)) pass(test.query); else @@ -269,7 +269,7 @@ test_build_url(); test_parse_query_string(); test_get_param_boolean(); test_parse_addr_spec(); -test_get_query_param_addr(); +test_get_param_addr(); if (num_failed == 0) quit(0); diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index d6bcdab..4aecc8c 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -220,11 +220,11 @@ function build_url(scheme, host, port, path, params) { return parts.join(""); } -/* Get a query or cookie string parameter and return it as a boolean, or return - default_val if param is not present in the string. True values are "1", - "true", and "". False values are "0" and "false". Any other value causes the - function to return null (effectively false). - +/* Get an object value and return it as a boolean. True values are "1", "true", + and "". False values are "0" and "false". Any other value causes the function + to return null (effectively false). Returns default_val if param is not a + key. + The empty string is true so that URLs like http://example.com/?debug will enable debug mode. */ function get_param_boolean(query, param, default_val) { @@ -241,9 +241,9 @@ function get_param_boolean(query, param, default_val) { return null; } -/* Get a query string parameter and return it as a string. Returns default_val - if param is not defined in the query string. */ -function get_query_param_string(query, param, default_val) { +/* Get an object value and return it as a string. Returns default_val if param + is not a key. */ +function get_param_string(query, param, default_val) { var val; val = query[param]; @@ -253,9 +253,9 @@ function get_query_param_string(query, param, default_val) { return val; } -/* Get a query string parameter, or the given default, and parse it as an - address spec. Returns null on a parsing error. */ -function get_query_param_addr(query, param, default_val) { +/* Get an object value and parse it as an address spec. Returns default_val if + param is not a key. Returns null on a parsing error. */ +function get_param_addr(query, param, default_val) { var val; val = query[param]; @@ -265,9 +265,9 @@ function get_query_param_addr(query, param, default_val) { return parse_addr_spec(val); } -/* Get an integer from the given movie parameter, or the given default. Returns - null on error. */ -function get_query_param_integer(query, param, default_val) { +/* Get an object value and parse it as an integer. Returns default_val if param + is not a key. Return null on a parsing error. */ +function get_param_integer(query, param, default_val) { var spec; var val; @@ -285,9 +285,9 @@ function get_query_param_integer(query, param, default_val) { } } -/* Get a number from the given movie parameter, or the given default. Returns - null on error. */ -function get_query_param_number(query, param, default_val) { +/* Get an object value and parse it as a real number. Returns default_val if + param is not a key. Return null on a parsing error. */ +function get_param_number(query, param, default_val) { var spec; var val; @@ -306,8 +306,8 @@ function get_query_param_number(query, param, default_val) { /* Get a floating-point number of seconds from a time specification. The only time specification format is a decimal number of seconds. Returns null on error. */ -function get_query_param_timespec(query, param, default_val) { - return get_query_param_number(query, param, default_val); +function get_param_timespec(query, param, default_val) { + return get_param_number(query, param, default_val); } /* Parse a count of bytes. A suffix of "k", "m", or "g" (or uppercase) @@ -339,9 +339,10 @@ function parse_byte_count(spec) { return count * Number(units); } -/* Get a count of bytes from a string specification like "100" or "1.3m". - Returns null on error. */ -function get_query_param_byte_count(query, param, default_val) { +/* Get an object value and parse it as a byte count. Example byte counts are + "100" and "1.3m". Returns default_val if param is not a key. Return null on a + parsing error. */ +function get_param_byte_count(query, param, default_val) { var spec; spec = query[param]; @@ -436,16 +437,16 @@ function FlashProxy() { var relay_addr; var rate_limit_bytes; - this.fac_url = get_query_param_string(query, "facilitator", DEFAULT_FACILITATOR_URL); + this.fac_url = get_param_string(query, "facilitator", DEFAULT_FACILITATOR_URL); - this.max_num_proxy_pairs = get_query_param_integer(query, "max_clients", DEFAULT_MAX_NUM_PROXY_PAIRS); + this.max_num_proxy_pairs = get_param_integer(query, "max_clients", DEFAULT_MAX_NUM_PROXY_PAIRS); if (this.max_num_proxy_pairs === null || this.max_num_proxy_pairs < 0) { puts("Error: max_clients must be a nonnegative integer."); this.die(); return; } - this.facilitator_poll_interval = get_query_param_timespec(query, "facilitator_poll_interval", DEFAULT_FACILITATOR_POLL_INTERVAL); + this.facilitator_poll_interval = get_param_timespec(query, "facilitator_poll_interval", DEFAULT_FACILITATOR_POLL_INTERVAL); if (this.facilitator_poll_interval === null || this.facilitator_poll_interval < MIN_FACILITATOR_POLL_INTERVAL) { puts("Error: facilitator_poll_interval must be a nonnegative number at least " + MIN_FACILITATOR_POLL_INTERVAL + "."); this.die(); @@ -455,7 +456,7 @@ function FlashProxy() { if (query["ratelimit"] === "off") rate_limit_bytes = undefined; else - rate_limit_bytes = get_query_param_byte_count(query, "ratelimit", DEFAULT_RATE_LIMIT); + rate_limit_bytes = get_param_byte_count(query, "ratelimit", DEFAULT_RATE_LIMIT); if (rate_limit_bytes === undefined) { this.rate_limit = new DummyRateLimit(); } else if (rate_limit_bytes === null || rate_limit_bytes < MIN_FACILITATOR_POLL_INTERVAL) { @@ -466,13 +467,13 @@ function FlashProxy() { this.rate_limit = new BucketRateLimit(rate_limit_bytes * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); } - client_addr = get_query_param_addr(query, "client"); + client_addr = get_param_addr(query, "client"); if (client_addr === null) { puts("Error: can't parse \"client\" parameter."); this.die(); return; } - relay_addr = get_query_param_addr(query, "relay"); + relay_addr = get_param_addr(query, "relay"); if (relay_addr === null) { puts("Error: can't parse \"relay\" parameter."); this.die();

1 0

[flashproxy/master] Change links to options page to open in new tab.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 2c94207c97d516227df690382e2330c3d054d9a0 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Fri Dec 21 14:11:24 2012 -0500 Change links to options page to open in new tab. Change the link targets to "_blank" to have the options page open in a new tab when users click on the badge. --- proxy/embed.html | 2 +- proxy/flashproxy.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/embed.html b/proxy/embed.html index 9524f9c..feb2fd0 100644 --- a/proxy/embed.html +++ b/proxy/embed.html @@ -81,7 +81,7 @@ body { flashproxy_badge_insert().start(); </script> <noscript> -<table id="flashproxy-badge" class="disabled"><tr><td><a href="options.html" target="_parent"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> +<table id="flashproxy-badge" class="disabled"><tr><td><a href="options.html" target="_blank"><img src="badge.png" alt="Internet freedom"></a></td></tr></table> </noscript> </body> </html> diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 704e514..aff64a9 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -795,7 +795,7 @@ function Badge() { tr.appendChild(td); a = document.createElement("a"); a.setAttribute("href", "options.html"); - a.setAttribute("target", "_parent"); + a.setAttribute("target", "_blank"); td.appendChild(a); img = document.createElement("img"); img.setAttribute("src", "badge.png");

1 0

[flashproxy/master] Add tests for parse_cookie_string.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 9ab1414d6817454f411acad1d2d5c7b78a1dcf8b Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Dec 26 12:23:17 2012 -0500 Add tests for parse_cookie_string. Add function to flashproxy-test.js to test the parse_cookie_string function. The tests assume the strings passed in follow the document.cookie format. --- proxy/flashproxy-test.js | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index 86c48d9..eb7d38d 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -107,6 +107,46 @@ function test_build_url() } } +/* This test only checks that things work for strings + formatted like document.cookie. Browsers maintain + several properties about this string, for example + cookie names are unique with no trailing whitespace. + See http://www.ietf.org/rfc/rfc2965.txt for the grammar. */ +function test_parse_cookie_string() +{ + var TESTS = [ + { cs: "", + expected: { } }, + { cs: "a=b", + expected: { a: "b"} }, + { cs: "a=b=c", + expected: { a: "b=c"} }, + { cs: "a=b; c=d", + expected: { a: "b", c: "d" } }, + { cs: "a=b ; c=d", + expected: { a: "b ", c: "d" } }, + { cs: "a= b", + expected: {a: " b" } }, + /* The '=' character is always present. */ + { cs: "a=", + expected: { a: "" } }, + { cs: "a=\"\"", + expected: { a: "\"\"" } }, + ]; + + announce("test_parse_cookie_string"); + for (var i = 0; i < TESTS.length; i++) { + var test = TESTS[i]; + var actual; + + actual = parse_cookie_string(test.cs); + if (objects_equal(actual, test.expected)) + pass(test.cs); + else + fail(test.cs, test.expected, actual); + } +} + function test_parse_query_string() { var TESTS = [ @@ -266,6 +306,7 @@ function test_get_query_param_addr() } test_build_url(); +test_parse_cookie_string(); test_parse_query_string(); test_get_param_boolean(); test_parse_addr_spec();

1 0

[flashproxy/master] Merge branch 'master' into opt-in
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 545a690753691cd49da61c74b4e5078f5acb554c Merge: 6d6505a c71ef52 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 25 13:41:44 2012 -0800 Merge branch 'master' into opt-in ChangeLog | 20 ++++++ Makefile | 4 +- doc/bundle-gnulinux.txt | 129 ++++++++++++++++++++++++++++++++++++++ doc/bundle-macosx.txt | 93 +++++++++++++++++++++++++++ doc/bundle-windows.txt | 66 +++++++++++++++++++ doc/facilitator-howto.txt | 4 +- doc/flashproxy-client.1 | 14 ++++- doc/flashproxy-client.1.txt | 6 ++ doc/flashproxy-reg-email.1 | 8 ++- doc/flashproxy-reg-email.1.txt | 6 ++- doc/flashproxy-reg-http.1 | 14 ++++- doc/flashproxy-reg-http.1.txt | 6 ++ experiments/facilitator-graph.py | 79 +++++------------------ facilitator/facilitator | 100 ++++++++++++++++++++++++----- facilitator/facilitator-test | 32 +++++++++ facilitator/facilitator.cgi | 10 ++-- flashproxy-client | 30 +++++++-- flashproxy-client.spec | 2 +- flashproxy-reg-http | 17 +++++- init.d/websockify | 2 +- proxy/flashproxy.js | 10 +++- torrc | 5 +- 22 files changed, 551 insertions(+), 106 deletions(-)

1 0