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

[tor/maint-0.2.1] Disable SSLv3 when using a not-up-to-date openssl
by nickm＠torproject.org 05 Jan '12

05 Jan '12

commit db78fe45898a6d03727f8db68642bfebdfc10bf8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 4 17:15:50 2012 -0500 Disable SSLv3 when using a not-up-to-date openssl This is to address bug 4822, and CVE-2011-4576. --- src/common/tortls.c | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index cc805f8..22b0e31 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -64,6 +64,16 @@ #define ADDR(tls) (((tls) && (tls)->address) ? tls->address : "peer") +#if (OPENSSL_VERSION_NUMBER < 0x0090813fL || \ + (OPENSSL_VERSION_NUMBER >= 0x00909000L && \ + OPENSSL_VERSION_NUMBER < 0x1000006fL)) +/* This is a version of OpenSSL before 0.9.8s/1.0.0f. It does not have + * the CVE-2011-4657 fix, and as such it can't use RELEASE_BUFFERS and + * SSL3 safely at the same time. + */ +#define DISABLE_SSL3_HANDSHAKE +#endif + /* We redefine these so that we can run correctly even if the vendor gives us * a version of OpenSSL that does not match its header files. (Apple: I am * looking at you.) @@ -739,16 +749,31 @@ tor_tls_context_new(crypto_pk_env_t *identity, unsigned int key_lifetime, result->key = crypto_pk_dup_key(rsa); } -#ifdef EVERYONE_HAS_AES - /* Tell OpenSSL to only use TLS1 */ +#if 0 + /* Tell OpenSSL to only use TLS1. This would actually break compatibility + * with clients that are configured to use SSLv23_method(), so we should + * probably never use it. + */ if (!(result->ctx = SSL_CTX_new(TLSv1_method()))) goto error; -#else +#endif + /* Tell OpenSSL to use SSL3 or TLS1 but not SSL2. */ if (!(result->ctx = SSL_CTX_new(SSLv23_method()))) goto error; SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2); + + if ( +#ifdef DISABLE_SSL3_HANDSHAKE + 1 || #endif + SSLeay() < 0x0090813fL || + (SSLeay() >= 0x00909000L && + SSLeay() < 0x1000006fL)) { + /* And not SSL3 if it's subject to CVE-2011-4657. */ + SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv3); + } + SSL_CTX_set_options(result->ctx, SSL_OP_SINGLE_DH_USE); #ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION

1 0

r25286: {website} get all the expert bundle versions (in website/trunk: . download/en)
by Erinn Clark 05 Jan '12

05 Jan '12

Author: erinn Date: 2012-01-05 18:46:55 +0000 (Thu, 05 Jan 2012) New Revision: 25286 Modified: website/trunk/Makefile website/trunk/download/en/download.wml website/trunk/publish Log: get all the expert bundle versions Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-01-05 18:40:50 UTC (rev 25285) +++ website/trunk/Makefile 2012-01-05 18:46:55 UTC (rev 25286) @@ -2,7 +2,7 @@ # # 1. Clone the Tor git repository and make TORGIT point to it: # -# git clone git://git.torproject.org/tor/ tor.git +# git clone git://git.torproject.org/tor/ tor # # Note that you will need to point to the actual .git directory. # 2. Edit include/versions.wmi or others if you like @@ -10,9 +10,9 @@ # 4. make # 5. ./publish -export TORGIT=set this to your tor.git path -export STABLETAG=tor-0.2.2.35 -export DEVTAG=tor-0.2.3.10-alpha +export TORGIT=/Users/erinn/src/tor.git/.git +export STABLETAG=tor-0.2.2.24-alpha +export DEVTAG=tor-0.2.2.24-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2012-01-05 18:40:50 UTC (rev 25285) +++ website/trunk/download/en/download.wml 2012-01-05 18:46:55 UTC (rev 25286) @@ -115,11 +115,11 @@  <div class="package"> <div class="downloads"> - <a class="button" href="../dist/win32/tor-<version-win32-stable>-win32.exe"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a> + <a class="button" href="../dist/win32/tor-<version-win32-stable>-win32-1.exe"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a> <div class="sig"> (<a href="../dist/win32/tor-<version-win32-stable>-win32-1.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <a class="additional" href="../dist/win32/tor-<version-win32-alpha>-win32-1.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>) + <a class="additional" href="../dist/win32/tor-<version-win32-alpha>-win32-1.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32-1.exe.asc">sig</a>) </div> <h2>Expert Bundle</h2> Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-01-05 18:40:50 UTC (rev 25285) +++ website/trunk/publish 2012-01-05 18:46:55 UTC (rev 25286) @@ -1,13 +1,7 @@ #!/bin/sh set -e # stop if we encounter an error -# pull the latest changes svn update - -# clean up the working directory -make clean - -# actually build the site make -j3 # don't copy over stuff with permissions that make it useless

