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

[flashproxy/master] Use the imp module to import from the facilitator program.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit dc8144fde50574faeece00fbe63798beb039ad08 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 16 23:47:27 2013 -0700 Use the imp module to import from the facilitator program. --- facilitator/facilitator-test | 13 ++++++++++++- facilitator/facilitator.py | 1 - 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index 040d4d4..fc4d513 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -4,13 +4,24 @@ from cStringIO import StringIO import socket import subprocess import tempfile +import sys import time import unittest -from facilitator import Endpoints, parse_relay_file import fac from fac import Transport, Endpoint +# Import the facilitator program as a module. +import imp +dont_write_bytecode = sys.dont_write_bytecode +sys.dont_write_bytecode = True +facilitator = imp.load_source("facilitator", "facilitator") +Endpoints = facilitator.Endpoints +parse_relay_file = facilitator.parse_relay_file +sys.dont_write_bytecode = dont_write_bytecode +del dont_write_bytecode +del facilitator + FACILITATOR_HOST = "127.0.0.1" FACILITATOR_PORT = 39002 # diff port to not conflict with production service FACILITATOR_ADDR = (FACILITATOR_HOST, FACILITATOR_PORT) diff --git a/facilitator/facilitator.py b/facilitator/facilitator.py deleted file mode 120000 index 28e5e91..0000000 --- a/facilitator/facilitator.py +++ /dev/null @@ -1 +0,0 @@ -facilitator \ No newline at end of file

1 0

[flashproxy/master] It looks like RELAYS is unused.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit e22541457eeb6025d7e882b95f02d82cb2c83d4e Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 16 23:50:53 2013 -0700 It looks like RELAYS is unused. --- facilitator/facilitator | 5 ----- 1 file changed, 5 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 9befcc6..a9fd8a7 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -30,11 +30,6 @@ DEFAULT_OUTER_TRANSPORTS = ["websocket"] 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):

1 0

[flashproxy/master] Remove obsolete comment.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit fd09c3605859f949801929704212e259ba0e021e Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 16 23:58:41 2013 -0700 Remove obsolete comment. --- facilitator/facilitator | 1 - 1 file changed, 1 deletion(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index c2f6167..8988d9e 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -357,7 +357,6 @@ class Handler(SocketServer.StreamRequestHandler): class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): allow_reuse_address = True -# Registration sets per-outermost-transport # Addresses are plain tuples (str(host), int(port)) CLIENTS = {

1 0

[flashproxy/master] Fix the PROXY_TRANSPORT log message.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit af8a6f59c1eb7040170dad7f35dc0cbb80333caa Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 16 22:49:40 2013 -0700 Fix the PROXY_TRANSPORT log message. It's not that PROXY_TRANSPORT is missing FROM, it's that GET is missing PROXY_TRANSPORT. --- facilitator/facilitator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 670a01d..9befcc6 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -299,7 +299,7 @@ class Handler(SocketServer.StreamRequestHandler): transport_list = fac.param_getlist("PROXY_TRANSPORT", params) if not transport_list: - return self.error(u"PROXY TRANSPORT missing FROM param") + return self.error(u"GET missing PROXY_TRANSPORT param") try: client_reg, relay_reg = get_match_for_proxy(proxy_addr, transport_list)

1 0

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

28 Oct '13

