- tor-commits - lists.torproject.org

[flashproxy/master] Click the badge to disable it.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit c1ae2bc401a7272f63e537064b4afc07b207f137 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 5 00:07:41 2012 -0700 Click the badge to disable it. Unfortunately this also removes the hyperlink to the info page. --- flashproxy.js | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 11964f1..a7406a8 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -49,8 +49,6 @@ * http://autobahn.ws/testsuite/reports/clients/index.html */ -var FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; - var DEFAULT_FACILITATOR_ADDR = { host: "tor-facilitator.bamsoftware.com", port: 9002 @@ -291,6 +289,10 @@ function make_websocket(addr) function FlashProxy() { this.badge = new Badge(); + /* Click the badge to disable it. */ + this.badge.elem.onclick = function(event) { + this.disable(); + }.bind(this); if (query.debug) this.badge_elem = debug_div; else @@ -680,17 +682,13 @@ function Badge() this.counter_text = document.createElement("td"); - var div, a, img, table, tr, td; + var div, img, table, tr, td; div = document.createElement("div"); - a = document.createElement("a"); - a.setAttribute("href", FLASHPROXY_INFO_URL); - div.appendChild(a); - img = document.createElement("img"); img.setAttribute("src", "badge.png"); - a.appendChild(img); + div.appendChild(img); table = document.createElement("table"); div.appendChild(table)

1 0

