April 2012 - tor-commits - lists.torproject.org

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

09 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/master] Rewrite apply_mask to use bytes.
by dcf＠torproject.org 09 Apr '12

09 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/master] --register in exercise.sh.
by dcf＠torproject.org 09 Apr '12

09 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/master] Use assertEqual instead of assertIsNone.
by dcf＠torproject.org 09 Apr '12

09 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/master] Missing quote.
by dcf＠torproject.org 09 Apr '12

09 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/master] Catch sendall socket errors.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit c752358b3506e45bcfee7d968e48350bb3e6d096 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 8 10:23:55 2012 -0700 Catch sendall socket errors. --- connector.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/connector.py b/connector.py index 97d48b1..d000a54 100755 --- a/connector.py +++ b/connector.py @@ -601,7 +601,12 @@ def proxy_chunk_local_to_remote(local, remote, data = None): remote.close() return False else: - remote.send_chunk(data) + try: + remote.send_chunk(data) + except socket.error, e: + log(u"Socket error writing to remote: %s" % repr(str(e))) + local.close() + return False return True def proxy_chunk_remote_to_local(remote, local, data = None): @@ -634,7 +639,12 @@ def proxy_chunk_remote_to_local(remote, local, data = None): remote.close() local.close() return False - local.send_chunk(data) + try: + local.send_chunk(data) + except socket.error, e: + log(u"Socket error writing to local: %s" % repr(str(e))) + remote.close() + return False return True def receive_unlinked(fd, label):

1 0

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

09 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/master] Python 2.4–compatible sha1 import.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit bb9a328ffe0d8234ef6157585b9bee1d63e6107f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 8 20:31:02 2012 -0700 Python 2.4–compatible sha1 import. --- connector.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/connector.py b/connector.py index d000a54..dad0071 100755 --- a/connector.py +++ b/connector.py @@ -4,7 +4,6 @@ import array import base64 import cStringIO import getopt -import hashlib import httplib import os import re @@ -19,6 +18,12 @@ import urllib import xml.sax.saxutils import BaseHTTPServer +try: + from hashlib import sha1 +except ImportError: + # Python 2.4 uses this name. + from sha import sha as sha1 + DEFAULT_REMOTE_ADDRESS = "0.0.0.0" DEFAULT_REMOTE_PORT = 9000 DEFAULT_LOCAL_ADDRESS = "127.0.0.1" @@ -502,7 +507,7 @@ def handle_websocket_request(fd): # 4.2.2, with the string "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", taking the # SHA-1 hash of this concatenated value to obtain a 20-byte value and # base64-encoding (see Section 4 of [RFC4648]) this 20-byte hash. - accept_key = base64.b64encode(hashlib.sha1(key + MAGIC_GUID).digest()) + accept_key = base64.b64encode(sha1(key + MAGIC_GUID).digest()) handler.send_header("Sec-WebSocket-Accept", accept_key) # 5. Optionally, a |Sec-WebSocket-Protocol| header field, with a value # /subprotocol/ as defined in step 4 in Section 4.2.2.

1 0

[flashproxy/master] Include flashproxy-reg-http.py in "make install".
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 228ddf88eed5f954eea64e724d9ff529e0f7b1b9 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 8 20:34:59 2012 -0700 Include flashproxy-reg-http.py in "make install". --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 94c5d1f..724325e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all: install: mkdir -p $(BINDIR) - cp -f connector.py facilitator.py $(BINDIR) + cp -f connector.py facilitator.py flashproxy-reg-http.py $(BINDIR) clean: :

1 0

[flashproxy/master] Restore public connector to the README.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit f5536c57ebe5ac7d8ee0cf1c6971057368b3160e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 8 20:37:48 2012 -0700 Restore public connector to the README. I restarted it using the JS/WebSocket code. --- README | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/README b/README index e6ad198..e9917e4 100644 --- a/README +++ b/README @@ -76,6 +76,15 @@ From tor you are looking for: [notice] Tor has successfully opened a circuit. Looks like client functionality is working. [notice] Bootstrapped 100%: Done. +=== Using a public connector + +Rather than running connector.py on your computer, you can use a public +connector. This way is not as realistic because all your Tor traffic +will first go to a public connector, which is at a fixed address and can +be easily blocked. However this is an easy way to try out the system +without having to do port forwarding. + $ tor ClientTransportPlugin "websocket socks4 127.0.0.1:9001" UseBridges 1 Bridge "websocket tor-facilitator.bamsoftware.com:9999" + === Troubleshooting Make sure someone is viewing https://crypto.stanford.edu/flashproxy/, or

1 0