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

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

28 Oct '13

commit d3e84a574aab264d02e24eb4239c4274f738cc50 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:42:22 2013 -0700 Whitespace. --- facilitator/facilitator | 1 - 1 file changed, 1 deletion(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 55304ec..57f39bf 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -551,4 +551,3 @@ obfs2|websocket 1.4.6.1:4123\ if __name__ == "__main__": main() -

1 0

[flashproxy/master] I think of these params as switched.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 63988be2f1deb6f1e9317c2667bde416f040f329 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:26:24 2013 -0700 I think of these params as switched. --- facilitator/facilitator | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 21a9572..89312b7 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -55,7 +55,7 @@ class options(object): return num_relays @staticmethod - def add_relay(transport, addr): + def add_relay(addr, transport): options.relays.setdefault(transport, []) options.relays[transport].append(fac.format_addr(addr)) @@ -477,7 +477,7 @@ def handle_relay_file(fname): raise ValueError("Wrong line format: %s" % line) addr = fac.parse_addr_spec(words_list[1], defport = DEFAULT_RELAY_PORT, resolve = True) - options.add_relay(parse_transport_chain(words_list[0]), addr) + options.add_relay(addr, parse_transport_chain(words_list[0])) def main(): opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:",

1 0

[flashproxy/master] Do this computation in steps.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 816355198a23b2674a118f6fd55a933c5da6e792 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:27:00 2013 -0700 Do this computation in steps. --- facilitator/facilitator | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 89312b7..20d5bde 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -477,7 +477,8 @@ def handle_relay_file(fname): raise ValueError("Wrong line format: %s" % line) addr = fac.parse_addr_spec(words_list[1], defport = DEFAULT_RELAY_PORT, resolve = True) - options.add_relay(addr, parse_transport_chain(words_list[0])) + transports = parse_transport_chain(words_list[0]) + options.add_relay(addr, transports) def main(): opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:p:r:",

1 0

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

28 Oct '13

commit 1b0eb6916fd457a5021cbb36003fe99291420bdb Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:24:09 2013 -0700 Use setdefault. --- facilitator/facilitator | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index abc0815..d131b1f 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -57,9 +57,7 @@ class options(object): @staticmethod def add_relay(transport, spec): spec = fac.parse_addr_spec(spec, defport = DEFAULT_RELAY_PORT, resolve = True) - if transport not in options.relays: - options.relays[transport] = [] - + options.relays.setdefault(transport, []) options.relays[transport].append(fac.format_addr(spec)) def usage(f = sys.stdout):

1 0

[flashproxy/master] Use "transports" for a transport chain tuple everywhere.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 1dc3f414da9bc44a69f5767bca6aece70c00fc0a Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:37:06 2013 -0700 Use "transports" for a transport chain tuple everywhere. --- facilitator/facilitator | 51 +++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 1e708d4..55304ec 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -87,12 +87,12 @@ def parse_transport_chain(transport_chain): # be manipulated so it should be cool. return tuple(transport_chain.split("|")) -def get_outermost_transport(transport_chain): +def get_outermost_transport(transports): """Given a combined transport name in 'transport', return the name of the outermost transport. e.g. if 'transport' is (obfs3, websocket) this function returns 'websocket'""" - assert(transport_chain) - return transport_chain[-1] + assert(transports) + return transports[-1] def safe_str(s): """Return "[scrubbed]" if options.safe_logging is true, and s otherwise.""" @@ -111,11 +111,11 @@ def log(msg): log_lock.release() class TCPReg(object): - def __init__(self, host, port, transport_chain): - """transport_chain: transport chain list. e.g. (obfs3, websocket)""" + def __init__(self, host, port, transports): + """transports: transport chain list. e.g. (obfs3, websocket)""" self.host = host self.port = port - self.transport_chain = transport_chain + self.transports = transports # Get a relay for this registration. Throw UnknownTransport if # could not be found. self.relay = self._get_matching_relay() @@ -124,15 +124,15 @@ class TCPReg(object): """Return a matching relay addrspec for this registration. Raise UnknownTransport if a relay with a matching transport chain could not be found.""" - if self.transport_chain not in options.relays: - raise UnknownTransport("Can't find relay with transport chain: %s" % self.transport_chain) + if self.transports not in options.relays: + raise UnknownTransport("Can't find relay with transport chain: %s" % self.transports) # Maybe this should be a random pick from the set of all the # eligible relays. But let's keep it deterministic for now, # and return the first one. - # return random.choice(options.relays[self.transport_chain]) - return options.relays[self.transport_chain][0] + # return random.choice(options.relays[self.transports]) + return options.relays[self.transports][0] def __unicode__(self): return fac.format_addr((self.host, self.port)) @@ -143,15 +143,15 @@ class TCPReg(object): def __cmp__(self, other): if isinstance(other, TCPReg): # XXX is this correct comparison? - return cmp((self.host, self.port, self.transport_chain), (other.host, other.port, other.transport_chain)) + return cmp((self.host, self.port, self.transports), (other.host, other.port, other.transports)) else: return False class Reg(object): @staticmethod - def parse(spec, transport_chain, defhost = None, defport = None): + def parse(spec, transports, defhost = None, defport = None): host, port = fac.parse_addr_spec(spec, defhost, defport) - return TCPReg(host, port, transport_chain) + return TCPReg(host, port, transports) class RegSet(object): def __init__(self): @@ -303,8 +303,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/%d)" % - (safe_str(repr(proxy_spec)), safe_str(unicode(reg)), reg.transport_chain, options.num_relays(), num_unhandled_regs(), num_regs())) + log(u"proxy (%s) gets client '%s' (transports: %s) (num relays: %s) (remaining regs: %d/%d)" % + (safe_str(repr(proxy_spec)), safe_str(unicode(reg)), reg.transports, 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))) @@ -316,23 +316,22 @@ class Handler(SocketServer.StreamRequestHandler): # 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: + transports_spec = fac.param_first("TRANSPORT_CHAIN", params) + if transports_spec is None: log(u"PUT missing TRANSPORT_CHAIN param") self.send_error() return False - # Turn the transport chain to tuple-form. - transport_chain = parse_transport_chain(transport_chain) + transports = parse_transport_chain(transports_spec) # 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) + if transports not in options.relays: + log(u"Unrecognized transport chain: %s" % transports) 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) + assert(get_outermost_transport(transports) in REGSETS_IPV4) client_spec = fac.param_first("CLIENT", params) if client_spec is None: @@ -341,7 +340,7 @@ class Handler(SocketServer.StreamRequestHandler): return False try: - reg = Reg.parse(client_spec, transport_chain) + reg = Reg.parse(client_spec, transports) 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))))) @@ -356,9 +355,9 @@ class Handler(SocketServer.StreamRequestHandler): return False if ok: - log(u"client %s (transports: %s) (remaining regs: %d/%d)" % (safe_str(unicode(reg)), reg.transport_chain, num_unhandled_regs(), num_regs())) + log(u"client %s (transports: %s) (remaining regs: %d/%d)" % (safe_str(unicode(reg)), reg.transports, num_unhandled_regs(), num_regs())) else: - log(u"client %s (already present) (transports: %s) (remaining regs: %d/%d)" % (safe_str(unicode(reg)), reg.transport_chain, num_unhandled_regs(), num_regs())) + log(u"client %s (already present) (transports: %s) (remaining regs: %d/%d)" % (safe_str(unicode(reg)), reg.transports, num_unhandled_regs(), num_regs())) self.send_ok() return True @@ -447,7 +446,7 @@ def put_reg(reg): """Add a registration.""" addr_str = reg.host af = addr_af(addr_str) - REGS = get_regs(af, get_outermost_transport(reg.transport_chain)) + REGS = get_regs(af, get_outermost_transport(reg.transports)) return REGS.add(reg) def handle_relay_file(fname):

1 0

[flashproxy/master] Collapse vertical space in comments.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit ff52a262f5cb06b65918a2ea1678c72fbd01f74d Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:29:54 2013 -0700 Collapse vertical space in comments. --- facilitator/facilitator | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 20d5bde..1e708d4 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -46,8 +46,6 @@ class options(object): @staticmethod def num_relays(): - """Return the number of registered relays.""" - num_relays = 0 for relay_list in options.relays.values(): num_relays += len(relay_list) @@ -80,11 +78,9 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). } 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) - """ + """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 @@ -92,11 +88,9 @@ def parse_transport_chain(transport_chain): 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' is (obfs3, websocket) this function returns 'websocket' - """ + """Given a combined transport name in 'transport', return the name of the + outermost transport. e.g. if 'transport' is (obfs3, websocket) this function + returns 'websocket'""" assert(transport_chain) return transport_chain[-1] @@ -118,9 +112,7 @@ def log(msg): class TCPReg(object): def __init__(self, host, port, transport_chain): - """ - transport_chain: transport chain list. e.g. (obfs3, websocket) - """ + """transport_chain: transport chain list. e.g. (obfs3, websocket)""" self.host = host self.port = port self.transport_chain = transport_chain @@ -129,12 +121,9 @@ class TCPReg(object): self.relay = self._get_matching_relay() def _get_matching_relay(self): - """ - Return a matching relay addrspec for this registration - - Raise UnknownTransport if a relay with a matching transport - chain could not be found. - """ + """Return a matching relay addrspec for this registration. Raise + UnknownTransport if a relay with a matching transport chain could not be + found.""" if self.transport_chain not in options.relays: raise UnknownTransport("Can't find relay with transport chain: %s" % self.transport_chain) @@ -462,10 +451,8 @@ def put_reg(reg): return REGS.add(reg) 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. - """ + """Parse a file containing Tor relays that we can point proxies to. + Throws ValueError if the file is not properly formatted.""" # File format is: # <transport> <addrport> # Example:

