- tor-commits - lists.torproject.org

[flashproxy/master] Make a callback for when a proxy pair is complete.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit a32498f29d9363bf8107a0f02d5c22a60865c3e7 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Mar 30 01:08:25 2012 -0700 Make a callback for when a proxy pair is complete. --- flashproxy.js | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 59bf103..1f9bc00 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -235,6 +235,11 @@ function FlashProxy() proxy_pair = new ProxyPair(client_addr, relay_addr); this.proxy_pairs.push(proxy_pair); + proxy_pair.complete_callback = function(event) { + puts("Complete."); + /* Delete from the list of active proxy pairs. */ + this.proxy_pairs.splice(this.proxy_pairs.indexOf(proxy_pair), 1); + }.bind(this); proxy_pair.connect(); }; @@ -254,6 +259,10 @@ function FlashProxy() this.flush_timeout_id = null; + /* This callback function can be overridden by external callers. */ + this.complete_callback = function() { + }; + /* Return a function that shows an error message and closes the other half of a communication pair. */ this.make_onerror_callback = function(partner) @@ -263,8 +272,7 @@ function FlashProxy() log(ws.label + ": error."); partner.close(); - // dispatchEvent(new Event(Event.COMPLETE)); - }; + }.bind(this); }; this.onopen_callback = function(event) { @@ -278,6 +286,9 @@ function FlashProxy() log(ws.label + ": closed."); this.flush(); + + if (is_closed(this.client_s) && is_closed(this.relay_s)) + this.complete_callback(); }.bind(this); this.onmessage_client_to_relay = function(event) { @@ -350,10 +361,7 @@ function FlashProxy() this.relay_s.close(); } - if (is_closed(this.client_s) && is_closed(this.relay_s)) - // dispatchEvent(new Event(Event.COMPLETE)); - ; - else if (this.r2c_schedule.length > 0 || this.c2r_schedule.length > 0) + if (this.r2c_schedule.length > 0 || this.c2r_schedule.length > 0) this.flush_timeout_id = setTimeout(this.flush, rate_limit.when() * 1000); }; }

1 0

