- tor-commits - lists.torproject.org

[flashproxy/js] Missing quote.
by dcf＠torproject.org 07 Apr '12

07 Apr '12

commit af4b6067ce45d783110ba10d5a0a1606bbbba4a7 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 19:09:00 2012 -0700 Missing quote. --- connector.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index a0b7149..a4c810b 100755 --- a/connector.py +++ b/connector.py @@ -257,7 +257,7 @@ class WebSocketDecoder(object): return None # "Control frames (see Section 5.5) MAY be injected in the middle of # a fragmented message. Control frames themselves MUST NOT be - # fragmented. + # fragmented." if frame.is_control(): if not frame.fin: raise ValueError("Control frame (opcode %d) has FIN bit clear" % frame.opcode)

1 0

[flashproxy/js] Fix switched sends of initial buffered data.
by dcf＠torproject.org 07 Apr '12

07 Apr '12

commit 6818aa5081677e2b6d09401845649f9e10431c50 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 19:52:54 2012 -0700 Fix switched sends of initial buffered data. The buffer of the local socket was being sent to the remote socket and vice versa. Practically, this only caused a problem when the buffers were non-empty, which happened when the local Tor connected before any remote proxy. --- connector.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/connector.py b/connector.py index a4c810b..97d48b1 100755 --- a/connector.py +++ b/connector.py @@ -670,10 +670,10 @@ def match_proxies(): log(u"Linking %s and %s." % (format_peername(local), format_peername(remote))) remote.partner = local local.partner = remote - if local.buf: - proxy_chunk_remote_to_local(remote, local, local.buf) if remote.buf: - proxy_chunk_local_to_remote(local, remote, remote.buf) + proxy_chunk_remote_to_local(remote, local, remote.buf) + if local.buf: + proxy_chunk_local_to_remote(local, remote, local.buf) class TimeoutSocket(object): def __init__(self, fd):

1 0

[flashproxy/js] --register in exercise.sh.
by dcf＠torproject.org 07 Apr '12

07 Apr '12