1 0

r25285: {website} update tor expert bundle version (website/trunk/download/en)
by Erinn Clark 05 Jan '12

05 Jan '12

Author: erinn Date: 2012-01-05 18:40:50 +0000 (Thu, 05 Jan 2012) New Revision: 25285 Modified: website/trunk/download/en/download.wml Log: update tor expert bundle version Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2012-01-05 17:20:18 UTC (rev 25284) +++ website/trunk/download/en/download.wml 2012-01-05 18:40:50 UTC (rev 25285) @@ -117,9 +117,9 @@ <div class="downloads"> <a class="button" href="../dist/win32/tor-<version-win32-stable>-win32.exe"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a> <div class="sig"> - (<a href="../dist/win32/tor-<version-win32-stable>-win32.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> + (<a href="../dist/win32/tor-<version-win32-stable>-win32-1.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> </div> - <a class="additional" href="../dist/win32/tor-<version-win32-alpha>-win32.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>) + <a class="additional" href="../dist/win32/tor-<version-win32-alpha>-win32-1.exe">Download Unstable</a> (<a href="../dist/win32/tor-<version-win32-alpha>-win32.exe.asc">sig</a>) </div> <h2>Expert Bundle</h2>

1 0

[stem/master] Tidying up lower runlevel logging
by atagar＠torproject.org 05 Jan '12

05 Jan '12

commit 4788095929ab2a3bfde04ade0b2cdf52fe82dc82 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 3 18:52:14 2012 -0800 Tidying up lower runlevel logging Cleaning up the log output for DEBUG and INFO runlevels we encounter when running the unit tests to be more helpful and user friendly. --- run_tests.py | 4 +-- stem/connection.py | 2 +- stem/socket.py | 34 +++++++++++++++++++++---------- stem/util/log.py | 1 + stem/util/system.py | 2 +- test/unit/connection/authentication.py | 9 ++++++++ 6 files changed, 36 insertions(+), 16 deletions(-) diff --git a/run_tests.py b/run_tests.py index 280b05e..c0ab23d 100755 --- a/run_tests.py +++ b/run_tests.py @@ -8,7 +8,6 @@ import os import sys import time import getopt -import logging import unittest import StringIO @@ -208,10 +207,9 @@ if __name__ == '__main__': test.output.colorize, ) - stem_logger = logging.getLogger("stem") + stem_logger = log.get_logger() logging_buffer = test.output.LogBuffer(log.logging_level(logging_runlevel)) stem_logger.addHandler(logging_buffer) - stem_logger.setLevel(logging.DEBUG) if run_unit_tests: print_divider("UNIT TESTS", True) diff --git a/stem/connection.py b/stem/connection.py index 37578cf..5c1fc55 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -795,7 +795,7 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): else: unknown_auth_methods.append(method) message_id = "stem.connection.unknown_auth_%s" % method - log.log_once(message_id, log.INFO, "PROTOCOLINFO response had an unrecognized authentication method: %s" % method) + log.log_once(message_id, log.INFO, "PROTOCOLINFO response included a type of authentication that we don't recognize: %s" % method) # our auth_methods should have a single AuthMethod.UNKNOWN entry if # any unknown authentication methods exist diff --git a/stem/socket.py b/stem/socket.py index b2bde2b..d383d35 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -690,6 +690,7 @@ def recv_message(control_file): """ parsed_content, raw_content = [], "" + logging_prefix = "Error while receiving a control message (%s): " while True: try: line = control_file.readline() @@ -697,13 +698,15 @@ def recv_message(control_file): # if the control_file has been closed then we will receive: # AttributeError: 'NoneType' object has no attribute 'recv' - log.info("SocketClosed: socket file has been closed") + prefix = logging_prefix % "SocketClosed" + log.info(prefix + "socket file has been closed") raise SocketClosed("socket file has been closed") except socket.error, exc: # when disconnected we get... # socket.error: [Errno 107] Transport endpoint is not connected - log.info("SocketClosed: received an exception (%s)" % exc) + prefix = logging_prefix % "SocketClosed" + log.info(prefix + "received exception \"%s\"" % exc) raise SocketClosed(exc) raw_content += line @@ -715,16 +718,20 @@ def recv_message(control_file): # if the socket is disconnected then the readline() method will provide # empty content - log.info("SocketClosed: empty socket content") + prefix = logging_prefix % "SocketClosed" + log.info(prefix + "empty socket content") raise SocketClosed("Received empty socket content.") elif len(line) < 4: - log.info("ProtocolError: line too short (%s)" % log.escape(line)) + prefix = logging_prefix % "ProtocolError" + log.info(prefix + "line too short, \"%s\"" % log.escape(line)) raise ProtocolError("Badly formatted reply line: too short") elif not re.match(r'^[a-zA-Z0-9]{3}[-+ ]', line): - log.info("ProtocolError: malformed status code/divider (%s)" % log.escape(line)) + prefix = logging_prefix % "ProtocolError" + log.info(prefix + "malformed status code/divider, \"%s\"" % log.escape(line)) raise ProtocolError("Badly formatted reply line: beginning is malformed") elif not line.endswith("\r\n"): - log.info("ProtocolError: no CRLF linebreak (%s)" % log.escape(line)) + prefix = logging_prefix % "ProtocolError" + log.info(prefix + "no CRLF linebreak, \"%s\"" % log.escape(line)) raise ProtocolError("All lines should end with CRLF") line = line[:-2] # strips off the CRLF @@ -740,7 +747,7 @@ def recv_message(control_file): # uses a newline divider if this is a multi-line message (more readable) log_message = raw_content.replace("\r\n", "\n").rstrip() div = "\n" if "\n" in log_message else " " - log.debug("Received:" + div + log_message) + log.trace("Received from Tor:" + div + log_message) return ControlMessage(parsed_content, raw_content) elif divider == "+": @@ -749,12 +756,16 @@ def recv_message(control_file): while True: try: line = control_file.readline() - except socket.error, exc: raise SocketClosed(exc) + except socket.error, exc: + prefix = logging_prefix % "SocketClosed" + log.info(prefix + "received an exception while mid-way through a data reply (exception: \"%s\", read content: \"%s\")" % (exc, log.escape(raw_content))) + raise SocketClosed(exc) raw_content += line if not line.endswith("\r\n"): - log.info("ProtocolError: no CRLF linebreak for data entry (%s)" % log.escape(line)) + prefix = logging_prefix % "ProtocolError" + log.info(prefix + "CRLF linebreaks missing from a data reply, \"%s\"" % log.escape(raw_content)) raise ProtocolError("All lines should end with CRLF") elif line == ".\r\n": break # data block termination @@ -775,8 +786,9 @@ def recv_message(control_file): else: # this should never be reached due to the prefix regex, but might as well # be safe... - log.warn("ProtocolError: unrecognized divider type (%s)" % line) - raise ProtocolError("Unrecognized type '%s': %s" % (divider, line)) + prefix = logging_prefix % "ProtocolError" + log.warn(prefix + "\"%s\" isn't a recognized divider type" % line) + raise ProtocolError("Unrecognized divider type '%s': %s" % (divider, line)) def send_formatting(message): """ diff --git a/stem/util/log.py b/stem/util/log.py index de84ead..fc4244f 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -36,6 +36,7 @@ LOG_VALUES = { } LOGGER = logging.getLogger("stem") +LOGGER.setLevel(LOG_VALUES[TRACE]) # There's some messages that we don't want to log more than once. This set has # the messages IDs that we've logged which fall into this category. diff --git a/stem/util/system.py b/stem/util/system.py index aa1180e..40d0669 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -245,7 +245,7 @@ def get_pid_by_name(process_name): pid = results[0].strip() if pid.isdigit(): return int(pid) - log.debug("failed to resolve a pid for %s" % process_name) + log.debug("failed to resolve a pid for '%s'" % process_name) return None def get_pid_by_port(port): diff --git a/test/unit/connection/authentication.py b/test/unit/connection/authentication.py index 729e6c7..ba56ccd 100644 --- a/test/unit/connection/authentication.py +++ b/test/unit/connection/authentication.py @@ -7,6 +7,7 @@ import functools import unittest import stem.connection +import stem.util.log as log # Functors to replace get_protocolinfo and authenticate_*. All of them take any # number of arguments. @@ -106,6 +107,11 @@ class TestAuthenticate(unittest.TestCase): subclass being raised. """ + # mute the logger for this test since otherwise the output is overwhelming + + stem_logger = log.get_logger() + stem_logger.setLevel(log.logging_level(None)) + # exceptions that the authentication functions are documented to raise auth_none_exc_types = (None, stem.connection.OpenAuthRejected) @@ -151,4 +157,7 @@ class TestAuthenticate(unittest.TestCase): stem.connection.authenticate(None, "blah", protocolinfo_input) else: self.assertRaises(stem.connection.AuthenticationFailure, stem.connection.authenticate, None, "blah", protocolinfo_input) + + # revert logging back to normal + stem_logger.setLevel(log.logging_level(log.TRACE))

