- tor-commits - lists.torproject.org

[flashproxy/js] Bind flush callback to this.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit dfed38da17068239fc64965fa02b2aa591f6a646 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 09:05:36 2012 -0700 Bind flush callback to this. --- flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 3fcf4a0..167ec2c 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -538,7 +538,7 @@ function FlashProxy() } if (this.r2c_schedule.length > 0 || this.c2r_schedule.length > 0) - this.flush_timeout_id = setTimeout(this.flush, rate_limit.when() * 1000); + this.flush_timeout_id = setTimeout(this.flush.bind(this), rate_limit.when() * 1000); }; } }

1 0

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

02 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/js] Fix undefined variable errors.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit 3455f9a79166ed92de864b91f9dcfa0bb222c82c Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 08:53:26 2012 -0700 Fix undefined variable errors. --- flashproxy.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 4803fce..3fcf4a0 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -383,8 +383,8 @@ function FlashProxy() puts("Error: can't parse relay spec " + repr(response.relay) + "."); return; } - puts("Facilitator: got client:" + repr(client_spec) + " " - + "relay:" + repr(relay_spec) + "."); + puts("Facilitator: got client:" + repr(client_addr) + " " + + "relay:" + repr(relay_addr) + "."); this.make_proxy_pair(client_addr, relay_addr); };

1 0

[flashproxy/js] torrc with external proxy websocket transport.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit 95b9cf95da0a9ff179a8e5d41dfae90861719a91 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 08:39:30 2012 -0700 torrc with external proxy websocket transport. --- torrc | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/torrc b/torrc index 0bab31c..9b9ca70 100644 --- a/torrc +++ b/torrc @@ -1,14 +1,9 @@ ## Configuration file for Tor over flash proxies. ## Usage: -## connector.py -f tor-facilitator.bamsoftware.com +## connector.py +## flashproxy-reg-http.py ## tor -f torrc +ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 -Bridge 127.0.0.1:9001 -Socks4Proxy 127.0.0.1:9001 - -# In case you are not able to receive remote connections on port 9000, comment -# the Socks4Proxy line above and uncomment this one. This will use a public -# connector. There is no need to run connector.py locally. - -# Socks4Proxy tor-facilitator.bamsoftware.com:9999 +Bridge websocket 127.0.0.1:9001

1 0

[flashproxy/js] Add init.d script for websockify.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit 0603a500826ce7930c62857513f395b28e2789a4 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 1 23:12:40 2012 -0700 Add init.d script for websockify. --- README | 11 +++++++++ init.d/websockify | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/README b/README index 51c19c4..a28c608 100644 --- a/README +++ b/README @@ -125,6 +125,8 @@ 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 @@ -161,3 +163,12 @@ CentOS. "make install" copies files to /usr/local/bin. -- Edit /etc/init.d/facilitator to set $RELAY. # chkconfig --add facilitator # service facilitator start + + # cd websockify + # cp websockify websocket.py /usr/local/bin + # useradd -d /dev/null -s /bin/false websockify + # mkdir /var/websockify + # chown -R websockify.websockify /var/websockify + # cp ~/flashproxy/init.d/websockify /etc/init.d/websockify + # chkconfig --add websockify + # service websockify start diff --git a/init.d/websockify b/init.d/websockify new file mode 100755 index 0000000..22a5450 --- /dev/null +++ b/init.d/websockify @@ -0,0 +1,62 @@ +#!/bin/sh +# +# websockify This shell script takes care of starting and stopping +# the websockify server. +# +# chkconfig: 2345 90 10 +# description: websockify server. +# processname: websockify +# pidfile: /var/websockify/websockify.pid + +# Installation instructions: +# cp init.d/websockify /etc/init.d/websockify +# chkconfig --add websockify +# service websockify start + +# Source function library. +. /etc/rc.d/init.d/functions + +BINDIR=/usr/local/bin +VARDIR=/var/websockify +WEBSOCKIFY=$BINDIR/websockify +WEBSOCKIFY_PORT=9901 +LOCAL_ADDRESS=127.0.0.1:9001 +PIDFILE=$VARDIR/websockify.pid +USER=websockify + +# See how we were called. +case "$1" in + start) + [ -x $WEBSOCKIFY ] || exit 1 + echo -n $"Starting websockify server: " + cd $VARDIR && daemon --user "$USER" --pidfile $PIDFILE "$WEBSOCKIFY" :"$WEBSOCKIFY_PORT" "$LOCAL_ADDRESS" + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/websockify + ;; + stop) + # Stop daemon. + echo -n $"Shutting down websockify server: " + killproc websockify + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/websockify + ;; + status) + status websockify + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + ;; + condrestart) + [ -f /var/lock/subsys/websockify ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|restart}" + RETVAL=3 + ;; +esac + +exit $RETVAL

1 0

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

02 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/js] Remove another mention of Flash.
by dcf＠torproject.org 02 Apr '12

02 Apr '12

commit 1fb342ce1dee122b04530ecbba0f116817e2f80a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Mar 31 17:48:17 2012 -0700 Remove another mention of Flash. --- README | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/README b/README index c4f0f46..51c19c4 100644 --- a/README +++ b/README @@ -24,8 +24,7 @@ changing pool of addresses. == Demonstration page This page has a description of the project; viewing it also turns your -computer into a flash proxy as long as the page is open. (Only if you -have Adobe Flash Player installed.) +computer into a flash proxy as long as the page is open. https://crypto.stanford.edu/flashproxy/

1 0

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

02 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/js] Merge branch 'master' into js
by dcf＠torproject.org 02 Apr '12

02 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/js] Remove notice of public connector.
by dcf＠torproject.org 02 Apr '12

02 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