1 0

[flashproxy/master] Store relays as addr tuples, not as strings.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 77a9e79d23a1d3c5a829124d8534dba7c9dd55d2 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:50:30 2013 -0700 Store relays as addr tuples, not as strings. --- facilitator/facilitator | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index ff3ad2b..986b166 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -47,7 +47,7 @@ class options(object): @staticmethod def add_relay(addr, transport): RELAYS.setdefault(transport, []) - RELAYS[transport].append(fac.format_addr(addr)) + RELAYS[transport].append(addr) def usage(f = sys.stdout): print >> f, """\ @@ -122,7 +122,7 @@ class TCPReg(object): self.relay = self._get_matching_relay() def _get_matching_relay(self): - """Return a matching relay addr_spec for this registration. Raise + """Return a matching relay address for this registration. Raise UnknownTransport if a relay with a matching transport chain could not be found.""" if self.transports not in RELAYS: @@ -306,7 +306,7 @@ class Handler(SocketServer.StreamRequestHandler): if reg: log(u"proxy (%s) gets client '%s' (transports: %s) (num relays: %s) (remaining regs: %d/%d)" % (safe_str(repr(proxy_spec)), safe_str(unicode(reg)), reg.transports, 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))) + print >> self.wfile, fac.render_transaction("OK", ("CLIENT", str(reg)), ("RELAY", fac.format_addr(reg.relay)), ("CHECK-BACK-IN", str(check_back_in))) else: 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)))

