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

[flashproxy/master] Support new client registrations.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 7b3010e1d4338d173bd9aec35e2ed819842d080d Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Sep 6 17:27:11 2013 +0300 Support new client registrations. --- facilitator/fac.py | 3 +- facilitator/facilitator | 25 ++++++++++++++--- facilitator/facilitator.cgi | 64 ++++++++++++++++++++++++++++++++++++------- 3 files changed, 77 insertions(+), 15 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index 70d482d..c79e415 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -239,11 +239,12 @@ def transact(f, command, *params): raise ValueError("No newline at end of string returned by facilitator") return parse_transaction(line[:-1]) -def put_reg(facilitator_addr, client_addr, registrant_addr=None): +def put_reg(facilitator_addr, client_addr, transport_chain, registrant_addr=None): """Send a registration to the facilitator using a one-time socket. Returns true iff the command was successful.""" f = fac_socket(facilitator_addr) params = [("CLIENT", format_addr(client_addr))] + params.append(("TRANSPORT_CHAIN", transport_chain)) if registrant_addr is not None: params.append(("FROM", format_addr(registrant_addr))) try: diff --git a/facilitator/facilitator b/facilitator/facilitator index 7b1c51a..3b99346 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -299,18 +299,35 @@ class Handler(SocketServer.StreamRequestHandler): print >> self.wfile, fac.render_transaction("NONE", ("CHECK-BACK-IN", str(check_back_in))) return True + # Handle a PUT request (client made a registration request; register it.) + # Example: PUT CLIENT="1.1.1.1:5555" FROM="1.1.1.2:6666" TRANSPORT_CHAIN="obfs3|websocket" def do_PUT(self, params): + # Check out if we recognize the transport chain in this registration request + transport_chain = fac.param_first("TRANSPORT_CHAIN", params) + if transport_chain is None: + log(u"PUT missing TRANSPORT_CHAIN param") + self.send_error() + return False + + # 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) + self.send_error() # XXX can we tell the flashproxy client of this error? + return False + # if we have relays that support this transport chain, we + # certainly have a regset for its outermost transport too. + assert(get_outermost_transport(transport_chain) in REGSETS_IPV4) + client_spec = fac.param_first("CLIENT", params) if client_spec is None: log(u"PUT missing CLIENT param") self.send_error() return False - # FROM - try: - reg = Reg.parse(client_spec) - except ValueError, e: + reg = Reg.parse(client_spec, transport_chain) + except (UnknownTransport, ValueError) as e: + # XXX should we throw a better error message to the client? Is it possible? log(u"syntax error in %s: %s" % (safe_str(repr(client_spec)), safe_str(repr(str(e))))) self.send_error() return False diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index 3adbc15..b20a9ed 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -79,18 +79,62 @@ Access-Control-Allow-Origin: *\r exit_error(400) def do_post(): + """Parse client registration.""" + + # Old style client registration: + # client=1.2.3.4:9000 + # New style client registration: + # client-websocket=1.2.3.4:9000&client-obfs3|websocket=1.2.3.4:10000 + + is_new_style = True + if path_info != "/": exit_error(400) - client_specs = fs.getlist("client") - if len(client_specs) != 1: - exit_error(400) - client_spec = client_specs[0].strip() - try: - client_addr = fac.parse_addr_spec(client_spec, defhost=remote_addr[0]) - except ValueError: - exit_error(400) - if not fac.put_reg(FACILITATOR_ADDR, client_addr, remote_addr): - exit_error(500) + + if "client" in fs.keys(): + is_new_style = False + + if is_new_style: + # It's a new style registration. We iterate through the items + # in the POST body, and see if any of them look like + # "client-websocket=1.2.3.4:9000". We then split all those + # items and send them as separate registrations to the + # facilitator. + for key in fs.keys(): + if not key.startswith("client-"): + continue + + # Get the "webssocket" part of "client-webscoket". + transport_chain = key[len("client-"):] + # Get the "1.2.3.4:9000" part of "client-websocket=1.2.3.4:9000". + client_spec = fs[key].value.strip() + try: + client_addr = fac.parse_addr_spec(client_spec, defhost=remote_addr[0]) + except ValueError: + exit_error(400) + + # XXX what if previous registrations passed through + # successfully, but the last one failed and called + # exit_error()? + + # XXX need to link these registrations together, so that + # when one is answerered the rest are invalidated. + if not fac.put_reg(FACILITATOR_ADDR, client_addr, transport_chain, remote_addr): + exit_error(500) + + else: # old-stle registration: + client_specs = fs.getlist("client") + if len(client_specs) != 1: + exit_error(400) + client_spec = client_specs[0].strip() + try: + client_addr = fac.parse_addr_spec(client_spec, defhost=remote_addr[0]) + except ValueError: + exit_error(400) + + if not fac.put_reg(FACILITATOR_ADDR, client_addr, "websocket", remote_addr): + exit_error(500) + print """\ Status: 200\r \r"""

