June 2011 - tor-commits - lists.torproject.org

[flashproxy/rtmfp] Wrap some long log output lines.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 2162c85c17e5f4315eb3f7027db60846586b66c4 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 10:18:04 2011 -0700 Wrap some long log output lines. --- facilitator.py | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-) diff --git a/facilitator.py b/facilitator.py index 0c1e4dd..09f8a32 100755 --- a/facilitator.py +++ b/facilitator.py @@ -200,7 +200,9 @@ class RegSet(object): class Handler(BaseHTTPServer.BaseHTTPRequestHandler): def do_GET(self): - log(u"proxy %s connects" % format_addr(self.client_address)) + proxy_addr_s = format_addr(self.client_address) + + log(u"proxy %s connects" % proxy_addr_s) path = urlparse.urlsplit(self.path)[2] @@ -211,35 +213,40 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): reg = REGS.fetch() if reg: log(u"proxy %s gets %s, relay %s (now %d)" % - (format_addr(self.client_address), unicode(reg), - options.relay_spec, len(REGS))) + (proxy_addr_s, unicode(reg), options.relay_spec, len(REGS))) self.send_client(reg) else: - log(u"proxy %s gets none" % format_addr(self.client_address)) + log(u"proxy %s gets none" % proxy_addr_s) self.send_client(None) def do_POST(self): + client_addr_s = format_addr(self.client_address) + data = cgi.FieldStorage(fp = self.rfile, headers = self.headers, environ = {"REQUEST_METHOD": "POST"}) client_spec = data.getfirst("client") if client_spec is None: self.send_error(400) - log(u"client %s missing \"client\" param" % format_addr(self.client_address)) + log(u"client %s missing \"client\" param" % client_addr_s) return try: reg = Reg.parse(client_spec, self.client_address[0]) except ValueError, e: self.send_error(400) - log(u"client %s syntax error in %s: %s" % (format_addr(self.client_address), repr(client_spec), repr(str(e)))) + log(u"client %s syntax error in %s: %s" + % (client_addr_s, repr(client_spec), repr(str(e)))) return - log(u"client %s regs %s -> %s" % (format_addr(self.client_address), repr(client_spec), unicode(reg))) + log(u"client %s regs %s -> %s" + % (client_addr_s, repr(client_spec), unicode(reg))) if REGS.add(reg): - log(u"client %s %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) + log(u"client %s %s (now %d)" + % (client_addr_s, unicode(reg), len(REGS))) else: - log(u"client %s %s (already present, now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) + log(u"client %s %s (already present, now %d)" + % (client_addr_s, unicode(reg), len(REGS))) self.send_response(200) self.end_headers() @@ -265,7 +272,8 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): def log_message(self, format, *args): msg = format % args - log(u"message from HTTP handler for %s: %s" % (format_addr(self.client_address), repr(msg))) + log(u"message from HTTP handler for %s: %s" + % (format_addr(self.client_address), repr(msg))) def send_client(self, reg): if reg:

1 0

