- tor-commits - lists.torproject.org

[flashproxy/js] Add a FlashProxy.disable method.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit f6a8d1b64ec373dc3a287bb1d7bfe54022ce94d3 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 22:40:56 2012 -0700 Add a FlashProxy.disable method. Turn the badge gray to show that it's disabled. Use this instead of having a separate DummyFlashProxy class. --- flashproxy.js | 37 +++++++++++++++---------------------- 1 files changed, 15 insertions(+), 22 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 8c29d82..02a564f 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -421,29 +421,23 @@ function FlashProxy() this.badge.proxy_begin(); }; + /* Cease all network operations and prevent any future ones. */ + this.disable = function() { + puts("disabling"); + this.proxy_main = function() { }; + this.make_proxy_pair = function(client_addr, relay_addr) { }; + while (this.proxy_pairs.length > 0) + this.proxy_pairs.pop().close(); + this.badge.set_color("#777"); + this.badge.refresh(); + }; + this.die = function() { puts("die"); this.badge.set_color("#111"); }; } -/* This is the non-functional badge that occupies space when - flashproxy_should_disable decides that the proxy shouldn't run. */ -function DummyFlashProxy() -{ - var img; - - img = document.createElement("img"); - img.setAttribute("src", "https://crypto.stanford.edu/flashproxy/badge.png"); - img.setAttribute("border", 0); - img.setAttribute("id", "flashproxy-badge"); - - this.badge_elem = img; - - this.start = function() { - }; -} - /* An instance of a client-relay connection. */ function ProxyPair(client_addr, relay_addr, rate_limit) { @@ -771,13 +765,12 @@ function flashproxy_should_disable() function flashproxy_badge_insert() { + var fp; var e; - if (flashproxy_should_disable()) { - fp = new DummyFlashProxy(); - } else { - fp = new FlashProxy(); - } + fp = new FlashProxy(); + if (flashproxy_should_disable()) + fp.disable(); /* http://intertwingly.net/blog/2006/11/10/Thats-Not-Write for this trick to insert right after the <script> element in the DOM. */

1 0

[flashproxy/js] Move WebSocket || MozWebSocket to global scope.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 8820e124b67b9861e33bda98cf97464247bbba22 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 23:27:46 2012 -0700 Move WebSocket || MozWebSocket to global scope. --- flashproxy.js | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 10ed935..b7f339b 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -66,6 +66,10 @@ var DEFAULT_RATE_LIMIT = undefined; var MIN_RATE_LIMIT = 10 * 1024; var RATE_LIMIT_HISTORY = 5.0; +/* Gecko browsers use the name MozWebSocket. Also we can test whether WebSocket + is defined to see if WebSockets are supported at all. */ +var WebSocket = window.WebSocket || window.MozWebSocket; + var query = parse_query_string(window.location.search.substr(1)); var debug_div; @@ -266,14 +270,11 @@ function have_websocket_binary_frames() function make_websocket(addr) { var url; - var WebSocket; var ws; url = "ws://" + encodeURIComponent(addr.host) + ":" + encodeURIComponent(addr.port) + "/"; - WebSocket = window.WebSocket || window.MozWebSocket; - if (have_websocket_binary_frames()) ws = new WebSocket(url); else

1 0

[flashproxy/js] Don't use "base64" WebSockets when we don't have to.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 7be603c856de465225936a5ed443ce69b69b5f16 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 23:13:19 2012 -0700 Don't use "base64" WebSockets when we don't have to. Currently it's assumed that binary frames never work, so this doesn't effectively change anything. --- flashproxy.js | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 25f23fb..10ed935 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -255,14 +255,36 @@ 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() +{ + return false; +} + function make_websocket(addr) { var url; + var WebSocket; + var ws; url = "ws://" + encodeURIComponent(addr.host) + ":" + encodeURIComponent(addr.port) + "/"; - return new (window.WebSocket || window.MozWebSocket)(url, "base64"); + WebSocket = window.WebSocket || window.MozWebSocket; + + if (have_websocket_binary_frames()) + ws = new WebSocket(url); + else + ws = new WebSocket(url, "base64"); + /* "User agents can use this as a hint for how to handle incoming binary + data: if the attribute is set to 'blob', it is safe to spool it to disk, + and if it is set to 'arraybuffer', it is likely more efficient to keep + the data in memory." */ + ws.binaryType = "arraybuffer"; + + return ws; } function FlashProxy()

1 0

[flashproxy/js] Disable whenever WebSockets are not supported.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit fdf3c12ceabdccbcc48e3ebee3724efa3f1fe791 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 23:29:33 2012 -0700 Disable whenever WebSockets are not supported. --- flashproxy.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 235ffbb..07de96b 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -786,6 +786,10 @@ function flashproxy_should_disable() } } + if (!WebSocket) + /* No WebSocket support. */ + return true; + return false; }

