- tor-commits - lists.torproject.org

[flashproxy/master] Add an init.d script for crossdomaind.py.
by dcf＠torproject.org 05 Sep '11

05 Sep '11

commit ce1642b5ce8d75eef949cdefebae396ade02a4e5 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 5 02:07:50 2011 -0400 Add an init.d script for crossdomaind.py. --- init.d/crossdomaind | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/init.d/crossdomaind b/init.d/crossdomaind new file mode 100755 index 0000000..3aecaaa --- /dev/null +++ b/init.d/crossdomaind @@ -0,0 +1,62 @@ +#!/bin/sh +# +# crossdomaind This shell script takes care of starting and stopping +# crossdomaind server. +# +# chkconfig: 2345 90 10 +# description: Crossdomain policy server. +# processname: crossdomaind.py +# pidfile: /var/flashproxy/crossdomaind.pid + +# Installation instructions: +# cp crossdomaind /etc/init.d/crossdomaind +# chkconfig --add crossdomaind +# service crossdomaind start + +# Source function library. +. /etc/rc.d/init.d/functions + +BINDIR=/usr/local/bin +VARDIR=/var/flashproxy +PROG=$BINDIR/crossdomaind.py +PIDFILE=$VARDIR/crossdomaind.pid + +# See how we were called. +case "$1" in + start) + [ -x $PROG ] || exit 1 + echo -n $"Starting flash proxy crossdomaind: " + cd $VARDIR && daemon --pidfile $PIDFILE $PROG --pidfile $PIDFILE --daemon + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/crossdomaind + ;; + stop) + # Stop daemon. + echo -n $"Shutting down flash proxy crossdomaind: " + killproc -p $PIDFILE + RETVAL=$? + echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/crossdomaind + rm -f $PIDFILE + fi + ;; + status) + status -p $PIDFILE crossdomaind + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + ;; + condrestart) + [ -f /var/lock/subsys/crossdomaind ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|restart}" + RETVAL=3 + ;; +esac + +exit $RETVAL

1 0

[flashproxy/master] Redirect stderr to the log file to retain tracebacks.
by dcf＠torproject.org 05 Sep '11

05 Sep '11

commit 794020e5bde5c49b154609a5db3b52ace572dbf5 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 5 02:41:44 2011 -0400 Redirect stderr to the log file to retain tracebacks. --- connector.py | 2 ++ facilitator.py | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/connector.py b/connector.py index 3d3fabe..d763303 100755 --- a/connector.py +++ b/connector.py @@ -144,6 +144,8 @@ else: if options.log_filename: options.log_file = open(options.log_filename, "a") + # Send error tracebacks to the log. + sys.stderr = options.log_file else: options.log_file = sys.stdout diff --git a/facilitator.py b/facilitator.py index 619b8b2..ef0cb48 100755 --- a/facilitator.py +++ b/facilitator.py @@ -347,11 +347,6 @@ for o, a in opts: print >> sys.stderr, u"Can't resolve relay %s: %s" % (repr(a), str(e)) sys.exit(1) -if options.log_filename: - options.log_file = open(options.log_filename, "a") -else: - options.log_file = sys.stdout - if not options.relay_spec: print >> sys.stderr, """\ The -r option is required. Give it the relay that will be sent to proxies. @@ -373,6 +368,13 @@ else: usage(sys.stderr) sys.exit(1) +if options.log_filename: + options.log_file = open(options.log_filename, "a") + # Send error tracebacks to the log. + sys.stderr = options.log_file +else: + options.log_file = sys.stdout + addrinfo = socket.getaddrinfo(address[0], address[1], 0, socket.SOCK_STREAM, socket.IPPROTO_TCP)[0] class Server(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):

1 0

[flashproxy/master] Add .PHONY Makefile target.
by dcf＠torproject.org 05 Sep '11

05 Sep '11

commit c15a866c47953cc41e75fdb158a5fe6bb5755d77 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 5 00:12:08 2011 -0400 Add .PHONY Makefile target. --- Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index ed799c6..20cd81b 100644 --- a/Makefile +++ b/Makefile @@ -11,3 +11,5 @@ swfcat.swf: *.as badge.png clean: rm -f $(TARGETS) + +.PHONY: all clean

1 0

[flashproxy/master] Add a --pidfile option to facilitator.py.
by dcf＠torproject.org 05 Sep '11

05 Sep '11