1 0

[stem/master] Registering TRACE and NOTICE level names
by atagar＠torproject.org 05 Jan '12

05 Jan '12

commit 228a431b06b2a89182335216b4d9cfce166c6ce9 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 4 17:34:50 2012 -0800 Registering TRACE and NOTICE level names Registering the custom TRACE and NOTICE runlevels with the logging module so their names will appear when we log a runlevel. --- stem/util/log.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/stem/util/log.py b/stem/util/log.py index fc4244f..5c5815e 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -35,6 +35,9 @@ LOG_VALUES = { Runlevel.ERROR: logging.ERROR, } +logging.addLevelName(LOG_VALUES[TRACE], "TRACE") +logging.addLevelName(LOG_VALUES[NOTICE], "NOTICE") + LOGGER = logging.getLogger("stem") LOGGER.setLevel(LOG_VALUES[TRACE]) @@ -131,4 +134,3 @@ def escape(message): return message -

1 0

[stem/master] Skipping unreliable lsof test on osx
by atagar＠torproject.org 05 Jan '12

05 Jan '12

commit ed68e97e2d6a27ee979bf75b1e1b7f3df2d6c8d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 5 10:39:09 2012 -0800 Skipping unreliable lsof test on osx On OSX the Quicklook process sometimes claims '/tmp' and possibly other common paths too, making the test unreliable there. Skipping is better than a false positive to avoiding the test when running on OSX. Caught and patch submitted by gsathya --- test/integ/util/system.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index dc06351..4f78099 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -196,6 +196,9 @@ class TestSystem(unittest.TestCase): Checks the stem.util.system.get_pid_by_open_file function. """ + # on macs this test is unreliable because Quicklook sometimes claims '/tmp' + if os.uname()[0] == "Darwin": self.skipTest("(unreliable due to Quicklook)") + # we're not running with a control socket so this just exercises the # failure case

1 0

[stem/master] Indenting multi-line logging output
by atagar＠torproject.org 05 Jan '12

05 Jan '12

commit ad5483352456ab3556068baa43db4fa97c008760 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 4 17:41:10 2012 -0800 Indenting multi-line logging output When sending logging to stdout indenting the lines in multi-line log entries to make them far more readable. --- run_tests.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run_tests.py b/run_tests.py index c0ab23d..2b1cd1e 100755 --- a/run_tests.py +++ b/run_tests.py @@ -111,8 +111,8 @@ def print_divider(msg, is_header = False): def print_logging(logging_buffer): if not logging_buffer.is_empty(): - for line in logging_buffer: - print term.format(line, term.Color.MAGENTA) + for entry in logging_buffer: + print term.format(entry.replace("\n", "\n "), term.Color.MAGENTA) print

1 0

[stem/master] Implementing TRACE level logging
by atagar＠torproject.org 05 Jan '12

05 Jan '12

commit b7e9f5c9314159679c73c707e3a6a15f5ff03fdc Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 5 10:34:09 2012 -0800 Implementing TRACE level logging Adding request/reply logging for tor and system calls. I'm also messing with the runlevels and messages of other logging to make the integ test output more readable. --- run_tests.py | 1 - stem/socket.py | 8 ++++---- stem/util/conf.py | 15 ++++++++------- stem/util/system.py | 10 +++++++--- test/runner.py | 3 --- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/run_tests.py b/run_tests.py index 2b1cd1e..8b59710 100755 --- a/run_tests.py +++ b/run_tests.py @@ -267,7 +267,6 @@ if __name__ == '__main__': for test_class in INTEG_TESTS: print_divider(test_class.__module__) - stem_logger.info("STARTING INTEGRATION TEST => %s" % test_class.__module__) suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() unittest.TextTestRunner(test_results, verbosity=2).run(suite) diff --git a/stem/socket.py b/stem/socket.py index d383d35..f3aeaf8 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -656,11 +656,13 @@ def send_message(control_file, message, raw = False): # uses a newline divider if this is a multi-line message (more readable) log_message = message.replace("\r\n", "\n").rstrip() div = "\n" if "\n" in log_message else " " - log.debug("Sending:" + div + log_message) try: control_file.write(message) control_file.flush() + + log_message = message.replace("\r\n", "\n").rstrip() + log.trace("Sent to tor:\n" + log_message) except socket.error, exc: log.info("Failed to send message: %s" % exc) raise SocketError(exc) @@ -744,10 +746,8 @@ def recv_message(control_file): # end of the message, return the message parsed_content.append((status_code, divider, content)) - # uses a newline divider if this is a multi-line message (more readable) log_message = raw_content.replace("\r\n", "\n").rstrip() - div = "\n" if "\n" in log_message else " " - log.trace("Received from Tor:" + div + log_message) + log.trace("Received from tor:\n" + log_message) return ControlMessage(parsed_content, raw_content) elif divider == "+": diff --git a/stem/util/conf.py b/stem/util/conf.py index 7111149..4c468d7 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -303,17 +303,17 @@ class Config(): if val.lower() == "true": val = True elif val.lower() == "false": val = False else: - log.info("Config entry '%s' is expected to be a boolean, defaulting to '%s'" % (key, str(default))) + log.debug("Config entry '%s' is expected to be a boolean, defaulting to '%s'" % (key, str(default))) val = default elif isinstance(default, int): try: val = int(val) except ValueError: - log.info("Config entry '%s' is expected to be an integer, defaulting to '%i'" % (key, default)) + log.debug("Config entry '%s' is expected to be an integer, defaulting to '%i'" % (key, default)) val = default elif isinstance(default, float): try: val = float(val) except ValueError: - log.info("Config entry '%s' is expected to be a float, defaulting to '%f'" % (key, default)) + log.debug("Config entry '%s' is expected to be a float, defaulting to '%f'" % (key, default)) val = default elif isinstance(default, list): pass # nothing special to do (already a list) @@ -326,7 +326,7 @@ class Config(): entryKey, entryVal = entry.split("=>", 1) valMap[entryKey.strip()] = entryVal.strip() else: - log.info("Ignoring invalid %s config entry (expected a mapping, but \"%s\" was missing \"=>\")" % (key, entry)) + log.debug("Ignoring invalid %s config entry (expected a mapping, but \"%s\" was missing \"=>\")" % (key, entry)) val = valMap return val @@ -353,7 +353,8 @@ class Config(): if not multiple: val = val[-1] self._requested_keys.add(key) else: - log.debug("config entry '%s' not found, defaulting to '%s'" % (key, default)) + message_id = "stem.util.conf.missing_config_key_%s" % key + log.log_once(message_id, log.TRACE, "config entry '%s' not found, defaulting to '%s'" % (key, default)) val = default self._contents_lock.release() @@ -387,7 +388,7 @@ class Config(): defaultStr = ", ".join([str(i) for i in default]) msg += ", defaulting to '%s'" % defaultStr - log.info(msg) + log.debug(msg) return default return conf_comp @@ -434,7 +435,7 @@ class Config(): break if error_msg: - log.info(error_msg) + log.debug(error_msg) return default else: return [int(val) for val in conf_comp] diff --git a/stem/util/system.py b/stem/util/system.py index 40d0669..5b6d9fe 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -582,13 +582,17 @@ def call(command, suppress_exc = True): try: start_time = time.time() + log.trace("Sent to system:\n" + command) stdout, stderr = subprocess.Popen(command.split(), stdout = subprocess.PIPE, stderr = subprocess.PIPE).communicate() stdout, stderr = stdout.strip(), stderr.strip() runtime = time.time() - start_time - msg = "system call: %s (runtime: %0.2f)" % (command, runtime) - if stderr: msg += "\nstderr: %s" % stderr - log.debug(msg) + if not stderr: + log.trace("Received from system:\n" + stdout) + else: + log.trace("Received from system:\nstdout: %s\nstderr: %s" % (stdout, stderr)) + + log.debug("system call: %s (runtime: %0.2f)" % (command, runtime)) if stdout: return stdout.split("\n") else: return [] diff --git a/test/runner.py b/test/runner.py index 581f95a..d6da306 100644 --- a/test/runner.py +++ b/test/runner.py @@ -455,9 +455,6 @@ class Runner: datefmt = '%D %H:%M:%S', ) - stem_logger = logging.getLogger("stem") - stem_logger.info("Logging opened for integration test run") - _print_status("done\n", STATUS_ATTR, quiet) else: _print_status(" configuring logger... skipped\n", STATUS_ATTR, quiet)

1 0

[metrics-web/master] Use less political country names.
by karsten＠torproject.org 05 Jan '12

05 Jan '12

commit bcdf0cabeb0b92369639faddeffae487719a9162 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 5 19:36:19 2012 +0100 Use less political country names. So far we used Maxmind's country names. Now we're using the names found in Wikipedia's country pages. Implements #4809. --- rserve/graphs.R | 24 ++++++++++++------------ src/org/torproject/ernie/web/Countries.java | 27 ++++++++++++--------------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 886fabf..2900c02 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -27,7 +27,7 @@ countrylist <- list( "bj" = "Benin", "bl" = "Saint Bartelemey", "bm" = "Bermuda", - "bn" = "Brunei Darussalam", + "bn" = "Brunei", "bo" = "Bolivia", "br" = "Brazil", "bs" = "the Bahamas", @@ -42,7 +42,7 @@ countrylist <- list( "cf" = "Central African Republic", "cg" = "Congo", "ch" = "Switzerland", - "ci" = "Cote d'Ivoire", + "ci" = "Côte d'Ivoire", "ck" = "the Cook Islands", "cl" = "Chile", "cm" = "Cameroon", @@ -106,7 +106,7 @@ countrylist <- list( "in" = "India", "io" = "the British Indian Ocean Territory", "iq" = "Iraq", - "ir" = "the Islamic Republic of Iran", + "ir" = "Iran", "is" = "Iceland", "it" = "Italy", "je" = "Jersey", @@ -119,12 +119,12 @@ countrylist <- list( "ki" = "Kiribati", "km" = "Comoros", "kn" = "Saint Kitts and Nevis", - "kp" = "the Democratic People's Republic of Korea", + "kp" = "North Korea", "kr" = "the Republic of Korea", "kw" = "Kuwait", "ky" = "the Cayman Islands", "kz" = "Kazakhstan", - "la" = "Lao People's Democratic Republic", + "la" = "Laos", "lb" = "Lebanon", "lc" = "Saint Lucia", "li" = "Liechtenstein", @@ -144,9 +144,9 @@ countrylist <- list( "mh" = "the Marshall Islands", "mk" = "Macedonia", "ml" = "Mali", - "mm" = "Myanmar", + "mm" = "Burma", "mn" = "Mongolia", - "mo" = "Macao", + "mo" = "Macau", "mp" = "the Northern Mariana Islands", "mq" = "Martinique", "mr" = "Mauritania", @@ -179,7 +179,7 @@ countrylist <- list( "pk" = "Pakistan", "pl" = "Poland", "pm" = "Saint Pierre and Miquelon", - "pn" = "Pitcairn", + "pn" = "the Pitcairn Islands", "pr" = "Puerto Rico", "ps" = "the Palestinian Territory", "pt" = "Portugal", @@ -189,7 +189,7 @@ countrylist <- list( "re" = "Reunion", "ro" = "Romania", "rs" = "Serbia", - "ru" = "the Russian Federation", + "ru" = "Russia", "rw" = "Rwanda", "sa" = "Saudi Arabia", "sb" = "the Solomon Islands", @@ -206,7 +206,7 @@ countrylist <- list( "sn" = "Senegal", "so" = "Somalia", "sr" = "Suriname", - "st" = "Sao Tome and Principe", + "st" = "São Tomé and Príncipe", "sv" = "El Salvador", "sy" = "the Syrian Arab Republic", "sz" = "Swaziland", @@ -217,7 +217,7 @@ countrylist <- list( "th" = "Thailand", "tj" = "Tajikistan", "tk" = "Tokelau", - "tl" = "Timor-Leste", + "tl" = "East Timor", "tm" = "Turkmenistan", "tn" = "Tunisia", "to" = "Tonga", @@ -232,7 +232,7 @@ countrylist <- list( "us" = "the United States", "uy" = "Uruguay", "uz" = "Uzbekistan", - "va" = "Vatican City State", + "va" = "Vatican City", "vc" = "Saint Vincent and the Grenadines", "ve" = "Venezuela", "vg" = "the British Virgin Islands", diff --git a/src/org/torproject/ernie/web/Countries.java b/src/org/torproject/ernie/web/Countries.java index 7149cfb..4411834 100644 --- a/src/org/torproject/ernie/web/Countries.java +++ b/src/org/torproject/ernie/web/Countries.java @@ -49,7 +49,7 @@ public class Countries { this.knownCountries.add("br;Brazil".split(";")); this.knownCountries.add("io;British Indian Ocean Territory". split(";")); - this.knownCountries.add("bn;Brunei Darussalam".split(";")); + this.knownCountries.add("bn;Brunei".split(";")); this.knownCountries.add("bg;Bulgaria".split(";")); this.knownCountries.add("bf;Burkina Faso".split(";")); this.knownCountries.add("mm;Burma".split(";")); @@ -72,7 +72,7 @@ public class Countries { this.knownCountries.add("cg;Congo".split(";")); this.knownCountries.add("ck;Cook Islands".split(";")); this.knownCountries.add("cr;Costa Rica".split(";")); - this.knownCountries.add("ci;Cote d'Ivoire".split(";")); + this.knownCountries.add("ci;Côte d'Ivoire".split(";")); this.knownCountries.add("hr;Croatia".split(";")); this.knownCountries.add("cu;Cuba".split(";")); this.knownCountries.add("cy;Cyprus".split(";")); @@ -116,15 +116,14 @@ public class Countries { this.knownCountries.add("ht;Haiti".split(";")); this.knownCountries.add("hm;Heard Island and McDonald Islands". split(";")); - this.knownCountries.add("va;Holy See (Vatican City State)". - split(";")); + this.knownCountries.add("va;Vatican City".split(";")); this.knownCountries.add("hn;Honduras".split(";")); this.knownCountries.add("hk;Hong Kong".split(";")); this.knownCountries.add("hu;Hungary".split(";")); this.knownCountries.add("is;Iceland".split(";")); this.knownCountries.add("in;India".split(";")); this.knownCountries.add("id;Indonesia".split(";")); - this.knownCountries.add("ir;Iran, Islamic Republic of".split(";")); + this.knownCountries.add("ir;Iran".split(";")); this.knownCountries.add("iq;Iraq".split(";")); this.knownCountries.add("ie;Ireland".split(";")); this.knownCountries.add("im;Isle of Man".split(";")); @@ -137,13 +136,11 @@ public class Countries { this.knownCountries.add("kz;Kazakhstan".split(";")); this.knownCountries.add("ke;Kenya".split(";")); this.knownCountries.add("ki;Kiribati".split(";")); - this.knownCountries.add("kp;Korea, Democratic People's Republic of". - split(";")); + this.knownCountries.add("kp;North Korea".split(";")); this.knownCountries.add("kr;Korea, Republic of".split(";")); this.knownCountries.add("kw;Kuwait".split(";")); this.knownCountries.add("kg;Kyrgyzstan".split(";")); - this.knownCountries.add("la;Lao People's Democratic Republic". - split(";")); + this.knownCountries.add("la;Laos".split(";")); this.knownCountries.add("lv;Latvia".split(";")); this.knownCountries.add("lb;Lebanon".split(";")); this.knownCountries.add("ls;Lesotho".split(";")); @@ -152,7 +149,7 @@ public class Countries { this.knownCountries.add("li;Liechtenstein".split(";")); this.knownCountries.add("lt;Lithuania".split(";")); this.knownCountries.add("lu;Luxembourg".split(";")); - this.knownCountries.add("mo;Macao".split(";")); + this.knownCountries.add("mo;Macau".split(";")); this.knownCountries.add("mk;Macedonia".split(";")); this.knownCountries.add("mg;Madagascar".split(";")); this.knownCountries.add("mw;Malawi".split(";")); @@ -175,7 +172,7 @@ public class Countries { this.knownCountries.add("ms;Montserrat".split(";")); this.knownCountries.add("ma;Morocco".split(";")); this.knownCountries.add("mz;Mozambique".split(";")); - this.knownCountries.add("mm;Myanmar".split(";")); + this.knownCountries.add("mm;Burma".split(";")); this.knownCountries.add("na;Namibia".split(";")); this.knownCountries.add("nr;Nauru".split(";")); this.knownCountries.add("np;Nepal".split(";")); @@ -199,14 +196,14 @@ public class Countries { this.knownCountries.add("py;Paraguay".split(";")); this.knownCountries.add("pe;Peru".split(";")); this.knownCountries.add("ph;Philippines".split(";")); - this.knownCountries.add("pn;Pitcairn".split(";")); + this.knownCountries.add("pn;Pitcairn Islands".split(";")); this.knownCountries.add("pl;Poland".split(";")); this.knownCountries.add("pt;Portugal".split(";")); this.knownCountries.add("pr;Puerto Rico".split(";")); this.knownCountries.add("qa;Qatar".split(";")); this.knownCountries.add("re;Reunion".split(";")); this.knownCountries.add("ro;Romania".split(";")); - this.knownCountries.add("ru;Russian Federation".split(";")); + this.knownCountries.add("ru;Russia".split(";")); this.knownCountries.add("rw;Rwanda".split(";")); this.knownCountries.add("bl;Saint Bartelemey".split(";")); this.knownCountries.add("sh;Saint Helena".split(";")); @@ -218,7 +215,7 @@ public class Countries { split(";")); this.knownCountries.add("ws;Samoa".split(";")); this.knownCountries.add("sm;San Marino".split(";")); - this.knownCountries.add("st;Sao Tome and Principe".split(";")); + this.knownCountries.add("st;São Tomé and Príncipe".split(";")); this.knownCountries.add("sa;Saudi Arabia".split(";")); this.knownCountries.add("sn;Senegal".split(";")); this.knownCountries.add("rs;Serbia".split(";")); @@ -245,7 +242,7 @@ public class Countries { this.knownCountries.add("tj;Tajikistan".split(";")); this.knownCountries.add("tz;Tanzania, United Republic of".split(";")); this.knownCountries.add("th;Thailand".split(";")); - this.knownCountries.add("tl;Timor-Leste".split(";")); + this.knownCountries.add("tl;East Timor".split(";")); this.knownCountries.add("tg;Togo".split(";")); this.knownCountries.add("tk;Tokelau".split(";")); this.knownCountries.add("to;Tonga".split(";"));

1 0

[vidalia/alpha] Get the current progress at connect without waiting for events
by chiiph＠torproject.org 05 Jan '12

05 Jan '12

commit 0786bf230ffc3db19a8087dd04b70e12e9db713d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Thu Jan 5 11:08:57 2012 -0300 Get the current progress at connect without waiting for events --- src/torcontrol/TorControl.cpp | 29 +++++++++++++++++++++++++++++ src/torcontrol/TorControl.h | 1 + 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index 433e1a9..5d31023 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -213,6 +213,33 @@ TorControl::disconnect() _controlConn->disconnect(); } +void +TorControl::getBootstrapPhase() +{ + ControlCommand cmd("GETINFO", "status/bootstrap-phase"); + ControlReply reply; + QString str; + + if (!send(cmd, reply, &str)) { + return; + } + + bool ok; + QHash<QString, QString> args; + args = string_parse_keyvals(reply.getMessage(), &ok); + + if(!ok) + return; + + tc::Severity severity = tc::severityFromString(args.value("status/bootstrap-phase")); + BootstrapStatus status + = BootstrapStatus(severity, + BootstrapStatus::statusFromString(args.value("TAG")), + args.value("PROGRESS").toInt(), + args.value("SUMMARY")); + emit bootstrapStatusChanged(status); +} + /** Emits a signal that the control socket disconnected from Tor */ void TorControl::onDisconnected() @@ -313,6 +340,8 @@ TorControl::onAuthenticated() /* We want to use extended events in all async events */ useFeature("EXTENDED_EVENTS"); + getBootstrapPhase(); + emit authenticated(); } diff --git a/src/torcontrol/TorControl.h b/src/torcontrol/TorControl.h index 589fa23..f3504f5 100644 --- a/src/torcontrol/TorControl.h +++ b/src/torcontrol/TorControl.h @@ -401,6 +401,7 @@ private: /* The slots below simply relay signals from the appropriate member objects */ private slots: void onStopped(int exitCode, QProcess::ExitStatus exitStatus); + void getBootstrapPhase(); void onDisconnected(); void onLogStdout(const QString &severity, const QString &message); void onAuthenticated();

1 0