- tor-commits - lists.torproject.org

[flashproxy/master] Better connection failure diagnostics.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit bc95aca58e2f615f2fb2d014d422e6e1d78087f1 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 10:45:33 2012 -0700 Better connection failure diagnostics. --- flashproxy.js | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 05674c4..e7d60c8 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -128,7 +128,17 @@ function FlashProxy() fac_url = "http://" + encodeURIComponent(fac_addr.host) + ":" + encodeURIComponent(fac_addr.port) + "/"; xhr = new XMLHttpRequest(); - xhr.open("GET", fac_url); + try { + xhr.open("GET", fac_url); + } catch (err) { + /* An exception happens here when, for example, NoScript allows the + domain on which the proxy badge runs, but not the domain to which + it's trying to make the HTTP request. The exception message is + like "Component returned failure code: 0x805e0006 + [nsIXMLHttpRequest.open]" on Firefox. */ + this.puts("Facilitator: exception while connecting: " + repr(err.message) + "."); + return; + } xhr.responseType = "text"; xhr.onreadystatechange = function() { /* Status 0 is UNSENT. 4 is DONE. */ @@ -137,10 +147,8 @@ function FlashProxy() } else if (xhr.readyState == 4) { if (xhr.status == 200) this.fac_complete(xhr.responseText); - else if (xhr.readyState == 4) - this.puts("Facilitator: got status " + xhr.status + "."); else - this.puts("Facilitator: unknown error."); + this.puts("Facilitator: can't connect: got response code " + xhr.status + "."); } }.bind(this); this.puts("Facilitator: connecting to " + fac_url + ".");

1 0

[flashproxy/master] Remove comment referring to Adobe Flash.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 1def82ae2382c45f30831771ac1f903a0fda3dce Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 11:08:37 2012 -0700 Remove comment referring to Adobe Flash. --- flashproxy.js | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index e7d60c8..65c6ea2 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -212,12 +212,6 @@ function repr(x) proxy? We take a best-effort guess as to whether this device runs on a battery or the data transfer might be expensive. - Matching mobile User-Agents is complex; but we only need to match - those devices that can also run a recent version of Adobe Flash, - which is a subset of this list: - https://secure.wikimedia.org/wikipedia/en/wiki/Adobe_Flash_Player#Mobile_op… - - Other resources: http://www.zytrax.com/tech/web/mobile_ids.html http://googlewebmastercentral.blogspot.com/2011/03/mo-better-to-also-detect… http://search.cpan.org/~cmanley/Mobile-UserAgent-1.05/lib/Mobile/UserAgent.…

1 0