[flashproxy/master] Add max_client and facilitator_poll_interval query parameters.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit a69d9149f458aec16ad9a8e180b1832898aa4667 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 15:38:39 2012 -0700 Add max_client and facilitator_poll_interval query parameters. --- flashproxy.js | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 7b8b0bc..4a758f9 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -15,6 +15,14 @@ * The address of the facilitator to use. By default it is * DEFAULT_FACILITATOR_ADDR. Both <HOST> and <PORT> must be present. * + * facilitator_poll_interval=<FLOAT> + * How often to poll the facilitator, in seconds. The default is + * DEFAULT_FACILITATOR_POLL_INTERVAL. There is a sanity-check minimum of 1.0 s. + * + * max_clients=<NUM> + * How many clients to serve concurrently. The default is + * DEFAULT_MAX_NUM_PROXY_PAIRS. + * * relay=<HOST>:<PORT> * The address of the relay to connect to. The proxy normally receives this * information from the facilitator. When this option is used, the facilitator @@ -26,6 +34,11 @@ var DEFAULT_FACILITATOR_ADDR = { port: 9002 }; +var DEFAULT_MAX_NUM_PROXY_PAIRS = 10; + +var DEFAULT_FACILITATOR_POLL_INTERVAL = 10.0; +var MIN_FACILITATOR_POLL_INTERVAL = 1.0; + /* 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, @@ -80,6 +93,54 @@ 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) +{ + var spec; + var val; + + spec = query[param]; + if (spec === undefined) { + return default_val; + } else if (!spec.match(/^-?[0-9]+/)) { + return null; + } else { + val = parseInt(spec, 10); + if (isNaN(val)) + return null; + else + return 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) +{ + var spec; + var val; + + spec = query[param]; + if (spec === undefined) { + return default_val; + } else { + val = Number(spec); + if (isNaN(val)) + return null; + else + return 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); +} + /* 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) @@ -165,6 +226,19 @@ function FlashProxy() puts("Error: Facilitator spec must be in the form \"host:port\"."); return; } + + this.max_num_proxy_pairs = get_query_param_integer(this.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."); + return; + } + + this.facilitator_poll_interval = get_query_param_timespec(this.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 + "."); + return; + } + client_addr = get_query_param_addr(this.query, "client"); relay_addr = get_query_param_addr(this.query, "relay"); if (client_addr !== undefined && relay_addr !== undefined) {

1 0

[flashproxy/master] Remove from unlinked_remotes as well as remotes.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit e4612f63338936cac508fdce7e3f3459213e37f4 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 15:39:04 2012 -0700 Remove from unlinked_remotes as well as remotes. --- connector.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/connector.py b/connector.py index 24630f3..89455ad 100755 --- a/connector.py +++ b/connector.py @@ -689,6 +689,7 @@ def main(): else: if not receive_unlinked(fd, "remote"): remotes.remove(fd) + unlinked_remotes.remove(fd) report_pending() elif fd in locals: remote = fd.partner @@ -699,6 +700,7 @@ def main(): else: if not receive_unlinked(fd, "local"): locals.remove(fd) + unlinked_locals.remove(fd) report_pending() match_proxies() while websocket_pending:

1 0

[flashproxy/master] Poll the facilitator in a loop.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 7fd20939a00ec521f31821305199fd6708b3a39d Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 15:44:47 2012 -0700 Poll the facilitator in a loop. --- flashproxy.js | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 4a758f9..7e0217e 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -217,12 +217,11 @@ function FlashProxy() this.proxy_pairs = []; this.start = function() { - var fac_addr; var client_addr; var relay_addr; - fac_addr = get_query_param_addr(this.query, "facilitator", DEFAULT_FACILITATOR_ADDR); - if (!fac_addr) { + this.fac_addr = get_query_param_addr(this.query, "facilitator", DEFAULT_FACILITATOR_ADDR); + if (!this.fac_addr) { puts("Error: Facilitator spec must be in the form \"host:port\"."); return; } @@ -250,18 +249,21 @@ function FlashProxy() puts("Error: the \"relay\" parameter requires \"client\" also.") return; } else { - this.proxy_main(fac_addr); + this.proxy_main(); } }; - this.proxy_main = function(fac_addr) { + this.proxy_main = function() { var fac_url; var xhr; - puts("Using facilitator " + format_addr(fac_addr) + "."); + if (this.proxy_pairs.length >= this.max_num_proxy_pairs) { + setTimeout(this.proxy_main.bind(this), this.facilitator_poll_interval); + return; + } - fac_url = "http://" + encodeURIComponent(fac_addr.host) - + ":" + encodeURIComponent(fac_addr.port) + "/"; + fac_url = "http://" + encodeURIComponent(this.fac_addr.host) + + ":" + encodeURIComponent(this.fac_addr.port) + "/"; xhr = new XMLHttpRequest(); try { xhr.open("GET", fac_url); @@ -294,6 +296,8 @@ function FlashProxy() var client_addr; var relay_addr; + setTimeout(this.proxy_main.bind(this), this.facilitator_poll_interval * 1000); + response = parse_query_string(text); if (!response.client) {

1 0

[flashproxy/master] Add a "debug" query parameter.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit e844cf18533ddf79a71b93d1eb501bb5bb96c18c Author: David Fifield <david(a)bamsoftware.com> Date: Fri Mar 30 01:22:23 2012 -0700 Add a "debug" query parameter. --- flashproxy.js | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 1f9bc00..bdec17d 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -7,6 +7,10 @@ * information from the facilitator. When this option is used, the facilitator * query is not done. The "relay" parameter must be given as well. * + * debug=1 + * If set (to any value), show verbose terminal-like output instead of the + * badge. + * * facilitator=<HOST>:<PORT> * The address of the facilitator to use. By default it is * DEFAULT_FACILITATOR_ADDR. Both <HOST> and <PORT> must be present. @@ -111,8 +115,27 @@ function make_websocket(addr) function FlashProxy() { - var debug_div = document.createElement("pre"); - debug_div.className = "debug"; + var debug_div; + + this.query = parse_query_string(window.location.search.substr(1)); + + if (this.query.debug) { + debug_div = document.createElement("pre"); + debug_div.className = "debug"; + + this.badge_elem = debug_div; + } else { + var img; + + debug_div = undefined; + img = document.createElement("img"); + img.setAttribute("src", "https://crypto.stanford.edu/flashproxy/badge.png"); + img.setAttribute("border", 0); + + this.badge_elem = img; + } + this.badge_elem.setAttribute("id", "flashproxy-badge"); + function puts(s) { if (debug_div) { var at_bottom; @@ -132,24 +155,18 @@ function FlashProxy() this.proxy_pairs = []; - this.badge_elem = debug_div; - this.badge_elem.setAttribute("id", "flashproxy-badge"); - this.start = function() { - var query; var fac_addr; var client_addr; var relay_addr; - query = parse_query_string(window.location.search.substr(1)); - - fac_addr = get_query_param_addr(query, "facilitator", DEFAULT_FACILITATOR_ADDR); + fac_addr = get_query_param_addr(this.query, "facilitator", DEFAULT_FACILITATOR_ADDR); if (!fac_addr) { puts("Error: Facilitator spec must be in the form \"host:port\"."); return; } - client_addr = get_query_param_addr(query, "client"); - relay_addr = get_query_param_addr(query, "relay"); + client_addr = get_query_param_addr(this.query, "client"); + relay_addr = get_query_param_addr(this.query, "relay"); if (client_addr !== undefined && relay_addr !== undefined) { this.make_proxy_pair(client_addr, relay_addr); } else if (client_addr !== undefined) {

1 0

[flashproxy/master] Add a badge class with a counter.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit cbaa1c2982eb6d5703b8ee77d042fc72d4e01d73 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 16:45:03 2012 -0700 Add a badge class with a counter. --- embed.html | 22 ++++++++++++++++ flashproxy.js | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 91 insertions(+), 9 deletions(-) diff --git a/embed.html b/embed.html index c88827b..d572bdb 100644 --- a/embed.html +++ b/embed.html @@ -7,6 +7,28 @@ body { margin: 0; padding: 0; } +#flashproxy-badge { + position: relative; + margin: 0; + padding: 0; + width: 70px; + height: 23px; +} +#flashproxy-badge div { + position: absolute; + width: 70px; + top: 4px; +} +#flashproxy-badge div p { + top: 20px; + margin: 0; + padding: 0; + margin-left: 47px; + margin-right: 2px; + text-align: center; + color: white; + font-size: 12px; +} #flashproxy-badge.debug { position: absolute; margin: 0; diff --git a/flashproxy.js b/flashproxy.js index 7e0217e..640e236 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -29,6 +29,8 @@ * query is not done. The "client" parameter must be given as well. */ +var FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; + var DEFAULT_FACILITATOR_ADDR = { host: "tor-facilitator.bamsoftware.com", port: 9002 @@ -180,20 +182,13 @@ function FlashProxy() this.query = parse_query_string(window.location.search.substr(1)); + this.badge = new Badge(); if (this.query.debug) { debug_div = document.createElement("pre"); debug_div.className = "debug"; - this.badge_elem = debug_div; } else { - var img; - - debug_div = undefined; - img = document.createElement("img"); - img.setAttribute("src", "https://crypto.stanford.edu/flashproxy/badge.png"); - img.setAttribute("border", 0); - - this.badge_elem = img; + this.badge_elem = this.badge.elem; } this.badge_elem.setAttribute("id", "flashproxy-badge"); @@ -333,8 +328,11 @@ function FlashProxy() puts("Complete."); /* Delete from the list of active proxy pairs. */ this.proxy_pairs.splice(this.proxy_pairs.indexOf(proxy_pair), 1); + this.badge.proxy_end(); }.bind(this); proxy_pair.connect(); + + this.badge.proxy_begin(); }; /* An instance of a client-relay connection. */ @@ -461,6 +459,68 @@ function FlashProxy() } } +var HTML_ESCAPES = { + "&": "amp", + "<": "lt", + ">": "gt", + "'": "apos", + "\"": "quot" +}; +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() +{ + /* Number of proxy pairs currently connected. */ + this.num_proxy_pairs = 0; + /* Number of proxy pairs ever connected. */ + this.total_proxy_pairs = 0; + + this.counter_text = document.createElement("p"); + + var div, subdiv, a, img; + + div = document.createElement("div"); + + a = document.createElement("a"); + a.setAttribute("href", FLASHPROXY_INFO_URL); + + img = document.createElement("img"); + img.setAttribute("src", "https://crypto.stanford.edu/flashproxy/badge.png"); + + subdiv = document.createElement("div"); + + this.counter_text = document.createElement("p"); + + div.appendChild(a); + a.appendChild(img); + div.appendChild(subdiv) + subdiv.appendChild(this.counter_text); + + this.elem = div; + + this.proxy_begin = function() { + this.num_proxy_pairs++; + this.total_proxy_pairs++; + this.refresh(); + }; + + this.proxy_end = function() { + this.num_proxy_pairs--; + this.refresh(); + } + + this.refresh = function() { + this.counter_text.innerHTML = escape_html(String(this.num_proxy_pairs)); + }; + + this.refresh(); +} + /* This is the non-functional badge that occupies space when flashproxy_should_disable decides that the proxy shouldn't run. */ function DummyFlashProxy()