1 0

[flashproxy/js] Always disable on Safari.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 48b68ca38541bb5204b04021f48d0e013413d2b0 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 4 23:28:05 2012 -0700 Always disable on Safari. Safari only supports the old hixie style of WebSockets. The client connector isn't compatible with that style. It should be made compatible, but in the meantime this will prevent Safari from poaching clients from the facilitator when it can't serve them. --- flashproxy.js | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index b7f339b..235ffbb 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -772,6 +772,9 @@ 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++) {

1 0

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

05 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/js] Layout fiddling.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 9516344486f1f76ee565b60e790789baa3561764 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 5 00:10:13 2012 -0700 Layout fiddling. --- embed.html | 24 +++++++++++++++--------- flashproxy.js | 21 +++++++++++---------- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/embed.html b/embed.html index 607d077..cf3a6f4 100644 --- a/embed.html +++ b/embed.html @@ -13,21 +13,27 @@ body { padding: 0; width: 70px; height: 23px; + color: white; background-color: #d80; } -#flashproxy-badge div { - position: absolute; - width: 70px; - top: 4px; +#flashproxy-badge a img { + border: 0; } -#flashproxy-badge div p { - top: 20px; +#flashproxy-badge table { + position: absolute; + top: 0px; + left: 0px; + width: 100%; + height: 100%; margin: 0; padding: 0; - margin-left: 47px; - margin-right: 2px; + border: 0; + border-collapse: collapse; +} +#flashproxy-badge table tr td { text-align: center; - color: white; + vertical-align: middle; + padding: 2px 2px 2px 47px; font-size: 12px; } #flashproxy-badge.debug { diff --git a/flashproxy.js b/flashproxy.js index 07de96b..11964f1 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -678,27 +678,28 @@ function Badge() /* Number of proxy pairs ever connected. */ this.total_proxy_pairs = 0; - this.counter_text = document.createElement("p"); + this.counter_text = document.createElement("td"); - var div, subdiv, a, img; + var div, a, 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"); - - subdiv = document.createElement("div"); - - this.counter_text = document.createElement("p"); - - div.appendChild(a); a.appendChild(img); - div.appendChild(subdiv) - subdiv.appendChild(this.counter_text); + table = document.createElement("table"); + div.appendChild(table) + tr = document.createElement("tr"); + table.appendChild(tr); + td = document.createElement("td"); + tr.appendChild(td); + + this.counter_text = td; this.elem = div; this.proxy_begin = function() {

1 0

[flashproxy/js] Safari requires "new" on the WebSocket constructor.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 9396261d8f6d2b9543aef8f490856f15daa458e8 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 13:57:21 2012 -0700 Safari requires "new" on the WebSocket constructor. --- flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 167ec2c..9a0b4fa 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -226,7 +226,7 @@ function make_websocket(addr) url = "ws://" + encodeURIComponent(addr.host) + ":" + encodeURIComponent(addr.port) + "/"; - return (window.WebSocket || window.MozWebSocket)(url, "base64"); + return new (window.WebSocket || window.MozWebSocket)(url, "base64"); } function FlashProxy()

1 0

[flashproxy/js] Typo.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit c19a0a88060cb692d923b6f7cf6c41285af286bc Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 19:21:51 2012 -0700 Typo. --- connector.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index a4e242a..38acbf7 100755 --- a/connector.py +++ b/connector.py @@ -146,7 +146,7 @@ class WebSocketMessage(object): class WebSocketDecoder(object): """RFC 6455 section 5 is about the WebSocket framing format.""" - # Raise an exception rather than buffer anything arger than this. + # Raise an exception rather than buffer anything larger than this. MAX_MESSAGE_LENGTH = 1024 * 1024 class MaskingError(ValueError):

1 0

[flashproxy/js] Use ClientTransportPlugin in exercise.sh.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 9ceca5714484999b245c505e3816d149edc207dd Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 12:59:34 2012 -0700 Use ClientTransportPlugin in exercise.sh. --- experiments/exercise/exercise.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 0557062..04026e8 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -25,7 +25,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" UseBridges 1 Bridge 127.0.0.1:9001 Socks4Proxy 127.0.0.1:$LOCAL_PORT LearnCircuitBuildTimeout 0 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 & PIDS_TO_KILL+=($!) sleep 60

1 0