[flashproxy/master] Break out a proxy_main function for after argument parsing.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit cace7b86e8a3d21c6705368d9bdae4b559884b5d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Mar 13 10:42:22 2012 -0700 Break out a proxy_main function for after argument parsing. --- flashproxy.js | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index ff9b1e6..05674c4 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -106,8 +106,7 @@ function FlashProxy() this.start = function() { var query; - var fac_addr, fac_url; - var xhr; + var fac_addr; query = parse_query_string(window.location.search.substr(1)); @@ -117,6 +116,13 @@ function FlashProxy() return; } + this.proxy_main(fac_addr); + }; + + this.proxy_main = function(fac_addr) { + var fac_url; + var xhr; + this.puts("Using facilitator " + format_addr(fac_addr) + "."); fac_url = "http://" + encodeURIComponent(fac_addr.host)

1 0

[flashproxy/master] Make the debug_div scrollable.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 8658de41ee98708363d7558b163afc2abf81af45 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 15 22:00:00 2012 -0700 Make the debug_div scrollable. --- embed.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/embed.html b/embed.html index 1d6f290..591f492 100644 --- a/embed.html +++ b/embed.html @@ -13,6 +13,7 @@ body { top: 0; width: 100%; height: 100%; + overflow: auto; color: #44cc44; background-color: #001f0f; }

1 0

[flashproxy/master] Scroll to the bottom of debug output.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit e7bef861f811115c27551bc5f5394cbd2dde5303 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 15 22:13:49 2012 -0700 Scroll to the bottom of debug output. --- flashproxy.js | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index ae31484..67620f7 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -99,8 +99,14 @@ function FlashProxy() this.puts = function(s) { if (this.debug_div) { + var at_bottom; + + /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ + at_bottom = (this.debug_div.scrollTop + this.debug_div.clientHeight == this.debug_div.scrollHeight); this.debug_div.appendChild(document.createTextNode(s)); this.debug_div.appendChild(document.createElement("br")); + if (at_bottom) + this.debug_div.scrollTop = this.debug_div.scrollHeight; } };

1 0

[flashproxy/master] Fix logic around XMLHttpRequest errors.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 888e29ea479df363b948dd308682d57cd7ba39f2 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 24 21:33:32 2012 -0700 Fix logic around XMLHttpRequest errors. I had confused the status and readyState members in a way that hid the same-origin failure error condition. --- flashproxy.js | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 67620f7..43c2342 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -147,14 +147,14 @@ function FlashProxy() } xhr.responseType = "text"; xhr.onreadystatechange = function() { - /* Status 0 is UNSENT. 4 is DONE. */ - if (xhr.status == 0 && xhr.statusText == null) { - this.puts("Facilitator: cross-domain error."); - } else if (xhr.readyState == 4) { + /* Status 4 is DONE. */ + if (xhr.readyState == 4) { if (xhr.status == 200) this.fac_complete(xhr.responseText); + else if (xhr.status == 0 && xhr.statusText == "") + this.puts("Facilitator: same-origin error."); else - this.puts("Facilitator: can't connect: got response code " + xhr.status + "."); + this.puts("Facilitator: can't connect: got status " + repr(xhr.status) + " and status text " + repr(xhr.statusText) + "."); } }.bind(this); this.puts("Facilitator: connecting to " + fac_url + ".");

1 0

[flashproxy/master] Remove more Flash stuff.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 5cdb99b25b101624fd1135a9a4e204cfffe737f0 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 24 22:18:56 2012 -0700 Remove more Flash stuff. --- README | 26 +------------------------- 1 files changed, 1 insertions(+), 25 deletions(-) diff --git a/README b/README index ced9527..cd15ba7 100644 --- a/README +++ b/README @@ -9,8 +9,7 @@ There are five main parts. Our terminology for each part is in quotes. 1. The Tor "client," running on someone's localhost. 2. A "connector," which waits for connections from the flash proxy and the Tor client, and joins them together. -3. A "flash proxy," running in someone's web browser. This piece is - called swfcat because it is like a netcat implemented in Flash. +3. A "flash proxy," an application running in someone's web browser. 4. A "facilitator," a pseudo-HTTP server that keeps a list of clients that want a connection, and hands them out to proxies. 5. A Tor "relay," which is just a normal Tor relay. @@ -130,29 +129,6 @@ Paste in this HTML where you want the badge to appear: See design.txt for some more technical information. -=== Building swfcat.swf - -Download the Flex SDK. You only need the "Open Source Flex SDK," not the -"Adobe Flex SDK." - http://opensource.adobe.com/wiki/display/flexsdk/Flex+SDK -Put its bin directory in your PATH. The important executable is mxmlc. - -To build, run - $ make -Copy the resulting swfcat.swf file to a web server. - -You can pass swfcat.swf the parameter debug=1 to see lots of debugging -information. - -Adobe makes a debug version of Flash player that raises a window on -errors instead of silently failing, and exposes some logging functions. - http://www.adobe.com/support/flashplayer/downloads.html - -This is a good tutorial on ActionScript programming with the Flex tools, -with sample code: - http://www.senocular.com/flash/tutorials/as3withmxmlc/ - http://www.senocular.com/flash/tutorials/as3withmxmlc/AS3Flex2b3StarterFile… - === Running a relay or facilitator On the facilitator, run

1 0

[flashproxy/master] websockify command example.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit b5048c334224bd67b89689df7892bc4efc21eb83 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 24 22:22:59 2012 -0700 websockify command example. --- README | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/README b/README index cd15ba7..d362ed7 100644 --- a/README +++ b/README @@ -118,6 +118,14 @@ If tor apparently hangs here: wait a few minutes. It can take a while to download relay descriptors. +== How to run a relay + +The relay runs with a WebSocket proxy in external proxy mode. + git clone git://github.com/kanaka/websockify.git +This command proxies WebSocket on port 9901 to a local ORPort on 9001. + ./websockify :9901 127.0.0.1:9001 + + == How to put a flash proxy badge on a web page. Paste in this HTML where you want the badge to appear: @@ -129,7 +137,7 @@ Paste in this HTML where you want the badge to appear: See design.txt for some more technical information. -=== Running a relay or facilitator +=== Running a facilitator On the facilitator, run $ ./facilitator.py -r <relay-ip>

1 0

[flashproxy/master] Make debug output use pre not div.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 6928215914947d6f722b580c313180dde8565da6 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 24 22:33:43 2012 -0700 Make debug output use pre not div. --- embed.html | 1 + flashproxy.js | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/embed.html b/embed.html index 591f492..c88827b 100644 --- a/embed.html +++ b/embed.html @@ -9,6 +9,7 @@ body { } #flashproxy-badge.debug { position: absolute; + margin: 0; left: 0; top: 0; width: 100%; diff --git a/flashproxy.js b/flashproxy.js index 43c2342..32497e6 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -91,7 +91,7 @@ function format_addr(addr) function FlashProxy() { - this.debug_div = document.createElement("div"); + this.debug_div = document.createElement("pre"); this.debug_div.className = "debug"; this.badge_elem = this.debug_div; @@ -103,8 +103,7 @@ function FlashProxy() /* http://www.w3.org/TR/cssom-view/#element-scrolling-members */ at_bottom = (this.debug_div.scrollTop + this.debug_div.clientHeight == this.debug_div.scrollHeight); - this.debug_div.appendChild(document.createTextNode(s)); - this.debug_div.appendChild(document.createElement("br")); + this.debug_div.appendChild(document.createTextNode(s + "\n")); if (at_bottom) this.debug_div.scrollTop = this.debug_div.scrollHeight; }

1 0

[flashproxy/master] Remove crossdomain policy sending from connector.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 15d91390d63ae0fccf4fa0538886b35bb47addbf Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 24 23:42:11 2012 -0700 Remove crossdomain policy sending from connector. --- connector.py | 63 ++++----------------------------------------------------- 1 files changed, 5 insertions(+), 58 deletions(-) diff --git a/connector.py b/connector.py index 68f1ce4..85fc4ad 100755 --- a/connector.py +++ b/connector.py @@ -180,22 +180,11 @@ def format_peername(s): except socket.error, e: return "<unconnected>" -# How long to wait for a crossdomain policy request before deciding that this is -# a normal socket. In 160 crossdomain connections to the public facilitator, the -# mean time before receiving a crossdomain request is only 0.05625 s. But that -# was measured from log entries with a one-second resolution, so give a healthy -# margin above that. -CROSSDOMAIN_TIMEOUT = 0.5 - # Local socket, accepting SOCKS requests from localhost local_s = listen_socket(options.local_addr) -# Remote socket, accepting both crossdomain policy requests and remote proxy -# connections. +# Remote socket, accepting remote WebSocket connections from proxies. remote_s = listen_socket(options.remote_addr) -# Sockets that may be crossdomain policy requests or may be normal remote -# connections. -crossdomain_pending = [] # Remote connection sockets. remotes = [] # New local sockets waiting to finish their SOCKS negotiation. @@ -208,31 +197,6 @@ local_for = {} remote_for = {} -def handle_policy_request(fd): - """Returns True iff the socket is still open and usable (wasn't a - crossdomain request and wasn't closed.""" - log(u"handle_policy_request") - try: - addr = fd.getpeername() - data = fd.recv(100) - except socket.error, e: - log(u"Socket error from crossdomain-pending: %s" % repr(str(e))) - return False - if data == "<policy-file-request/>\0": - log(u"Sending crossdomain policy to %s." % format_addr(addr)) - fd.sendall(""" -<cross-domain-policy> -<allow-access-from domain="*" to-ports="%s"/> -</cross-domain-policy> -\0""" % xml.sax.saxutils.escape(str(options.remote_addr[1]))) - return False - elif data == "": - log(u"No data from %s." % format_addr(addr)) - return False - else: - fd.buf += data - return True - def grab_string(s, pos): """Grab a NUL-terminated string from the given string, starting at the given offset. Return (pos, str) tuple, or (pos, None) on error.""" @@ -377,27 +341,19 @@ register() def main(): while True: - rset = [remote_s, local_s] + crossdomain_pending + socks_pending + remote_for.keys() + local_for.keys() + locals + remotes - rset, _, _ = select.select(rset, [], [], CROSSDOMAIN_TIMEOUT) + rset = [remote_s, local_s] + socks_pending + remote_for.keys() + local_for.keys() + locals + remotes + rset, _, _ = select.select(rset, [], []) for fd in rset: if fd == remote_s: remote_c, addr = fd.accept() log(u"Remote connection from %s." % format_addr(addr)) - crossdomain_pending.append(BufferSocket(remote_c)) + remotes.append(fd) + handle_remote_connection(fd) elif fd == local_s: local_c, addr = fd.accept() log(u"Local connection from %s." % format_addr(addr)) socks_pending.append(local_c) register() - elif fd in crossdomain_pending: - log(u"Data from crossdomain-pending %s." % format_addr(addr)) - if handle_policy_request(fd): - remotes.append(fd) - handle_remote_connection(fd) - else: - fd.close() - crossdomain_pending.remove(fd) - report_pending() elif fd in socks_pending: log(u"SOCKS request from %s." % format_addr(addr)) if handle_socks_request(fd): @@ -428,15 +384,6 @@ def main(): remotes.remove(fd) report_pending() match_proxies() - while crossdomain_pending: - pending = crossdomain_pending[0] - if not pending.is_expired(CROSSDOMAIN_TIMEOUT): - break - log(u"Expired pending crossdomain from %s." % format_peername(pending)) - crossdomain_pending.pop(0) - remotes.append(pending) - handle_remote_connection(pending) - report_pending() try: main()

1 0