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

[stem/master] stem.process.launch_tor() doesn't work without stdout logging
by atagar＠torproject.org 07 Mar '13

07 Mar '13

commit a564ae2a6c24aebb822e777e7dea8bda3cffcf68 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Mar 7 09:33:37 2013 -0800 stem.process.launch_tor() doesn't work without stdout logging The launch_tor() function uses tor's stdout logs to figure out when it has finished bootstrapping. This, of course, doesn't work if tor isn't logging to stdout... https://trac.torproject.org/7677 Changing launch_tor_with_config() to slip in a 'Log NOTICE stdout' option so it always works, and adding a note to launch_tor() warning users of the requirement. --- stem/process.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/stem/process.py b/stem/process.py index e21b077..0764d7f 100644 --- a/stem/process.py +++ b/stem/process.py @@ -43,6 +43,10 @@ def launch_tor(tor_cmd = "tor", args = None, torrc_path = None, completion_perce while. Usually this is done in 50 seconds or so, but occasionally calls seem to get stuck, taking well over the default timeout. + **To work to must log at NOTICE runlevel to stdout.** It does this by + default, but if you have a 'Log' entry in your torrc then you'll also need + 'Log NOTICE stdout'. + Note: The timeout argument does not work on Windows (`ticket <https://trac.torproject.org/5783>`_) @@ -221,6 +225,25 @@ def launch_tor_with_config(config, tor_cmd = "tor", completion_percent = 100, in timeout without success """ + # we need to be sure that we're logging to stdout to figure out when we're + # done bootstrapping + + if 'Log' in config: + stdout_options = ['DEBUG stdout', 'INFO stdout', 'NOTICE stdout'] + + if isinstance(config['Log'], str): + config['Log'] = [config['Log']] + + has_stdout = False + + for log_config in config['Log']: + if log_config in stdout_options: + has_stdout = True + break + + if not has_stdout: + config['Log'].append('NOTICE stdout') + torrc_path = tempfile.mkstemp(prefix = "torrc-", text = True)[1] try:

1 0

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

07 Mar '13

commit d0721a409f17705915f0ea4426fb2c622b04594a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 7 17:16:20 2013 +0000 Update translations for torbirdy --- nb/torbirdy.properties | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/nb/torbirdy.properties b/nb/torbirdy.properties new file mode 100644 index 0000000..eb0d847 --- /dev/null +++ b/nb/torbirdy.properties @@ -0,0 +1,19 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy Aktivert: Tor +torbirdy.enabled.jondo=TorBirdy Aktivert: JonDo +torbirdy.enabled.custom=TorBirdy Aktivert: Egendefinert Proxy +torbirdy.enabled.torification=TorBirdy Aktivert: Transparent Torification +# torbirdy.enabled.whonix=TorBirdy Enabled: Whonix +torbirdy.disabled=TorBirdy: Deaktivert! + +# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. + +# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. +# torbirdy.email.advanced.nextwarning=Show this warning next time +# torbirdy.email.advanced.title=TorBirdy Advanced Settings + +# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. + +# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. +# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

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

07 Mar '13

commit 1c118c7c9dfea310328447289c32757a090a9d1d Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 01:23:45 2013 -0800 Add facilitator-reg to facilitator-howto.txt. --- doc/facilitator-howto.txt | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/doc/facilitator-howto.txt b/doc/facilitator-howto.txt index 0da4118..4952cea 100644 --- a/doc/facilitator-howto.txt +++ b/doc/facilitator-howto.txt @@ -19,8 +19,15 @@ facilitator. The email rendezvous uses the helper program facilitator-email-poller. Clients use the flashproxy-reg-email program to send an encrypted message to a Gmail address. The poller constantly checks for new -messages, decrypts and deletes them, and forwards the registrations to -the facilitator. +messages and forwards them to facilitator-reg. + +facilitator-reg is a simple program that forwards its standard input to +a locally running facilitator-reg-daemon process. + +facilitator-reg-daemon accepts connections containing encrypted client +registrations and forwards them to the facilitator. It exists as a +process of its own so that only one program requires access to the +facilitator's private key. fac.py is a Python module containing code common to the various facilitator programs. @@ -100,8 +107,8 @@ Restart servers. # make install This installs facilitator.cgi, facilitator, facilitator-email-poller, -and fac.py to /usr/local/bin. It also installs System V init files to -/etc/init.d/. +facilitator-reg-daemon, facilitator-reg, and fac.py to /usr/local/bin. +It also installs System V init files to /etc/init.d/. # update-rc.d facilitator defaults # /etc/init.d/facilitator start