[flashproxy/rtmfp] Use repr on a user-controlled string in a log message.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 8a78d7d8885543ce894d9c2489596cfb0b35f6f1 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 10:09:18 2011 -0700 Use repr on a user-controlled string in a log message. --- facilitator.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/facilitator.py b/facilitator.py index 801d0ad..0c1e4dd 100755 --- a/facilitator.py +++ b/facilitator.py @@ -235,7 +235,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): log(u"client %s syntax error in %s: %s" % (format_addr(self.client_address), repr(client_spec), repr(str(e)))) return - log(u"client %s regs %s -> %s" % (format_addr(self.client_address), client_spec, unicode(reg))) + log(u"client %s regs %s -> %s" % (format_addr(self.client_address), repr(client_spec), unicode(reg))) if REGS.add(reg): log(u"client %s %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) else:

1 0

[flashproxy/rtmfp] Do log lines before sending responses in case there's an error in the send.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit efef83ad96cd4787b0cdaa97e266efbde0a90f72 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 10:54:49 2011 -0700 Do log lines before sending responses in case there's an error in the send. --- facilitator.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/facilitator.py b/facilitator.py index a41ed6f..4d08673 100755 --- a/facilitator.py +++ b/facilitator.py @@ -227,16 +227,16 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): client_spec = data.getfirst("client") if client_spec is None: - self.send_error(400) log(u"client %s missing \"client\" param" % client_addr_s) + self.send_error(400) return try: reg = Reg.parse(client_spec, self.client_address[0]) except ValueError, e: - self.send_error(400) log(u"client %s syntax error in %s: %s" % (client_addr_s, repr(client_spec), repr(str(e)))) + self.send_error(400) return log(u"client %s regs %s -> %s"

1 0

[flashproxy/rtmfp] Log request line, status code, and referer.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 6f7049dc58d07d96c98eead01f2361893cc9d672 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 10:46:59 2011 -0700 Log request line, status code, and referer. --- facilitator.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/facilitator.py b/facilitator.py index 09f8a32..a41ed6f 100755 --- a/facilitator.py +++ b/facilitator.py @@ -270,6 +270,12 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): if message: self.wfile.write(message) + def log_request(self, code): + addr_s = format_addr(self.client_address) + referer = self.headers.get("Referer") or "-" + log(u"resp %s %s %d %s" + % (addr_s, repr(self.requestline), code, repr(referer))) + def log_message(self, format, *args): msg = format % args log(u"message from HTTP handler for %s: %s"

1 0

[flashproxy/rtmfp] Use crypto.stanford.edu demo page.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 81bad6eb6cbd1714000351333ef93797ec3e20d0 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 12:17:53 2011 -0700 Use crypto.stanford.edu demo page. --- README | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index b4b1d0e..0ed7582 100644 --- a/README +++ b/README @@ -16,11 +16,11 @@ There are five main parts. Our terminology for each part is in quotes. 5. A Tor "relay," which is just a normal Tor relay except that its host must also serve a Flash crossdomain policy. -== Quick start +== Demonstration page -A demonstration page that doesn't require building anything is here: +https://crypto.stanford.edu/flashproxy/ -http://www.stanford.edu/~dcf/tor/ +== Quick start === Building

1 0

[flashproxy/rtmfp] Use the same connector as in master branch.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit e8f3ca392f37f326dac975a6827a9d4e71eb6c50 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 12:29:17 2011 -0700 Use the same connector as in master branch. Instead of coding different default ports, just document the command-line parameters you need to use to make the difference. --- connector.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/connector.py b/connector.py index 731fa19..27fff61 100755 --- a/connector.py +++ b/connector.py @@ -12,8 +12,8 @@ import time import urllib import xml.sax.saxutils -DEFAULT_REMOTE_ADDRESS = "127.0.0.1" -DEFAULT_REMOTE_PORT = 9002 +DEFAULT_REMOTE_ADDRESS = "0.0.0.0" +DEFAULT_REMOTE_PORT = 9000 DEFAULT_LOCAL_ADDRESS = "127.0.0.1" DEFAULT_LOCAL_PORT = 9001 DEFAULT_FACILITATOR_PORT = 9002 @@ -281,7 +281,7 @@ def register(): spec = format_addr((None, options.remote_addr[1])) log(u"Registering \"%s\" with %s." % (spec, format_addr(options.facilitator_addr))) http = httplib.HTTPConnection(*options.facilitator_addr) - http.request("POST", "/", urllib.urlencode({"client": spec}), {"Content-Type":"application/x-www-form-urlencoded"}) + http.request("POST", "/", urllib.urlencode({"client": spec})) http.close() return True

1 0

[flashproxy/rtmfp] Merge branch 'master' into rtmfp
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 58af9ccdd5a264080c4df7dec4f9894f490ee12b Merge: 147a34c 81bad6e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 12:18:55 2011 -0700 Merge branch 'master' into rtmfp Conflicts: README README | 6 +- facilitator.py | 34 ++++++++--- notes.txt | 4 - reconnector.py | 179 -------------------------------------------------------- 4 files changed, 28 insertions(+), 195 deletions(-)

1 0

[flashproxy/rtmfp] Rename DEFAULT_FAC_POLL_INTERVAL to FACILITATOR_POLL_INTERVAL.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit efed6d80241205315ae3f79724d0cd027a2319c1 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 12:44:12 2011 -0700 Rename DEFAULT_FAC_POLL_INTERVAL to FACILITATOR_POLL_INTERVAL. --- swfcat.as | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/swfcat.as b/swfcat.as index dd2396d..d0aad9a 100644 --- a/swfcat.as +++ b/swfcat.as @@ -37,9 +37,9 @@ package host: "127.0.0.1", port: 9002 }; - - /* Poll facilitator every 10 sec */ - private const DEFAULT_FAC_POLL_INTERVAL:uint = 10000; + + // Milliseconds. + private const FACILITATOR_POLL_INTERVAL:int = 10000; // Socket to Cirrus server private var s_c:CirrusSocket; @@ -185,7 +185,7 @@ package s_f = new FacilitatorSocket(fac_addr.host, fac_addr.port); s_f.addEventListener(FacilitatorSocketEvent.CONNECT_FAILED, function (e:Event):void { puts("Facilitator: connect failed."); - setTimeout(establish_facilitator_connection, DEFAULT_FAC_POLL_INTERVAL); + setTimeout(establish_facilitator_connection, FACILITATOR_POLL_INTERVAL); }); if (proxy_mode) { @@ -210,14 +210,14 @@ package }); s_f.addEventListener(FacilitatorSocketEvent.REGISTRATIONS_EMPTY, function (e:Event):void { puts("Facilitator: no registrations available."); - setTimeout(establish_facilitator_connection, DEFAULT_FAC_POLL_INTERVAL); + setTimeout(establish_facilitator_connection, FACILITATOR_POLL_INTERVAL); }); puts("Facilitator: getting registration."); s_f.get_registration(); } else { s_f.addEventListener(FacilitatorSocketEvent.REGISTRATION_FAILED, function (e:Event):void { puts("Facilitator: registration failed."); - setTimeout(establish_facilitator_connection, DEFAULT_FAC_POLL_INTERVAL); + setTimeout(establish_facilitator_connection, FACILITATOR_POLL_INTERVAL); }); puts("Facilitator: posting registration."); s_f.post_registration(s_c.id);

