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

[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

[flashproxy/master] Copy parse_cookie_string to options.html.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 451912bfcfe591d389b13cadb70851d3fb09c788 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 25 12:11:55 2012 -0800 Copy parse_cookie_string to options.html. --- proxy/options.html | 41 ++++++++++++++++++++++++++++------------- 1 files changed, 28 insertions(+), 13 deletions(-) diff --git a/proxy/options.html b/proxy/options.html index 59f0125..b7e8c59 100644 --- a/proxy/options.html +++ b/proxy/options.html @@ -81,23 +81,38 @@ function set_cookie_disallowed() { document.cookie = COOKIE_NAME + "=0 ;path=/ ;expires=" + COOKIE_LIFETIME; } -/* Returns the value of the cookie, or undefined - if the cookie is not present. */ -function read_cookie() { - var str, j; - var cookies = document.cookie.split(";"); +function parse_cookie_string(cookies) { + var strings; + var result; - for (i in cookies) { - str = cookies[i]; + result = {}; + if (cookies) + strings = cookies.split(";"); + else + strings = []; + for (var i = 0; i < strings.length; i++) { + var string = strings[i]; + var j, name, value; - while (str[0] === " ") - str = str.substr(1); + j = string.indexOf("="); + if (j === -1) { + return null; + } + name = decodeURIComponent(string.substr(0, j).trim()); + value = decodeURIComponent(string.substr(j + 1).trim()); - j = str.indexOf("="); - if (COOKIE_NAME === str.substr(0, j)) - return str.substr(j + 1); + if (!(name in result)) + result[name] = value; } - return undefined; + + return result; +} + +/* Returns the value of the cookie, or undefined + if the cookie is not present. */ +function read_cookie() { + var cookies = parse_cookie_string(document.cookie); + return cookies[COOKIE_NAME]; } /* Updates the text telling the user what his current setting is.*/

1 0

[flashproxy/master] Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit d3dd285f70bb727db8d26fef4510bf4a2dfe170c Merge: 545a690 9ab1414 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 28 06:08:09 2012 -0800 Merge branch 'opt-in' of https://github.com/aallai/flashproxy into opt-in proxy/flashproxy-test.js | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-)

1 0

[flashproxy/master] Add a couple more cookie tests.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 10d23f9ee2a3f305807807b88c44ae42da1247ba Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 28 06:11:06 2012 -0800 Add a couple more cookie tests. --- proxy/flashproxy-test.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index 4c82376..aed5247 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -129,6 +129,10 @@ function test_parse_cookie_string() expected: {a: "b" } }, { cs: "a=", expected: { a: "" } }, + { cs: "key", + expected: null }, + { cs: "key=%26%20", + expected: { key: "& " } }, { cs: "a=\"\"", expected: { a: "\"\"" } }, ];

1 0

[flashproxy/master] Strip whitespace in cookie parsing tests.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit b9ebfac6910d4464e11825b2d2439de9b23c0e43 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 28 06:10:05 2012 -0800 Strip whitespace in cookie parsing tests. --- proxy/flashproxy-test.js | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index 19a830d..4c82376 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -124,10 +124,9 @@ function test_parse_cookie_string() { cs: "a=b; c=d", expected: { a: "b", c: "d" } }, { cs: "a=b ; c=d", - expected: { a: "b ", c: "d" } }, + expected: { a: "b", c: "d" } }, { cs: "a= b", - expected: {a: " b" } }, - /* The '=' character is always present. */ + expected: {a: "b" } }, { cs: "a=", expected: { a: "" } }, { cs: "a=\"\"",

1 0

[flashproxy/master] Adding opt-in page html and javascript.
by dcf＠torproject.org 28 Dec '12

28 Dec '12

commit 1f20f598494fba8612472545272d721f8f45468c Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Tue Dec 4 21:33:33 2012 -0500 Adding opt-in page html and javascript. Adding some functional html and javascript for the opt-in page (ticket #7063). There is no CSS for the page yet. --- proxy/options.html | 32 +++++++++++++++++++++++++ proxy/options.js | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 0 deletions(-) diff --git a/proxy/options.html b/proxy/options.html new file mode 100644 index 0000000..109c626 --- /dev/null +++ b/proxy/options.html @@ -0,0 +1,32 @@ +<!DOCTYPE html> +<html> +<head> +<meta charset="utf-8"> +</head> +<body> +<div> + <h4>Flash proxy options</h4> + <p> + This page enables you to use your web browser as a proxy to help + censored Internet users. When you click yes, your browser will act as a + censorship circumvention proxy as long as you are viewing a page with the + flash proxy badge: <img src="badge.png" alt="Internet Freedom"> + </p> + <p> + <a href="http://crypto.stanford.edu/flashproxy/">For more information on this system click here</a>. + </p> +</div> +<div id="setting"> +</div> +<div id="buttons" style="display: none;"> + <button id="yes">Yes</button><button id="no">No</button> +</div> +<div id="cookies_disabled" style="display: none;"> + <p> + It seems your browser has cookies disabled. You will need to enable them in + order to set flash proxy settings. + </p> +</div> +<script type="text/javascript" src="options.js"></script> +</body> +</html> diff --git a/proxy/options.js b/proxy/options.js new file mode 100644 index 0000000..9dd06d2 --- /dev/null +++ b/proxy/options.js @@ -0,0 +1,66 @@ +/* This is the javascript for the opt-in page. It sets/deletes + a cookie which controls whether the flashproxy javascript + code should run or disable itself. */ + +var COOKIE_NAME = "flashproxy"; +/* In seconds. */ +var COOKIE_LIFETIME = 60 * 60 * 24 * 365; + +window.addEventListener("load", function () { + + /* This checks if cookies are enabled in the browser. + document.cookie has special behavior, if cookies + are disabled it will not retain any values stored in it. */ + function cookies_enabled() { + /*Not supported in all browsers.*/ + if (navigator.cookieEnabled) { + return true; + } else if (navigator.cookieEnabled === undefined) { + document.cookie = "test"; + if (document.cookie.indexOf("test") !== -1) + return true; + } + return false; + } + + /* Updates the text telling the user what his current setting is. + According to the DOM level 2 specification, + http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038, + document.cookie is always defined and non-null, so this function + is safe if cookies are disabled. */ + function update_setting_text() { + var setting = document.getElementById("setting"); + var prefix = "<p>Your current setting is: "; + + if (document.cookie.indexOf(COOKIE_NAME) !== -1) { + setting.innerHTML = prefix + "use my browser as a proxy. " + + "Click no below to change your setting.</p>"; + } else { + setting.innerHTML = prefix + "do not use my browser as a proxy. " + + "Click yes below to change your setting.</p>"; + } + } + + function set_cookie() { + document.cookie = COOKIE_NAME + "=; max-age=" + COOKIE_LIFETIME; + } + + function del_cookie() { + document.cookie = COOKIE_NAME + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT"; + } + + if (cookies_enabled()) { + var buttons = document.getElementById("buttons"); + buttons.addEventListener("click", update_setting_text); + document.getElementById("yes").addEventListener("click", set_cookie); + document.getElementById("no").addEventListener("click", del_cookie); + buttons.style.display = "block"; + update_setting_text(); + } else { + document.getElementById("cookies_disabled").style.display = "block"; + /* Manually set the text here as it refers to the buttons, + which won't show up if cookies are disabled. */ + document.getElementById("setting").innerHTML = "<p>Your current setting is: " + + "do not use my browser as a proxy.</p>"; + } +});

1 0