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

[flashproxy/master] Add missing import.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 770f78aab48f1aa6a3834d5648857583865d96d8 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 1 10:11:26 2012 -0700 Add missing import. --- flashproxy-reg-http.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/flashproxy-reg-http.py b/flashproxy-reg-http.py index 032a0fb..9ebaa72 100755 --- a/flashproxy-reg-http.py +++ b/flashproxy-reg-http.py @@ -3,6 +3,7 @@ import getopt import httplib import socket +import re import sys import urllib

1 0

[flashproxy/master] Bail out after an error in a WebSocket request.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 593d9981b519b728ad700de0d86d2aed6f76c95d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 1 10:10:15 2012 -0700 Bail out after an error in a WebSocket request. Without this, an exception happened later because the BaseHTTPRequestHandler did not fill in all the necessary fields. --- connector.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/connector.py b/connector.py index 89455ad..db32f03 100755 --- a/connector.py +++ b/connector.py @@ -383,6 +383,8 @@ def handle_websocket_request(fd): log(u"handle_websocket_request") request_text = fd.recv(10 * 1024) handler = WebSocketRequestHandler(request_text, fd) + if handler.error: + return None method = handler.command path = handler.path headers = handler.headers

1 0

[flashproxy/master] Remove notice of public connector.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit df496945881e69d7a85a94b4bc98019c7bbf8661 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 09:35:17 2012 -0700 Remove notice of public connector. That won't be working at the moment. --- README | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/README b/README index a28c608..2351195 100644 --- a/README +++ b/README @@ -79,21 +79,6 @@ 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. - -1. Edit the included torrc file to comment one line and uncomment - another: - # Socks4Proxy 127.0.0.1:9001 - Socks4Proxy tor-facilitator.bamsoftware.com:9999 -2. Run Tor using the included torrc file. - $ tor -f flashproxy/torrc - === Troubleshooting Make sure someone is viewing https://crypto.stanford.edu/flashproxy/, or

1 0

[flashproxy/master] Allow an empty host in flashproxy-reg-http.py.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 1566d432c78d8a2522ca37d62677002d3adc2a3e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 1 10:11:36 2012 -0700 Allow an empty host in flashproxy-reg-http.py. --- flashproxy-reg-http.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy-reg-http.py b/flashproxy-reg-http.py index 9ebaa72..8892fb2 100755 --- a/flashproxy-reg-http.py +++ b/flashproxy-reg-http.py @@ -7,7 +7,7 @@ import re import sys import urllib -DEFAULT_REMOTE_ADDR = None +DEFAULT_REMOTE_ADDR = "" DEFAULT_REMOTE_PORT = 9000 DEFAULT_FACILITATOR_HOST = "tor-facilitator.bamsoftware.com" DEFAULT_FACILITATOR_PORT = 9002 @@ -61,7 +61,7 @@ def parse_addr_spec(spec, defhost = None, defport = None): af = 0 host = host or defhost port = port or defport - if not (host and port): + if not port: raise ValueError("Bad address specification \"%s\"" % spec) return host, int(port)

1 0

[flashproxy/master] Remove manual flashproxy-reg-http.py from README.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit bb3e3e7c419937ced4ef5f1d3f695f3cb12cd5c1 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 10:19:22 2012 -0700 Remove manual flashproxy-reg-http.py from README. --- README | 7 ++++--- torrc | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index b263862..b593328 100644 --- a/README +++ b/README @@ -59,14 +59,11 @@ ephemeral proxies. 1. Run the connector. $ python connector.py - Register with a public facilitator. - $ python flashproxy-reg-http.py 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 flashproxy-reg-http.py -a :8888 2. Run Tor using the included torrc file. $ tor -f flashproxy/torrc @@ -103,6 +100,10 @@ If tor apparently hangs here: [notice] new bridge descriptor '...' (fresh) wait a few minutes. It can take a while to download relay descriptors. +If you suspect that the facilitator has lost your client registration, you can +re-register: + $ python flashproxy-reg-http.py + == How to run a relay diff --git a/torrc b/torrc index 9b9ca70..f13cf87 100644 --- a/torrc +++ b/torrc @@ -1,7 +1,6 @@ ## Configuration file for Tor over flash proxies. ## Usage: ## connector.py -## flashproxy-reg-http.py ## tor -f torrc ClientTransportPlugin websocket socks4 127.0.0.1:9001

1 0

[flashproxy/master] Merge branch 'master' into js
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 3396d52885bfdf57feedef75fdd7426106becf16 Merge: 96b3d5d f2ab3c9 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 09:39:29 2012 -0700 Merge branch 'master' into js README | 2 +- facilitator.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --cc README index b3cbc2d,c7d6a79..b263862 --- a/README +++ b/README @@@ -104,19 -148,7 +104,19 @@@ If tor apparently hangs here wait a few minutes. It can take a while to download relay descriptors. +== How to run a relay + +The relay runs with a WebSocket proxy in external proxy mode. + git clone git://github.com/kanaka/websockify.git +This command proxies WebSocket on port 9901 to a local ORPort on 9001. + ./websockify :9901 127.0.0.1:9001 +The init.d script described under "Installing so as to restart at boot" +does this automatically. + +Add this line to torrc to make the relay use the external proxy: + ServerTransportPlugin websocket proxy 127.0.0.1:9901 + - == How to put a flash proxy badge on a web page. + == How to put a flash proxy badge on a web page Paste in this HTML where you want the badge to appear:

