March 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Add /usr/local/bin to init script PATH.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit 9e9dfefc7a4f017485981f6c38506d44ff6352a6 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 01:06:01 2013 -0800 Add /usr/local/bin to init script PATH. This is needed for the programs to be able to find flashproxy-reg. --- facilitator/init.d/facilitator | 2 +- facilitator/init.d/facilitator-email-poller | 2 +- facilitator/init.d/facilitator-reg-daemon | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/facilitator/init.d/facilitator b/facilitator/init.d/facilitator index 8780ff0..b2f4d19 100755 --- a/facilitator/init.d/facilitator +++ b/facilitator/init.d/facilitator @@ -18,7 +18,7 @@ # This is the IPv4 address of tor1.bamsoftware.com. RELAY=173.255.221.44:9901 -PATH=/sbin:/usr/sbin:/bin:/usr/bin +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin DESC="Flash proxy facilitator" NAME=facilitator PIDFILE=/var/run/$NAME.pid diff --git a/facilitator/init.d/facilitator-email-poller b/facilitator/init.d/facilitator-email-poller index 8f52845..5f1c3d7 100755 --- a/facilitator/init.d/facilitator-email-poller +++ b/facilitator/init.d/facilitator-email-poller @@ -14,7 +14,7 @@ # Based on /etc/init.d/skeleton from Debian 6. -PATH=/sbin:/usr/sbin:/bin:/usr/bin +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin DESC="Flash proxy email rendezvous poller" NAME=facilitator-email-poller PIDFILE=/var/run/$NAME.pid diff --git a/facilitator/init.d/facilitator-reg-daemon b/facilitator/init.d/facilitator-reg-daemon index 52d4890..810f697 100755 --- a/facilitator/init.d/facilitator-reg-daemon +++ b/facilitator/init.d/facilitator-reg-daemon @@ -14,7 +14,7 @@ # Based on /etc/init.d/skeleton from Debian 6. -PATH=/sbin:/usr/sbin:/bin:/usr/bin +PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin DESC="Flash proxy local registration daemon" NAME=facilitator-reg-daemon PIDFILE=/var/run/$NAME.pid

1 0

[flashproxy/master] facilitator-reg.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit dadfb7639c25415958d543e0a14c15248dbc38fd Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 00:01:55 2013 -0800 facilitator-reg. This is the unprivileged program that feeds encoded registrations to facilitator-reg-daemon. --- facilitator/Makefile | 2 +- facilitator/facilitator-reg | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletions(-) diff --git a/facilitator/Makefile b/facilitator/Makefile index d23a259..90855d2 100644 --- a/facilitator/Makefile +++ b/facilitator/Makefile @@ -6,7 +6,7 @@ all: install: mkdir -p $(BINDIR) - cp -f facilitator facilitator-email-poller facilitator-reg-daemon facilitator.cgi fac.py $(BINDIR) + cp -f facilitator facilitator-email-poller facilitator-reg-daemon facilitator-reg facilitator.cgi fac.py $(BINDIR) cp -f init.d/facilitator init.d/facilitator-email-poller init.d/facilitator-reg-daemon /etc/init.d/ clean: diff --git a/facilitator/facilitator-reg b/facilitator/facilitator-reg new file mode 100755 index 0000000..c39eed5 --- /dev/null +++ b/facilitator/facilitator-reg @@ -0,0 +1,59 @@ +#!/usr/bin/env python + +import getopt +import socket +import sys + +CONNECT_ADDRESS = "127.0.0.1" +DEFAULT_CONNECT_PORT = 9003 + +class options(object): + connect_port = DEFAULT_CONNECT_PORT + +def usage(f = sys.stdout): + print >> f, """\ +Usage: %(progname)s +Reads a base64-encoded encrypted client registration from stdin and +feeds it to a local facilitator-reg-daemon process. Returns 0 if the +registration was successful, 1 otherwise. + + -h, --help show this help. + -p, --port PORT connect to PORT (by default %(port)d).\ +""" % { + "progname": sys.argv[0], + "port": DEFAULT_CONNECT_PORT, +} + +def main(): + opts, args = getopt.gnu_getopt(sys.argv[1:], "hp:", ["help", "port="]) + for o, a in opts: + if o == "-h" or o == "--help": + usage() + sys.exit() + elif o == "-p" or o == "--pass": + options.connect_port = int(a) + + if len(args) != 0: + usage(sys.stderr) + sys.exit(1) + + addrinfo = socket.getaddrinfo(CONNECT_ADDRESS, options.connect_port, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP)[0] + + s = socket.socket(addrinfo[0], addrinfo[1], addrinfo[2]) + s.connect(addrinfo[4]) + + while True: + data = sys.stdin.read(1024) + if data == "": + break + s.send(data) + s.shutdown(socket.SHUT_WR) + data = s.recv(1024) + + if data.strip() == "OK": + sys.exit(0) + else: + sys.exit(1) + +if __name__ == "__main__": + main()

1 0