1 0

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

28 Oct '13

commit 704fa5e1cf3669836c9f2b642eda086b866a2cad Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:57:48 2013 -0700 Shorter num_relays. --- facilitator/facilitator | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 481ccdd..9610993 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -70,11 +70,7 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). } def num_relays(): - num_relays = 0 - for relay_list in RELAYS.values(): - num_relays += len(relay_list) - - return num_relays + return sum(len(x) for x in RELAYS.values()) def parse_transport_chain(spec): """Parse a transport chain string and return a tuple of individual

1 0

[flashproxy/master] Use RELAYS in place of options.relays.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 96f04c67fe56cdad5459c0f6fdcf92139d068187 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:46:39 2013 -0700 Use RELAYS in place of options.relays. It's not really an option, just a global variable. --- facilitator/facilitator | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 29714e3..ff3ad2b 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -27,6 +27,11 @@ MAX_PROXIES_PER_CLIENT = 5 LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" +# Dictionary containing Tor relay addresses that we can pass to +# proxies. It looks like this: +# {"websocket" : ["1.1.1.1:123"], "obfs3|websocket" : ["3.1.2.3:5555", "1.2.3.4:6666"], "obfs2|websocket" : ["1.2.4.4:5123"]} +RELAYS = {} + class UnknownTransport(Exception): pass class options(object): @@ -39,23 +44,10 @@ class options(object): privdrop_username = None safe_logging = True - # Dictionary containing Tor relays that we can pass to - # flashproxies. It looks like this: - # {"websocket" : ["1.1.1.1:123"], "obfs3|websocket" : ["3.1.2.3:5555", "1.2.3.4:6666"], "obfs2|websocket" : ["1.2.4.4:5123"]} - relays = {} - - @staticmethod - def num_relays(): - num_relays = 0 - for relay_list in options.relays.values(): - num_relays += len(relay_list) - - return num_relays - @staticmethod def add_relay(addr, transport): - options.relays.setdefault(transport, []) - options.relays[transport].append(fac.format_addr(addr)) + RELAYS.setdefault(transport, []) + RELAYS[transport].append(fac.format_addr(addr)) def usage(f = sys.stdout): print >> f, """\ @@ -77,6 +69,13 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). "log": DEFAULT_LOG_FILENAME, } +def num_relays(): + num_relays = 0 + for relay_list in RELAYS.values(): + num_relays += len(relay_list) + + return num_relays + def parse_transport_chain(spec): """Parse a transport chain string and return a tuple of individual transports, each of which is a string. @@ -126,15 +125,15 @@ class TCPReg(object): """Return a matching relay addr_spec for this registration. Raise UnknownTransport if a relay with a matching transport chain could not be found.""" - if self.transports not in options.relays: + if self.transports not in RELAYS: raise UnknownTransport("Can't find relay with transport chain: %s" % self.transports) # Maybe this should be a random pick from the set of all the # eligible relays. But let's keep it deterministic for now, # and return the first one. - # return random.choice(options.relays[self.transports]) - return options.relays[self.transports][0] + # return random.choice(RELAYS[self.transports]) + return RELAYS[self.transports][0] def __unicode__(self): return fac.format_addr((self.host, self.port)) @@ -306,7 +305,7 @@ class Handler(SocketServer.StreamRequestHandler): if reg: log(u"proxy (%s) gets client '%s' (transports: %s) (num relays: %s) (remaining regs: %d/%d)" % - (safe_str(repr(proxy_spec)), safe_str(unicode(reg)), reg.transports, options.num_relays(), num_unhandled_regs(), num_regs())) + (safe_str(repr(proxy_spec)), safe_str(unicode(reg)), reg.transports, 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))) @@ -327,7 +326,7 @@ class Handler(SocketServer.StreamRequestHandler): transports = parse_transport_chain(transports_spec) # See if we have relays that support this transport chain - if transports not in options.relays: + if transports not in RELAYS: log(u"Unrecognized transport chain: %s" % transports) self.send_error() # XXX can we tell the flashproxy client of this error? return False @@ -503,11 +502,11 @@ obfs2|websocket 1.4.6.1:4123\ handle_relay_file(options.relay_filename) - if not options.relays: + if not RELAYS: print >> sys.stderr, u"Warning: no relays configured." # Create RegSets for our supported transports - for transport in options.relays.keys(): + for transport in RELAYS.keys(): outermost_transport = get_outermost_transport(transport) if outermost_transport not in REGSETS_IPV4: REGSETS_IPV4[outermost_transport] = RegSet() @@ -526,7 +525,7 @@ obfs2|websocket 1.4.6.1:4123\ server = Server(addrinfo[4], Handler) log(u"start on %s" % fac.format_addr(addrinfo[4])) - log(u"using relays %s" % str(options.relays)) + log(u"using relays %s" % str(RELAYS)) if options.daemonize: log(u"daemonizing")

1 0

[flashproxy/master] Comments and variable names.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 40e96dde1662004a06ae7d2f759dac518c32fcf9 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Sep 20 22:44:35 2013 -0700 Comments and variable names. --- facilitator/facilitator | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 57f39bf..29714e3 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -77,20 +77,23 @@ again. Listen on 127.0.0.1 and port PORT (by default %(port)d). "log": DEFAULT_LOG_FILENAME, } -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) +def parse_transport_chain(spec): + """Parse a transport chain string and return a tuple of individual + transports, each of which is a string. + >>> parse_transport_chain("obfs3|websocket") + ('obfs3', 'websocket') + """ + assert(spec) # 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("|")) + return tuple(spec.split("|")) def get_outermost_transport(transports): - """Given a combined transport name in 'transport', return the name of the - outermost transport. e.g. if 'transport' is (obfs3, websocket) this function - returns 'websocket'""" + """Given a transport chain tuple, return the last element. + >>> get_outermost_transport(("obfs3", "websocket")) + 'websocket' + """ assert(transports) return transports[-1] @@ -112,7 +115,6 @@ def log(msg): class TCPReg(object): def __init__(self, host, port, transports): - """transports: transport chain list. e.g. (obfs3, websocket)""" self.host = host self.port = port self.transports = transports @@ -121,7 +123,7 @@ class TCPReg(object): self.relay = self._get_matching_relay() def _get_matching_relay(self): - """Return a matching relay addrspec for this registration. Raise + """Return a matching relay addr_spec for this registration. Raise UnknownTransport if a relay with a matching transport chain could not be found.""" if self.transports not in options.relays:

1 0