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

[flashproxy/master] Make rtmfpcat more uniform with swfcat.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 9f3a2b7d607edbbd328e8116b666d442fb2743d0 Author: David Fifield <david(a)bamsoftware.com> Date: Tue May 24 23:48:17 2011 -0700 Make rtmfpcat more uniform with swfcat. --- Utils.as | 25 ------------- rtmfpcat.as | 112 ++++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 69 insertions(+), 68 deletions(-) diff --git a/Utils.as b/Utils.as deleted file mode 100644 index 48f9a62..0000000 --- a/Utils.as +++ /dev/null @@ -1,25 +0,0 @@ -package -{ - - public class Utils { - - /* Parse an address in the form "host:port". Returns an Object with - keys "host" (String) and "port" (int). Returns null on error. */ - public static function parseAddrSpec(spec:String):Object - { - var parts:Array; - var addr:Object; - - parts = spec.split(":", 2); - if (parts.length != 2 || !parseInt(parts[1])) - return null; - addr = {} - addr.host = parts[0]; - addr.port = parseInt(parts[1]); - - return addr; - } - - } - -} \ No newline at end of file diff --git a/rtmfpcat.as b/rtmfpcat.as index d4766c4..49fcdeb 100644 --- a/rtmfpcat.as +++ b/rtmfpcat.as @@ -1,7 +1,10 @@ package { import flash.display.Sprite; + import flash.display.StageAlign; + import flash.display.StageScaleMode; import flash.text.TextField; + import flash.text.TextFormat; import flash.net.Socket; import flash.events.Event; import flash.events.EventDispatcher; @@ -14,64 +17,68 @@ package import rtmfp.RTMFPSocket; import rtmfp.events.RTMFPSocketEvent; - import Utils; public class rtmfpcat extends Sprite { + /* David's relay (nickname 3VXRyxz67OeRoqHn) that also serves a + crossdomain policy. */ + private const DEFAULT_TOR_PROXY_ADDR:Object = { + host: "173.255.221.44", + port: 9001 + }; /* Nate's facilitator -- also serving a crossdomain policy */ - private const DEFAULT_FAC_ADDR:Object = { + private const DEFAULT_FACILITATOR_ADDR:Object = { host: "128.12.179.80", port: 9002 }; - private const DEFAULT_TOR_CLIENT_ADDR:Object = { host: "127.0.0.1", port: 3333 }; - /* David's relay (nickname 3VXRyxz67OeRoqHn) that also serves a - crossdomain policy. */ - private const DEFAULT_TOR_PROXY_ADDR:Object = { - host: "173.255.221.44", - port: 9001 - }; - // Milliseconds. private const FACILITATOR_POLL_INTERVAL:int = 10000; - private var output_text:TextField; - + // Socket to facilitator. private var s_f:Socket; + // Socket to RTMFP peer (flash proxy). private var s_r:RTMFPSocket; + // Socket to local Tor client. private var s_t:Socket; + /* TextField for debug output. */ + private var output_text:TextField; + private var fac_addr:Object; private var tor_addr:Object; private var proxy_mode:Boolean; + public function puts(s:String):void + { + output_text.appendText(s + "\n"); + output_text.scrollV = output_text.maxScrollV; + } + public function rtmfpcat() { + // Absolute positioning. + stage.scaleMode = StageScaleMode.NO_SCALE; + stage.align = StageAlign.TOP_LEFT; + output_text = new TextField(); - output_text.width = 400; - output_text.height = 300; + output_text.width = stage.stageWidth; + output_text.height = stage.stageHeight; output_text.background = true; output_text.backgroundColor = 0x001f0f; - output_text.textColor = 0x44CC44; - addChild(output_text); + output_text.textColor = 0x44cc44; puts("Starting."); - - this.loaderInfo.addEventListener(Event.COMPLETE, onLoaderInfoComplete); - } - - private function puts(s:String):void - { - output_text.appendText(s + "\n"); - output_text.scrollV = output_text.maxScrollV; + // Wait until the query string parameters are loaded. + this.loaderInfo.addEventListener(Event.COMPLETE, loaderinfo_complete); } - private function onLoaderInfoComplete(e:Event):void + private function loaderinfo_complete(e:Event):void { var fac_spec:String; var tor_spec:String; @@ -79,36 +86,38 @@ package puts("Parameters loaded."); proxy_mode = (this.loaderInfo.parameters["proxy"] != null); + addChild(output_text); fac_spec = this.loaderInfo.parameters["facilitator"]; - if (!fac_spec) { - puts("No \"facilitator\" specification provided...using default."); - fac_addr = DEFAULT_FAC_ADDR; - } else { + if (fac_spec) { puts("Facilitator spec: \"" + fac_spec + "\""); - fac_addr = Utils.parseAddrSpec(fac_spec); - } - - if (!fac_addr) { + fac_addr = parse_addr_spec(fac_spec); + if (!fac_addr) { puts("Error: Facilitator spec must be in the form \"host:port\"."); return; + } + } else { + fac_addr = DEFAULT_FACILITATOR_ADDR; } tor_spec = this.loaderInfo.parameters["tor"]; - if (!tor_spec) { - puts("No Tor specification provided...using default."); - if (proxy_mode) tor_addr = DEFAULT_TOR_PROXY_ADDR; - else tor_addr = DEFAULT_TOR_CLIENT_ADDR; + if (tor_spec) { + puts("Tor spec: \"" + tor_spec + "\""); + tor_addr = parse_addr_spec(tor_spec); + if (!tor_addr) { + puts("Error: Tor spec must be in the form \"host:port\"."); + return; + } } else { - puts("Tor spec: \"" + tor_spec + "\"") - tor_addr = Utils.parseAddrSpec(tor_spec); + tor_addr = DEFAULT_TOR_CLIENT_ADDR; } - if (!tor_addr) { - puts("Error: Tor spec must be in the form \"host:port\"."); - return; - } + main(); + } + /* The main logic begins here, after start-up issues are taken care of. */ + private function main():void + { establishRTMFPConnection(); } @@ -204,5 +213,22 @@ package s_f.connect(fac_addr.host, fac_addr.port); } + + /* Parse an address in the form "host:port". Returns an Object with + keys "host" (String) and "port" (int). Returns null on error. */ + private static function parse_addr_spec(spec:String):Object + { + var parts:Array; + var addr:Object; + + parts = spec.split(":", 2); + if (parts.length != 2 || !parseInt(parts[1])) + return null; + addr = {} + addr.host = parts[0]; + addr.port = parseInt(parts[1]); + + return addr; + } } }

1 0

[flashproxy/master] final changes before bed, too tired to recall
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit c53afd19ac8c84950ae8c4b496c36e017ce2675d Author: ellitron <jdellit(a)stanford.edu> Date: Fri May 27 01:24:21 2011 -0700 final changes before bed, too tired to recall --- return_of_the_rtmfpcat.as | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/return_of_the_rtmfpcat.as b/return_of_the_rtmfpcat.as index 00bba3a..f1842e4 100644 --- a/return_of_the_rtmfpcat.as +++ b/return_of_the_rtmfpcat.as @@ -215,6 +215,8 @@ package private function poll_for_id():void { + puts("Facilitator: got " + rcp_pairs + " connections... polling for another"); + var s_f:Socket = new Socket(); s_f.addEventListener(Event.CONNECT, function (e:Event):void { puts("Facilitator: connected to " + fac_addr.host + ":" + fac_addr.port + "."); @@ -239,7 +241,8 @@ package /* Need to clear any outstanding timers to ensure * that only one timer ever runs. */ clearTimeout(fac_poll_timeo_id); - fac_poll_timeo_id = setTimeout(poll_for_id, FACILITATOR_POLL_INTERVAL); + if(rcp_pairs < MAXIMUM_RCP_PAIRS) + fac_poll_timeo_id = setTimeout(poll_for_id, FACILITATOR_POLL_INTERVAL); } }); s_f.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void {

1 0

[flashproxy/master] Appended unique data stream name to registration to prevent connection aliasing
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit f77bd570a94428678cedbcf0899d11b569b599c4 Author: ellitron <jdellit(a)stanford.edu> Date: Fri May 27 09:54:55 2011 -0700 Appended unique data stream name to registration to prevent connection aliasing --- return_of_the_rtmfpcat.as | 87 ++++++++++++++++++++++++++++++-------------- 1 files changed, 59 insertions(+), 28 deletions(-) diff --git a/return_of_the_rtmfpcat.as b/return_of_the_rtmfpcat.as index f1842e4..a1d14cc 100644 --- a/return_of_the_rtmfpcat.as +++ b/return_of_the_rtmfpcat.as @@ -55,11 +55,13 @@ package private static const DEFAULT_CIRCON_TIMEOUT:uint = 4000; /* Maximum connections. */ - private const MAXIMUM_RCP_PAIRS:uint = 1; + private const DEFAULT_MAXIMUM_RCP_PAIRS:uint = 1; /* Milliseconds. */ private const FACILITATOR_POLL_INTERVAL:int = 10000; + private var max_rcp_pairs; + /* TextField for debug output. */ private var output_text:TextField; @@ -89,6 +91,8 @@ package /* Number of connected RTMFPConnectionPairs. */ private var rcp_pairs:uint; + private var rtmfp_data_counter:uint; + /* Keep track of facilitator polling timer. */ private var fac_poll_timeo_id:uint; @@ -115,6 +119,9 @@ package /* Initialize connection pair count. */ rcp_pairs = 0; + /* Unique counter for RTMFP data publishing. */ + rtmfp_data_counter = 0; + puts("Meow!"); puts("Starting."); // Wait until the query string parameters are loaded. @@ -168,6 +175,11 @@ package else cir_key = DEFAULT_CIRRUS_KEY; + if(this.loaderInfo.parameters["max_con"]) + max_rcp_pairs = this.loaderInfo.parameters["max_con"]; + else + max_rcp_pairs = DEFAULT_MAXIMUM_RCP_PAIRS; + main(); } @@ -202,11 +214,12 @@ package var rcp:RTMFPConnectionPair = new RTMFPConnectionPair(circon, tor_addr, output_text); rcp.addEventListener(Event.CONNECT, rcp_connect_event); rcp.addEventListener(Event.CLOSE, rcp_close_event); - rcp.listen(); + rcp.listen(String(rtmfp_data_counter)); - puts("Registering with facilitator"); - /* Register ID with facilitator. */ - register_id(circon.nearID, fac_addr); + var reg_str:String = circon.nearID + ":" + String(rtmfp_data_counter); + puts("Registering " + reg_str + " with facilitator"); + register_id(reg_str, fac_addr); + rtmfp_data_counter++; } break; @@ -229,19 +242,25 @@ package puts("Facilitator: I/O error: " + e.text + "."); }); s_f.addEventListener(ProgressEvent.SOCKET_DATA, function (e:ProgressEvent):void { - var clientID:String = s_f.readMultiByte(e.bytesLoaded, "utf-8"); - puts("Facilitator: got \"" + clientID + "\""); - if (clientID != "Registration list empty") { - puts("Connecting to " + clientID + "."); + var client:String = s_f.readMultiByte(e.bytesLoaded, "utf-8"); + puts("Facilitator: got \"" + client + "\""); + if (client != "Registration list empty") { + puts("Connecting to " + client + "."); + + var client_id:String = client.split(":")[0]; + var client_data:String = client.split(":")[1]; + + clearTimeout(fac_poll_timeo_id); + var rcp:RTMFPConnectionPair = new RTMFPConnectionPair(circon, tor_addr, output_text); rcp.addEventListener(Event.CONNECT, rcp_connect_event); rcp.addEventListener(Event.CLOSE, rcp_close_event); - rcp.connect(clientID); + rcp.connect(client_id, client_data); } else { /* Need to clear any outstanding timers to ensure * that only one timer ever runs. */ clearTimeout(fac_poll_timeo_id); - if(rcp_pairs < MAXIMUM_RCP_PAIRS) + if(rcp_pairs < max_rcp_pairs) fac_poll_timeo_id = setTimeout(poll_for_id, FACILITATOR_POLL_INTERVAL); } }); @@ -260,17 +279,21 @@ package rcp_pairs++; if(proxy_mode) { - if(rcp_pairs < MAXIMUM_RCP_PAIRS) { + if(rcp_pairs < max_rcp_pairs) { poll_for_id(); } } else { /* Setup listening RTMFPConnectionPair. */ - if(rcp_pairs < MAXIMUM_RCP_PAIRS) { + if(rcp_pairs < max_rcp_pairs) { puts("Setting up listening RTMFPConnectionPair"); var rcp:RTMFPConnectionPair = new RTMFPConnectionPair(circon, tor_addr, output_text); rcp.addEventListener(Event.CONNECT, rcp_connect_event); rcp.addEventListener(Event.CLOSE, rcp_close_event); - rcp.listen(); + rcp.listen(String(rtmfp_data_counter)); + var reg_str:String = circon.nearID + ":" + String(rtmfp_data_counter); + puts("Registering " + reg_str + " with facilitator"); + register_id(reg_str, fac_addr); + rtmfp_data_counter++; } } } @@ -284,16 +307,20 @@ package /* FIXME: Do I need to unregister the event listeners so * that the system can garbage collect the rcp object? */ if(proxy_mode) { - if(rcp_pairs < MAXIMUM_RCP_PAIRS) { + if(rcp_pairs < max_rcp_pairs) { poll_for_id(); } } else { - if(rcp_pairs < MAXIMUM_RCP_PAIRS) { + if(rcp_pairs < max_rcp_pairs) { puts("Setting up listening RTMFPConnectionPair"); var rcp:RTMFPConnectionPair = new RTMFPConnectionPair(circon, tor_addr, output_text); rcp.addEventListener(Event.CONNECT, rcp_connect_event); rcp.addEventListener(Event.CLOSE, rcp_close_event); - rcp.listen(); + rcp.listen(String(rtmfp_data_counter)); + var reg_str:String = circon.nearID + ":" + String(rtmfp_data_counter); + puts("Registering " + reg_str + " with facilitator"); + register_id(reg_str, fac_addr); + rtmfp_data_counter++; } } } @@ -362,7 +389,7 @@ import flash.text.TextField; class RTMFPSocket extends EventDispatcher { /* The name of the "media" to pass between peers. */ - private static const DATA:String = "data"; + private var data:String; /* Connection to the Cirrus rendezvous service. * RTMFPSocket is established using this service. */ @@ -399,19 +426,23 @@ class RTMFPSocket extends EventDispatcher }); } - public function listen():void + public function listen(data:String):void { + this.data = data; + send_stream = new NetStream(circon, NetStream.DIRECT_CONNECTIONS); var client:Object = new Object(); client.onPeerConnect = send_stream_peer_connect; send_stream.client = client; - send_stream.publish(DATA); + send_stream.publish(data); } - public function connect(clientID:String):void + public function connect(clientID:String, data:String):void { puts("RTMFPSocket: connecting to peer..."); + this.data = data; + send_stream = new NetStream(circon, NetStream.DIRECT_CONNECTIONS); var client:Object = new Object(); client.onPeerConnect = function (peer:NetStream):Boolean { @@ -422,7 +453,7 @@ class RTMFPSocket extends EventDispatcher return true; }; send_stream.client = client; - send_stream.publish(DATA); + send_stream.publish(data); recv_stream = new NetStream(circon, clientID); var client_rtmfp:RTMFPSocketClient = new RTMFPSocketClient(); @@ -434,7 +465,7 @@ class RTMFPSocket extends EventDispatcher }, false, 0, true); recv_stream.client = client_rtmfp; - recv_stream.play(DATA); + recv_stream.play(data); } private function send_stream_peer_connect(peer:NetStream):Boolean @@ -451,7 +482,7 @@ class RTMFPSocket extends EventDispatcher dispatchEvent(new Event(Event.CONNECT)); }, false, 0, true); recv_stream.client = client; - recv_stream.play(DATA); + recv_stream.play(data); peer.send("setPeerConnectAcknowledged"); @@ -574,20 +605,20 @@ class RTMFPConnectionPair extends EventDispatcher this.output_text = output_text; } - public function connect(clientID:String):void + public function connect(clientID:String, rtmfp_data:String):void { s_r = new RTMFPSocket(circon, output_text); s_r.addEventListener(Event.CONNECT, rtmfp_connect_event); s_r.addEventListener(Event.CLOSE, rtmfp_close_event); - s_r.connect(clientID); + s_r.connect(clientID, rtmfp_data); } - public function listen():void + public function listen(rtmfp_data:String):void { s_r = new RTMFPSocket(circon, output_text); s_r.addEventListener(Event.CONNECT, rtmfp_connect_event); s_r.addEventListener(Event.CLOSE, rtmfp_close_event); - s_r.listen(); + s_r.listen(rtmfp_data); } private function rtmfp_connect_event(e:Event):void

1 0

[flashproxy/master] completed client side part
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit ae03e4efe589f591af5ea40fe2a4ef7044a98f72 Author: ellitron <jdellit(a)stanford.edu> Date: Thu May 26 17:21:36 2011 -0700 completed client side part --- return_of_the_rtmfpcat.as | 54 +++++++++++++++++++++++++++++++------------- 1 files changed, 38 insertions(+), 16 deletions(-) diff --git a/return_of_the_rtmfpcat.as b/return_of_the_rtmfpcat.as index 8436f1a..3958c69 100644 --- a/return_of_the_rtmfpcat.as +++ b/return_of_the_rtmfpcat.as @@ -43,6 +43,12 @@ package host: "128.12.179.80", port: 9002 }; + + /* David's facilitator. */ + //private const DEFAULT_FACILITATOR_ADDR:Object = { + // host: "tor-facilitator.bamsoftware.com", + // port: 9006 + //}; /* Cirrus server information. */ private const DEFAULT_CIRRUS_ADDRESS:String = "rtmfp://p2p.rtmfp.net"; @@ -181,7 +187,7 @@ package { switch (event.info.code) { case "NetConnection.Connect.Success" : - puts("circon_netstatus_event: NetConnection.Connect.Success"); + puts("Cirrus server connection established."); puts("Got id " + circon.nearID + "."); clearInterval(circon_timeo_id); @@ -200,18 +206,6 @@ package } break; - case "NetStream.Connect.Success" : - puts("circon_netstatus_event: NetStream.Connect.Success"); - break; - case "NetStream.Publish.BadName" : - puts("circon_netstatus_event: NetStream.Publish.BadName"); - break; - case "NetStream.Connect.Closed" : - puts("circon_netstatus_event: NetStream.Connect.Closed"); - // we've disconnected from the peer - // can reset to accept another - // clear the publish stream and re-publish another - break; } } @@ -250,7 +244,7 @@ package var s_f:Socket = new Socket(); s_f.addEventListener(Event.CONNECT, function (e:Event):void { puts("Facilitator: connected to " + fac_addr.host + ":" + fac_addr.port + "."); - puts("Registering id " + id); + puts("Facilitator: Registering id " + id); s_f.writeUTFBytes("POST / HTTP/1.0\r\n\r\nclient=" + id + "\r\n"); }); s_f.addEventListener(Event.CLOSE, function (e:Event):void { @@ -296,6 +290,7 @@ import flash.events.EventDispatcher; import flash.events.IOErrorEvent; import flash.events.ProgressEvent; import flash.events.SecurityErrorEvent; +import flash.events.NetStatusEvent; import flash.net.Socket; import flash.utils.ByteArray; import flash.utils.clearTimeout; @@ -335,6 +330,14 @@ class RTMFPSocket extends EventDispatcher this.circon = circon; this.output_text = output_text; connected = false; + + circon.addEventListener(NetStatusEvent.NET_STATUS, circon_netstatus_event); + circon.addEventListener(IOErrorEvent.IO_ERROR, function (e:Event):void { + puts("RTMFPSocket: Cirrus connection had an IOErrorEvent.IO_ERROR event"); + }); + circon.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:Event):void { + puts("RTMFPSocket: Cirrus connection had a SecurityErrorEvent.SECURITY_ERROR"); + }); } public function listen():void @@ -365,6 +368,25 @@ class RTMFPSocket extends EventDispatcher return true; } + private function circon_netstatus_event(event:NetStatusEvent):void + { + switch (event.info.code) { + case "NetStream.Connect.Closed" : + puts("RTMFPSocket: NetStream connection was closed"); + + if(connected) + { + send_stream.close(); + recv_stream.close(); + connected = false; + dispatchEvent(new Event(Event.CLOSE)); + } + + break; + } + } + + public function readBytes(bytes:ByteArray):void { recv_stream.client.bytes.readBytes(bytes); @@ -471,8 +493,8 @@ class RTMFPConnectionPair extends EventDispatcher private function rtmfp_connect_event(e:Event):void { - puts("RTMFPConnectionPair: RTMFPSocket connected!"); - puts("RTMFPConnectionPair: setting up tor connection..."); + puts("RTMFPConnectionPair: RTMFPSocket side connected!"); + puts("RTMFPConnectionPair: setting up tor side connection..."); /* Setup tor connection linked to RTMFPSocket. */ s_t = new Socket();

1 0

[flashproxy/master] Allow the facilitator to handle both TCP and RTMFP regs.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 0423ede0cfa8efa3224cc371581c5f0ca5d3bfff Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 25 18:04:44 2011 -0700 Allow the facilitator to handle both TCP and RTMFP regs. --- facilitator.py | 54 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/facilitator.py b/facilitator.py index 0333aee..c9859db 100755 --- a/facilitator.py +++ b/facilitator.py @@ -97,31 +97,61 @@ def format_addr(addr): else: return u"%s:%d" % (host, port) -class Reg(object): +class TCPReg(object): + def __init__(self, host, port): + self.host = host + self.port = port + + def __unicode__(self): + return format_addr((self.host, self.port)) + + def __str__(self): + return unicode(self).encode("UTF-8") + + def __cmp__(self, other): + if isinstance(other, TCPReg): + return cmp((self.host, self.port), (other.host, other.port)) + else: + return False + +class RTMFPReg(object): def __init__(self, id): self.id = id def __unicode__(self): - return u"%s" % (self.id) + return u"%s" % self.id def __str__(self): return unicode(self).encode("UTF-8") def __cmp__(self, other): - return cmp((self.id), (other.id)) + if isinstance(other, RTMFPReg): + return cmp(self.id, other.id) + else: + return False +class Reg(object): @staticmethod def parse(spec, defhost = None, defport = None): - af, host, port = parse_addr_spec(spec, defhost, defport) try: - addrs = socket.getaddrinfo(host, port, af, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) - except socket.gaierror, e: - raise ValueError("Bad host or port: \"%s\" \"%s\": %s" % (host, port, str(e))) - if not addrs: - raise ValueError("Bad host or port: \"%s\" \"%s\"" % (host, port)) + af, host, port = parse_addr_spec(spec, defhost, defport) + except ValueError: + pass + else: + try: + addrs = socket.getaddrinfo(host, port, af, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) + except socket.gaierror, e: + raise ValueError("Bad host or port: \"%s\" \"%s\": %s" % (host, port, str(e))) + if not addrs: + raise ValueError("Bad host or port: \"%s\" \"%s\"" % (host, port)) + + host, port = socket.getnameinfo(addrs[0][4], socket.NI_NUMERICHOST | socket.NI_NUMERICSERV) + return TCPReg(host, int(port)) + + if re.match(ur'^[0-9A-Fa-f]{64}$', spec): + return RTMFPReg(spec) - host, port = socket.getnameinfo(addrs[0][4], socket.NI_NUMERICHOST | socket.NI_NUMERICSERV) - return Reg(host, int(port)) + raise ValueError("Bad spec format: %s" % repr(spec)) class RegSet(object): def __init__(self): @@ -182,7 +212,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): val = client_specs[0] try: - reg = Reg(val) + reg = Reg.parse(val, self.client_address[0]) except ValueError, e: log(u"client %s syntax error in %s: %s" % (format_addr(self.client_address), repr(val), repr(str(e)))) return

1 0

[flashproxy/master] fixed peer connecting issue
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit a70cd794e99e9eba01fc46ad0775e0ccb74bff0b Author: ellitron <jdellit(a)stanford.edu> Date: Fri May 27 00:45:03 2011 -0700 fixed peer connecting issue --- return_of_the_rtmfpcat.as | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/return_of_the_rtmfpcat.as b/return_of_the_rtmfpcat.as index a4ec182..00bba3a 100644 --- a/return_of_the_rtmfpcat.as +++ b/return_of_the_rtmfpcat.as @@ -37,16 +37,16 @@ package }; /* Nate's facilitator -- also serving a crossdomain policy */ + //private const DEFAULT_FACILITATOR_ADDR:Object = { + // host: "128.12.179.80", + // port: 9002 + //}; + + /* David's facilitator. */ private const DEFAULT_FACILITATOR_ADDR:Object = { - host: "128.12.179.80", + host: "127.0.0.1", port: 9002 }; - - /* David's facilitator. */ - //private const DEFAULT_FACILITATOR_ADDR:Object = { - // host: "tor-facilitator.bamsoftware.com", - // port: 9006 - //}; /* Cirrus server information. */ private const DEFAULT_CIRRUS_ADDRESS:String = "rtmfp://p2p.rtmfp.net"; @@ -415,6 +415,7 @@ class RTMFPSocket extends EventDispatcher puts("RTMFPSocket: connected to peer"); connected = true; dispatchEvent(new Event(Event.CONNECT)); + peer.send("setPeerConnectAcknowledged"); return true; }; send_stream.client = client; @@ -425,6 +426,10 @@ class RTMFPSocket extends EventDispatcher client_rtmfp.addEventListener(ProgressEvent.SOCKET_DATA, function (event:ProgressEvent):void { dispatchEvent(event); }, false, 0, true); + client_rtmfp.addEventListener(RTMFPSocketClient.PEER_CONNECT_ACKNOWLEDGED, function (event:Event):void { + /* Empty... here for symmetry. */ + }, false, 0, true); + recv_stream.client = client_rtmfp; recv_stream.play(DATA); } @@ -445,6 +450,8 @@ class RTMFPSocket extends EventDispatcher recv_stream.client = client; recv_stream.play(DATA); + peer.send("setPeerConnectAcknowledged"); + return true; } @@ -486,6 +493,7 @@ class RTMFPSocket extends EventDispatcher } } +[Event(name="peerConnectAcknowledged", type="flash.events.Event")] dynamic class RTMFPSocketClient extends EventDispatcher { public static const PEER_CONNECT_ACKNOWLEDGED:String = "peerConnectAcknowledged";

1 0

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

12 Jun '11

commit 9b43d64be7a6b6d11f33a632030dfc020dc8f0ac Merge: 57c2678 8cac767 Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 26 22:11:17 2011 -0700 Merge branch 'master' into rtmfp Conflicts: README swfcat.as README | 4 +- connector.py | 89 +++++++++++++++++++++------------------ swfcat.as | 53 +++++++++++++++--------- tor-ignore-bridge-failure.diff | 19 ++++++++ 4 files changed, 102 insertions(+), 63 deletions(-) diff --cc README index 17fadf5,067f92e..afae925 --- a/README +++ b/README @@@ -39,16 -29,14 +39,16 @@@ Download the (free software) 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. +Copy the resulting rtmfpcat.swf file to a web server. On the computer that will be the facilitator, run - sudo ./crossdomaind.py - ./facilitator.py + 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. +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 client needs to be running a version of Tor that supports the Socks4Proxy configuration. This means version 0.2.2.1-alpha or

1 0

[flashproxy/master] Added lots of code to make connection pairs and connect to the connector and so on...
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit e1784683cccccf352ffd7d6d273085b3890079e8 Author: ellitron <jdellit(a)stanford.edu> Date: Thu May 26 13:55:55 2011 -0700 Added lots of code to make connection pairs and connect to the connector and so on... --- return_of_the_rtmfpcat.as | 163 ++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 153 insertions(+), 10 deletions(-) diff --git a/return_of_the_rtmfpcat.as b/return_of_the_rtmfpcat.as index 9ecc61f..8436f1a 100644 --- a/return_of_the_rtmfpcat.as +++ b/return_of_the_rtmfpcat.as @@ -50,6 +50,9 @@ package private static const DEFAULT_CIRCON_TIMEOUT:uint = 4000; + /* Maximum connections. */ + private const MAXIMUM_RCP_PAIRS:uint = 1; + /* TextField for debug output. */ private var output_text:TextField; @@ -76,8 +79,8 @@ package /* Cirrus connection timeout ID. */ private var circon_timeo_id:int; - /* Array of connection pairs */ - private var con_pairs:Array; + /* Number of connected RTMFPConnectionPairs. */ + private var rcp_pairs:uint; /* Put a string to the screen. */ public function puts(s:String):void @@ -99,6 +102,9 @@ package output_text.backgroundColor = 0x001f0f; output_text.textColor = 0x44cc44; + /* Initialize connection pair count. */ + rcp_pairs = 0; + puts("Meow!"); puts("Starting."); // Wait until the query string parameters are loaded. @@ -182,11 +188,13 @@ package if(proxy_mode) { } else { - /* Listen for incoming RTMFP connections. */ - var s_r:RTMFPSocket = new RTMFPSocket(circon); - s_r.addEventListener(Event.CONNECT, rtmfp_connect_event); - s_r.listen(); + puts("Setting up listening RTMFPConnectionPair"); + var rcp:RTMFPConnectionPair = new RTMFPConnectionPair(circon, tor_addr, output_text); + rcp.addEventListener(Event.CONNECT, rcp_connect_event); + rcp.addEventListener(Event.CLOSE, rcp_close_event); + rcp.listen(); + puts("Registering with facilitator"); /* Register ID with facilitator. */ register_id(circon.nearID, fac_addr); } @@ -207,9 +215,34 @@ package } } - private function rtmfp_connect_event(e:Event):void + private function rcp_connect_event(e:Event):void + { + puts("RTMFPConnectionPair connected"); + + rcp_pairs++; + + if(proxy_mode) { + + } else { + /* Setup listening RTMFPConnectionPair. */ + if(rcp_pairs < MAXIMUM_RCP_PAIRS) { + puts("Setting up listening RTMFPConnectionPair"); + var rcp:RTMFPConnectionPair = new RTMFPConnectionPair(circon, tor_addr, output_text); + rcp.addEventListener(Event.CONNECT, rcp_connect_event); + rcp.addEventListener(Event.CLOSE, rcp_close_event); + rcp.listen(); + } + } + } + + private function rcp_close_event(e:Event):void { - puts("VICTORY!"); + puts("RTMFPConnectionPair closed"); + + rcp_pairs--; + + /* FIXME: Do I need to unregister the event listeners so + * that the system can garbage collect the rcp object? */ } private function register_id(id:String, fac_addr:Object):void @@ -270,6 +303,7 @@ import flash.utils.getTimer; import flash.utils.setTimeout; import flash.net.NetConnection; import flash.net.NetStream; +import flash.text.TextField; class RTMFPSocket extends EventDispatcher { @@ -284,9 +318,23 @@ class RTMFPSocket extends EventDispatcher private var send_stream:NetStream; private var recv_stream:NetStream; - public function RTMFPSocket(circon:NetConnection) + /* Keeps the state of our connectedness. */ + public var connected:Boolean; + + private var output_text:TextField; + + /* Put a string to the screen. */ + public function puts(s:String):void + { + output_text.appendText(s + "\n"); + output_text.scrollV = output_text.maxScrollV; + } + + public function RTMFPSocket(circon:NetConnection, output_text:TextField) { this.circon = circon; + this.output_text = output_text; + connected = false; } public function listen():void @@ -300,12 +348,15 @@ class RTMFPSocket extends EventDispatcher private function send_stream_peer_connect(peer:NetStream):Boolean { + puts("RTMFPSocket: peer connecting..."); recv_stream = new NetStream(circon, peer.farID); var client:RTMFPSocketClient = new RTMFPSocketClient(); client.addEventListener(ProgressEvent.SOCKET_DATA, function (event:ProgressEvent):void { dispatchEvent(event); }, false, 0, true); client.addEventListener(RTMFPSocketClient.PEER_CONNECT_ACKNOWLEDGED, function (event:Event):void { + puts("RTMFPSocket: peer connected"); + connected = true; dispatchEvent(new Event(Event.CONNECT)); }, false, 0, true); recv_stream.client = client; @@ -314,7 +365,23 @@ class RTMFPSocket extends EventDispatcher return true; } + public function readBytes(bytes:ByteArray):void + { + recv_stream.client.bytes.readBytes(bytes); + } + + public function writeBytes(bytes:ByteArray):void + { + send_stream.send("dataAvailable", bytes); + } + public function close():void + { + puts("RTMFPSocket: closing..."); + send_stream.close(); + recv_stream.close(); + connected = false; + } } dynamic class RTMFPSocketClient extends EventDispatcher @@ -368,7 +435,83 @@ dynamic class RTMFPSocketClient extends EventDispatcher } -class ConnectionPair extends EventDispatcher +class RTMFPConnectionPair extends EventDispatcher { + private var circon:NetConnection; + + private var tor_addr:Object; + + private var s_r:RTMFPSocket; + + private var s_t:Socket; + + private var output_text:TextField; + + /* Put a string to the screen. */ + public function puts(s:String):void + { + output_text.appendText(s + "\n"); + output_text.scrollV = output_text.maxScrollV; + } + + public function RTMFPConnectionPair(circon:NetConnection, tor_addr:Object, output_text:TextField) + { + this.circon = circon; + this.tor_addr = tor_addr; + this.output_text = output_text; + } + + public function listen():void + { + s_r = new RTMFPSocket(circon, output_text); + s_r.addEventListener(Event.CONNECT, rtmfp_connect_event); + s_r.addEventListener(Event.CLOSE, rtmfp_close_event); + s_r.listen(); + } + + private function rtmfp_connect_event(e:Event):void + { + puts("RTMFPConnectionPair: RTMFPSocket connected!"); + puts("RTMFPConnectionPair: setting up tor connection..."); + + /* Setup tor connection linked to RTMFPSocket. */ + s_t = new Socket(); + s_t.addEventListener(Event.CONNECT, function (e:Event):void { + puts("RTMFPConnectionPair: Tor: connected to " + tor_addr.host + ":" + tor_addr.port + "."); + dispatchEvent(new Event(Event.CONNECT)); + }); + s_t.addEventListener(Event.CLOSE, function (e:Event):void { + puts("RTMFPConnectionPair: Tor: closed connection."); + /* Close other side of connection pair if it is open and + * dispatch close event. */ + if(s_r.connected) + s_r.close(); + dispatchEvent(new Event(Event.CLOSE)); + }); + s_t.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { + puts("RTMFPConnectionPair: Tor: I/O error: " + e.text + "."); + }); + s_t.addEventListener(ProgressEvent.SOCKET_DATA, function (e:ProgressEvent):void { + var bytes:ByteArray = new ByteArray(); + s_t.readBytes(bytes, 0, e.bytesLoaded); + puts("RTMFPConnectionPair: Tor: read " + bytes.length + " bytes."); + s_r.writeBytes(bytes); + }); + s_t.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { + puts("RTMFPConnectionPair: Tor: security error: " + e.text + "."); + }); + + s_t.connect(tor_addr.host, tor_addr.port); + } + + private function rtmfp_close_event(e:Event):void + { + puts("RTMFPConnectionPair: RTMFPSocket closed connection"); + /* Close other side of connection pair if it is open and dispatch + * close event. */ + if(s_t.connected) + s_t.close(); + dispatchEvent(new Event(Event.CLOSE)); + } }

1 0

[flashproxy/master] completed proxy side of the code, untested
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 57c267849ce64c15a597211c07072414baf2e267 Author: ellitron <jdellit(a)stanford.edu> Date: Thu May 26 18:39:32 2011 -0700 completed proxy side of the code, untested --- return_of_the_rtmfpcat.as | 112 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 104 insertions(+), 8 deletions(-) diff --git a/return_of_the_rtmfpcat.as b/return_of_the_rtmfpcat.as index 3958c69..ed582b8 100644 --- a/return_of_the_rtmfpcat.as +++ b/return_of_the_rtmfpcat.as @@ -59,6 +59,9 @@ package /* Maximum connections. */ private const MAXIMUM_RCP_PAIRS:uint = 1; + /* Milliseconds. */ + private const FACILITATOR_POLL_INTERVAL:int = 10000; + /* TextField for debug output. */ private var output_text:TextField; @@ -88,6 +91,9 @@ package /* Number of connected RTMFPConnectionPairs. */ private var rcp_pairs:uint; + /* Keep track of facilitator polling timer. */ + private var fac_poll_timeo_id:uint; + /* Put a string to the screen. */ public function puts(s:String):void { @@ -192,7 +198,7 @@ package clearInterval(circon_timeo_id); if(proxy_mode) { - + poll_for_id(); } else { puts("Setting up listening RTMFPConnectionPair"); var rcp:RTMFPConnectionPair = new RTMFPConnectionPair(circon, tor_addr, output_text); @@ -209,6 +215,43 @@ package } } + private function poll_for_id():void + { + var s_f:Socket = new Socket(); + s_f.addEventListener(Event.CONNECT, function (e:Event):void { + puts("Facilitator: connected to " + fac_addr.host + ":" + fac_addr.port + "."); + s_f.writeUTFBytes("GET / HTTP/1.0\r\n\r\n"); + }); + s_f.addEventListener(Event.CLOSE, function (e:Event):void { + puts("Facilitator: connection closed."); + }); + s_f.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { + puts("Facilitator: I/O error: " + e.text + "."); + }); + s_f.addEventListener(ProgressEvent.SOCKET_DATA, function (e:ProgressEvent):void { + var clientID:String = s_f.readMultiByte(e.bytesLoaded, "utf-8"); + puts("Facilitator: got \"" + clientID + "\""); + if (clientID != "Registration list empty") { + puts("Connecting to " + clientID + "."); + var rcp:RTMFPConnectionPair = new RTMFPConnectionPair(circon, tor_addr, output_text); + rcp.addEventListener(Event.CONNECT, rcp_connect_event); + rcp.addEventListener(Event.CLOSE, rcp_close_event); + rcp.connect(clientID); + } else { + /* Need to clear any outstanding timers to ensure + * that only one timer ever runs. */ + clearTimeout(fac_poll_timeo_id); + fac_poll_timeo_id = setTimeout(poll_for_id, FACILITATOR_POLL_INTERVAL); + } + }); + s_f.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { + puts("Facilitator: security error: " + e.text + "."); + }); + + s_f.connect(fac_addr.host, fac_addr.port); + + } + private function rcp_connect_event(e:Event):void { puts("RTMFPConnectionPair connected"); @@ -216,7 +259,9 @@ package rcp_pairs++; if(proxy_mode) { - + if(rcp_pairs < MAXIMUM_RCP_PAIRS) { + poll_for_id(); + } } else { /* Setup listening RTMFPConnectionPair. */ if(rcp_pairs < MAXIMUM_RCP_PAIRS) { @@ -237,6 +282,19 @@ package /* FIXME: Do I need to unregister the event listeners so * that the system can garbage collect the rcp object? */ + if(proxy_mode) { + if(rcp_pairs < MAXIMUM_RCP_PAIRS) { + poll_for_id(); + } + } else { + if(rcp_pairs < MAXIMUM_RCP_PAIRS) { + puts("Setting up listening RTMFPConnectionPair"); + var rcp:RTMFPConnectionPair = new RTMFPConnectionPair(circon, tor_addr, output_text); + rcp.addEventListener(Event.CONNECT, rcp_connect_event); + rcp.addEventListener(Event.CLOSE, rcp_close_event); + rcp.listen(); + } + } } private function register_id(id:String, fac_addr:Object):void @@ -349,6 +407,30 @@ class RTMFPSocket extends EventDispatcher send_stream.publish(DATA); } + public function connect(clientID:String):void + { + puts("RTMFPSocket: connecting to peer..."); + + send_stream = new NetStream(circon, NetStream.DIRECT_CONNECTIONS); + var client:Object = new Object(); + client.onPeerConnect = function (peer:NetStream):Boolean { + puts("RTMFPSocket: connected to peer"); + connected = true; + dispatchEvent(new Event(Event.CONNECT)); + return true; + }; + send_stream.client = client; + send_stream.publish(DATA); + + recv_stream = new NetStream(circon, clientID); + var client:RTMFPSocketClient = new RTMFPSocketClient(); + client.addEventListener(ProgressEvent.SOCKET_DATA, function (event:ProgressEvent):void { + dispatchEvent(event); + }, false, 0, true); + recv_stream.client = client; + recv_stream.play(DATA); + } + private function send_stream_peer_connect(peer:NetStream):Boolean { puts("RTMFPSocket: peer connecting..."); @@ -483,6 +565,14 @@ class RTMFPConnectionPair extends EventDispatcher this.output_text = output_text; } + public function connect(clientID:String):void + { + s_r = new RTMFPSocket(circon, output_text); + s_r.addEventListener(Event.CONNECT, rtmfp_connect_event); + s_r.addEventListener(Event.CLOSE, rtmfp_close_event); + s_r.connect(clientID); + } + public function listen():void { s_r = new RTMFPSocket(circon, output_text); @@ -500,6 +590,18 @@ class RTMFPConnectionPair extends EventDispatcher s_t = new Socket(); s_t.addEventListener(Event.CONNECT, function (e:Event):void { puts("RTMFPConnectionPair: Tor: connected to " + tor_addr.host + ":" + tor_addr.port + "."); + s_r.addEventListener(ProgressEvent.SOCKET_DATA, function (e:ProgressEvent):void { + var bytes:ByteArray = new ByteArray(); + s_r.readBytes(bytes, 0, e.bytesLoaded); + puts("RTMFPConnectionPair: RTMFP: read " + bytes.length + " bytes."); + s_t.writeBytes(bytes); + }); + s_t.addEventListener(ProgressEvent.SOCKET_DATA, function (e:ProgressEvent):void { + var bytes:ByteArray = new ByteArray(); + s_t.readBytes(bytes, 0, e.bytesLoaded); + puts("RTMFPConnectionPair: Tor: read " + bytes.length + " bytes."); + s_r.writeBytes(bytes); + }); dispatchEvent(new Event(Event.CONNECT)); }); s_t.addEventListener(Event.CLOSE, function (e:Event):void { @@ -513,12 +615,6 @@ class RTMFPConnectionPair extends EventDispatcher s_t.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { puts("RTMFPConnectionPair: Tor: I/O error: " + e.text + "."); }); - s_t.addEventListener(ProgressEvent.SOCKET_DATA, function (e:ProgressEvent):void { - var bytes:ByteArray = new ByteArray(); - s_t.readBytes(bytes, 0, e.bytesLoaded); - puts("RTMFPConnectionPair: Tor: read " + bytes.length + " bytes."); - s_r.writeBytes(bytes); - }); s_t.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { puts("RTMFPConnectionPair: Tor: security error: " + e.text + "."); });

1 0

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

12 Jun '11

commit 4ba49ccb6c04da8565f06923a30734aa765414cd Merge: d5c1258 9b584d0 Author: David Fifield <david(a)bamsoftware.com> Date: Tue May 24 22:56:05 2011 -0700 Merge branch 'master' into rtmfp badge.png | Bin 264 -> 682 bytes badge_con_counter.png | Bin 270 -> 0 bytes nat-birthday.py | 132 ----------------------------------- notes.txt | 2 - swfcat.as | 184 +++++++++++++++++++++++++++++++++++++++++++++---- 5 files changed, 170 insertions(+), 148 deletions(-) diff --cc swfcat.as index 76de948,6f4be0c..108f6eb --- a/swfcat.as +++ b/swfcat.as @@@ -45,13 -50,13 +50,15 @@@ packag /* Number of proxy pairs ever connected. */ private var total_proxy_pairs:int = 0; + public var rate_limit:RateLimit; + /* Badge with a client counter */ - [Embed(source="badge_con_counter.png")] + [Embed(source="badge.png")] private var BadgeImage:Class; - private var client_count_tf:TextField; - private var client_count_fmt:TextFormat; + 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 puts(s:String):void {

1 0