[flashproxy/master] facilitator-reg-daemon.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit 108517dfe2fc7873b468fed1ce35bde29eb4c107 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 23:43:22 2013 -0800 facilitator-reg-daemon. This process will be the one with access to key material. --- doc/facilitator-howto.txt | 2 + facilitator/Makefile | 4 +- facilitator/facilitator-reg-daemon | 214 +++++++++++++++++++++++++++++ facilitator/init.d/facilitator-reg-daemon | 118 ++++++++++++++++ 4 files changed, 336 insertions(+), 2 deletions(-) diff --git a/doc/facilitator-howto.txt b/doc/facilitator-howto.txt index fda9b8c..25c0a8c 100644 --- a/doc/facilitator-howto.txt +++ b/doc/facilitator-howto.txt @@ -107,6 +107,8 @@ and fac.py to /usr/local/bin. It also installs System V init files to # /etc/init.d/facilitator start # update-rc.d facilitator-email-poller defaults # /etc/init.d/facilitator-email-poller start + # update-rc.d facilitator-reg-daemon defaults + # /etc/init.d/facilitator-reg-daemon start == HTTP server setup diff --git a/facilitator/Makefile b/facilitator/Makefile index 14d7807..d23a259 100644 --- a/facilitator/Makefile +++ b/facilitator/Makefile @@ -6,8 +6,8 @@ all: install: mkdir -p $(BINDIR) - cp -f facilitator facilitator-email-poller facilitator.cgi fac.py $(BINDIR) - cp -f init.d/facilitator init.d/facilitator-email-poller /etc/init.d/ + cp -f facilitator facilitator-email-poller facilitator-reg-daemon facilitator.cgi fac.py $(BINDIR) + cp -f init.d/facilitator init.d/facilitator-email-poller init.d/facilitator-reg-daemon /etc/init.d/ clean: rm -f *.pyc diff --git a/facilitator/facilitator-reg-daemon b/facilitator/facilitator-reg-daemon new file mode 100755 index 0000000..996c50e --- /dev/null +++ b/facilitator/facilitator-reg-daemon @@ -0,0 +1,214 @@ +#!/usr/bin/env python + +import SocketServer +import getopt +import os +import socket +import stat +import sys +import threading +import time + +import fac + +from M2Crypto import RSA + +# Generating an RSA keypair for use by this program: +# openssl genrsa reg-daemon 2048 +# chmod 600 reg-daemon + +LISTEN_ADDRESS = "127.0.0.1" +DEFAULT_LISTEN_PORT = 9003 +FACILITATOR_ADDR = ("127.0.0.1", 9002) +DEFAULT_LOG_FILENAME = "facilitator-reg-daemon.log" + +# Don't indulge clients for more than this many seconds. +CLIENT_TIMEOUT = 1.0 +# Buffer no more than this many bytes per connection. +MAX_LENGTH = 40 * 1024 + +LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" + +class options(object): + key_filename = None + listen_port = DEFAULT_LISTEN_PORT + log_filename = DEFAULT_LOG_FILENAME + log_file = sys.stdout + daemonize = True + pid_filename = None + safe_logging = True + +def usage(f = sys.stdout): + print >> f, """\ +Usage: %(progname)s --key=KEYFILE +Facilitator-side daemon that reads base64-encoded encrypted client +registrations and registers them with a local facilitator. This program +exists on its own in order to isolate the reading of key material in a +single process. + + -d, --debug don't daemonize, log to stdout. + -h, --help show this help. + -k, --key=KEYFILE read the private key from KEYFILE (required). + -l, --log FILENAME write log to FILENAME (default \"%(log)s\"). + -p, --port PORT listen on PORT (by default %(port)d). + --pidfile FILENAME write PID to FILENAME after daemonizing. + --unsafe-logging don't scrub email password and IP addresses from logs.\ +""" % { + "progname": sys.argv[0], + "log": DEFAULT_LOG_FILENAME, + "port": DEFAULT_LISTEN_PORT, +} + +def safe_str(s): + """Return s if options.safe_logging is true, and "[scrubbed]" otherwise.""" + if options.safe_logging: + return "[scrubbed]" + else: + return s + +log_lock = threading.Lock() +def log(msg): + log_lock.acquire() + try: + print >> options.log_file, (u"%s %s" % (time.strftime(LOG_DATE_FORMAT), msg)).encode("UTF-8") + options.log_file.flush() + finally: + log_lock.release() + +def find_client_addr(body): + """Find and parse the first client line of the form + client=... + Returns None if no client line was found.""" + for line in body.splitlines(): + if line.startswith("client="): + _, client_spec = line.split("=", 1) + return fac.parse_addr_spec(client_spec) + return None + +# Return true iff the given fd is readable, writable, and executable only by its +# owner. +def check_perms(fd): + mode = os.fstat(fd)[0] + return (mode & (stat.S_IRWXG | stat.S_IRWXO)) == 0 + +class Handler(SocketServer.StreamRequestHandler): + def __init__(self, *args, **kwargs): + self.deadline = time.time() + CLIENT_TIMEOUT + self.buffer = "" + SocketServer.StreamRequestHandler.__init__(self, *args, **kwargs) + + def recv(self): + timeout = self.deadline - time.time() + self.connection.settimeout(timeout) + return self.connection.recv(1024) + + def read_input(self): + while True: + data = self.recv() + if not data: + break + self.buffer += data + if len(self.buffer) > MAX_LENGTH: + raise socket.error("refusing to buffer %d bytes (last read was %d bytes)" % (buflen, len(data))) + return self.buffer + + @fac.catch_epipe + def handle(self): + try: + b64_ciphertext = self.read_input() + except socket.error, e: + log("socket error reading input: %s" % str(e)) + return + try: + ciphertext = b64_ciphertext.decode("base64") + plaintext = rsa.private_decrypt(ciphertext, RSA.pkcs1_oaep_padding) + client_addr = find_client_addr(plaintext) + log(u"registering %s" % safe_str(fac.format_addr(client_addr))) + if fac.put_reg(FACILITATOR_ADDR, client_addr): + print >> self.wfile, "OK" + else: + print >> self.wfile, "FAIL" + except Exception, e: + log("error registering: %s" % str(e)) + print >> self.wfile, "FAIL" + raise + + finish = fac.catch_epipe(SocketServer.StreamRequestHandler.finish) + +class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): + allow_reuse_address = True + +def main(): + global rsa + + opts, args = getopt.gnu_getopt(sys.argv[1:], "dhk:l:p:", ["debug", "help", "key=", "log=", "port=", "pidfile=", "unsafe-logging"]) + for o, a in opts: + if o == "-d" or o == "--debug": + options.daemonize = False + options.log_filename = None + elif o == "-h" or o == "--help": + usage() + sys.exit() + elif o == "-k" or o == "--key": + options.key_filename = a + elif o == "-l" or o == "--log": + options.log_filename = a + elif o == "-p" or o == "--pass": + options.listen_port = int(a) + elif o == "--pidfile": + options.pid_filename = a + elif o == "--unsafe-logging": + options.safe_logging = False + + if len(args) != 0: + usage(sys.stderr) + sys.exit(1) + + # Load the private key. + if options.key_filename is None: + print >> sys.stderr, "The --key option is required." + sys.exit(1) + try: + key_file = open(options.key_filename) + except Exception, e: + print >> sys.stderr, "Failed to open private key file \"%s\": %s." % (options.key_filename, str(e)) + sys.exit(1) + try: + if not check_perms(key_file.fileno()): + print >> sys.stderr, "Refusing to run with group- or world-readable private key file. Try" + print >> sys.stderr, "\tchmod 600 %s" % options.key_filename + sys.exit(1) + rsa = RSA.load_key_string(key_file.read()) + finally: + key_file.close() + + 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(LISTEN_ADDRESS, options.listen_port, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP)[0] + + server = Server(addrinfo[4], Handler) + + log(u"start on %s" % fac.format_addr(addrinfo[4])) + + if options.daemonize: + log(u"daemonizing") + 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: + server.serve_forever() + except KeyboardInterrupt: + sys.exit(0) + +if __name__ == "__main__": + main() diff --git a/facilitator/init.d/facilitator-reg-daemon b/facilitator/init.d/facilitator-reg-daemon new file mode 100755 index 0000000..52d4890 --- /dev/null +++ b/facilitator/init.d/facilitator-reg-daemon @@ -0,0 +1,118 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: facilitator-reg-daemon +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Flash proxy local registration daemon. +# Description: Debian init script for the flash proxy local registration daemon. +### END INIT INFO +# +# Author: David Fifield <david(a)bamsoftware.com> +# + +# Based on /etc/init.d/skeleton from Debian 6. + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC="Flash proxy local registration daemon" +NAME=facilitator-reg-daemon +PIDFILE=/var/run/$NAME.pid +LOGFILE=/var/log/$NAME.log +CONFDIR=/etc/flashproxy +DAEMON=/usr/local/bin/$NAME +DAEMON_ARGS="--key $CONFDIR/reg-daemon.key --log $LOGFILE --pidfile $PIDFILE" +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x "$DAEMON" ] || exit 0 + +. /lib/init/vars.sh +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + rm -f $PIDFILE + return "$RETVAL" +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac + +:

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 07 Mar '13