commit 7933791109aaa9204d84ff1e2a550b6e14e75401 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 16 23:51:24 2013 -0700 Use the name RELAYS in place of SERVERS. To match the terminology used elsewhere. --- facilitator/facilitator | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index a9fd8a7..c2f6167 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -365,14 +365,14 @@ CLIENTS = { socket.AF_INET6: Endpoints(af=socket.AF_INET6, maxserve=MAX_PROXIES_PER_CLIENT) } -SERVERS = { +RELAYS = { socket.AF_INET: Endpoints(af=socket.AF_INET), socket.AF_INET6: Endpoints(af=socket.AF_INET6) } def num_relays(): """Return the total number of relays.""" - return sum(pts.getNumEndpoints() for pts in SERVERS.itervalues()) + return sum(pts.getNumEndpoints() for pts in RELAYS.itervalues()) def num_regs(): """Return the total number of registrations.""" @@ -391,7 +391,7 @@ def addr_af(addr_str): def get_match_for_proxy(proxy_addr, transport_list): af = addr_af(proxy_addr[0]) try: - return Endpoints.match(CLIENTS[af], SERVERS[af], transport_list) + return Endpoints.match(CLIENTS[af], RELAYS[af], transport_list) except ValueError as e: raise UnknownTransport("Could not find registration for transport list: %s: %s" % (transport_list, e)) @@ -467,7 +467,7 @@ obfs2|websocket 1.4.6.1:4123\ try: with open(options.relay_filename) as fp: - parse_relay_file(SERVERS, fp) + parse_relay_file(RELAYS, fp) except ValueError as e: print >> sys.stderr, u"Could not parse file '%s': %s" % (repr(a), str(e)) sys.exit(1) @@ -485,8 +485,8 @@ 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 IPv4 relays %s" % str(SERVERS[socket.AF_INET]._endpoints)) - log(u"using IPv6 relays %s" % str(SERVERS[socket.AF_INET6]._endpoints)) + log(u"using IPv4 relays %s" % str(RELAYS[socket.AF_INET]._endpoints)) + log(u"using IPv6 relays %s" % str(RELAYS[socket.AF_INET6]._endpoints)) if options.daemonize: log(u"daemonizing")

1 0

[flashproxy/master] Don't pun different data types behind the same variable name.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 2c02a4b96a7ff7aefacb32dcf8531a5ab17b6aa2 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 17 00:23:50 2013 -0700 Don't pun different data types behind the same variable name. You parse a string such as "obfs3|websocket" to get a Transport. --- facilitator/facilitator | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 8988d9e..0cd287a 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -320,11 +320,11 @@ class Handler(SocketServer.StreamRequestHandler): # Example: PUT CLIENT="1.1.1.1:5555" TRANSPORT="obfs3|websocket" def do_PUT(self, params): # Check out if we recognize the transport in this registration request - transport = fac.param_first("TRANSPORT", params) - if transport is None: + transport_spec = fac.param_first("TRANSPORT", params) + if transport_spec is None: return self.error(u"PUT missing TRANSPORT param") - transport = Transport.parse(transport) + transport = Transport.parse(transport_spec) # See if we have relays that support this transport if transport.outer not in options.outer_transports: return self.error(u"Unrecognized transport: %s" % transport.outer)

1 0

[flashproxy/master] Set test relay addrs and transports from variables.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit e06c97b6c1256b144438031684f4abfa83db0622 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 17 01:16:27 2013 -0700 Set test relay addrs and transports from variables. --- facilitator/facilitator-test | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index fc4d513..a8fcbbc 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -26,6 +26,7 @@ FACILITATOR_HOST = "127.0.0.1" FACILITATOR_PORT = 39002 # diff port to not conflict with production service FACILITATOR_ADDR = (FACILITATOR_HOST, FACILITATOR_PORT) CLIENT_TP = "websocket" +RELAY_TP = "websocket" PROXY_TPS = ["websocket", "webrtc"] def gimme_socket(host, port): @@ -204,14 +205,16 @@ class FacilitatorProcTest(unittest.TestCase): IPV6_CLIENT_ADDR = ("[11::11]", 9000) IPV4_PROXY_ADDR = ("2.2.2.2", 13000) IPV6_PROXY_ADDR = ("[22::22]", 13000) + IPV4_RELAY_ADDR = ("0.0.1.0", 1) + IPV6_RELAY_ADDR = ("[0:0::1:0]", 1) def gimme_socket(self): return gimme_socket(FACILITATOR_HOST, FACILITATOR_PORT) def setUp(self): self.relay_file = tempfile.NamedTemporaryFile() - self.relay_file.write("websocket 0.0.1.0:1\n") - self.relay_file.write("websocket [0:0::1:0]:1\n") + self.relay_file.write("%s %s\n" % (RELAY_TP, fac.format_addr(self.IPV4_RELAY_ADDR))) + self.relay_file.write("%s %s\n" % (RELAY_TP, fac.format_addr(self.IPV6_RELAY_ADDR))) self.relay_file.flush() self.relay_file.seek(0) self.process = subprocess.Popen(["./facilitator", "-d", "-p", str(FACILITATOR_PORT), "-r", self.relay_file.name, "-l", "/dev/null"])

1 0

[flashproxy/master] Add a test that all required response fields are present.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 08c6e67105bb2b089fcb41bdbadacbb24012b684 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 17 01:22:04 2013 -0700 Add a test that all required response fields are present. A previously existing test checked for "check-back-in"; also check "client" and "relay". --- facilitator/facilitator-test | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index a8fcbbc..ffeb87e 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -280,10 +280,12 @@ class FacilitatorProcTest(unittest.TestCase): reg = fac.get_reg(FACILITATOR_ADDR, self.IPV6_PROXY_ADDR, PROXY_TPS) self.assertEqual(reg["client"], fac.format_addr(self.IPV6_CLIENT_ADDR)) - def test_check_back_in(self): - """Test that facilitator responses contain a CHECK-BACK-IN key with a - numeric value.""" - reg = fac.get_reg(FACILITATOR_ADDR, self.IPV6_PROXY_ADDR, PROXY_TPS) + def test_fields(self): + """Test that facilitator responses contain all the required fields.""" + fac.put_reg(FACILITATOR_ADDR, self.IPV4_CLIENT_ADDR, CLIENT_TP) + reg = fac.get_reg(FACILITATOR_ADDR, self.IPV4_PROXY_ADDR, PROXY_TPS) + self.assertEqual(reg["client"], fac.format_addr(self.IPV4_CLIENT_ADDR)) + self.assertEqual(reg["relay"], fac.format_addr(self.IPV4_RELAY_ADDR)) self.assertGreater(int(reg["check-back-in"]), 0) # def test_same_proxy(self):

1 0

[flashproxy/master] Add CLIENT-TRANSPORT and RELAY-TRANSPORT to responses.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit 966dccb5cf2709547523fcd0ce191cc648c43f07 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 17 01:39:02 2013 -0700 Add CLIENT-TRANSPORT and RELAY-TRANSPORT to responses. --- facilitator/facilitator | 2 ++ 1 file changed, 2 insertions(+) diff --git a/facilitator/facilitator b/facilitator/facilitator index 0cd287a..526e8e2 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -308,7 +308,9 @@ class Handler(SocketServer.StreamRequestHandler): (safe_str(repr(proxy_spec)), safe_str(repr(client_reg.addr)), transport_list, num_relays(), num_unhandled_regs(), num_regs())) print >> self.wfile, fac.render_transaction("OK", ("CLIENT", fac.format_addr(client_reg.addr)), + ("CLIENT-TRANSPORT", client_reg.transport.outer), ("RELAY", fac.format_addr(relay_reg.addr)), + ("RELAY-TRANSPORT", relay_reg.transport.outer), ("CHECK-BACK-IN", str(check_back_in))) else: log(u"proxy (%s) gets none" % safe_str(repr(proxy_spec)))

1 0

[flashproxy/master] Test that client-transport and relay-transport are present.
by infinity0＠torproject.org 28 Oct '13

28 Oct '13

commit d96dcec00996ae7ae935c006d13f397b690a8db7 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 17 01:26:25 2013 -0700 Test that client-transport and relay-transport are present. --- facilitator/facilitator-test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index ffeb87e..6b45f6f 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -285,7 +285,9 @@ class FacilitatorProcTest(unittest.TestCase): fac.put_reg(FACILITATOR_ADDR, self.IPV4_CLIENT_ADDR, CLIENT_TP) reg = fac.get_reg(FACILITATOR_ADDR, self.IPV4_PROXY_ADDR, PROXY_TPS) self.assertEqual(reg["client"], fac.format_addr(self.IPV4_CLIENT_ADDR)) + self.assertEqual(reg["client-transport"], CLIENT_TP) self.assertEqual(reg["relay"], fac.format_addr(self.IPV4_RELAY_ADDR)) + self.assertEqual(reg["relay-transport"], RELAY_TP) self.assertGreater(int(reg["check-back-in"]), 0) # def test_same_proxy(self):

1 0