1 0

[flashproxy/master] Remove unused RELAY from facilitator-email-poller init script.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit 0c61db2957d536a205c051a604de130e99502f58 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 23:45:11 2013 -0800 Remove unused RELAY from facilitator-email-poller init script. --- facilitator/init.d/facilitator-email-poller | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/facilitator/init.d/facilitator-email-poller b/facilitator/init.d/facilitator-email-poller index 94fb0a0..a41f9e0 100755 --- a/facilitator/init.d/facilitator-email-poller +++ b/facilitator/init.d/facilitator-email-poller @@ -14,9 +14,6 @@ # Based on /etc/init.d/skeleton from Debian 6. -# The relay must support the websocket pluggable transport. -RELAY=tor1.bamsoftware.com:9901 - PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="Flash proxy email rendezvous poller" NAME=facilitator-email-poller

1 0

[flashproxy/master] Move catch_epipe to fac.py.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit 6701af88e5879850a3401b343e0bb8187210057b Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 22:56:55 2013 -0800 Move catch_epipe to fac.py. --- facilitator/fac.py | 18 ++++++++++++++++++ facilitator/facilitator | 22 ++-------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index 357009c..301ba3f 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -1,6 +1,24 @@ +import errno import re import socket +# A decorator to ignore "broken pipe" errors. +def catch_epipe(fn): + def ret(self, *args): + try: + return fn(self, *args) + except socket.error, e: + try: + err_num = e.errno + except AttributeError: + # Before Python 2.6, exception can be a pair. + err_num, errstr = e + except: + raise + if err_num != errno.EPIPE: + raise + return ret + def parse_addr_spec(spec, defhost = None, defport = None, resolve = False): """Parse a host:port specification and return a 2-tuple ("host", port) as understood by the Python socket functions. diff --git a/facilitator/facilitator b/facilitator/facilitator index 0f16620..a4e0fb8 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -1,7 +1,6 @@ #!/usr/bin/env python import SocketServer -import errno import getopt import os import socket @@ -140,23 +139,6 @@ class RegSet(object): finally: self.cv.release() -# A decorator to ignore "broken pipe" errors. -def catch_epipe(fn): - def ret(self, *args): - try: - return fn(self, *args) - except socket.error, e: - try: - err_num = e.errno - except AttributeError: - # Before Python 2.6, exception can be a pair. - err_num, errstr = e - except: - raise - if err_num != errno.EPIPE: - raise - return ret - class Handler(SocketServer.StreamRequestHandler): def __init__(self, *args, **kwargs): self.deadline = time.time() + CLIENT_TIMEOUT @@ -197,7 +179,7 @@ class Handler(SocketServer.StreamRequestHandler): if buflen >= READLINE_MAX_LENGTH: raise socket.error("readline: refusing to buffer %d bytes (last read was %d bytes)" % (buflen, len(data))) - @catch_epipe + @fac.catch_epipe def handle(self): num_lines = 0 while True: @@ -295,7 +277,7 @@ class Handler(SocketServer.StreamRequestHandler): self.send_ok() return True - finish = catch_epipe(SocketServer.StreamRequestHandler.finish) + finish = fac.catch_epipe(SocketServer.StreamRequestHandler.finish) class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): allow_reuse_address = True

1 0

[flashproxy/master] Check for the facilitator process dying in facilitator-test.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit f744538cab6eaa7579bd33c12041bd1756f3b3a0 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 6 22:25:01 2013 -0800 Check for the facilitator process dying in facilitator-test. --- facilitator/facilitator-test | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index 455aa3f..cbd45f8 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -32,6 +32,9 @@ class FacilitatorTest(unittest.TestCase): time.sleep(0.1) def tearDown(self): + ret = self.process.poll() + if ret is not None: + raise Exception("facilitator subprocess exited unexpectedly with status %d" % ret) self.process.terminate() def test_timeout(self):

1 0

[flashproxy/master] Add fac.put_reg_base64.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit 669209ac77b4617b5e66d0b6390599a33e0d473b Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 00:15:09 2013 -0800 Add fac.put_reg_base64. This calls a local facilitator-reg program. --- facilitator/fac.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index 301ba3f..3a84ef4 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -1,6 +1,7 @@ import errno import re import socket +import subprocess # A decorator to ignore "broken pipe" errors. def catch_epipe(fn): @@ -261,3 +262,10 @@ def get_reg(facilitator_addr, proxy_addr): return response else: raise ValueError("Facilitator response was not \"OK\"") + +def put_reg_base64(b64): + """Attempt to add a registration by running a facilitator-reg program + locally.""" + p = subprocess.Popen(["facilitator-reg"], stdin=subprocess.PIPE) + stdout, stderr = p.communicate(b64) + return p.returncode == 0