07 Mar '13

commit e19be4960432b00c99b5ed7d51aede932c6b297e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 7 07:45:24 2013 +0000 Update translations for vidalia_alpha --- fa/vidalia_fa.po | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 129fcbf..f9e14c2 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.po @@ -2,6 +2,7 @@ # Translators: # Ardeshir <ardeshir(a)redteam.io>, 2012. # <behravanhamed(a)gmail.com>, 2011. +# <junk_mail_1st(a)yahoo.com>, 2013. # <mohammad(a)azeribalasi.com>, 2012. # <slander_mo(a)hotmail.com>, 2012. msgid "" @@ -9,14 +10,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-08-19 16:36+0000\n" -"Last-Translator: mohammad.s.n <mohammad(a)azeribalasi.com>\n" +"PO-Revision-Date: 2013-03-07 07:45+0000\n" +"Last-Translator: jra <junk_mail_1st(a)yahoo.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fa\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -1871,7 +1872,7 @@ msgctxt "MainWindow" msgid "" "Vidalia was unable to register for some events. Many of Vidalia's features " "may be unavailable." -msgstr "" +msgstr "ویدالیا به دلایلی قادر به ثبت نبود. بدین ترتیب بسیاری از قابلیتهای ویدالیا غیر قابل دسترسی خواهند بود." msgctxt "MainWindow" msgid "Tor Update Available" @@ -1881,7 +1882,7 @@ msgctxt "MainWindow" msgid "" "The currently installed version of Tor is out of date or no longer " "recommended. Please visit the Tor website to download the latest version." -msgstr "" +msgstr "نسخه نصب شده تور قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تور رفته و آخرین نسخه را بارگذاری کنید." msgctxt "MainWindow" msgid "Tor website: %1" @@ -1921,7 +1922,7 @@ msgctxt "MainWindow" msgid "" "The currently installed version of Tor is out of date or no longer " "recommended." -msgstr "" +msgstr "نسخه نصب شده تُر قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تُر رفته و نهایی ترین نسخه آن را بارگذاری کنید." msgctxt "MainWindow" msgid "" @@ -1936,7 +1937,7 @@ msgctxt "MainWindow" msgid "" "Tor has automatically closed your connection in order to protect your " "anonymity." -msgstr "" +msgstr "تُر به دلیل حفاظت از ناشناس بودن شما، به صورت خودکار اتصال شما را قطع کرده است." msgctxt "MainWindow" msgid "Update Failed" @@ -1969,7 +1970,7 @@ msgid "" "Anything sent over this connection could be monitored. Please check your " "application's configuration and use only encrypted protocols, such as SSL, " "if possible." -msgstr "" +msgstr "هرآنچه بوسیله این ارتباط فرستاده شود می تواند مانیتور شود. لطفاً تنظیمات برنامه را بررسی کنید و در صورت امکان تنها از پروتکل های رمزگذاری شده، از قبیل SSL استفاده کنید." msgctxt "MainWindow" msgid "toolBar" @@ -2116,7 +2117,7 @@ msgstr "خطا در بازکردن فایل گزارش" msgctxt "MessageLog" msgid "Vidalia was unable to open the specified log file." -msgstr "" +msgstr "ویدالیا قادر به باز کردن فایل گزارش مورد نظر نیست" msgctxt "MessageLog" msgid "Log Filename Required"

1 0

[torbutton/master] Bug 8423: Don't clear cookies at shutdown if user wants disk history
by mikeperry＠torproject.org 07 Mar '13

07 Mar '13