1 0

[flashproxy/master] Remove debugging line.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit eb2b940c72f9f0828db045af1479c20b9b25c9b6 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 16:45:27 2012 -0700 Remove debugging line. --- flashproxy.js | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 640e236..754e22e 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -320,8 +320,6 @@ function FlashProxy() this.make_proxy_pair = function(client_addr, relay_addr) { var proxy_pair; - puts("make_proxy_pair"); - proxy_pair = new ProxyPair(client_addr, relay_addr); this.proxy_pairs.push(proxy_pair); proxy_pair.complete_callback = function(event) {

1 0

[flashproxy/master] Use relative URL for badge.png.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 9efecfd7be9ced260fa5106d73b8e9e68d924e45 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 16:47:53 2012 -0700 Use relative URL for badge.png. --- flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 754e22e..178b7ba 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -488,7 +488,7 @@ function Badge() a.setAttribute("href", FLASHPROXY_INFO_URL); img = document.createElement("img"); - img.setAttribute("src", "https://crypto.stanford.edu/flashproxy/badge.png"); + img.setAttribute("src", "badge.png"); subdiv = document.createElement("div");

1 0

[flashproxy/master] Make badge.png transparent and control its color with CSS.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 4103253a215eb394bd7effff90182294e0c29a85 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 16:48:07 2012 -0700 Make badge.png transparent and control its color with CSS. --- badge.png | Bin 270 -> 230 bytes embed.html | 1 + 2 files changed, 1 insertions(+), 0 deletions(-) diff --git a/badge.png b/badge.png index d832e24..17d2c79 100644 Binary files a/badge.png and b/badge.png differ diff --git a/embed.html b/embed.html index d572bdb..607d077 100644 --- a/embed.html +++ b/embed.html @@ -13,6 +13,7 @@ body { padding: 0; width: 70px; height: 23px; + background-color: #d80; } #flashproxy-badge div { position: absolute;

1 0

[flashproxy/master] Add a die function to alert when the proxy has stopped working.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit fc83bfec46599ab12569e5b0d93c907f1b5c8255 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 16:57:52 2012 -0700 Add a die function to alert when the proxy has stopped working. --- flashproxy.js | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 178b7ba..786f428 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -218,18 +218,21 @@ function FlashProxy() this.fac_addr = get_query_param_addr(this.query, "facilitator", DEFAULT_FACILITATOR_ADDR); if (!this.fac_addr) { puts("Error: Facilitator spec must be in the form \"host:port\"."); + this.die(); return; } this.max_num_proxy_pairs = get_query_param_integer(this.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(this.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(); return; } @@ -239,9 +242,11 @@ function FlashProxy() this.make_proxy_pair(client_addr, relay_addr); } else if (client_addr !== undefined) { puts("Error: the \"client\" parameter requires \"relay\" also.") + this.die(); return; } else if (relay_addr !== undefined) { puts("Error: the \"relay\" parameter requires \"client\" also.") + this.die(); return; } else { this.proxy_main(); @@ -269,6 +274,7 @@ function FlashProxy() like "Component returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. */ puts("Facilitator: exception while connecting: " + repr(err.message) + "."); + this.die(); return; } xhr.responseType = "text"; @@ -333,6 +339,11 @@ function FlashProxy() this.badge.proxy_begin(); }; + this.die = function() { + puts("die"); + this.badge.set_color("#111"); + } + /* An instance of a client-relay connection. */ function ProxyPair(client_addr, relay_addr) { @@ -516,6 +527,10 @@ function Badge() this.counter_text.innerHTML = escape_html(String(this.num_proxy_pairs)); }; + this.set_color = function(color) { + this.elem.style.backgroundColor = color; + }; + this.refresh(); }

1 0