1 0

[flashproxy/master] Move check_perms to fac.py.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit 62a54a9b715c6347300600cee0629f656915572c Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 00:19:36 2013 -0800 Move check_perms to fac.py. --- facilitator/fac.py | 8 ++++++++ facilitator/facilitator-email-poller | 8 +------- facilitator/facilitator-reg-daemon | 9 +-------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/facilitator/fac.py b/facilitator/fac.py index 3a84ef4..9d33a3e 100644 --- a/facilitator/fac.py +++ b/facilitator/fac.py @@ -1,8 +1,16 @@ import errno +import os import re import socket +import stat import subprocess +# 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 + # A decorator to ignore "broken pipe" errors. def catch_epipe(fn): def ret(self, *args): diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index f2f9466..e2a794e 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -148,12 +148,6 @@ if len(args) != 0: usage(sys.stderr) sys.exit(1) -# 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 - # Load the email password. if options.password_filename is None: print >> sys.stderr, "The --pass option is required." @@ -166,7 +160,7 @@ Failed to open password file "%s": %s.\ """ % (options.password_filename, str(e)) sys.exit(1) try: - if not check_perms(password_file.fileno()): + if not fac.check_perms(password_file.fileno()): print >> sys.stderr, "Refusing to run with group- or world-readable password file. Try" print >> sys.stderr, "\tchmod 600 %s" % options.password_filename sys.exit(1) diff --git a/facilitator/facilitator-reg-daemon b/facilitator/facilitator-reg-daemon index 996c50e..e684127 100755 --- a/facilitator/facilitator-reg-daemon +++ b/facilitator/facilitator-reg-daemon @@ -4,7 +4,6 @@ import SocketServer import getopt import os import socket -import stat import sys import threading import time @@ -85,12 +84,6 @@ def find_client_addr(body): 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 @@ -174,7 +167,7 @@ def main(): 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()): + if not fac.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)

1 0

[flashproxy/master] Use fac.put_reg_base64 in facilitator-email-poller.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit 910658c6ad2360edb36083a37593949da541afd0 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 00:17:52 2013 -0800 Use fac.put_reg_base64 in facilitator-email-poller. --- facilitator/facilitator-email-poller | 47 ++++++-------------------- facilitator/init.d/facilitator-email-poller | 2 +- 2 files changed, 12 insertions(+), 37 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index e9c5d3a..f2f9466 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -16,7 +16,7 @@ import time import fac from hashlib import sha1 -from M2Crypto import BIO, RSA, X509 +from M2Crypto import X509 DEFAULT_IMAP_HOST = "imap.gmail.com" DEFAULT_IMAP_PORT = 993 @@ -60,16 +60,11 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y # hashing the public key, not the entire certificate. PUBKEY_SHA1 = "fc54c0b2fcfcdfe4abf2f1755dfd3376f6481703".decode("hex") -# Generating an RSA keypair for use by this program: -# openssl genrsa reg-email 2048 -# chmod 600 reg-email - LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S" class options(object): email_addr = None imap_addr = None - key_filename = None password_filename = None log_filename = DEFAULT_LOG_FILENAME log_file = sys.stdout @@ -91,7 +86,7 @@ class IMAP4_SSL_REQUIRED(imaplib.IMAP4_SSL): def usage(f = sys.stdout): print >> f, """\ -Usage: %(progname)s --key=KEYFILE --pass=PASSFILE +Usage: %(progname)s --pass=PASSFILE Facilitator-side helper for the facilitator-reg-email rendezvous. Polls an IMAP server for email messages with client registrations, deletes them, and forwards the registrations to the facilitator. @@ -101,7 +96,6 @@ them, and forwards the registrations to the facilitator. -h, --help show this help. -i, --imap=HOST[:PORT] use the given IMAP server (default "%(imap_addr)s"). --imaplib-debug show raw IMAP messages (will include email password). - -k, --key=KEYFILE read a facilitator private key from KEYFILE. -l, --log FILENAME write log to FILENAME (default \"%(log)s\"). -p, --pass=PASSFILE use the email password contained in PASSFILE. --pidfile FILENAME write PID to FILENAME after daemonizing. @@ -127,7 +121,7 @@ def log(msg): options.email_addr = DEFAULT_EMAIL_ADDRESS options.imap_addr = (DEFAULT_IMAP_HOST, DEFAULT_IMAP_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "de:hi:k:l:p:", ["debug", "email=", "help", "imap=", "imaplib-debug", "key=", "log=", "pass=", "pidfile=", "unsafe-logging"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "de:hi:l:p:", ["debug", "email=", "help", "imap=", "imaplib-debug", "log=", "pass=", "pidfile=", "unsafe-logging"]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False @@ -141,8 +135,6 @@ for o, a in opts: options.imap_addr = fac.parse_addr_spec(a, DEFAULT_IMAP_HOST, DEFAULT_IMAP_PORT) if o == "--imaplib-debug": options.imaplib_debug = True - 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": @@ -182,26 +174,6 @@ try: finally: password_file.close() -# Load the private key specific to this registration method. -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. @@ -234,11 +206,14 @@ def find_client_addr(body): return None def handle_message(msg): - ciphertext = msg.get_payload().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))) - fac.put_reg(FACILITATOR_ADDR, client_addr) + try: + if fac.put_reg_base64(msg.get_payload()): + log(u"registered client") + else: + log(u"failed to register client") + except Exception, e: + log(u"error registering client") + raise def truncate_repr(s, n): if not isinstance(s, basestring): diff --git a/facilitator/init.d/facilitator-email-poller b/facilitator/init.d/facilitator-email-poller index a41f9e0..8f52845 100755 --- a/facilitator/init.d/facilitator-email-poller +++ b/facilitator/init.d/facilitator-email-poller @@ -21,7 +21,7 @@ PIDFILE=/var/run/$NAME.pid LOGFILE=/var/log/$NAME.log CONFDIR=/etc/flashproxy DAEMON=/usr/local/bin/$NAME -DAEMON_ARGS="--pass $CONFDIR/reg-email.pass --key $CONFDIR/reg-email.key --log $LOGFILE --pidfile $PIDFILE" +DAEMON_ARGS="--pass $CONFDIR/reg-email.pass --log $LOGFILE --pidfile $PIDFILE" SCRIPTNAME=/etc/init.d/$NAME # Exit if the package is not installed