commit 7e5486a7a05e26fc9449e79170ac22b90ad47a6f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 6 18:30:26 2013 -0800 Bug 8423: Don't clear cookies at shutdown if user wants disk history We'll let them tweak the Firefox prefs for this. --- src/components/startup-observer.js | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index c3b4251..d7b7bcd 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -184,23 +184,6 @@ StartupObserver.prototype = { } } - if((this._prefs.getIntPref("extensions.torbutton.shutdown_method") == 1 && - this._prefs.getBoolPref("extensions.torbutton.tor_enabled")) - || this._prefs.getIntPref("extensions.torbutton.shutdown_method") == 2) { - var selector = - Components.classes["@torproject.org/cookie-jar-selector;1"] - .getService(Components.interfaces.nsISupports) - .wrappedJSObject; - selector.clearCookies(); - // clear the cookie jar by saving the empty cookies to it. - if(this._prefs.getIntPref("extensions.torbutton.shutdown_method") == 2) { - if(this._prefs.getBoolPref('extensions.torbutton.dual_cookie_jars')) - selector.saveCookies("tor"); - selector.saveCookies("nontor"); - } else if(this._prefs.getBoolPref('extensions.torbutton.dual_cookie_jars')) { - selector.saveCookies("tor"); - } - } this.logger.log(3, "Torbutton normal exit."); //this.unregister(); }

1 0

[torbutton/master] Emit session clearing event earlier in New Identity.
by mikeperry＠torproject.org 07 Mar '13

07 Mar '13

commit 98da166d26c6d79dbf89ed716425e5a9373f6aab Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 6 21:51:55 2013 -0800 Emit session clearing event earlier in New Identity. It clears our error console, which makes debugging hard otherwise. --- src/chrome/content/torbutton.js | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 55eb2bf..0034e1a 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1307,10 +1307,9 @@ function torbutton_new_identity() { * * XXX: intermediate SSL certificates are not cleared. */ -// XXX: Test urls: -// http://www.stevesouders.com/blog/2012/09/10/clearing-browser-data/ // Bug 1506 P4: Needed for New Identity. function torbutton_do_new_identity() { + var obsSvc = Components.classes["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService); torbutton_log(3, "New Identity: Disabling JS"); torbutton_disable_all_js(); @@ -1350,7 +1349,10 @@ function torbutton_do_new_identity() { findbox.reset(); gFindBar.close(); } - + + torbutton_log(3, "New Identity: Emitting Private Browsing Session clear event"); + obsSvc.notifyObservers(null, "browser:purge-session-history", ""); + torbutton_log(3, "New Identity: Clearing HTTP Auth"); if(m_tb_prefs.getBoolPref('extensions.torbutton.clear_http_auth')) { @@ -1466,12 +1468,8 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Closing open connections"); // Clear keep-alive - var obsSvc = Components.classes["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService); obsSvc.notifyObservers(this, "net:prune-all-connections", null); - - torbutton_log(3, "New Identity: Emitting Private Browsing Session clear event"); - obsSvc.notifyObservers(null, "browser:purge-session-history", ""); - + torbutton_log(3, "New Identity: Clearing Content Preferences"); // XXX: This may not clear zoom site-specific

1 0

[torbutton/master] Bug 6202: Rewrite cookie storing code to use JSON.
by mikeperry＠torproject.org 07 Mar '13

07 Mar '13

commit 4f585aa6cf7a5c9097fa4474fd150a5d1c291048 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Mar 6 21:55:05 2013 -0800 Bug 6202: Rewrite cookie storing code to use JSON. --- src/chrome/content/torcookie.js | 38 +---- src/components/cookie-jar-selector.js | 241 +++++++++++---------------------- 2 files changed, 88 insertions(+), 191 deletions(-) diff --git a/src/chrome/content/torcookie.js b/src/chrome/content/torcookie.js index fb8b02c..9420994 100644 --- a/src/chrome/content/torcookie.js +++ b/src/chrome/content/torcookie.js @@ -34,7 +34,8 @@ var cookiesTreeView = { getColumnProperties : function(column,columnElement,prop){}, getCellProperties : function(row,column,prop) {} }; - + +// XXX: Must match the definition in cookie-jar-selector :/ function Cookie(number,name,value,isDomain,host,rawHost,HttpOnly,path,isSecure,isSession, expires,isProtected) { this.number = number; @@ -166,24 +167,10 @@ function DeleteCookie() { function getProtectedCookies() { - var tor_enabled = prefs.getBoolPref("extensions.torbutton.tor_enabled"); - var cookiesAsXml = selector.getProtectedCookies(tor_enabled? "tor" : "nontor"); - if (cookiesAsXml == null) + var gotCookies = selector.getProtectedCookies("tor"); + if (gotCookies == null) return; - for (var i = 0; i < cookiesAsXml.cookie.length(); i++) { - var xml = cookiesAsXml.cookie[i]; - var value = xml.toString(); - var cname = xml.@name; - var host = xml.@host; - var path = xml.@path; - var expiry = xml.@expiry; - var isSecure = (xml.@isSecure == 1); - var isSession = (xml.@isSession == 1); - var isHttpOnly = (xml.@isHttpOnly == 1); - //this.logger.log(2, "Loading cookie: "+host+":"+cname+" until: "+expiry); - protectedCookies[i] = new Cookie(i,cname,value,true,host,(host.charAt(0)=="."),isHttpOnly, path, isSecure, isSession, - expiry, true) - } + protectedCookies = gotCookies; } //Tree Utils @@ -216,13 +203,8 @@ function SortTree(tree, view, table, column, lastSortColumn, lastSortAscending, if (table[s].number == selectedNumber) { // update selection // note: we need to deselect before reselecting in order to trigger ...Selected() - if (oldTreeCode) { - tree.treeBoxObject.view.selection.select(-1); - tree.treeBoxObject.view.selection.select(s); - } else { - tree.view.selection.select(-1); - tree.view.selection.select(s); - } + tree.view.selection.select(-1); + tree.view.selection.select(s); selectedRow = s; break; } @@ -389,11 +371,7 @@ function DeleteAllFromTree // update selection and/or buttons if (table.length) { // update selection to top - if (oldTreeCode) { - tree.treeBoxObject.view.selection.select(0); - } else { - tree.view.selection.select(0); - } + tree.view.selection.select(0); tree.treeBoxObject.ensureRowIsVisible(0); //if it exists is must already be protected document.getElementById(unprotButton).disabled = false; diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index c6a3ee8..c06fef7 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -20,6 +20,23 @@ const kMODULE_CID = Components.ID("e6204253-b690-4159-bfe8-d4eedab6b3be"); const Cr = Components.results; +// XXX: Must match the definition in torcookie.js :/ +function Cookie(number,name,value,isDomain,host,rawHost,HttpOnly,path,isSecure,isSession, + expires,isProtected) { + this.number = number; + this.name = name; + this.value = value; + this.isDomain = isDomain; + this.host = host; + this.rawHost = rawHost; + this.isHttpOnly = HttpOnly; + this.path = path; + this.isSecure = isSecure; + this.isSession = isSession; + this.expires = expires; + this.isProtected = isProtected; +} + function CookieJarSelector() { var Cc = Components.classes; var Ci = Components.interfaces; @@ -84,87 +101,61 @@ function CookieJarSelector() { } }; - // json would be a fine alternative to e4x, but is only available from - // gecko1.9 - // - // see http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Guide:Processing_X… - // and http://developer.mozilla.org/en/docs/E4X - // for information about e4x - this._cookiesToXml = function(getSession) { + this._cookiesToJS = function(getSession) { var cookieManager = Cc["@mozilla.org/cookiemanager;1"] .getService(Ci.nsICookieManager); var cookiesEnum = cookieManager.enumerator; - var cookiesAsXml = new XML('<cookies/>'); + var cookiesAsJS = []; + var count = 0; while (cookiesEnum.hasMoreElements()) { - var cookie = cookiesEnum.getNext().QueryInterface(Ci.nsICookie2); - var xml = <cookie>{cookie.value}</cookie>; - //this.logger.log(2, "Saving cookie: "+cookie.host+":"+cookie.name+" until: "+cookie.expiry); - xml.@name = cookie.name; - xml.@host = cookie.host; - xml.@path = cookie.path; - if (cookie.isSecure) - xml.@isSecure = 1; - if (cookie.isSession) { - xml.@isSession = 1; - // session cookies get fucked up expiry. Give it 1yr if - // the user wants to save their session cookies - xml.@expiry = Date.now()/1000 + 365*24*60*60; - } else { - xml.@expiry = cookie.expiry; - } - if (cookie.isHttpOnly) - xml.@isHttpOnly = 1; - + var nextCookie = cookiesEnum.getNext().QueryInterface(Ci.nsICookie2); + var JSCookie = new Cookie(count++, nextCookie.name, nextCookie.value, nextCookie.isDomain, nextCookie.host, + (nextCookie.host.charAt(0)==".") ? nextCookie.host.substring(1,nextCookie.host.length) : nextCookie.host, + nextCookie.isHttpOnly, nextCookie.path, nextCookie.isSecure, nextCookie.isSession, nextCookie.expires, + false); // Save either session or non-session cookies this time around: - if (cookie.isSession && getSession || - !cookie.isSession && !getSession) - cookiesAsXml.appendChild(xml); + if (JSCookie.isSession && getSession || + !JSCookie.isSession && !getSession) + cookiesAsJS.push(JSCookie); } - return cookiesAsXml; + return cookiesAsJS; }; - this._loadCookiesFromXml = function(cookiesAsXml) { - if (typeof(cookiesAsXml) == "undefined" || !cookiesAsXml) + this._loadCookiesFromJS = function(cookiesAsJS) { + if (typeof(cookiesAsJS) == "undefined" || !cookiesAsJS) return; var cookieManager = Cc["@mozilla.org/cookiemanager;1"] .getService(Ci.nsICookieManager2); - for (var i = 0; i < cookiesAsXml.cookie.length(); i++) { - var xml = cookiesAsXml.cookie[i]; - var value = xml.toString(); - var cname = xml.@name; - var host = xml.@host; - var path = xml.@path; - var expiry = xml.@expiry; - var isSecure = (xml.@isSecure == 1); - var isSession = (xml.@isSession == 1); - var isHttpOnly = (xml.@isHttpOnly == 1); + for (var i = 0; i < cookiesAsJS.length; i++) { + var cookie = cookiesAsJS[i]; //this.logger.log(2, "Loading cookie: "+host+":"+cname+" until: "+expiry); - cookieManager.add(host, path, cname, value, isSecure, - isHttpOnly, isSession, expiry); + cookieManager.add(cookie.host, cookie.path, cookie.name, cookie.value, + cookie.isSecure, cookie.isHttpOnly, cookie.isSession, + cookie.expires); } }; this._cookiesToFile = function(name) { - var file = getProfileFile("cookies-" + name + ".xml"); + var file = getProfileFile("cookies-" + name + ".json"); var foStream = Cc["@mozilla.org/network/file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); foStream.init(file, 0x02 | 0x08 | 0x20, 0666, 0); - var data = this["cookiesobj-" + name].toString(); + var data = JSON.stringify(this["cookiesobj-" + name]); foStream.write(data, data.length); foStream.close(); }; // Start1506 this._protectedCookiesToFile = function(name) { - var file = getProfileFile("protected-" + name + ".xml"); + var file = getProfileFile("protected-" + name + ".json"); var foStream = Cc["@mozilla.org/network/file-output-stream;1"] .createInstance(Ci.nsIFileOutputStream); foStream.init(file, 0x02 | 0x08 | 0x20, 0666, 0); - var data = this["protected-" + name].toString(); + var data = JSON.stringify(this["protected-" + name]); foStream.write(data, data.length); foStream.close(); }; @@ -175,34 +166,24 @@ function CookieJarSelector() { var cookies = this.getProtectedCookies(name); if (typeof(cookies) == "undefined" || cookies == null - || cookies.toString() == "") - cookies = new XML('<cookies/>'); - var xml = <cookie>{cookie.value}</cookie>; - xml.@name = cookie.name; - xml.@host = cookie.host; - xml.@path = cookie.path; - if (cookie.isSecure) - xml.@isSecure = 1; + || cookies.length == 0) + cookies = []; + if (cookie.isSession) { - xml.@isSession = 1; // session cookies get fucked up expiry. Give it 1yr if // the user wants to save their session cookies - xml.@expiry = Date.now()/1000 + 365*24*60*60; - } else { - xml.@expiry = cookie.expiry; + cookie.expires = Date.now()/1000 + 365*24*60*60; } - if (cookie.isHttpOnly) - xml.@isHttpOnly = 1; - cookies.appendChild(xml); + cookies.push(cookie); this["protected-" + name] = cookies; - if (!this.prefs.getBoolPref("extensions.torbutton." + name + "_memory_jar")) { + if (!this.prefs.getBoolPref("extensions.torbutton.block_disk")) { // save protected cookies to file this._protectedCookiesToFile(name); } else { try { - var file = getProfileFile("protected-" + name + ".xml"); + var file = getProfileFile("protected-" + name + ".json"); if (file.exists()) { file.remove(false); } @@ -213,7 +194,7 @@ function CookieJarSelector() { }; this.getProtectedCookies = function(name) { - var file = getProfileFile("protected-" + name + ".xml"); + var file = getProfileFile("protected-" + name + ".json"); if (!file.exists()) { return this["protected-" + name]; } @@ -234,7 +215,7 @@ function CookieJarSelector() { sstream.close(); fstream.close(); try { - var ret = XML(data); + var ret = JSON.parse(data); } catch(e) { // file has been corrupted; XXX: handle error differently this.logger.log(5, "Cookies corrupted: "+e); try { @@ -251,12 +232,12 @@ function CookieJarSelector() { var tor_enabled = this.prefs.getBoolPref("extensions.torbutton.tor_enabled"); var name = tor_enabled? "tor" : "nontor"; this._writeProtectCookies(cookies,name); - if (!this.prefs.getBoolPref("extensions.torbutton." + name + "_memory_jar")) { + if (!this.prefs.getBoolPref("extensions.torbutton.block_disk")) { // save protected cookies to file this._protectedCookiesToFile(name); } else { try { - var file = getProfileFile("protected-" + name + ".xml"); + var file = getProfileFile("protected-" + name + ".json"); if (file.exists()) { file.remove(false); } @@ -267,40 +248,20 @@ function CookieJarSelector() { }; this._writeProtectCookies = function(cookies, name) { - var cookieManager = - Cc["@mozilla.org/cookiemanager;1"] - .getService(Ci.nsICookieManager); - var cookiesEnum = cookieManager.enumerator; - var cookiesAsXml = new XML('<cookies/>'); for (var i = 0; i < cookies.length; i++) { - var cookie = cookies[i]; - var xml = <cookie>{cookie.value}</cookie>; - //this.logger.log(2, "Saving cookie: "+cookie.host+":"+cookie.name+" until: "+cookie.expiry); - xml.@name = cookie.name; - xml.@host = cookie.host; - xml.@path = cookie.path; - if (cookie.isSecure) - xml.@isSecure = 1; - if (cookie.isSession) { - xml.@isSession = 1; + if (cookies[i].isSession) { // session cookies get fucked up expiry. Give it 1yr if // the user wants to save their session cookies - xml.@expiry = Date.now()/1000 + 365*24*60*60; - } else { - xml.@expiry = cookie.expires; + cookies[i].expires = Date.now()/1000 + 365*24*60*60; } - if (cookie.isHttpOnly) - xml.@isHttpOnly = 1; - - // Save either session or non-session cookies this time around: - cookiesAsXml.appendChild(xml); + cookies[i].isProtected = true; } - this["protected-" + name] = cookiesAsXml; + this["protected-" + name] = cookies; }; // End1506 this._cookiesFromFile = function(name) { - var file = getProfileFile("cookies-" + name + ".xml"); + var file = getProfileFile("cookies-" + name + ".json"); if (!file.exists()) return null; var data = ""; @@ -320,7 +281,7 @@ function CookieJarSelector() { sstream.close(); fstream.close(); try { - var ret = XML(data); + var ret = JSON.parse(data); } catch(e) { // file has been corrupted; XXX: handle error differently this.logger.log(5, "Cookies corrupted: "+e); try { @@ -336,7 +297,7 @@ function CookieJarSelector() { this.saveCookies = function(name) { // transition removes old tor-style cookie file try { - var oldCookieFile = getProfileFile("cookies-"+name+this.extn); + var oldCookieFile = getProfileFile("cookies-"+name+".xml"); if (oldCookieFile.exists()) { oldCookieFile.remove(false); } @@ -344,16 +305,17 @@ function CookieJarSelector() { this.logger.log(5, "Can't remove old "+name+" file "+e); } - // save cookies to xml objects - this["session-cookiesobj-" + name] = this._cookiesToXml(true); - this["cookiesobj-" + name] = this._cookiesToXml(false); + // save cookies to JS objects + this["session-cookiesobj-" + name] = this._cookiesToJS(true); + this["cookiesobj-" + name] = this._cookiesToJS(false); - if (!this.prefs.getBoolPref("extensions.torbutton." + name + "_memory_jar")) { + if (!this.prefs.getBoolPref("extensions.torbutton.block_disk")) { // save cookies to file this._cookiesToFile(name); } else { + // Clear the old file try { - var file = getProfileFile("cookies-" + name + ".xml"); + var file = getProfileFile("cookies-" + name + ".json"); if (file.exists()) { file.remove(false); } @@ -369,10 +331,11 @@ function CookieJarSelector() { // Start1506 this.clearUnprotectedCookies = function(name) { try { - var cookiesAsXml = this.getProtectedCookies(name); - if (cookiesAsXml == null || typeof(cookiesAsXml) == "undefined" - || cookiesAsXml.toString() == "") { + var protCookies = this.getProtectedCookies(name); + if (protCookies == null || typeof(protCookies) == "undefined" + || protCookies.length == 0) { //file does not exist - no protected cookies. Clear them all. + this.logger.log(3, "No protected cookies. Clearing all cookies."); this.clearCookies(); return; } @@ -389,20 +352,18 @@ function CookieJarSelector() { if (!nextCookie) break; nextCookie = nextCookie.QueryInterface(Components.interfaces.nsICookie); - for (var i = 0; i < cookiesAsXml.cookie.length(); i++) { - var xml = cookiesAsXml.cookie[i]; - var cvalue = xml.toString(); - var cname = xml.@name; - var chost = xml.@host; - var cpath = xml.@path; - - protcookie = protcookie || (nextCookie.host == chost && nextCookie.name == cname && nextCookie.path == cpath); + for (var i = 0; i < protCookies.length; i++) { + protcookie = protcookie || (nextCookie.host == protCookies[i].host && + nextCookie.name == protCookies[i].name && + nextCookie.path == protCookies[i].path); } if (!protcookie) { cookiemanager.remove(nextCookie.host, nextCookie.name, nextCookie.path, false); + } else { + this.logger.log(3, "Found protected cookie for "+nextCookie.host); } protcookie = false; } @@ -411,50 +372,16 @@ function CookieJarSelector() { var obsSvc = Components.classes["@mozilla.org/observer-service;1"].getService(nsIObserverService); obsSvc.notifyObservers(this, "cookie-changed", "cleared"); } catch (e) { - this.logger.log(3, "Error deleting unprotected cookies: " + e); + this.logger.log(5, "Error deleting unprotected cookies: " + e); } }; // End1506 - this._oldLoadCookies = function(name, deleteSavedCookieJar) { - var cookieManager = - Cc["@mozilla.org/cookiemanager;1"] - .getService(Ci.nsICookieManager); - cookieManager.QueryInterface(Ci.nsIObserver); - - // Tell the cookie manager to unload cookies from memory and disk - var context = "shutdown-cleanse"; - cookieManager.observe(this, "profile-before-change", context); - - // Replace the cookies.txt file with the loaded data - var fn = deleteSavedCookieJar ? moveProfileFile : copyProfileFile; - fn("cookies-"+name+this.extn, "cookies"+this.extn); - - // Tell the cookie manager to reload cookies from disk - cookieManager.observe(this, "profile-do-change", context); - this.logger.log(2, "Cookies reloaded"); - }; - this.loadCookies = function(name, deleteSavedCookieJar) { // remove cookies before loading old ones this.clearCookies(); - /* transition code from old jars */ - if (!this.is_ff3) { - try { - var oldCookieFile = getProfileFile("cookies-"+name+this.extn); - if (oldCookieFile.exists()) { - this._oldLoadCookies(name, deleteSavedCookieJar); - if (oldCookieFile.exists()) { - oldCookieFile.remove(false); - } - } - } catch(e) { - this.logger.log(5, "Can't remove old "+name+" file "+e); - } - } - - if (!this.prefs.getBoolPref("extensions.torbutton." + name + "_memory_jar")) { + if (!this.prefs.getBoolPref("extensions.torbutton.block_disk")) { // load cookies from file this["cookiesobj-" + name] = this._cookiesFromFile(name); } @@ -462,7 +389,7 @@ function CookieJarSelector() { //delete file if needed if (deleteSavedCookieJar) { try { - var file = getProfileFile("cookies-" + name + ".xml"); + var file = getProfileFile("cookies-" + name + ".json"); if (file.exists()) file.remove(false); } catch(e) { @@ -470,9 +397,9 @@ function CookieJarSelector() { } } - // load cookies from xml objects - this._loadCookiesFromXml(this["cookiesobj-"+name]); - this._loadCookiesFromXml(this["session-cookiesobj-"+name]); + // load cookies from JS objects + this._loadCookiesFromJS(this["cookiesobj-"+name]); + this._loadCookiesFromJS(this["session-cookiesobj-"+name]); // XXX: send a profile-do-change event? @@ -486,14 +413,6 @@ function CookieJarSelector() { var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"] .getService(Components.interfaces.nsIVersionComparator); - if(versionChecker.compare(appInfo.version, "3.0a1") >= 0) { - this.is_ff3 = true; - this.extn = ".sqlite"; - } else { - this.is_ff3 = false; - this.extn = ".txt"; - } - // This JSObject is exported directly to chrome this.wrappedJSObject = this;

1 0

[stem/master] Replacing Controller's enable_caching constructor arg with setter
by atagar＠torproject.org 07 Mar '13

07 Mar '13

commit 27630c4d7f17052975238a0f7622ec3418bdbd5e Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 5 11:01:56 2013 -0800 Replacing Controller's enable_caching constructor arg with setter It's clunky for cache toggling to be a constructor arg since most of our users will be using from_port() or from_socket_file() instead. --- stem/control.py | 17 +++++++++++++++-- test/unit/control/controller.py | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/stem/control.py b/stem/control.py index a342fd0..85b1c8e 100644 --- a/stem/control.py +++ b/stem/control.py @@ -42,6 +42,7 @@ providing its own for interacting at a higher level. |- remove_event_listener - removes a listener so it isn't notified of further events | |- is_caching_enabled - true if the controller has enabled caching + |- set_caching - enables or disables caching |- clear_cache - clears any cached results | |- load_conf - loads configuration information as if it was in the torrc @@ -659,10 +660,10 @@ class Controller(BaseController): from_port = staticmethod(from_port) from_socket_file = staticmethod(from_socket_file) - def __init__(self, control_socket, enable_caching = True): + def __init__(self, control_socket): super(Controller, self).__init__(control_socket) - self._is_caching_enabled = enable_caching + self._is_caching_enabled = True self._request_cache = {} # mapping of event types to their listeners @@ -1585,6 +1586,18 @@ class Controller(BaseController): return self._is_caching_enabled + def set_caching(self, enabled): + """ + Enables or disables caching of information retrieved from tor. + + :param bool enabled: **True** to enable caching, **False** to disable it + """ + + self._is_caching_enabled = enabled + + if not self._is_caching_enabled: + self.clear_cache() + def clear_cache(self): """ Drops any cached results. diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index bf910f2..746d9ce 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -20,7 +20,7 @@ class TestControl(unittest.TestCase): socket = stem.socket.ControlSocket() mocking.mock_method(Controller, "add_event_listener", mocking.no_op()) - self.controller = Controller(socket, enable_caching = True) + self.controller = Controller(socket) mocking.revert_mocking() def tearDown(self):

1 0

[stem/master] Dropping the _get_pid() helper from stem.process
by atagar＠torproject.org 07 Mar '13

07 Mar '13

commit f40ab20110a1979efbffaa7854eca5ff77a5e9c3 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 6 19:56:57 2013 -0800 Dropping the _get_pid() helper from stem.process Huh, that's odd. There's a comment saying that I tried to use the mocking module for os.getpid() but it was a no-go, necessitating an ugly hack. I just tried again and it worked - maybe a bug we have since fixed with the mocking? --- stem/process.py | 6 +----- test/integ/process.py | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/stem/process.py b/stem/process.py index 4c7d118..e21b077 100644 --- a/stem/process.py +++ b/stem/process.py @@ -98,7 +98,7 @@ def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_perce runtime_args += ["-f", torrc_path] if take_ownership: - runtime_args += ["__OwningControllerProcess", _get_pid()] + runtime_args += ["__OwningControllerProcess", str(os.getpid())] tor_process = subprocess.Popen(runtime_args, stdout = subprocess.PIPE, stderr = subprocess.PIPE) @@ -241,7 +241,3 @@ def launch_tor_with_config(config, tor_cmd = "tor", completion_percent = 100, in os.remove(torrc_path) except: pass - - -def _get_pid(): - return str(os.getpid()) diff --git a/test/integ/process.py b/test/integ/process.py index a65a24b..59663f3 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -116,12 +116,8 @@ class TestProcess(unittest.TestCase): elif test.runner.require_version(self, stem.version.Requirement.TAKEOWNERSHIP): return - # Have os.getpid provide the pid of a process we can safely kill. I hate - # needing to a _get_pid() helper but after much head scratching I haven't - # been able to mock os.getpid() or posix.getpid(). - sleep_process = subprocess.Popen(['sleep', '60']) - mocking.mock(stem.process._get_pid, mocking.return_value(str(sleep_process.pid))) + mocking.mock(os.getpid, mocking.return_value(str(sleep_process.pid)), target_module = os) tor_process = stem.process.launch_tor_with_config( tor_cmd = test.runner.get_runner().get_tor_command(),

1 0

[stem/master] Mocking didn't properly revert static methods
by atagar＠torproject.org 07 Mar '13

07 Mar '13

commit de9b6220b21f0c09239181ab17a9f7554ea601eb Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 6 09:39:34 2013 -0800 Mocking didn't properly revert static methods When working on our tutorials I expanded our mocking module to handle static methods. This worked well for our unit tests, but when we reverted the mocks we did so as standard rather than static methods. This in turn broke all of our integ tests that relied upon Controller.from_port(). This went undetected because it only manifests when *both* unit and integ tests are run together (and I've only been running one or the other recently). --- test/mocking.py | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index 9ed3fbb..2a19b83 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -73,7 +73,7 @@ import stem.response MOCK_ID = itertools.count(0) -# mock_id => (module, function_name, original_function) +# mock_id => (module, function_name, original_function, is_static) MOCK_STATE = {} @@ -337,13 +337,13 @@ def mock(target, mock_call, target_module = None, is_static = False): if hasattr(target, "mock_id"): # we're overriding an already mocked function mocking_id = getattr(target, "mock_id") - target_module, target_function, _ = MOCK_STATE[mocking_id] + target_module, target_function, _, _ = MOCK_STATE[mocking_id] else: # this is a new mocking, save the original state mocking_id = MOCK_ID.next() target_module = target_module or inspect.getmodule(target) target_function = target.__name__ - MOCK_STATE[mocking_id] = (target_module, target_function, target) + MOCK_STATE[mocking_id] = (target_module, target_function, target, is_static) mock_wrapper = lambda *args, **kwargs: mock_call(*args, **kwargs) setattr(mock_wrapper, "mock_id", mocking_id) @@ -389,11 +389,11 @@ def mock_method(target_class, method_name, mock_call): if hasattr(target_method, "mock_id"): # we're overriding an already mocked method mocking_id = target_method.mock_id - _, target_method, _ = MOCK_STATE[mocking_id] + _, target_method, _, _ = MOCK_STATE[mocking_id] else: # this is a new mocking, save the original state mocking_id = MOCK_ID.next() - MOCK_STATE[mocking_id] = (target_class, method_name, target_method) + MOCK_STATE[mocking_id] = (target_class, method_name, target_method, False) mock_wrapper = lambda *args, **kwargs: mock_call(*args, **kwargs) setattr(mock_wrapper, "mock_id", mocking_id) @@ -415,7 +415,7 @@ def revert_mocking(): mock_ids.reverse() for mock_id in mock_ids: - module, function, impl = MOCK_STATE[mock_id] + module, function, impl, is_static = MOCK_STATE[mock_id] # Python 3.x renamed __builtin__ to builtins. Ideally we'd account for # this with a simple 'import __builtin__ as builtins' but that somehow @@ -428,6 +428,9 @@ def revert_mocking(): import __builtin__ builtin_module = __builtin__ + if is_static: + impl = staticmethod(impl) + if module == builtin_module: setattr(builtin_module, function, impl) else:

1 0