commit b8e39caa3d5b28ff1aa91e41683ff4ad030e5748 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 12:26:05 2012 -0700 --register in exercise.sh. --- experiments/exercise/exercise.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 04026e8..117b2f5 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -19,8 +19,9 @@ stop() { trap stop EXIT date - -"$FLASHPROXY_DIR"/connector.py -f tor-facilitator.bamsoftware.com ":$LOCAL_PORT" ":$REMOTE_PORT" & + +cd "$FLASHPROXY_DIR" +./connector.py --register ":$LOCAL_PORT" ":$REMOTE_PORT" & PIDS_TO_KILL+=($!) sleep 20

1 0

[flashproxy/js] Use assertEqual instead of assertIsNone.
by dcf＠torproject.org 07 Apr '12

07 Apr '12

commit 6379d7023fe0c62d3285c9129cfa5e6af04156dc Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 11:54:47 2012 -0600 Use assertEqual instead of assertIsNone. assertEqual is only in Python 2.7. --- connector-test.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/connector-test.py b/connector-test.py index d1a6bda..b19fcc6 100755 --- a/connector-test.py +++ b/connector-test.py @@ -74,11 +74,11 @@ class TestWebSocketDecoder(unittest.TestCase): def test_empty_feed(self): """Test that the decoder can handle a zero-byte feed.""" dec = WebSocketDecoder() - self.assertIsNone(dec.read_frame()) + self.assertEqual(dec.read_frame(), None) dec.feed("") - self.assertIsNone(dec.read_frame()) + self.assertEqual(dec.read_frame(), None) dec.feed("\x81\x05H") - self.assertIsNone(dec.read_frame()) + self.assertEqual(dec.read_frame(), None) dec.feed("ello") self.assertEqual(read_frames(dec), [(True, 1, u"Hello")])

1 0

[flashproxy/js] Rewrite apply_mask to use bytes.
by dcf＠torproject.org 07 Apr '12

07 Apr '12

commit 4c9298cfed95f32561a61874d329e8328410bf62 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 10:31:56 2012 -0700 Rewrite apply_mask to use bytes. Unlike the struct module, the array module doesn't guarantee the size of types. apply_mask failed because it assumed that a long "l" was four bytes, when it could be 8 (or really, anything greater than 4). --- connector.py | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/connector.py b/connector.py index 8653907..d10a6ab 100755 --- a/connector.py +++ b/connector.py @@ -126,22 +126,23 @@ def format_addr(addr): def apply_mask(payload, mask_key): - result = array.array("l") - result.fromstring(payload[:len(payload) // 4 * 4]) - m, = struct.unpack("=l", mask_key) + result = array.array("B", payload) + m = array.array("B", mask_key) i = 0 + while i < len(result) - 7: + result[i] ^= m[0] + result[i+1] ^= m[1] + result[i+2] ^= m[2] + result[i+3] ^= m[3] + result[i+4] ^= m[0] + result[i+5] ^= m[1] + result[i+6] ^= m[2] + result[i+7] ^= m[3] + i += 8 while i < len(result): - result[i] ^= m + result[i] ^= m[i%4] i += 1 - result = result.tostring() - i *= 4 - if i < len(payload): - remainder = [] - while i < len(payload): - remainder.append(chr(ord(payload[i]) ^ ord(mask_key[i%4]))) - i += 1 - result = result + "".join(remainder) - return result + return result.tostring() class WebSocketFrame(object): def __init__(self):

1 0

[flashproxy/js] Gracefully handle a masking error from a remote.
by dcf＠torproject.org 07 Apr '12

07 Apr '12

commit 9da7c9a065ebb74027d0618327a786227ef3d245 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 11:55:12 2012 -0600 Gracefully handle a masking error from a remote. --- connector.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index d10a6ab..a0b7149 100755 --- a/connector.py +++ b/connector.py @@ -620,7 +620,13 @@ def proxy_chunk_remote_to_local(remote, local, data = None): else: remote.dec.feed(data) while True: - data = remote.dec.read() + try: + data = remote.dec.read() + except (WebSocketDecoder.MaskingError, ValueError), e: + log(u"WebSocket decode error from remote: %s" % repr(str(e))) + remote.close() + local.close() + return False if data is None: break elif not data:

1 0

[flashproxy/js] Add a test for connector connection limits.
by dcf＠torproject.org 07 Apr '12

07 Apr '12

commit 1f4535bfefbf6a8cd6f7b9f26b1d76e8f7bec55c Author: David Fifield <david(a)bamsoftware.com> Date: Fri Apr 6 11:42:42 2012 -0700 Add a test for connector connection limits. --- connector-test.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/connector-test.py b/connector-test.py index 36c9208..d1a6bda 100755 --- a/connector-test.py +++ b/connector-test.py @@ -1,9 +1,14 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +import socket +import subprocess import unittest from connector import WebSocketDecoder, WebSocketEncoder +LOCAL_ADDRESS = ("127.0.0.1", 40000) +REMOTE_ADDRESS = ("127.0.0.1", 40001) + def read_frames(dec): frames = [] while True: @@ -176,5 +181,22 @@ class TestWebSocketEncoder(unittest.TestCase): dec.feed(enc_message) self.assertEqual(read_messages(dec), [(opcode, payload)]) +def format_address(addr): + return "%s:%d" % addr + +class TestConnectionLimit(unittest.TestCase): + def setUp(self): + self.p = subprocess.Popen(["./connector.py", format_address(LOCAL_ADDRESS), format_address(REMOTE_ADDRESS)]) + + def tearDown(self): + self.p.terminate() + + def test_remote_limit(self): + """Test that the connector limits the number of remote connections that + it will accept.""" + for i in range(5): + s = socket.create_connection(REMOTE_ADDRESS, 2) + self.assertRaises(socket.error, socket.create_connection, REMOTE_ADDRESS) + if __name__ == "__main__": unittest.main()

1 0

[flashproxy/js] Add a --register option to the connector.
by dcf＠torproject.org 07 Apr '12

07 Apr '12

commit 6b54d70dd731952236cd08ef9bb4ba9be209f427 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Apr 6 12:34:47 2012 -0700 Add a --register option to the connector. Now it doesn't register by default but only when you use this option. --- README | 4 ++-- connector.py | 19 ++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/README b/README index b593328..e6ad198 100644 --- a/README +++ b/README @@ -58,12 +58,12 @@ registration with the facilitator: everything else happens over ephemeral proxies. 1. Run the connector. - $ python connector.py + $ python connector.py --register By default the connector listens on Internet-facing TCP port 9000. If you have to use a different port (to get through a firewall, for example), give it on the command lines like this (here using port 8888): - $ python connector.py 127.0.0.1:9001 :8888 + $ python connector.py --register 127.0.0.1:9001 :8888 2. Run Tor using the included torrc file. $ tor -f flashproxy/torrc diff --git a/connector.py b/connector.py index 9c725be..8653907 100755 --- a/connector.py +++ b/connector.py @@ -34,6 +34,7 @@ class options(object): log_filename = None log_file = sys.stdout daemonize = False + register = False pid_filename = None # We accept up to this many bytes from a socket not yet matched with a partner @@ -42,7 +43,7 @@ UNCONNECTED_BUFFER_LIMIT = 10240 def usage(f = sys.stdout): print >> f, """\ -Usage: %(progname)s -f FACILITATOR[:PORT] [LOCAL][:PORT] [REMOTE][:PORT] +Usage: %(progname)s --register [LOCAL][:PORT] [REMOTE][:PORT] Wait for connections on a local and a remote port. When any pair of connections exists, data is ferried between them until one side is closed. By default LOCAL is "%(local)s" and REMOTE is "%(remote)s". @@ -51,14 +52,17 @@ The local connection acts as a SOCKS4a proxy, but the host and port in the SOCKS request are ignored and the local connection is always linked to a remote connection. -The REMOTE address is registered with the given FACILITATOR:PORT (or whatever -is the default of the flashproxy-reg-http.py program). +If the --register option is used, then your IP address will be sent to the +facilitator so that proxies can connect to you. You need to register in some way +in order to get any service. The --facilitator option allows controlling which +facilitator is used; if omitted, it uses a public default. --daemon daemonize (Unix only). -f, --facilitator=HOST[:PORT] advertise willingness to receive connections to HOST:PORT. -h, --help show this help. -l, --log FILENAME write log to FILENAME (default stdout). - --pidfile FILENAME write PID to FILENAME after daemonizing.\ + --pidfile FILENAME write PID to FILENAME after daemonizing. + -r, --register register with the facilitator.\ """ % { "progname": sys.argv[0], "local": format_addr((DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT)), @@ -567,6 +571,9 @@ def report_pending(): log(u"remotes (%d): %s" % (len(remotes), [format_peername(x) for x in remotes])) def register(): + if not options.register: + return + spec = format_addr((None, options.remote_addr[1])) command = ["./flashproxy-reg-http.py"] if options.facilitator_addr is None: @@ -768,7 +775,7 @@ def main(): report_pending() if __name__ == "__main__": - opts, args = getopt.gnu_getopt(sys.argv[1:], "f:hl:", ["daemon", "facilitator=", "help", "log=", "pidfile="]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "f:hl:r", ["daemon", "facilitator=", "help", "log=", "pidfile=", "register"]) for o, a in opts: if o == "--daemon": options.daemonize = True @@ -781,6 +788,8 @@ if __name__ == "__main__": options.log_filename = a elif o == "--pidfile": options.pid_filename = a + elif o == "-r" or o == "--register": + options.register = True if len(args) == 0: options.local_addr = (DEFAULT_LOCAL_ADDRESS, DEFAULT_LOCAL_PORT)

1 0

[flashproxy/js] Add websockify to experiments/README.
by dcf＠torproject.org 07 Apr '12

07 Apr '12

commit 9525e3cd708f48939287e3ac272e4238312d346e Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 01:54:53 2012 -0700 Add websockify to experiments/README. --- experiments/README | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/experiments/README b/experiments/README index bd814dd..69d3d83 100644 --- a/experiments/README +++ b/experiments/README @@ -9,11 +9,11 @@ You need to have installed certain software before running the tests. Wget Python thttpd - Flash Player + websockify socat, Wget, and Python are easily installed on most GNU/Linux distributions. thttpd can be compiled from the packages at -http://acme.com/software/thttpd/. A debug version of Flash Player can be -downloaded from http://www.adobe.com/support/flashplayer/downloads.html. +http://acme.com/software/thttpd/. websockify is from +https://github.com/kanaka/websockify/. Firefox versions 9 and 10 will not work; these versions have a change to the -no-remote option that prevents the tests from running. This is @@ -30,10 +30,6 @@ and in each one, set this about:config variable: This allows the scripts to clear the contents of a tab and replace them with another page. -Before running any tests, start the crossdomain server as root: - sudo crossdomaind.py --daemon -The tests themselves shouldn't be run as root. - I personally run these tests in an Arch Linux VM. useradd -m user passwd user

1 0

[flashproxy/js] Add WEBSOCKIFY to experiments/common.sh.
by dcf＠torproject.org 07 Apr '12

07 Apr '12

commit f0fc170fe3e9c7e96ad2f970f49ceb0d613e6357 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 7 02:00:00 2012 -0700 Add WEBSOCKIFY to experiments/common.sh. --- experiments/common.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/experiments/common.sh b/experiments/common.sh index dcafd84..87f7d79 100644 --- a/experiments/common.sh +++ b/experiments/common.sh @@ -5,6 +5,7 @@ FLASHPROXY_DIR="$(dirname $BASH_SOURCE)/.." FIREFOX=firefox SOCAT=socat +WEBSOCKIFY=websockify THTTPD=thttpd TOR=tor

1 0