October 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Turn transport chains into tuples.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 66d25a1aec3201b6442df3b42c2a32aea182f939 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 18 17:18:51 2013 +0300 Turn transport chains into tuples. --- facilitator/facilitator | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 0044f02..3964115 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -81,13 +81,26 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). "log": DEFAULT_LOG_FILENAME, } -def get_outermost_transport(transport): +def parse_transport_chain(transport_chain): + """ + Given a combined transport name in 'transport', return a tuple that + contains the transport chain. + e.g. if 'transport' == 'obfs3|websocket' we return (obfs3, websocket) + """ + assert(transport_chain) + # XXX We explicitly cast to tuple so that the return value can be + # used as a dictionary key. Transport chains are not supposed to + # be manipulated so it should be cool. + return tuple(transport_chain.split("|")) + +def get_outermost_transport(transport_chain): """ Given a combined transport name in 'transport', return the name of the outermost transport. - e.g. if 'transport' == 'obfs3|websocket' this function returns 'websocket' + e.g. if 'transport' is (obfs3, websocket) this function returns 'websocket' """ - return transport.split("|")[-1] + assert(transport_chain) + return transport_chain[-1] def safe_str(s): """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" @@ -108,7 +121,7 @@ def log(msg): class TCPReg(object): def __init__(self, host, port, transport_chain): """ - transport_chain: string that looks like "obfs3|websocket" + transport_chain: transport chain list. e.g. (obfs3, websocket) """ self.host = host self.port = port @@ -322,6 +335,9 @@ class Handler(SocketServer.StreamRequestHandler): self.send_error() return False + # Turn the transport chain to tuple-form. + transport_chain = parse_transport_chain(transport_chain) + # See if we have relays that support this transport chain if transport_chain not in options.relays: log(u"Unrecognized transport chain: %s" % transport_chain) @@ -463,7 +479,7 @@ def handle_relay_file(fname): raise ValueError("Wrong line format: %s" % line) # XXX Maybe we should validate here - options.add_relay(words_list[0], words_list[1]) + options.add_relay(parse_transport_chain(words_list[0]), words_list[1]) def main(): opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:",

1 0

[flashproxy/master] Fix a bug when handling FieldStorage.getlist() return values.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit dac5b62449ff4987d7270921b10dd41a2c381cb1 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 19 13:19:53 2013 +0300 Fix a bug when handling FieldStorage.getlist() return values. getlist() returns the empty list when it doesn't find a value, not None. --- facilitator/facilitator.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index e0dbb3f..51a898a 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -69,7 +69,7 @@ def do_get(): # 'transports' (optional) can be repeated and carries # transport names. transport_list = fs.getlist("transport") - if transport_list is None: + if not transport_list: transport_list = ["websocket"] try:

1 0

[flashproxy/master] Just include outermost transports in facilitator responses.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 4c73e6dfb93ac216c8e1d68c88e7499860516f88 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 01:59:22 2013 -0700 Just include outermost transports in facilitator responses. This is in contradiction to what I proposed in https://trac.torproject.org/projects/tor/ticket/9349#comment:20. Really there's no need for the proxy to know that there's obfs2 underneath; it just has to make a connection and copy bytes. --- doc/design.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/design.txt b/doc/design.txt index 89c6721..583c4e4 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -176,7 +176,7 @@ Design of flash proxies client-<transport>=[<address>:<port>]&relay-<transport>=<address>:<port> For example: - client-obfs3|websocket=1.2.3.4:2000&relay-obfs3|websocket=10.10.10:9902 + client-websocket=1.2.3.4:2000&relay-websocket=10.10.10:9902 If the value for the client parameter is empty, it means that there are no client registrations for this proxy.

1 0

[flashproxy/master] Polling requests include client port numbers.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit ed12b470ff56ba87bd57d4ee515bea04cb768f6b Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 02:02:34 2013 -0700 Polling requests include client port numbers. --- doc/design.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/design.txt b/doc/design.txt index 583c4e4..9ab1859 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -159,7 +159,7 @@ Design of flash proxies The proxy asks the facilitator for a registration with an HTTP GET request: - GET /?r=<version>&client=<client addr>&transport=<transport name> HTTP/1.0 + GET /?r=<version>&client=<addr>:<port>&transport=<transport name> HTTP/1.0 The 'r' parameter is the protocol revision number (should be '1' for now). The 'client' parameter carries the IP address of a flashproxy @@ -169,7 +169,7 @@ Design of flash proxies this flashproxy supports. For example: - GET /?r=1&client=7.1.43.21&client=1.2.3.4&transport=webrtc&transport=websocket HTTP/1.0 + GET /?r=1&client=7.1.43.21:9999&client=1.2.3.4:9000&transport=webrtc&transport=websocket HTTP/1.0 The response code is 200 and the body looks like this:

1 0