1 0

[flashproxy/rtmfp] Remove outdated information from README.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 15a659481601670a8081bec25e21686beb927138 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 12:26:53 2011 -0700 Remove outdated information from README. --- README | 52 +++++++++++++--------------------------------------- 1 files changed, 13 insertions(+), 39 deletions(-) diff --git a/README b/README index 8597a96..ff12174 100644 --- a/README +++ b/README @@ -5,24 +5,12 @@ Adobe Flash proxy running on another computer. The Flash proxy can be run just by opening a web page in a computer that has Flash Player installed. -This RTMFP version leverages the NAT-punching capabilities of Adobe's -Cirrus server, making it possible for clients behind a NAT to still -get access to Tor. The big operational difference between this version -and the swfcat version is that now the client must maintain a rtmfpcat -running in client mode open in his/her browser. The client's rtmfpcat -talks to the rtmfpcat proxy running on another computer (location uncertain) -via the UDP-based RTMFP to funnel data to a Tor relay/bridge. - 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 client's rtmfpcat and +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 rtmfpcat (totally ripped off of swfcat) because it is like a - netcat implemented in Flash. The rtmfpcat exists on both the local - and remote ends since it's the easiest way to take advantage of RTMFP. - We could get rid of the client-side rtmfpcat by making the connector - speak RTMFP, but that's too much work for now. + called swfcat because it is like a netcat implemented in Flash. 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 except that its host @@ -46,40 +34,34 @@ variable CIRRUS_KEY so it can be found by Makefile. To build, run $ make -Copy the resulting rtmfpcat.swf file to a web server. +Copy the resulting swfcat.swf file to a web server. On the computer that will be the facilitator, run sudo ./crossdomaind.py ./facilitator.py crossdomaind.py needs to be run on any server that will accept connections from a Flash proxy. It serves a chunk of data on port 843. -The facilitator runs on port 9002 by default. Note that this is a different -facilitator script than the swfcat one, since this facilitator needs to -deal with Cirrus client IDs instead of ip:port tuples. +The facilitator runs on port 9002 by default. The client needs to be running a version of Tor that supports the Socks4Proxy configuration. This means version 0.2.2.1-alpha or later--not the current stable release. On the client, run - ./connector.py -This is a modified form of the swfcat connector.py that has different -defaults, equivalent to passing 127.0.0.1:9001 for [LOCAL][:PORT] and -127.0.0.1:3333 [REMOTE][:PORT] to the swfcat connector. - -Also on the client, open up the browser to rtmfpcat.swf. Passing no + ./connector.py 127.0.0.1:9001 127.0.0.1:9002 +Also on the client, open up the browser to swfcat.swf. Passing no arguments should give you good defaults (expects the facilitator running -on Nate's server). rtmfpcat will connect to the Cirrus server to +on Nate's server). swfcat will connect to the Cirrus server to obtain a client ID which it then registers with the facilitator. -In a browser somewhere, open rtmfpcat.swf and pass the "?proxy=true" query -string, telling it to operate in proxy mode. - http://www.example.com/rtmfpcat.swf?proxy=true -This rtmfpcat will also connect to the Cirrus server to obtain a client ID, +In a browser somewhere, open swfcat.swf and pass parameters telling it +which facilitator to use and to operate in proxy mode. + http://www.example.com/swfcat.swf?proxy=true&facilitator=<FACILITATOR_IP>:9002&debug=1 +This swfcat will also connect to the Cirrus server to obtain a client ID, and then it will ping the facilitator to check if there are any registered client IDs. If there is one, it will open a RTMFP connection (coordinated by the Cirrus server) to the client and an additional connection to a -hardcoded Tor relay (David's bridge, nicknamed eRYaZuvY02FpExln). +Tor relay. Back on the client, start Tor with the following configuration: UseBridges 1 @@ -92,7 +74,7 @@ If you see messages like try deleting the files in ~/.tor or /var/lib/tor. You will be able to see byte counts flowing in both browsers displaying -rtmfpcat.swf (client and proxy), and eventually be able to build a circuit. +swfcat.swf (client and proxy), and eventually be able to build a circuit. == Rationale @@ -111,14 +93,6 @@ Clients register with the facilitator by sending an HTTP message: POST / HTTP/1.0\r\n \r\n client=<CIRRUS-CLIENT-ID> - -The <CIRRUS-CLIENT-ID> is returned by Adobe's developer Cirrus server -as soon as the rtfmpcat can connect to it. Each rtmfpcat needs to connect -to a server like this to get one of these client IDs, since the Cirrus -server uses these to coordinate RTMFP connections (including NAT punching). -The need to communicate with a Cirrus server in addition to a facilitator is -one of the major weaknesses of this design. - The Flash proxy also gets a client address over HTTP: GET / HTTP/1.0\r\n \r\n