1 0

[flashproxy/master] Support new flashproxy polling.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 1b5028f98f11711d5773c1481729379f00715428 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Sep 6 17:27:41 2013 +0300 Support new flashproxy polling. --- facilitator/fac.py | 17 ++++++++++++----- facilitator/facilitator | 12 +++++++++++- facilitator/facilitator.cgi | 13 +++++++++++-- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index c79e415..f6fb43c 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -253,14 +253,21 @@ def put_reg(facilitator_addr, client_addr, transport_chain, registrant_addr=None f.close() return command == "OK" -def get_reg(facilitator_addr, proxy_addr): - """Get a registration from the facilitator using a one-time socket. Returns - a dict with keys "client" and "relay" if successful, or a dict with the key - "client" mapped to the value "" if there are no registrations available for +def get_reg(facilitator_addr, proxy_addr, transport_list): + """ + Get a client registration for proxy 'proxy_addr' from the + facilitator at 'facilitator_addr' using a one-time + socket. 'transports' is a list containing the transport names that + the flashproxy supports. + + Returns a dict with keys "client-<transport>" and + "relay-<transport>" if successful, or a dict with the key "client" + mapped to the value "" if there are no registrations available for proxy_addr. Raises an exception otherwise.""" f = fac_socket(facilitator_addr) + transports = ",".join(transport_list) # xxx wtf try: - command, params = transact(f, "GET", ("FROM", format_addr(proxy_addr))) + command, params = transact(f, "GET", ("FROM", format_addr(proxy_addr)), ("TRANSPORTS", transports)) finally: f.close() response = {} diff --git a/facilitator/facilitator b/facilitator/facilitator index 3b99346..e3df8c6 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -270,6 +270,8 @@ class Handler(SocketServer.StreamRequestHandler): def send_error(self): print >> self.wfile, "ERROR" + # Handle a GET request (got flashproxy poll; need to return a proper client registration) + # Example: GET FROM="3.3.3.3:3333" TRANSPORTS="websocket,webrtc" def do_GET(self, params): proxy_spec = fac.param_first("FROM", params) if proxy_spec is None: @@ -283,12 +285,20 @@ class Handler(SocketServer.StreamRequestHandler): self.send_error() return False + transports = fac.param_first("TRANSPORTS", params) + if transports is None: + log(u"TRANSPORTS missing FROM param") + self.send_error() + return False + transport_list = transports.split(",") # XXX messy + try: - reg = get_reg_for_proxy(proxy_addr) + reg = get_reg_for_proxy(proxy_addr, transport_list) except Exception, e: log(u"error getting reg for proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) self.send_error() return False + check_back_in = get_check_back_in_for_proxy(proxy_addr) if reg: log(u"proxy gets %s, num_relays %s (now %d)" % diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index b20a9ed..f970c51 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -32,7 +32,6 @@ path_info = os.environ.get("PATH_INFO") or "/" if not method or not remote_addr[0]: exit_error(400) - fs = cgi.FieldStorage() # Print the HEAD part of a URL-based registration response, or exit with an @@ -54,6 +53,10 @@ def do_head(): exit_error(400) def do_get(): + """Parses flashproxy polls. + Example: GET /r=1&client=7.1.43.21&client=1.2.3.4&transports=webrtc,websocket + """ + path_parts = [x for x in path_info.split("/") if x] if len(path_parts) == 2 and path_parts[0] == "reg": url_reg(path_parts[1]) @@ -63,8 +66,14 @@ def do_get(): if len(r) != 1 or r[0] != "1": exit_error(400) + # 'transports' (optional) can be repeated and carries + # transport names. + transport_list = fs.getlist("transports") + if transport_list is None: + transport_list = ["websocket"] + try: - reg = fac.get_reg(FACILITATOR_ADDR, remote_addr) or "" + reg = fac.get_reg(FACILITATOR_ADDR, remote_addr, transport_list) or "" except Exception: exit_error(500) # Allow XMLHttpRequest from any domain. http://www.w3.org/TR/cors/.

1 0

[flashproxy/master] Use "transport" instead of "transports" in flashproxy polls.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 30fb6bfed76a52f87355052537d292e757969860 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 19 13:26:36 2013 +0300 Use "transport" instead of "transports" in flashproxy polls. --- facilitator/facilitator.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index f970c51..bf2200b 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -54,7 +54,7 @@ def do_head(): def do_get(): """Parses flashproxy polls. - Example: GET /r=1&client=7.1.43.21&client=1.2.3.4&transports=webrtc,websocket + Example: GET /r=1&client=7.1.43.21&client=1.2.3.4&transport=webrtc&transport=websocket """ path_parts = [x for x in path_info.split("/") if x] @@ -68,7 +68,7 @@ def do_get(): # 'transports' (optional) can be repeated and carries # transport names. - transport_list = fs.getlist("transports") + transport_list = fs.getlist("transport") if transport_list is None: transport_list = ["websocket"]

1 0

[flashproxy/master] Improve logging a bit.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit cc493700acd52c44abfa5910a1c8beaf67b83789 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Sep 10 18:34:33 2013 +0300 Improve logging a bit. --- facilitator/facilitator | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index e3df8c6..729f427 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -108,6 +108,9 @@ def log(msg): class TCPReg(object): def __init__(self, host, port, transport_chain): + """ + transport_chain: string that looks like "obfs3|websocket" + """ self.host = host self.port = port self.transport_chain = transport_chain @@ -300,13 +303,15 @@ class Handler(SocketServer.StreamRequestHandler): return False check_back_in = get_check_back_in_for_proxy(proxy_addr) + if reg: - log(u"proxy gets %s, num_relays %s (now %d)" % - (safe_str(unicode(reg)), options.num_relays(), num_regs())) + log(u"proxy (%s) gets client '%s' (transport_chain: %s) (num relays: %s) (remaining regs: %d)" % + (safe_str(repr(proxy_spec)), safe_str(unicode(reg)), reg.transport_chain, options.num_relays(), num_regs())) print >> self.wfile, fac.render_transaction("OK", ("CLIENT", str(reg)), ("RELAY", reg.relay), ("CHECK-BACK-IN", str(check_back_in))) else: - log(u"proxy gets none") + log(u"proxy (%s) gets none" % safe_str(repr(proxy_spec))) print >> self.wfile, fac.render_transaction("NONE", ("CHECK-BACK-IN", str(check_back_in))) + return True # Handle a PUT request (client made a registration request; register it.) @@ -348,10 +353,11 @@ class Handler(SocketServer.StreamRequestHandler): log(u"error putting reg %s: %s" % (safe_str(repr(client_spec)), safe_str(repr(str(e))))) self.send_error() return False + if ok: - log(u"client %s (now %d)" % (safe_str(unicode(reg)), num_regs())) + log(u"client %s (transports: %s) (remaining regs: %d)" % (safe_str(unicode(reg)), reg.transport_chain, num_regs())) else: - log(u"client %s (already present, now %d)" % (safe_str(unicode(reg)), num_regs())) + log(u"client %s (already present) (transports: %s) (remaining regs: %d)" % (safe_str(unicode(reg)), reg.transport_chain, num_regs())) self.send_ok() return True @@ -382,7 +388,7 @@ def num_regs(): def get_regs(af, transport): """Return the correct regs pool for the given address family and transport.""" if transport not in REGSETS_IPV4: - raise UnknownTransport("unknown transport %s" % transport) + raise UnknownTransport("unknown transport '%s'" % transport) if af == socket.AF_INET: return REGSETS_IPV4[transport]

1 0

[flashproxy/master] GET command: Do "TRANSPORT=obfs2 TRANPSORT=obfs3" instead of "TRASPORTS=obfs2, obfs3".
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 33e513526cc8541afb9345e14c2c9a0abf9ffcfb Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 19 13:27:08 2013 +0300 GET command: Do "TRANSPORT=obfs2 TRANPSORT=obfs3" instead of "TRASPORTS=obfs2,obfs3". --- facilitator/fac.py | 23 +++++++++++++++++++++-- facilitator/facilitator | 9 ++++----- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index f6fb43c..5e1737a 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -206,11 +206,22 @@ def parse_transaction(line): return command, tuple(pairs) def param_first(key, params): + """Search 'params' for 'key' and return the first value that + occurs. If 'key' was not found, return None.""" for k, v in params: if key == k: return v return None +def param_getlist(key, params): + """Search 'params' for 'key' and return a list with its values. If + 'key' did not appear in 'params', return the empty list.""" + result = [] + for k, v in params: + if key == k: + result.append(v) + return result + def quote_string(s): chars = [] for c in s: @@ -265,9 +276,17 @@ def get_reg(facilitator_addr, proxy_addr, transport_list): mapped to the value "" if there are no registrations available for proxy_addr. Raises an exception otherwise.""" f = fac_socket(facilitator_addr) - transports = ",".join(transport_list) # xxx wtf + + # Form a list (in transact() format) with the transports that we + # should send to the facilitator. Then pass that list to the + # transact() function. + # For example, TRANSPORT=obfs2 TRANSPORT=obfs3. + transports = [] + for transport in transport_list: + transports += ("TRANSPORT", transport) + try: - command, params = transact(f, "GET", ("FROM", format_addr(proxy_addr)), ("TRANSPORTS", transports)) + command, params = transact(f, "GET", ("FROM", format_addr(proxy_addr)), transports) finally: f.close() response = {} diff --git a/facilitator/facilitator b/facilitator/facilitator index e7e0325..d674769 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -274,7 +274,7 @@ class Handler(SocketServer.StreamRequestHandler): print >> self.wfile, "ERROR" # Handle a GET request (got flashproxy poll; need to return a proper client registration) - # Example: GET FROM="3.3.3.3:3333" TRANSPORTS="websocket,webrtc" + # Example: GET FROM="3.3.3.3:3333" TRANSPORT="websocket" TRANSPORT="webrtc" def do_GET(self, params): proxy_spec = fac.param_first("FROM", params) if proxy_spec is None: @@ -288,12 +288,11 @@ class Handler(SocketServer.StreamRequestHandler): self.send_error() return False - transports = fac.param_first("TRANSPORTS", params) - if transports is None: - log(u"TRANSPORTS missing FROM param") + transport_list = fac.param_getlist("TRANSPORT", params) + if not transport_list: + log(u"TRANSPORT missing FROM param") self.send_error() return False - transport_list = transports.split(",") # XXX messy try: reg = get_reg_for_proxy(proxy_addr, transport_list)

1 0

[flashproxy/master] Log the number of unhandled registrations.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 24fee750c028df2b7b15444450193da64b5e362a Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 12 14:30:24 2013 +0300 Log the number of unhandled registrations. --- facilitator/facilitator | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 729f427..e7e0325 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -305,8 +305,8 @@ class Handler(SocketServer.StreamRequestHandler): check_back_in = get_check_back_in_for_proxy(proxy_addr) if reg: - log(u"proxy (%s) gets client '%s' (transport_chain: %s) (num relays: %s) (remaining regs: %d)" % - (safe_str(repr(proxy_spec)), safe_str(unicode(reg)), reg.transport_chain, options.num_relays(), num_regs())) + log(u"proxy (%s) gets client '%s' (transport_chain: %s) (num relays: %s) (remaining regs: %d/%d)" % + (safe_str(repr(proxy_spec)), safe_str(unicode(reg)), reg.transport_chain, options.num_relays(), num_unhandled_regs(), num_regs())) print >> self.wfile, fac.render_transaction("OK", ("CLIENT", str(reg)), ("RELAY", reg.relay), ("CHECK-BACK-IN", str(check_back_in))) else: log(u"proxy (%s) gets none" % safe_str(repr(proxy_spec))) @@ -355,9 +355,9 @@ class Handler(SocketServer.StreamRequestHandler): return False if ok: - log(u"client %s (transports: %s) (remaining regs: %d)" % (safe_str(unicode(reg)), reg.transport_chain, num_regs())) + log(u"client %s (transports: %s) (remaining regs: %d/%d)" % (safe_str(unicode(reg)), reg.transport_chain, num_unhandled_regs(), num_regs())) else: - log(u"client %s (already present) (transports: %s) (remaining regs: %d)" % (safe_str(unicode(reg)), reg.transport_chain, num_regs())) + log(u"client %s (already present) (transports: %s) (remaining regs: %d/%d)" % (safe_str(unicode(reg)), reg.transport_chain, num_unhandled_regs(), num_regs())) self.send_ok() return True @@ -385,6 +385,20 @@ def num_regs(): return num_regs +def num_unhandled_regs(): + """Return the total number of unhandled registrations.""" + num_regs = 0 + + # Iterate the regsets of each regset-dictionary, and count their + # unhandled registrations. The first tier of each regset contains + # the registrations with no assigned proxy. + for regset in REGSETS_IPV4.values(): + num_regs += len(regset.tiers[0]) + for regset in REGSETS_IPV6.values(): + num_regs += len(regset.tiers[0]) + + return num_regs + def get_regs(af, transport): """Return the correct regs pool for the given address family and transport.""" if transport not in REGSETS_IPV4:

1 0

[flashproxy/master] Question marks for query strings.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 90445d9cc88169e0b31dc4f681791cdcca436e08 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 01:56:23 2013 -0700 Question marks for query strings. As noticed by Ximin. https://trac.torproject.org/projects/tor/ticket/9349#comment:20 --- doc/design.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/design.txt b/doc/design.txt index f38ba55..89c6721 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=<client addr>&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&client=1.2.3.4&transport=webrtc&transport=websocket HTTP/1.0 The response code is 200 and the body looks like this:

1 0

[flashproxy/master] Improve client registration parsing.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit fb55ab7fe6aec6182217d11999a5818869f539ca Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 18 16:45:48 2013 +0300 Improve client registration parsing. Don't differentiate between old-style and new-style registrations. --- facilitator/facilitator.cgi | 59 +++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index bf2200b..e0dbb3f 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -95,53 +95,36 @@ def do_post(): # New style client registration: # client-websocket=1.2.3.4:9000&client-obfs3|websocket=1.2.3.4:10000 - is_new_style = True - if path_info != "/": exit_error(400) - if "client" in fs.keys(): - is_new_style = False - - if is_new_style: - # It's a new style registration. We iterate through the items - # in the POST body, and see if any of them look like - # "client-websocket=1.2.3.4:9000". We then split all those - # items and send them as separate registrations to the - # facilitator. - for key in fs.keys(): - if not key.startswith("client-"): - continue - - # Get the "webssocket" part of "client-webscoket". + # We iterate through the items in the POST body, and see if any of + # them look like "client-websocket=1.2.3.4:9000". We then split + # all those items and send them as separate registrations to the + # facilitator. + for key in fs.keys(): + if key != "client" and not key.startswith("client-"): + continue + + if key == "client": # reg without transport info -- default to websocket. + transport_chain = "websocket" + else: # reg with transport info -- get the "websocket" part out of "client-websocket". transport_chain = key[len("client-"):] - # Get the "1.2.3.4:9000" part of "client-websocket=1.2.3.4:9000". - client_spec = fs[key].value.strip() - try: - client_addr = fac.parse_addr_spec(client_spec, defhost=remote_addr[0]) - except ValueError: - exit_error(400) - - # XXX what if previous registrations passed through - # successfully, but the last one failed and called - # exit_error()? - - # XXX need to link these registrations together, so that - # when one is answerered the rest are invalidated. - if not fac.put_reg(FACILITATOR_ADDR, client_addr, transport_chain, remote_addr): - exit_error(500) - - else: # old-stle registration: - client_specs = fs.getlist("client") - if len(client_specs) != 1: - exit_error(400) - client_spec = client_specs[0].strip() + + # Get the "1.2.3.4:9000" part of "client-websocket=1.2.3.4:9000". + client_spec = fs[key].value.strip() try: client_addr = fac.parse_addr_spec(client_spec, defhost=remote_addr[0]) except ValueError: exit_error(400) - if not fac.put_reg(FACILITATOR_ADDR, client_addr, "websocket", remote_addr): + # XXX what if previous registrations passed through + # successfully, but the last one failed and called + # exit_error()? + + # XXX need to link these registrations together, so that + # when one is answerered the rest are invalidated. + if not fac.put_reg(FACILITATOR_ADDR, client_addr, transport_chain, remote_addr): exit_error(500) print """\

1 0

[flashproxy/master] Replace -r switch to load a relay file.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit f79dce1ecf9a57f397a9a423b48a8eb1c8afee49 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 18 16:32:48 2013 +0300 Replace -r switch to load a relay file. --- facilitator/facilitator | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index d674769..0044f02 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -73,8 +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 RELAY send RELAY (host:port) to proxies as the relay to use. - -f, --relay-file FILE 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], @@ -448,7 +447,7 @@ def put_reg(reg): REGS = get_regs(af, get_outermost_transport(reg.transport_chain)) return REGS.add(reg) -def parse_relay_file(fname): +def handle_relay_file(fname): """ Parse a file containing Tor relays that we can point proxies to. Throws ValueError if the file is not properly formatted. @@ -467,8 +466,8 @@ def parse_relay_file(fname): options.add_relay(words_list[0], words_list[1]) def main(): - opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:f:", - ["debug", "help", "log=", "port=", "pidfile=", "privdrop-user=", "relay=", "relay-file=", "unsafe-logging"]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:", + ["debug", "help", "log=", "port=", "pidfile=", "privdrop-user=", "relay-file=", "unsafe-logging"]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False @@ -484,15 +483,9 @@ def main(): options.pid_filename = a elif o == "--privdrop-user": options.privdrop_username = a - elif o == "-r" or o == "--relay": + elif o == "-r" or o == "--relay-file": try: - options.add_relay("websocket", a) - except (ValueError, socket.gaierror) as e: - print >> sys.stderr, u"Can't resolve relay %s: %s" % (repr(a), str(e)) - sys.exit(1) - elif o == "-f" or o == "--relay-file": - try: - parse_relay_file(a) + 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)

1 0

[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