[flashproxy/master] Fix various JSLint complaints.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 9b1e4a7017e30c56c417b3ca943316ed5098ced3 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 5 01:24:20 2012 -0700 Fix various JSLint complaints. --- flashproxy.js | 111 ++++++++++++++++++++++---------------------------------- 1 files changed, 44 insertions(+), 67 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index a7406a8..005e51d 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -76,13 +76,12 @@ if (query.debug) { debug_div.className = "debug"; } -function puts(s) -{ +function puts(s) { if (debug_div) { var at_bottom; /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ - at_bottom = (debug_div.scrollTop + debug_div.clientHeight == debug_div.scrollHeight); + at_bottom = (debug_div.scrollTop + debug_div.clientHeight === debug_div.scrollHeight); debug_div.appendChild(document.createTextNode(s + "\n")); if (at_bottom) debug_div.scrollTop = debug_div.scrollHeight; @@ -98,8 +97,7 @@ function puts(s) 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) -{ +function parse_query_string(qs) { var strings; var result; @@ -107,13 +105,13 @@ function parse_query_string(qs) if (qs) strings = qs.split("&"); else - strings = {} + strings = {}; for (var i = 0; i < strings.length; i++) { var string = strings[i]; var j, name, value; j = string.indexOf("="); - if (j == -1) { + if (j === -1) { name = string; value = ""; } else { @@ -132,8 +130,7 @@ function parse_query_string(qs) /* 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) -{ +function get_query_param_addr(query, param, default_val) { var val; val = query[param]; @@ -145,8 +142,7 @@ function get_query_param_addr(query, param, default_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) -{ +function get_query_param_integer(query, param, default_val) { var spec; var val; @@ -166,8 +162,7 @@ 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) -{ +function get_query_param_number(query, param, default_val) { var spec; var val; @@ -186,15 +181,13 @@ 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) -{ +function get_query_param_timespec(query, param, default_val) { return get_query_param_number(query, param, default_val); } /* Parse a count of bytes. A suffix of "k", "m", or "g" (or uppercase) does what you would think. Returns null on error. */ -function parse_byte_count(spec) -{ +function parse_byte_count(spec) { var UNITS = { k: 1024, m: 1024 * 1024, g: 1024 * 1024 * 1024, K: 1024, M: 1024 * 1024, G: 1024 * 1024 * 1024 @@ -203,18 +196,18 @@ function parse_byte_count(spec) var matches; matches = spec.match(/^(\d+(?:\.\d*)?)(\w*)$/); - if (matches == null) + if (matches === null) return null; count = Number(matches[1]); if (isNaN(count)) return null; - if (matches[2] == "") { + if (matches[2] === "") { units = 1; } else { units = UNITS[matches[2]]; - if (units == null) + if (units === null) return null; } @@ -223,8 +216,7 @@ function parse_byte_count(spec) /* 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) -{ +function get_query_param_byte_count(query, param, default_val) { var spec; spec = query[param]; @@ -236,8 +228,7 @@ function get_query_param_byte_count(query, param, default_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) -{ +function parse_addr_spec(spec) { var groups; var host, port; @@ -252,21 +243,18 @@ function parse_addr_spec(spec) return { host: host, port: port } } -function format_addr(addr) -{ +function format_addr(addr) { return addr.host + ":" + addr.port; } /* Does the WebSocket implementation in this browser support binary frames? (RFC 6455 section 5.6.) If not, we have to use base64-encoded text frames. It is assumed that the client and relay endpoints always support binary frames. */ -function have_websocket_binary_frames() -{ +function have_websocket_binary_frames() { return false; } -function make_websocket(addr) -{ +function make_websocket(addr) { var url; var ws; @@ -286,8 +274,7 @@ function make_websocket(addr) return ws; } -function FlashProxy() -{ +function FlashProxy() { this.badge = new Badge(); /* Click the badge to disable it. */ this.badge.elem.onclick = function(event) { @@ -314,26 +301,26 @@ function FlashProxy() } this.max_num_proxy_pairs = get_query_param_integer(query, "max_clients", DEFAULT_MAX_NUM_PROXY_PAIRS); - if (this.max_num_proxy_pairs == null || this.max_num_proxy_pairs < 0) { + 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); - if (this.facilitator_poll_interval == null || this.facilitator_poll_interval < MIN_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(); return; } - if (query["ratelimit"] == "off") + if (query["ratelimit"] === "off") rate_limit_bytes = undefined; else rate_limit_bytes = get_query_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) { + } else if (rate_limit_bytes === null || rate_limit_bytes < MIN_FACILITATOR_POLL_INTERVAL) { puts("Error: ratelimit must be a nonnegative number at least " + MIN_RATE_LIMIT + "."); this.die(); return; @@ -384,10 +371,10 @@ function FlashProxy() } xhr.responseType = "text"; xhr.onreadystatechange = function() { - if (xhr.readyState == xhr.DONE) { - if (xhr.status == 200) + if (xhr.readyState === xhr.DONE) { + if (xhr.status === 200) this.fac_complete(xhr.responseText); - else if (xhr.status == 0 && xhr.statusText == "") + else if (xhr.status === 0 && xhr.statusText === "") puts("Facilitator: same-origin error."); else puts("Facilitator: can't connect: got status " + repr(xhr.status) + " and status text " + repr(xhr.statusText) + "."); @@ -464,8 +451,7 @@ function FlashProxy() } /* An instance of a client-relay connection. */ -function ProxyPair(client_addr, relay_addr, rate_limit) -{ +function ProxyPair(client_addr, relay_addr, rate_limit) { function log(s) { puts(s) @@ -547,12 +533,12 @@ function ProxyPair(client_addr, relay_addr, rate_limit) function is_open(ws) { - return ws.readyState == ws.OPEN; + return ws.readyState === ws.OPEN; } function is_closed(ws) { - return ws.readyState == ws.CLOSED; + return ws.readyState === ws.CLOSED; } this.close = function() { @@ -587,11 +573,11 @@ function ProxyPair(client_addr, relay_addr, rate_limit) } } - if (is_closed(this.relay_s) && !is_closed(this.client_s) && this.r2c_schedule.length == 0) { + if (is_closed(this.relay_s) && !is_closed(this.client_s) && this.r2c_schedule.length === 0) { log("Client: closing."); this.client_s.close(); } - if (is_closed(this.client_s) && !is_closed(this.relay_s) && this.c2r_schedule.length == 0) { + if (is_closed(this.client_s) && !is_closed(this.relay_s) && this.c2r_schedule.length === 0) { log("Relay: closing."); this.relay_s.close(); } @@ -601,8 +587,7 @@ function ProxyPair(client_addr, relay_addr, rate_limit) }; } -function BucketRateLimit(capacity, time) -{ +function BucketRateLimit(capacity, time) { this.amount = 0.0; /* capacity / time is the rate we are aiming for. */ this.capacity = capacity; @@ -644,8 +629,7 @@ function BucketRateLimit(capacity, time) } /* A rate limiter that never limits. */ -function DummyRateLimit(capacity, time) -{ +function DummyRateLimit(capacity, time) { this.update = function(n) { return true; }; @@ -666,15 +650,13 @@ var HTML_ESCAPES = { "'": "apos", "\"": "quot" }; -function escape_html(s) -{ +function escape_html(s) { return s.replace(/&<>'"/, function(x) { return HTML_ESCAPES[x] }); } /* The usual embedded HTML badge. The "elem" member is a DOM element that can be included elsewhere. */ -function Badge() -{ +function Badge() { /* Number of proxy pairs currently connected. */ this.num_proxy_pairs = 0; /* Number of proxy pairs ever connected. */ @@ -722,31 +704,28 @@ function Badge() this.refresh(); } -function quote(s) -{ +function quote(s) { return "\"" + s.replace(/([\\\"])/, "\\$1") + "\""; } -function maybe_quote(s) -{ +function maybe_quote(s) { if (!/^[a-zA-Z_]\w*$/.test(s)) return quote(s); else return s; } -function repr(x) -{ +function repr(x) { if (x === null) { return "null"; - } else if (typeof x == "undefined") { + } else if (typeof x === "undefined") { return "undefined"; - } else if (typeof x == "object") { + } 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") { + } else if (typeof x === "string") { return quote(x); } else { return x.toString(); @@ -761,8 +740,7 @@ function repr(x) http://googlewebmastercentral.blogspot.com/2011/03/mo-better-to-also-detect… http://search.cpan.org/~cmanley/Mobile-UserAgent-1.05/lib/Mobile/UserAgent.… */ -function flashproxy_should_disable() -{ +function flashproxy_should_disable() { var ua; ua = window.navigator.userAgent; @@ -792,8 +770,7 @@ function flashproxy_should_disable() return false; } -function flashproxy_badge_insert() -{ +function flashproxy_badge_insert() { var fp; var e; @@ -804,7 +781,7 @@ function flashproxy_badge_insert() /* http://intertwingly.net/blog/2006/11/10/Thats-Not-Write for this trick to insert right after the <script> element in the DOM. */ e = document; - while (e.lastChild && e.lastChild.nodeType == 1) { + while (e.lastChild && e.lastChild.nodeType === 1) { e = e.lastChild; } e.parentNode.appendChild(fp.badge_elem);

1 0

[flashproxy/master] .gitignore *.pyc.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit cad75a991e7f6c7b66c0e9c614028ed5ee2fe131 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 01:57:23 2012 -0700 .gitignore *.pyc. --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 37dbfdd..6b5ef76 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /facilitator.log +*.pyc

1 0

[flashproxy/master] Stop ignoring *.swf.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit b6ae01669985b77f0b96281f510464c6673dfcf2 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 01:56:39 2012 -0700 Stop ignoring *.swf. This is the of building a Flash application. --- .gitignore | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 8c4c114..37dbfdd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/*.swf /facilitator.log

1 0

[flashproxy/master] Add websockify to experiments/README.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 9525e3cd708f48939287e3ac272e4238312d346e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 01:54:53 2012 -0700 Add websockify to experiments/README. --- experiments/README | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/experiments/README b/experiments/README index bd814dd..69d3d83 100644 --- a/experiments/README +++ b/experiments/README @@ -9,11 +9,11 @@ You need to have installed certain software before running the tests. Wget Python thttpd - Flash Player + websockify socat, Wget, and Python are easily installed on most GNU/Linux distributions. thttpd can be compiled from the packages at -http://acme.com/software/thttpd/. A debug version of Flash Player can be -downloaded from http://www.adobe.com/support/flashplayer/downloads.html. +http://acme.com/software/thttpd/. websockify is from +https://github.com/kanaka/websockify/. Firefox versions 9 and 10 will not work; these versions have a change to the -no-remote option that prevents the tests from running. This is @@ -30,10 +30,6 @@ and in each one, set this about:config variable: This allows the scripts to clear the contents of a tab and replace them with another page. -Before running any tests, start the crossdomain server as root: - sudo crossdomaind.py --daemon -The tests themselves shouldn't be run as root. - I personally run these tests in an Arch Linux VM. useradd -m user passwd user

1 0

[flashproxy/master] Don't disable for Chrome.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 69bbe1f1f97866edbe6552569becbebec4ea1efa Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 04:19:00 2012 -0700 Don't disable for Chrome. The Chrome/Chromium user-agent includes "Safari"; do an extra check. --- flashproxy.js | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 005e51d..df049c1 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -749,9 +749,6 @@ function flashproxy_should_disable() { /\bmobile\b/i, /\bandroid\b/i, /\bopera mobi\b/i, - /* Disable on Safari because it doesn't have the hybi/RFC type of - WebSockets. */ - /\bsafari\b/i, ]; for (var i = 0; i < UA_LIST.length; i++) { @@ -763,6 +760,11 @@ function flashproxy_should_disable() { } } + if (ua.match(/\bsafari\b/i) && !ua.match(/\bchrome\b/i)) + /* Disable on Safari because it doesn't have the hybi/RFC type of + WebSockets. */ + return true; + if (!WebSocket) /* No WebSocket support. */ return true;

1 0

[flashproxy/master] Add WEBSOCKIFY to experiments/common.sh.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit f0fc170fe3e9c7e96ad2f970f49ceb0d613e6357 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 02:00:00 2012 -0700 Add WEBSOCKIFY to experiments/common.sh. --- experiments/common.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/experiments/common.sh b/experiments/common.sh index dcafd84..87f7d79 100644 --- a/experiments/common.sh +++ b/experiments/common.sh @@ -5,6 +5,7 @@ FLASHPROXY_DIR="$(dirname $BASH_SOURCE)/.." FIREFOX=firefox SOCAT=socat +WEBSOCKIFY=websockify THTTPD=thttpd TOR=tor

1 0

[flashproxy/master] Make it a log but not a fatal error when failing to register.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit a374073b7b03b432a43123dde7b8d793143889cf Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 02:03:09 2012 -0700 Make it a log but not a fatal error when failing to register. --- connector.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index 38acbf7..5bdbda4 100755 --- a/connector.py +++ b/connector.py @@ -552,7 +552,10 @@ def register(): else: command += [format_addr(options.facilitator_addr)] command += ["-a", spec] - p = subprocess.Popen(command) + try: + p = subprocess.Popen(command) + except OSError, e: + log(u"Failed to register: %s" % str(e)) def proxy_chunk_local_to_remote(local, remote): try:

1 0

[flashproxy/master] Remove the custom "same-origin error" message.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 6089495ad4ad099a06be32ae41e4ee7d124fcc20 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 02:05:51 2012 -0700 Remove the custom "same-origin error" message. I am also seeing this for "connection refused." --- flashproxy.js | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index df049c1..33dd85b 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -374,8 +374,6 @@ function FlashProxy() { if (xhr.readyState === xhr.DONE) { if (xhr.status === 200) this.fac_complete(xhr.responseText); - else if (xhr.status === 0 && xhr.statusText === "") - puts("Facilitator: same-origin error."); else puts("Facilitator: can't connect: got status " + repr(xhr.status) + " and status text " + repr(xhr.statusText) + "."); }

1 0

[flashproxy/master] Don't allow bufferedAmount to grow too large.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 9428184e0850e623286ed6f289fca24c2ae1b766 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 02:09:50 2012 -0700 Don't allow bufferedAmount to grow too large. --- flashproxy.js | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 33dd85b..4e42106 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -450,6 +450,8 @@ function FlashProxy() { /* An instance of a client-relay connection. */ function ProxyPair(client_addr, relay_addr, rate_limit) { + var MAX_BUFFER = 10 * 1024 * 1024; + function log(s) { puts(s) @@ -557,13 +559,13 @@ function ProxyPair(client_addr, relay_addr, rate_limit) { var chunk; busy = false; - if (is_open(this.client_s) && this.r2c_schedule.length > 0) { + if (is_open(this.client_s) && this.client_s.bufferedAmount < MAX_BUFFER && this.r2c_schedule.length > 0) { chunk = this.r2c_schedule.shift(); this.rate_limit.update(chunk.length); this.client_s.send(chunk); busy = true; } - if (is_open(this.relay_s) && this.c2r_schedule.length > 0) { + if (is_open(this.relay_s) && this.relay_s.bufferedAmount < MAX_BUFFER && this.c2r_schedule.length > 0) { chunk = this.c2r_schedule.shift(); this.rate_limit.update(chunk.length); this.relay_s.send(chunk);

1 0