1 0

[flashproxy/master] We need pluggable transports, not Socks4Proxy.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 96b3d5dab27b96023ae9bb91addd1bb0b93528d3 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 09:37:01 2012 -0700 We need pluggable transports, not Socks4Proxy. --- README | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 2351195..b3cbc2d 100644 --- a/README +++ b/README @@ -31,8 +31,8 @@ https://crypto.stanford.edu/flashproxy/ == Quick start for users -You must have a version of Tor that supports the Socks4Proxy option. -This means version 0.2.2.32 (released 2011-08-29) or later. +You must have a version of Tor that supports pluggable transports. This +means version 0.2.2.32 (released 2011-08-29) or later. All the flashproxy programs and source code can be downloaded this way: git clone https://git.torproject.org/flashproxy.git

1 0

[flashproxy/master] Restore automatic registration to connector.py.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 5eb6529fda3aaefdfede5ceed0bcbc9b9fa3c379 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 10:17:40 2012 -0700 Restore automatic registration to connector.py. This works now by calling flashproxy-reg-http.py. --- connector.py | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/connector.py b/connector.py index db32f03..f7f35e3 100755 --- a/connector.py +++ b/connector.py @@ -4,11 +4,13 @@ import base64 import cStringIO import getopt import hashlib +import httplib import os import re import select import socket import struct +import subprocess import sys import time import traceback @@ -26,6 +28,7 @@ LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): local_addr = None remote_addr = None + facilitator_addr = None log_filename = None log_file = sys.stdout @@ -38,7 +41,7 @@ UNCONNECTED_BUFFER_LIMIT = 10240 def usage(f = sys.stdout): print >> f, """\ -Usage: %(progname)s [LOCAL][:PORT] [REMOTE][:PORT] +Usage: %(progname)s -f FACILITATOR[:PORT] [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". @@ -46,7 +49,12 @@ LOCAL is "%(local)s" and REMOTE is "%(remote)s". 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). --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.\ @@ -535,6 +543,16 @@ def handle_socks_request(fd): def report_pending(): log(u"locals (%d): %s" % (len(locals), [format_peername(x) for x in locals])) log(u"remotes (%d): %s" % (len(remotes), [format_peername(x) for x in remotes])) + +def register(): + spec = format_addr((None, options.remote_addr[1])) + command = ["./flashproxy-reg-http.py"] + if options.facilitator_addr is None: + log(u"Registering \"%s\"." % spec) + else: + command += [format_addr(options.facilitator_addr)] + command += ["-a", spec] + p = subprocess.Popen(command) def proxy_chunk_local_to_remote(local, remote): try: @@ -661,6 +679,7 @@ def main(): local_c, addr = fd.accept() log(u"Local connection from %s." % format_addr(addr)) socks_pending.append(local_c) + register() elif fd in websocket_pending: log(u"Data from WebSocket-pending %s." % format_addr(addr)) protocols = handle_websocket_request(fd) @@ -688,10 +707,12 @@ def main(): if not proxy_chunk_remote_to_local(fd, local): remotes.remove(fd) locals.remove(local) + register() else: if not receive_unlinked(fd, "remote"): remotes.remove(fd) unlinked_remotes.remove(fd) + register() report_pending() elif fd in locals: remote = fd.partner @@ -715,10 +736,12 @@ def main(): report_pending() if __name__ == "__main__": - opts, args = getopt.gnu_getopt(sys.argv[1:], "hl:", ["daemon", "help", "log=", "pidfile="]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "f:hl:", ["daemon", "facilitator=", "help", "log=", "pidfile="]) for o, a in opts: if o == "--daemon": options.daemonize = True + elif o == "-f" or o == "--facilitator": + options.facilitator_addr = parse_addr_spec(a) elif o == "-h" or o == "--help": usage() sys.exit() @@ -765,6 +788,8 @@ if __name__ == "__main__": # Locals not yet linked with a remote. This is a subset of remotes. unlinked_locals = [] + register() + if options.daemonize: log(u"Daemonizing.") pid = os.fork()

1 0

[flashproxy/master] Use ClientTransportPlugin in exercise.sh.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 9ceca5714484999b245c505e3816d149edc207dd Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 12:59:34 2012 -0700 Use ClientTransportPlugin in exercise.sh. --- experiments/exercise/exercise.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 0557062..04026e8 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -25,7 +25,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" UseBridges 1 Bridge 127.0.0.1:9001 Socks4Proxy 127.0.0.1:$LOCAL_PORT LearnCircuitBuildTimeout 0 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 & PIDS_TO_KILL+=($!) sleep 60

1 0

[flashproxy/master] Safari requires "new" on the WebSocket constructor.
by dcf＠torproject.org 09 Apr '12

09 Apr '12

commit 9396261d8f6d2b9543aef8f490856f15daa458e8 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 13:57:21 2012 -0700 Safari requires "new" on the WebSocket constructor. --- flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 167ec2c..9a0b4fa 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -226,7 +226,7 @@ function make_websocket(addr) url = "ws://" + encodeURIComponent(addr.host) + ":" + encodeURIComponent(addr.port) + "/"; - return (window.WebSocket || window.MozWebSocket)(url, "base64"); + return new (window.WebSocket || window.MozWebSocket)(url, "base64"); } function FlashProxy()

1 0