[flashproxy/master] Punctuation.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit b8b111dd38ad062b505e1a22c35f3d35cb432eb8 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:07:38 2013 -0700 Punctuation. --- facilitator/facilitator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 3964115..a09bd4a 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -73,7 +73,7 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). -p, --port PORT listen on PORT (by default %(port)d). --pidfile FILENAME write PID to FILENAME after daemonizing. --privdrop-user USER switch UID and GID to those of USER. - -r, --relay-file RELAY learn relays from FILE + -r, --relay-file RELAY learn relays from FILE. --unsafe-logging don't scrub IP addresses from logs.\ """ % { "progname": sys.argv[0],

1 0

[flashproxy/master] Straighten up handling of --relay-file.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit b94f65f16b8d0e61a2a973d75d078f1d714cab14 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:15:35 2013 -0700 Straighten up handling of --relay-file. --- facilitator/facilitator | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index a09bd4a..f6be9e0 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -33,6 +33,7 @@ class options(object): listen_port = DEFAULT_LISTEN_PORT log_filename = DEFAULT_LOG_FILENAME log_file = sys.stdout + relay_filename = None daemonize = True pid_filename = None privdrop_username = None @@ -500,21 +501,28 @@ def main(): elif o == "--privdrop-user": options.privdrop_username = a elif o == "-r" or o == "--relay-file": - try: - handle_relay_file(a) - except ValueError as e: - print >> sys.stderr, u"Could not parse file '%s': %s" % (repr(a), str(e)) - sys.exit(1) + options.relay_filename = a elif o == "--unsafe-logging": options.safe_logging = False - if not options.relays: + if not options.relay_filename: print >> sys.stderr, """\ -The -r option is required. Give it the relay that will be sent to proxies. - -r HOST[:PORT]\ - """ +The -r option is required. Give it the name of a file +containing relay transports and addresses. + -r HOST[:PORT] +Example file contents: +obfs2|websocket 1.4.6.1:4123\ +""" + sys.exit(1) + + try: + handle_relay_file(options.relay_filename) + except ValueError as e: + print >> sys.stderr, u"Could not parse relay file %s: %s." % (repr(options.relay_filename), str(e)) sys.exit(1) + if not options.relays: + sys.exit(1) # Create RegSets for our supported transports for transport in options.relays.keys():

1 0

[flashproxy/master] Make it only a warning if no relays were configured.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 45a5184e78d288d7ce7626c6362318afbccda1b3 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:15:54 2013 -0700 Make it only a warning if no relays were configured. --- facilitator/facilitator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index f6be9e0..55f4af0 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -522,7 +522,7 @@ obfs2|websocket 1.4.6.1:4123\ sys.exit(1) if not options.relays: - sys.exit(1) + print >> sys.stderr, u"Warning: no relays configured." # Create RegSets for our supported transports for transport in options.relays.keys():

1 0

[flashproxy/master] Just let it crash if there's a problem loading the relays file.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 664cc093c0ee51a5d6d0ff5d51de62a9e473fba2 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:21:44 2013 -0700 Just let it crash if there's a problem loading the relays file. --- facilitator/facilitator | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 55f4af0..abc0815 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -515,11 +515,7 @@ obfs2|websocket 1.4.6.1:4123\ """ sys.exit(1) - try: - handle_relay_file(options.relay_filename) - except ValueError as e: - print >> sys.stderr, u"Could not parse relay file %s: %s." % (repr(options.relay_filename), str(e)) - sys.exit(1) + handle_relay_file(options.relay_filename) if not options.relays: print >> sys.stderr, u"Warning: no relays configured."

1 0

[flashproxy/master] Add default relay configuration.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 1a442ad14b6d4630c0a15c27850fc722014c6e5b Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:18:03 2013 -0700 Add default relay configuration. --- facilitator/relays | 1 + 1 file changed, 1 insertion(+) diff --git a/facilitator/relays b/facilitator/relays new file mode 100644 index 0000000..8fa0320 --- /dev/null +++ b/facilitator/relays @@ -0,0 +1 @@ +obfs3|websocket 173.255.221.44:9500

1 0

[flashproxy/master] Resolve outside of add_relay.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 7beb0ca82e1a3bfadf1e22ce9fd8ae0eae20e4c7 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:25:30 2013 -0700 Resolve outside of add_relay. --- facilitator/facilitator | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index d131b1f..21a9572 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -55,10 +55,9 @@ class options(object): return num_relays @staticmethod - def add_relay(transport, spec): - spec = fac.parse_addr_spec(spec, defport = DEFAULT_RELAY_PORT, resolve = True) + def add_relay(transport, addr): options.relays.setdefault(transport, []) - options.relays[transport].append(fac.format_addr(spec)) + options.relays[transport].append(fac.format_addr(addr)) def usage(f = sys.stdout): print >> f, """\ @@ -477,8 +476,8 @@ def handle_relay_file(fname): if len(words_list) != 2: raise ValueError("Wrong line format: %s" % line) - # XXX Maybe we should validate here - options.add_relay(parse_transport_chain(words_list[0]), words_list[1]) + addr = fac.parse_addr_spec(words_list[1], defport = DEFAULT_RELAY_PORT, resolve = True) + options.add_relay(parse_transport_chain(words_list[0]), addr) def main(): opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:",

1 0