- tor-commits - lists.torproject.org

[flashproxy/rtmfp] Use a host name instead of an IP address for the facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 972030b0b5902dea425adcd6c2c13a5d979dd6ba Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 02:44:57 2011 -0700 Use a host name instead of an IP address for the facilitator. --- swfcat.as | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/swfcat.as b/swfcat.as index 130b061..34983ce 100644 --- a/swfcat.as +++ b/swfcat.as @@ -25,7 +25,7 @@ package port: 9001 }; private const DEFAULT_FACILITATOR_ADDR:Object = { - host: "173.255.221.44", + host: "tor-facilitator.bamsoftware.com", port: 9002 };

1 0

[flashproxy/rtmfp] Add a required --relay option to the facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 1b1687e87fe6ce17ad1509bac7eaf479c7247628 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 03:15:25 2011 -0700 Add a required --relay option to the facilitator. --- facilitator.py | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) diff --git a/facilitator.py b/facilitator.py index 5c33ea2..be7543a 100755 --- a/facilitator.py +++ b/facilitator.py @@ -15,6 +15,7 @@ import urlparse DEFAULT_ADDRESS = "0.0.0.0" DEFAULT_PORT = 9002 +DEFAULT_RELAY_PORT = 9001 DEFAULT_LOG_FILENAME = "facilitator.log" LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" @@ -22,17 +23,26 @@ LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): log_filename = DEFAULT_LOG_FILENAME log_file = sys.stdout + relay_spec = None daemonize = True + @staticmethod + def set_relay_spec(spec): + af, host, port = parse_addr_spec(spec, defport = DEFAULT_RELAY_PORT) + # Resolve to get an IP address. + addrs = socket.getaddrinfo(host, port, af) + options.relay_spec = format_addr(addrs[0][4]) + def usage(f = sys.stdout): print >> f, """\ -Usage: %(progname)s <OPTIONS> [HOST] [PORT] +Usage: %(progname)s -r RELAY <OPTIONS> [HOST] [PORT] Flash bridge facilitator: Register client addresses with HTTP POST requests and serve them out again with HTTP GET. Listen on HOST and PORT, by default %(addr)s %(port)d. -d, --debug don't daemonize, log to stdout. -h, --help show this help. - -l, --log FILENAME write log to FILENAME (default \"%(log)s\").\ + -l, --log FILENAME write log to FILENAME (default \"%(log)s\"). + -r, --relay RELAY send RELAY (host:port) to proxies as the relay to use.\ """ % { "progname": sys.argv[0], "addr": DEFAULT_ADDRESS, @@ -200,7 +210,9 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): reg = REGS.fetch() if reg: - log(u"proxy %s gets %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) + log(u"proxy %s gets %s, relay %s (now %d)" % + (format_addr(self.client_address), unicode(reg), + options.relay_spec, len(REGS))) self.send_client(reg) else: log(u"proxy %s gets none" % format_addr(self.client_address)) @@ -272,11 +284,16 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_response(200) self.send_header("Content-Type", "x-www-form-urlencoded") self.end_headers() - self.request.send(urllib.urlencode({"client": client_str})) + + data = {} + data["client"] = client_str + data["relay"] = options.relay_spec + self.request.send(urllib.urlencode(data)) REGS = RegSet() -opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:", ["debug", "help", "log="]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:r:", + ["debug", "help", "log=", "relay="]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False @@ -286,12 +303,25 @@ for o, a in opts: sys.exit() elif o == "-l" or o == "--log": options.log_filename = a + elif o == "-r" or o == "--relay": + try: + options.set_relay_spec(a) + except socket.gaierror, e: + print >> sys.stderr, u"Can't resolve relay %s: %s" % (repr(a), str(e)) + sys.exit(1) if options.log_filename: options.log_file = open(options.log_filename, "a") else: options.log_file = sys.stdout +if not options.relay_spec: + print >> sys.stderr, """\ +The -r option is required. Give it the relay that will be sent to proxies. + -r HOST[:PORT]\ +""" + sys.exit(1) + if len(args) == 0: address = (DEFAULT_ADDRESS, DEFAULT_PORT) elif len(args) == 1:

1 0

[flashproxy/rtmfp] Let swfcat get the relay from the facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit c48df422a4eb497d5cc65a77f4d987f3d4999cbf Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 03:15:59 2011 -0700 Let swfcat get the relay from the facilitator. --- README | 9 +++++---- design.txt | 6 +++--- swfcat.as | 27 ++++++++++++++------------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/README b/README index 4e58907..b4b1d0e 100644 --- a/README +++ b/README @@ -81,8 +81,8 @@ changing pool of addresses. == Design notes -The Tor relay address is hardcoded in swfcat.as. It could be any relay, -with the caveat that the server also has to serve a crossdomain policy. +Any Tor relay can be used, as long as it also serves a crossdomain +policy. The Tor client needs to be able to listen for an incoming connection, which generally means not being behind NAT. @@ -94,11 +94,12 @@ Clients register with the facilitator by sending an HTTP message: The Flash proxy also gets a client address over HTTP: GET / HTTP/1.0\r\n \r\n -The server sends back an address specification in an HTTP respose. +The server sends back address specifications of a client and a relay in +an HTTP respose. HTTP/1.0 200 OK\r\n Server: BaseHTTP/0.3 Python/2.5.2\r\n \r\n - client=1.2.3.4%3A9000 + client=1.2.3.4%3A9000&relay=9.9.9.9:9001 == ActionScript programming diff --git a/design.txt b/design.txt index abc53a4..27be8ab 100644 --- a/design.txt +++ b/design.txt @@ -128,8 +128,8 @@ Design of Flash proxies 7. Behavior of the Flash proxy The Flash proxy polls the facilitator for client registrations. When - it receives a registration, it opens one connection to a Tor relay, - one to the given client, and begin proxying data between them. + it receives a registration, it opens one connection to the given Tor + relay, one to the given client, and begin proxying data between them. The proxy asks the facilitator for a registration with an HTTP GET request: @@ -139,7 +139,7 @@ Design of Flash proxies The response code is 200 and the body looks like this: - client=[<address>:<port>] + client=[<address>:<port>]&relay=<address>:<port> If <address>:<port> is missing, it means that there are no client registrations for this proxy. diff --git a/swfcat.as b/swfcat.as index 34983ce..8c91ae8 100644 --- a/swfcat.as +++ b/swfcat.as @@ -18,12 +18,6 @@ package public class swfcat extends Sprite { - /* David's relay (nickname 3VXRyxz67OeRoqHn) that also serves a - crossdomain policy. */ - private const DEFAULT_RELAY_ADDR:Object = { - host: "173.255.221.44", - port: 9001 - }; private const DEFAULT_FACILITATOR_ADDR:Object = { host: "tor-facilitator.bamsoftware.com", port: 9002 @@ -43,7 +37,6 @@ package private var output_text:TextField; private var fac_addr:Object; - private var relay_addr:Object; /* Number of proxy pairs currently connected (up to MAX_NUM_PROXY_PAIRS). */ @@ -158,11 +151,6 @@ package puts("Error: Facilitator spec must be in the form \"host:port\"."); return; } - relay_addr = get_param_addr("relay", DEFAULT_RELAY_ADDR); - if (!relay_addr) { - puts("Error: Relay spec must be in the form \"host:port\"."); - return; - } main(); } @@ -213,6 +201,8 @@ package var loader:URLLoader; var client_spec:String; var client_addr:Object; + var relay_spec:String; + var relay_addr:Object; var proxy_pair:Object; setTimeout(main, FACILITATOR_POLL_INTERVAL); @@ -226,13 +216,24 @@ package puts("Error: missing \"client\" in response."); return; } - puts("Facilitator: got \"" + client_spec + "\"."); + relay_spec = loader.data.relay; + if (!relay_spec) { + puts("Error: missing \"relay\" in response."); + return; + } + puts("Facilitator: got client:\"" + client_spec + "\" " + + "relay:\"" + relay_spec + "\"."); client_addr = parse_addr_spec(client_spec); if (!client_addr) { puts("Error: Client spec must be in the form \"host:port\"."); return; } + relay_addr = parse_addr_spec(relay_spec); + if (!client_addr) { + puts("Error: Relay spec must be in the form \"host:port\"."); + return; + } num_proxy_pairs++; total_proxy_pairs++;

1 0

[flashproxy/master] Serve /crossdomain.xml.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 8eb56ea0f43e48fecf8a564005c8446ca3477448 Author: David Fifield <david(a)bamsoftware.com> Date: Fri May 20 05:17:00 2011 -0700 Serve /crossdomain.xml. --- facilitator.py | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/facilitator.py b/facilitator.py index 56a9774..5c33ea2 100755 --- a/facilitator.py +++ b/facilitator.py @@ -11,6 +11,7 @@ import sys import threading import time import urllib +import urlparse DEFAULT_ADDRESS = "0.0.0.0" DEFAULT_PORT = 9002 @@ -191,6 +192,12 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): def do_GET(self): log(u"proxy %s connects" % format_addr(self.client_address)) + path = urlparse.urlsplit(self.path)[2] + + if path == u"/crossdomain.xml": + self.send_crossdomain() + return + reg = REGS.fetch() if reg: log(u"proxy %s gets %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) @@ -231,6 +238,19 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_response(200) self.end_headers() + def send_crossdomain(self): + crossdomain = """\ +<cross-domain-policy> +<allow-access-from domain="*"/> +</cross-domain-policy> +""" + self.send_response(200) + # Content-Type must be one of a few whitelisted types. + # http://www.adobe.com/devnet/flashplayer/articles/fplayer9_security.html#_Co… + self.send_header("Content-Type", "application/xml") + self.end_headers() + self.wfile.write(crossdomain) + def send_error(self, code, message = None): self.send_response(code) self.end_headers()

1 0

[flashproxy/master] Make the facilitator use real HTTP in its responses.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit a3c045f340661c9256d08de86dc70e055feae25a Author: David Fifield <david(a)bamsoftware.com> Date: Fri May 20 05:07:48 2011 -0700 Make the facilitator use real HTTP in its responses. --- README | 12 +++++++----- design.txt | 24 ++++++++++++------------ facilitator.py | 29 ++++++++++++++++++++++++++++- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/README b/README index 067f92e..4e58907 100644 --- a/README +++ b/README @@ -87,16 +87,18 @@ with the caveat that the server also has to serve a crossdomain policy. The Tor client needs to be able to listen for an incoming connection, which generally means not being behind NAT. -Clients register with the facilitator by sending an HTTP-like message: +Clients register with the facilitator by sending an HTTP message: POST / HTTP/1.0\r\n \r\n client=:9000 - -The Flash proxy also gets a client address using something like HTTP: +The Flash proxy also gets a client address over HTTP: GET / HTTP/1.0\r\n \r\n -The server sends back an address specification (no HTTP header): - 192.168.0.102:8888 +The server sends back an address specification in an HTTP respose. + HTTP/1.0 200 OK\r\n + Server: BaseHTTP/0.3 Python/2.5.2\r\n + \r\n + client=1.2.3.4%3A9000 == ActionScript programming diff --git a/design.txt b/design.txt index 4776b73..abc53a4 100644 --- a/design.txt +++ b/design.txt @@ -108,10 +108,11 @@ Design of Flash proxies client=[<address>]:<port> - (The facilitator sends back no data in response.) If the connector - omits the [<address>] part, the facilitator will automatically fill it - in based on the HTTP client address, which means the connector doesn't - have to know its external address. + The facilitator sends a 200 reply if the registration was successful + and an error status otherwise. If the connector omits the [<address>] + part, the facilitator will automatically fill it in based on the HTTP + client address, which means the connector doesn't have to know its + external address. The connector solves the impedance mismatch between the Tor client and the Flash proxy, both of which want to make outgoing connections to @@ -136,22 +137,21 @@ Design of Flash proxies GET / HTTP/1.0 - The response is not really HTTP: the data follows immediately with no - HTTP header. An empty document means that there are no clients - registered. Otherwise, the response looks like this: + The response code is 200 and the body looks like this: - <address>:<port> + client=[<address>:<port>] - Both <address> and <port> are required. + If <address>:<port> is missing, it means that there are no client + registrations for this proxy. The Flash proxy may serve more than one relay–client pair at once. It limits its own bandwidth to 10 KB/s (combined upload/download). 8. Behavior of the facilitator - The faciliator is a pseudo-HTTP server that handles client POST - registrations and proxy GET requests according to the formats given - above. The facilitator listens on port 9002. + The faciliator is a HTTP server that handles client POST registrations + and proxy GET requests according to the formats given above. The + facilitator listens on port 9002. In the current implementation, the facilitator forgets a client registration after giving it to a Flash proxy. The client must diff --git a/facilitator.py b/facilitator.py index d5bac75..56a9774 100755 --- a/facilitator.py +++ b/facilitator.py @@ -10,6 +10,7 @@ import socket import sys import threading import time +import urllib DEFAULT_ADDRESS = "0.0.0.0" DEFAULT_PORT = 9002 @@ -193,20 +194,23 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): reg = REGS.fetch() if reg: log(u"proxy %s gets %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) - self.request.send(str(reg)) + self.send_client(reg) else: log(u"proxy %s gets none" % format_addr(self.client_address)) + self.send_client(None) def do_POST(self): data = self.rfile.readline(1024).strip() try: vals = cgi.parse_qs(data, False, True) except ValueError, e: + self.send_error(400) log(u"client %s POST syntax error: %s" % (format_addr(self.client_address), repr(str(e)))) return client_specs = vals.get("client") if client_specs is None or len(client_specs) != 1: + self.send_error(400) log(u"client %s missing \"client\" param" % format_addr(self.client_address)) return val = client_specs[0] @@ -214,6 +218,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): try: reg = Reg.parse(val, 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(val), repr(str(e)))) return @@ -223,10 +228,32 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): else: log(u"client %s %s (already present, now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) + self.send_response(200) + self.end_headers() + + def send_error(self, code, message = None): + self.send_response(code) + self.end_headers() + if message: + self.wfile.write(message) + 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))) + def send_client(self, reg): + if reg: + client_str = str(reg) + else: + # Send an empty string rather than a 404 or similar because Flash + # Player's URLLoader can't always distinguish a 404 from, say, + # "server not found." + client_str = "" + self.send_response(200) + self.send_header("Content-Type", "x-www-form-urlencoded") + self.end_headers() + self.request.send(urllib.urlencode({"client": client_str})) + REGS = RegSet() opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:", ["debug", "help", "log="])

1 0

[flashproxy/master] Use a host name instead of an IP address for the facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 972030b0b5902dea425adcd6c2c13a5d979dd6ba Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 02:44:57 2011 -0700 Use a host name instead of an IP address for the facilitator. --- swfcat.as | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/swfcat.as b/swfcat.as index 130b061..34983ce 100644 --- a/swfcat.as +++ b/swfcat.as @@ -25,7 +25,7 @@ package port: 9001 }; private const DEFAULT_FACILITATOR_ADDR:Object = { - host: "173.255.221.44", + host: "tor-facilitator.bamsoftware.com", port: 9002 };

1 0

[flashproxy/master] Use a URLLoader to query the HTTP facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 5ae83e1cc6ce4bd38958538bbdbecf955a6bfc65 Author: David Fifield <david(a)bamsoftware.com> Date: Mon May 30 21:18:16 2011 -0700 Use a URLLoader to query the HTTP facilitator. --- swfcat.as | 54 +++++++++++++++++++++++++++++------------------------- 1 files changed, 29 insertions(+), 25 deletions(-) diff --git a/swfcat.as b/swfcat.as index 05da498..130b061 100644 --- a/swfcat.as +++ b/swfcat.as @@ -6,6 +6,9 @@ package import flash.text.TextField; import flash.text.TextFormat; import flash.net.Socket; + import flash.net.URLLoader; + import flash.net.URLLoaderDataFormat; + import flash.net.URLRequest; import flash.events.Event; import flash.events.IOErrorEvent; import flash.events.ProgressEvent; @@ -36,9 +39,6 @@ package // Seconds. private const RATE_LIMIT_HISTORY:Number = 5.0; - // Socket to facilitator. - private var s_f:Socket; - /* TextField for debug output. */ private var output_text:TextField; @@ -183,45 +183,49 @@ package /* The main logic begins here, after start-up issues are taken care of. */ private function main():void { + var fac_url:String; + var loader:URLLoader; + if (num_proxy_pairs >= MAX_NUM_PROXY_PAIRS) { setTimeout(main, FACILITATOR_POLL_INTERVAL); return; } - s_f = new Socket(); - - s_f.addEventListener(Event.CONNECT, fac_connected); - s_f.addEventListener(Event.CLOSE, function (e:Event):void { - puts("Facilitator: closed connection."); - setTimeout(main, FACILITATOR_POLL_INTERVAL); - }); - s_f.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { + loader = new URLLoader(); + /* Get the x-www-form-urlencoded values. */ + loader.dataFormat = URLLoaderDataFormat.VARIABLES; + loader.addEventListener(Event.COMPLETE, fac_complete); + loader.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { puts("Facilitator: I/O error: " + e.text + "."); }); - s_f.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { + loader.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { puts("Facilitator: security error: " + e.text + "."); }); - puts("Facilitator: connecting to " + fac_addr.host + ":" + fac_addr.port + "."); - s_f.connect(fac_addr.host, fac_addr.port); - } - - private function fac_connected(e:Event):void - { - puts("Facilitator: connected."); - - s_f.addEventListener(ProgressEvent.SOCKET_DATA, fac_data); - - s_f.writeUTFBytes("GET / HTTP/1.0\r\n\r\n"); + fac_url = "http://" + encodeURIComponent(fac_addr.host) + + ":" + encodeURIComponent(fac_addr.port) + "/"; + puts("Facilitator: connecting to " + fac_url + "."); + loader.load(new URLRequest(fac_url)); } - private function fac_data(e:ProgressEvent):void + private function fac_complete(e:Event):void { + var loader:URLLoader; var client_spec:String; var client_addr:Object; var proxy_pair:Object; - client_spec = s_f.readMultiByte(e.bytesLoaded, "utf-8"); + setTimeout(main, FACILITATOR_POLL_INTERVAL); + + loader = e.target as URLLoader; + client_spec = loader.data.client; + if (client_spec == "") { + puts("No clients."); + return; + } else if (!client_spec) { + puts("Error: missing \"client\" in response."); + return; + } puts("Facilitator: got \"" + client_spec + "\"."); client_addr = parse_addr_spec(client_spec);

1 0

[flashproxy/master] Add a required --relay option to the facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 1b1687e87fe6ce17ad1509bac7eaf479c7247628 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 03:15:25 2011 -0700 Add a required --relay option to the facilitator. --- facilitator.py | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) diff --git a/facilitator.py b/facilitator.py index 5c33ea2..be7543a 100755 --- a/facilitator.py +++ b/facilitator.py @@ -15,6 +15,7 @@ import urlparse DEFAULT_ADDRESS = "0.0.0.0" DEFAULT_PORT = 9002 +DEFAULT_RELAY_PORT = 9001 DEFAULT_LOG_FILENAME = "facilitator.log" LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" @@ -22,17 +23,26 @@ LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): log_filename = DEFAULT_LOG_FILENAME log_file = sys.stdout + relay_spec = None daemonize = True + @staticmethod + def set_relay_spec(spec): + af, host, port = parse_addr_spec(spec, defport = DEFAULT_RELAY_PORT) + # Resolve to get an IP address. + addrs = socket.getaddrinfo(host, port, af) + options.relay_spec = format_addr(addrs[0][4]) + def usage(f = sys.stdout): print >> f, """\ -Usage: %(progname)s <OPTIONS> [HOST] [PORT] +Usage: %(progname)s -r RELAY <OPTIONS> [HOST] [PORT] Flash bridge facilitator: Register client addresses with HTTP POST requests and serve them out again with HTTP GET. Listen on HOST and PORT, by default %(addr)s %(port)d. -d, --debug don't daemonize, log to stdout. -h, --help show this help. - -l, --log FILENAME write log to FILENAME (default \"%(log)s\").\ + -l, --log FILENAME write log to FILENAME (default \"%(log)s\"). + -r, --relay RELAY send RELAY (host:port) to proxies as the relay to use.\ """ % { "progname": sys.argv[0], "addr": DEFAULT_ADDRESS, @@ -200,7 +210,9 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): reg = REGS.fetch() if reg: - log(u"proxy %s gets %s (now %d)" % (format_addr(self.client_address), unicode(reg), len(REGS))) + log(u"proxy %s gets %s, relay %s (now %d)" % + (format_addr(self.client_address), unicode(reg), + options.relay_spec, len(REGS))) self.send_client(reg) else: log(u"proxy %s gets none" % format_addr(self.client_address)) @@ -272,11 +284,16 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_response(200) self.send_header("Content-Type", "x-www-form-urlencoded") self.end_headers() - self.request.send(urllib.urlencode({"client": client_str})) + + data = {} + data["client"] = client_str + data["relay"] = options.relay_spec + self.request.send(urllib.urlencode(data)) REGS = RegSet() -opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:", ["debug", "help", "log="]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:r:", + ["debug", "help", "log=", "relay="]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False @@ -286,12 +303,25 @@ for o, a in opts: sys.exit() elif o == "-l" or o == "--log": options.log_filename = a + elif o == "-r" or o == "--relay": + try: + options.set_relay_spec(a) + except socket.gaierror, e: + print >> sys.stderr, u"Can't resolve relay %s: %s" % (repr(a), str(e)) + sys.exit(1) if options.log_filename: options.log_file = open(options.log_filename, "a") else: options.log_file = sys.stdout +if not options.relay_spec: + print >> sys.stderr, """\ +The -r option is required. Give it the relay that will be sent to proxies. + -r HOST[:PORT]\ +""" + sys.exit(1) + if len(args) == 0: address = (DEFAULT_ADDRESS, DEFAULT_PORT) elif len(args) == 1:

1 0

[flashproxy/master] Check whether s_c and s_r exist before checking for connectedness.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit 0f17fa91026c6d42e866700ddb85c3094934654f Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 03:05:46 2011 -0700 Check whether s_c and s_r exist before checking for connectedness. --- swfcat.as | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/swfcat.as b/swfcat.as index 8c91ae8..2afde01 100644 --- a/swfcat.as +++ b/swfcat.as @@ -429,19 +429,19 @@ class ProxyPair extends EventDispatcher s_r.addEventListener(Event.CONNECT, relay_connected); s_r.addEventListener(Event.CLOSE, function (e:Event):void { log("Relay: closed."); - if (s_c.connected) + if (s_c && s_c.connected) s_c.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_r.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { log("Relay: I/O error: " + e.text + "."); - if (s_c.connected) + if (s_c && s_c.connected) s_c.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_r.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { log("Relay: security error: " + e.text + "."); - if (s_c.connected) + if (s_c && s_c.connected) s_c.close(); dispatchEvent(new Event(Event.COMPLETE)); }); @@ -460,19 +460,19 @@ class ProxyPair extends EventDispatcher s_c.addEventListener(Event.CONNECT, client_connected); s_c.addEventListener(Event.CLOSE, function (e:Event):void { log("Client: closed."); - if (s_r.connected) + if (s_r && s_r.connected) s_r.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_c.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { log("Client: I/O error: " + e.text + "."); - if (s_r.connected) + if (s_r && s_r.connected) s_r.close(); dispatchEvent(new Event(Event.COMPLETE)); }); s_c.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { log("Client: security error: " + e.text + "."); - if (s_r.connected) + if (s_r && s_r.connected) s_r.close(); dispatchEvent(new Event(Event.COMPLETE)); });

1 0

[flashproxy/master] Let swfcat get the relay from the facilitator.
by dcf＠torproject.org 10 Jun '11

10 Jun '11

commit c48df422a4eb497d5cc65a77f4d987f3d4999cbf Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 10 03:15:59 2011 -0700 Let swfcat get the relay from the facilitator. --- README | 9 +++++---- design.txt | 6 +++--- swfcat.as | 27 ++++++++++++++------------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/README b/README index 4e58907..b4b1d0e 100644 --- a/README +++ b/README @@ -81,8 +81,8 @@ changing pool of addresses. == Design notes -The Tor relay address is hardcoded in swfcat.as. It could be any relay, -with the caveat that the server also has to serve a crossdomain policy. +Any Tor relay can be used, as long as it also serves a crossdomain +policy. The Tor client needs to be able to listen for an incoming connection, which generally means not being behind NAT. @@ -94,11 +94,12 @@ Clients register with the facilitator by sending an HTTP message: The Flash proxy also gets a client address over HTTP: GET / HTTP/1.0\r\n \r\n -The server sends back an address specification in an HTTP respose. +The server sends back address specifications of a client and a relay in +an HTTP respose. HTTP/1.0 200 OK\r\n Server: BaseHTTP/0.3 Python/2.5.2\r\n \r\n - client=1.2.3.4%3A9000 + client=1.2.3.4%3A9000&relay=9.9.9.9:9001 == ActionScript programming diff --git a/design.txt b/design.txt index abc53a4..27be8ab 100644 --- a/design.txt +++ b/design.txt @@ -128,8 +128,8 @@ Design of Flash proxies 7. Behavior of the Flash proxy The Flash proxy polls the facilitator for client registrations. When - it receives a registration, it opens one connection to a Tor relay, - one to the given client, and begin proxying data between them. + it receives a registration, it opens one connection to the given Tor + relay, one to the given client, and begin proxying data between them. The proxy asks the facilitator for a registration with an HTTP GET request: @@ -139,7 +139,7 @@ Design of Flash proxies The response code is 200 and the body looks like this: - client=[<address>:<port>] + client=[<address>:<port>]&relay=<address>:<port> If <address>:<port> is missing, it means that there are no client registrations for this proxy. diff --git a/swfcat.as b/swfcat.as index 34983ce..8c91ae8 100644 --- a/swfcat.as +++ b/swfcat.as @@ -18,12 +18,6 @@ package public class swfcat extends Sprite { - /* David's relay (nickname 3VXRyxz67OeRoqHn) that also serves a - crossdomain policy. */ - private const DEFAULT_RELAY_ADDR:Object = { - host: "173.255.221.44", - port: 9001 - }; private const DEFAULT_FACILITATOR_ADDR:Object = { host: "tor-facilitator.bamsoftware.com", port: 9002 @@ -43,7 +37,6 @@ package private var output_text:TextField; private var fac_addr:Object; - private var relay_addr:Object; /* Number of proxy pairs currently connected (up to MAX_NUM_PROXY_PAIRS). */ @@ -158,11 +151,6 @@ package puts("Error: Facilitator spec must be in the form \"host:port\"."); return; } - relay_addr = get_param_addr("relay", DEFAULT_RELAY_ADDR); - if (!relay_addr) { - puts("Error: Relay spec must be in the form \"host:port\"."); - return; - } main(); } @@ -213,6 +201,8 @@ package var loader:URLLoader; var client_spec:String; var client_addr:Object; + var relay_spec:String; + var relay_addr:Object; var proxy_pair:Object; setTimeout(main, FACILITATOR_POLL_INTERVAL); @@ -226,13 +216,24 @@ package puts("Error: missing \"client\" in response."); return; } - puts("Facilitator: got \"" + client_spec + "\"."); + relay_spec = loader.data.relay; + if (!relay_spec) { + puts("Error: missing \"relay\" in response."); + return; + } + puts("Facilitator: got client:\"" + client_spec + "\" " + + "relay:\"" + relay_spec + "\"."); client_addr = parse_addr_spec(client_spec); if (!client_addr) { puts("Error: Client spec must be in the form \"host:port\"."); return; } + relay_addr = parse_addr_spec(relay_spec); + if (!client_addr) { + puts("Error: Relay spec must be in the form \"host:port\"."); + return; + } num_proxy_pairs++; total_proxy_pairs++;

1 0