1 0

[flashproxy/rtmfp] Refactor InternetFreedomBadge (now Badge).
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 024e47f75fa52f3fa65659e05f0e8e6358b59285 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 13:34:30 2011 -0700 Refactor InternetFreedomBadge (now Badge). Make it its own Sprite, don't cause it to change the UI of the main display. Use proxy_begin and proxy_end methods instead of modifying current/total counts directly. --- swfcat.as | 76 ++++++++++++++++++++++-------------------------------------- 1 files changed, 28 insertions(+), 48 deletions(-) diff --git a/swfcat.as b/swfcat.as index d0aad9a..d24c833 100644 --- a/swfcat.as +++ b/swfcat.as @@ -60,7 +60,7 @@ package private var output_text:TextField; /* Badge for display */ - private var badge:InternetFreedomBadge; + private var badge:Badge; private var fac_addr:Object; private var relay_addr:Object; @@ -94,8 +94,8 @@ package debug_mode = (this.loaderInfo.parameters["debug"] != null) proxy_mode = (this.loaderInfo.parameters["proxy"] != null); if (proxy_mode && !debug_mode) { - badge = new InternetFreedomBadge(this); - badge.display(); + badge = new Badge(); + addChild(badge); } else { output_text = new TextField(); output_text.width = stage.stageWidth; @@ -170,8 +170,7 @@ package start_proxy_pair(); s_c.send_hello(e.peer); } else if (!debug_mode && badge != null) { - badge.total_proxy_pairs++; - badge.num_proxy_pairs++; + badge.proxy_begin(); } p_p.client = {peer: e.peer, stream: e.stream}; @@ -234,7 +233,7 @@ package puts("ProxyPair: connection closed."); p_p = null; if (proxy_mode && !debug_mode && badge != null) { - badge.num_proxy_pairs--; + badge.proxy_end(); } establish_facilitator_connection(); }); @@ -278,29 +277,25 @@ package } } -import flash.text.TextField; import flash.text.TextFormat; +import flash.text.TextField; + +class Badge extends flash.display.Sprite +{ + /* Number of proxy pairs currently connected. */ + private var num_proxy_pairs:int = 0; + /* Number of proxy pairs ever connected. */ + private var total_proxy_pairs:int = 0; -class InternetFreedomBadge { - - private var ui:swfcat; - - private var _num_proxy_pairs:uint; - private var _total_proxy_pairs:uint; - [Embed(source="badge.png")] private var BadgeImage:Class; private var tot_client_count_tf:TextField; private var tot_client_count_fmt:TextFormat; private var cur_client_count_tf:TextField; private var cur_client_count_fmt:TextFormat; - - public function InternetFreedomBadge(ui:swfcat) + + public function Badge() { - this.ui = ui; - _num_proxy_pairs = 0; - _total_proxy_pairs = 0; - /* Setup client counter for badge. */ tot_client_count_fmt = new TextFormat(); tot_client_count_fmt.color = 0xFFFFFF; @@ -330,42 +325,27 @@ class InternetFreedomBadge { cur_client_count_tf.x=47; cur_client_count_tf.y=6; + addChild(new BadgeImage()); + addChild(tot_client_count_tf); + addChild(cur_client_count_tf); + /* Update the client counter on badge. */ update_client_count(); } - - public function display():void - { - ui.addChild(new BadgeImage()); - /* Tried unsuccessfully to add counter to badge. */ - /* For now, need two addChilds :( */ - ui.addChild(tot_client_count_tf); - ui.addChild(cur_client_count_tf); - } - - public function get num_proxy_pairs():uint - { - return _num_proxy_pairs; - } - - public function set num_proxy_pairs(amount:uint):void + + public function proxy_begin():void { - _num_proxy_pairs = amount; + num_proxy_pairs++; + total_proxy_pairs++; update_client_count(); } - - public function get total_proxy_pairs():uint - { - return _total_proxy_pairs; - } - - public function set total_proxy_pairs(amount:uint):void + + public function proxy_end():void { - _total_proxy_pairs = amount; - /* note: doesn't update, so be sure to update this - before you update num_proxy_pairs! */ + num_proxy_pairs--; + update_client_count(); } - + private function update_client_count():void { /* Update total client count. */

1 0