1 0

[flashproxy/master] Key and pass in facilitator-howto.txt.
by dcf＠torproject.org 07 Mar '13

07 Mar '13

commit e78021c120e607c164fdd39a72f2356b623e3328 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Mar 7 00:24:25 2013 -0800 Key and pass in facilitator-howto.txt. --- doc/facilitator-howto.txt | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/doc/facilitator-howto.txt b/doc/facilitator-howto.txt index 25c0a8c..0da4118 100644 --- a/doc/facilitator-howto.txt +++ b/doc/facilitator-howto.txt @@ -164,10 +164,24 @@ Copy the new tor-facilitator.pem to the facilitator server as # /etc/init.d/apache2 restart +=== Registration daemon setup + +The facilitator-reg-daemon program requires a private RSA key (used to +decrypt encrypted client registrations). + + # openssl genrsa -out /etc/flashproxy/reg-daemon.key 2048 + # chmod 600 /etc/flashproxy/reg-daemon.key + # openssl rsa -pubout < /etc/flashproxy/reg-daemon.key > reg-daemon.pub + +You will have to edit flashproxy-reg-email and copy the contents of +reg-email.pub into the appropriate place. + +Install reg-daemon.key /etc/flashproxy to match what the init script +expects. + === Email poller setup -The facilitator-email-poller program requires a private RSA key (used to -decrypt encrypted client registrations), and a password that is used to +The facilitator-email-poller program requires a password that is used to log in to the designated Gmail account. See the file gmail-setup.txt for instructions on setting up a Gmail account. After you've set up the account and have the password, save it to a file reg-email.pass and make @@ -175,16 +189,5 @@ it not readable or writable by anyone but its owner. # chmod 600 /etc/flashproxy/reg-email.pass -You need an RSA keypair because all client registrations over email are -encrypted. - - # openssl genrsa -out /etc/flashproxy/reg-email.key 2048 - # chmod 600 /etc/flashproxy/reg-email.key - # openssl rsa -pubout < /etc/flashproxy/reg-email.key > reg-email.pub - -You will have to edit flashproxy-reg-email and copy the contents of -reg-email.pub into the appropriate place. - -Install reg-email.key and reg-email.pass to /etc/flashproxy to match -what the init script expects, or else use the --key and --pass options -if you have them stored in another place. +Install reg-email.pass to /etc/flashproxy to match what the init script +expects.

1 0