commit 8e8467406e6839a25daad5e287cf676b2bfc6462 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 5 01:52:57 2011 -0400 Add a --pidfile option to facilitator.py. --- facilitator.py | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/facilitator.py b/facilitator.py index 495cd3b..619b8b2 100755 --- a/facilitator.py +++ b/facilitator.py @@ -26,6 +26,7 @@ class options(object): log_file = sys.stdout relay_spec = None daemonize = True + pid_filename = None @staticmethod def set_relay_spec(spec): @@ -40,10 +41,11 @@ Usage: %(progname)s -r RELAY <OPTIONS> [HOST] [PORT] Flash proxy facilitator: Register client addresses with HTTP POST requests and serve them out again with HTTP GET. Listen on HOST and PORT, by default %(addr)s %(port)d. - -d, --debug don't daemonize, log to stdout. - -h, --help show this help. - -l, --log FILENAME write log to FILENAME (default \"%(log)s\"). - -r, --relay RELAY send RELAY (host:port) to proxies as the relay to use.\ + -d, --debug don't daemonize, log to stdout. + -h, --help show this help. + -l, --log FILENAME write log to FILENAME (default \"%(log)s\"). + --pidfile FILENAME write PID to FILENAME after daemonizing. + -r, --relay RELAY send RELAY (host:port) to proxies as the relay to use.\ """ % { "progname": sys.argv[0], "addr": DEFAULT_ADDRESS, @@ -326,7 +328,7 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): REGS = RegSet() opts, args = getopt.gnu_getopt(sys.argv[1:], "dhl:r:", - ["debug", "help", "log=", "relay="]) + ["debug", "help", "log=", "pidfile=", "relay="]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False @@ -336,6 +338,8 @@ for o, a in opts: sys.exit() elif o == "-l" or o == "--log": options.log_filename = a + elif o == "--pidfile": + options.pid_filename = a elif o == "-r" or o == "--relay": try: options.set_relay_spec(a) @@ -382,7 +386,12 @@ log(u"using relay address %s" % options.relay_spec) if options.daemonize: log(u"daemonizing") - if os.fork() != 0: + pid = os.fork() + if pid != 0: + if options.pid_filename: + f = open(options.pid_filename, "w") + print >> f, pid + f.close() sys.exit(0) try:

1 0

[flashproxy/master] Add init.d script for facilitator.py.
by dcf＠torproject.org 05 Sep '11

05 Sep '11

commit 5065368704e341cd6aa3603cd3bf774a8d396b33 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 5 01:59:06 2011 -0400 Add init.d script for facilitator.py. --- init.d/facilitator | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/init.d/facilitator b/init.d/facilitator new file mode 100755 index 0000000..03be16e --- /dev/null +++ b/init.d/facilitator @@ -0,0 +1,68 @@ +#!/bin/sh +# +# facilitator This shell script takes care of starting and stopping +# the flash proxy facilitator. +# +# chkconfig: 2345 90 10 +# description: Flash proxy facilitator. +# processname: facilitator.py +# pidfile: /var/flashproxy/facilitator.pid + +# Installation instructions: +# cp facilitator /etc/init.d/facilitator +# chkconfig --add facilitator +# service facilitator start + +# Source function library. +. /etc/rc.d/init.d/functions + +# Replace this with the address of a Tor relay that allows crossdomain +# connections (i.e., is running crossdomaind.py). You can use host:port +# syntax. +RELAY=... + +BINDIR=/usr/local/bin +VARDIR=/var/flashproxy +PROG=$BINDIR/facilitator.py +PIDFILE=$VARDIR/facilitator.pid +USER=flashproxy + +# See how we were called. +case "$1" in + start) + [ -x $PROG ] || exit 1 + echo -n $"Starting flash proxy facilitator: " + cd $VARDIR && daemon --user $USER --pidfile $PIDFILE $PROG --pidfile $PIDFILE -r $RELAY + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/facilitator + ;; + stop) + # Stop daemon. + echo -n $"Shutting down flash proxy facilitator: " + killproc -p $PIDFILE + RETVAL=$? + echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/facilitator + rm -f $PIDFILE + fi + ;; + status) + status -p $PIDFILE facilitator + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + ;; + condrestart) + [ -f /var/lock/subsys/facilitator ] && restart || : + ;; + *) + echo $"Usage: $0 {start|stop|status|restart}" + RETVAL=3 + ;; +esac + +exit $RETVAL

1 0

[flashproxy/master] Add a --pidfile to crossdomaind.py.
by dcf＠torproject.org 05 Sep '11

05 Sep '11

commit e793f36db253b8df55f9eb785a02860214fdc6f1 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Sep 5 01:54:56 2011 -0400 Add a --pidfile to crossdomaind.py. --- crossdomaind.py | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/crossdomaind.py b/crossdomaind.py index 07d1de4..72d4327 100755 --- a/crossdomaind.py +++ b/crossdomaind.py @@ -13,6 +13,7 @@ DEFAULT_PORTS = "*" class options(object): daemonize = False + pid_filename = None domain = DEFAULT_DOMAIN ports = DEFAULT_PORTS @@ -21,10 +22,11 @@ def usage(f = sys.stdout): Usage: %(progname)s <OPTIONS> [HOST] [PORT] Serve a Flash crossdomain policy. By default HOST is \"%(addr)s\" and PORT is %(port)d. - --daemon daemonize (Unix only). - -d, --domain=DOMAIN limit access to the given DOMAIN (default \"%(domain)s\"). - -h, --help show this help. - -p, --ports=PORTS limit access to the given PORTS (default \"%(ports)s\").\ + --daemon daemonize (Unix only). + -d, --domain=DOMAIN limit access to the given DOMAIN (default \"%(domain)s\"). + -h, --help show this help. + --pidfile FILENAME write PID to FILENAME after daemonizing. + -p, --ports=PORTS limit access to the given PORTS (default \"%(ports)s\").\ """ % { "progname": sys.argv[0], "addr": DEFAULT_ADDRESS, @@ -40,7 +42,7 @@ def make_policy(domain, ports): </cross-domain-policy> \0""" % (xml.sax.saxutils.escape(domain), xml.sax.saxutils.escape(ports)) -opts, args = getopt.gnu_getopt(sys.argv[1:], "d:hp:", ["daemon", "domain", "help", "ports"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "d:hp:", ["daemon", "domain", "help", "pidfile=", "ports"]) for o, a in opts: if o == "--daemon": options.daemonize = True @@ -49,6 +51,8 @@ for o, a in opts: sys.exit() elif o == "-d" or o == "--domain": options.domain = a + elif o == "--pidfile": + options.pid_filename = a elif o == "-p" or o == "--ports": options.ports = a @@ -76,7 +80,12 @@ s.bind(addrinfo[4]) s.listen(10) if options.daemonize: - if os.fork() != 0: + pid = os.fork() + if pid != 0: + if options.pid_filename: + f = open(options.pid_filename, "w") + print >> f, pid + f.close() sys.exit(0) while True:

1 0

[flashproxy/master] Revert facilitator blocking until a reg is available.
by dcf＠torproject.org 05 Sep '11

05 Sep '11

commit 55841fece74c90019457092bf67ed4309b0d7312 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 4 20:17:15 2011 -0700 Revert facilitator blocking until a reg is available. This reverts 91cceeef62061d66732be7039d559f5fff49e8ef Document the facilitator's waiting until a reg is available. c3ea89cb2a2c1e5f8496ec526b9d1c7451e2d06d Log the socket error when we fail to send a reg. 90510d7bf565f0cc9876665aa6e85b55c8e5a3c1 Make facilitator requests block until a reg is available. This would be a nice model, but the URLLoader in ActionScript doesn't work exactly the way I expect it to (at least with Flash Player in Firefox), and it means that this "long polling" technique doesn't work robustly. The first time swfcat is loaded, everything is fine: it makes the /crossdomain.xml request, then starts a URLLoader for /. If there is no client to be served immediately, then the URLLoader just hangs until there is one (this part works well). What goes wrong is when you refresh the page (or navigate away and then back again). I expected that the URLLoader would break its connection when this happens, which would be noticed by the facilitator. Instead, what seems to happen is the URLLoader's HTTP connection goes into limbo, still alive and waiting for a response, but not hooked up to anything on the client side. (I suppose this is an artifact of Flash Player using the browser to make the request, so it might differ on other browsers.) The new instance of swfcat asks for /crossdomain.xml, and claims to be opening a URLLoader for /, but instead what appears to happen is the new request gets queued behind the pending one that is in limbo; tcpdump doesn't see any second request until the first is completed. Now, if a client registers, its reg goes out over the in-limbo connection and effectively disappears. The queued URLLoader request from the proxy gets sent, but at this point there is no more client reg because it was presumed to be handled by the first proxy request. This queueing behavior is evident if you refresh the page, say, five times, and then kill the facilitator: you see one HTTP request, then a RST from the server, then four other immediate SYN-RST pairs. So instead, we go back to the facilitator always returning immediately (possibly without a client), and the proxy polling on a regular basis for clients. --- design.txt | 4 ++-- facilitator.py | 38 ++++++++++++++------------------------ 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/design.txt b/design.txt index f33468c..55427b6 100644 --- a/design.txt +++ b/design.txt @@ -151,8 +151,8 @@ Design of flash proxies client=[<rtmfp-id>]&relay=<address>:<port> - The facilitator keeps the HTTP session alive and does not send a - registration until one is available. + If the value for the client parameter is empty, it means that there are no + client registrations for this proxy. The flash proxy may serve more than one relay–client pair at once. diff --git a/facilitator.py b/facilitator.py index bea3957..495cd3b 100755 --- a/facilitator.py +++ b/facilitator.py @@ -183,23 +183,11 @@ class RegSet(object): finally: self.cv.release() - def add_front(self, reg): - self.cv.acquire() - try: - if reg not in list(self.set): - self.set.append(reg) - self.cv.notify() - return True - else: - return False - finally: - self.cv.release() - def fetch(self): self.cv.acquire() try: - while not self.set: - self.cv.wait() + if not self.set: + return None return self.set.pop(0) finally: self.cv.release() @@ -224,16 +212,13 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): return reg = REGS.fetch() - - try: - self.send_client(reg) + if reg: log(u"proxy %s gets %s, relay %s (now %d)" % (proxy_addr_s, unicode(reg), options.relay_spec, len(REGS))) - except socket.error, e: - # Something went wrong; likely the proxy disconnected without - # receiving a reg. Restore the reg to the front of the queue. - REGS.add_front(reg) - log(u"proxy %s gets none (%s)" % (proxy_addr_s, str(e))) + self.send_client(reg) + else: + log(u"proxy %s gets none" % proxy_addr_s) + self.send_client(None) def do_POST(self): client_addr_s = format_addr(self.client_address) @@ -301,8 +286,13 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): % (format_addr(self.client_address), repr(msg))) def send_client(self, reg): - client_str = str(reg) - + if reg: + client_str = str(reg) + else: + # Send an empty string rather than a 404 or similar because Flash + # Player's URLLoader can't always distinguish a 404 from, say, + # "server not found." + client_str = "" self.send_response(200) self.send_header("Content-Type", "x-www-form-urlencoded") self.send_header("Cache-Control", "no-cache")

1 0

[flashproxy/master] Restore facilitator polling interval of 10 s (was 1 s).
by dcf＠torproject.org 05 Sep '11

05 Sep '11

commit c22394bb027f589c720d33605ef6b7e3526ea6e2 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 4 20:38:41 2011 -0700 Restore facilitator polling interval of 10 s (was 1 s). 1 s was for running the local experiments, but it's obnoxious to request so frequently when we have to poll. --- swfcat.as | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/swfcat.as b/swfcat.as index dd1ef9b..f114051 100644 --- a/swfcat.as +++ b/swfcat.as @@ -35,7 +35,7 @@ package private const MAX_NUM_PROXY_PAIRS:uint = 100; // Milliseconds. - private const FACILITATOR_POLL_INTERVAL:int = 1000; + private const FACILITATOR_POLL_INTERVAL:int = 10000; // Bytes per second. Set to undefined to disable limit. public static const RATE_LIMIT:Number = undefined;

1 0

[flashproxy/master] Copy cumulus init.d installation instructions to the script itself.
by dcf＠torproject.org 05 Sep '11

05 Sep '11

commit dc0274d72b17c5cccd528fc5c18215c3e9124aa8 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Sep 4 20:49:30 2011 -0700 Copy cumulus init.d installation instructions to the script itself. --- cumulus | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/cumulus b/cumulus index 7fdac3e..b1c428d 100755 --- a/cumulus +++ b/cumulus @@ -8,6 +8,11 @@ # processname: CumulusService # pidfile: /var/cumulus/cumulus.pid +# Installation instructions: +# cp cumulus /etc/init.d/cumulus +# chkconfig --add cumulus +# service cumulus start + # Source function library. . /etc/rc.d/init.d/functions

1 0

r25027: {website} bump tor browser bundles to 2.2.32-3 (website/trunk/include)
by Erinn Clark 05 Sep '11

05 Sep '11

Author: erinn Date: 2011-09-05 04:14:42 +0000 (Mon, 05 Sep 2011) New Revision: 25027 Modified: website/trunk/include/versions.wmi Log: bump tor browser bundles to 2.2.32-3 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-05 04:05:55 UTC (rev 25026) +++ website/trunk/include/versions.wmi 2011-09-05 04:14:42 UTC (rev 25027) @@ -23,28 +23,28 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.32</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.32</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.32-2</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.32-3</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.14-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>6.0.1</define-tag> -<define-tag version-torbrowser-torbutton whitespace=delete>1.4.1</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>6.0.2</define-tag> +<define-tag version-torbrowser-torbutton whitespace=delete>1.4.2</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.32-2</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.32-2</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.32-3</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.32-3</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.14, zlib-1.2.5, openssl-0.9.8p</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>6.0.1</define-tag> -<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.1</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>6.0.2</define-tag> +<define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>2.2.32-2</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>2.2.32-3</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.32</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>6.0.1</define-tag> -<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.1</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>6.0.2</define-tag> +<define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.2</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.14</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.14</define-tag>

1 0