- tor-commits - lists.torproject.org

[arm/master] Improving tor detection for BSD platforms
by atagar＠torproject.org 11 Oct '11

11 Oct '11

commit b1fce355c3661324f477e2698a08214035d09c10 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 11 08:47:05 2011 -0700 Improving tor detection for BSD platforms Linux and BSD platforms (mac, openbsd, and freebsd) have distinct argument sets for their ps resolvers. Taking into account for this for tor detection, guessing the family based on uname results then trying both if we guess wrong. Adding the '-a' argument to get results for all users thanks to Jordi Espasa Clofent. Tested this ps command on Mac and OpenBSD, and just guessing that FreeBSD will behave the same. --- src/util/torTools.py | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 34c9adc..a4ab70c 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -350,20 +350,27 @@ def isTorRunning(): then this returns False. """ - # suggestions welcome for making this more reliable - commandResults = sysTools.call("ps -A co command") - + # Linux and the BSD families have different variants of ps. Guess based on + # os.uname() results which to try first, then fall back to the other. + # + # Linux + # -A - Select all processes. Identical to -e. + # -co command - Shows just the base command. + # + # Mac / BSD + # -a - Display information about other users' processes as well as + # your own. + # -o ucomm= - Shows just the ucomm attribute ("name to be used for + # accounting") + + primaryResolver, secondaryResolver = "ps -A co command", "ps -ao ucomm=" + + if os.uname()[0] in ("Darwin", "FreeBSD", "OpenBSD"): + primaryResolver, secondaryResolver = secondaryResolver, primaryResolver + + commandResults = sysTools.call(primaryResolver) if not commandResults: - # OpenBSD uses a weird (and largely broken from the looks of it) version of - # ps. It lacks the -A argument and according to the man page -j, -l, and -u - # all do something similar but they fail. - # - # ucomm is defined in the man page as 'Alias: comm. Name to be used for - # accounting.' The alias part is a lie (it works, but with an error - # message), though this seems to do what we want and prints the bare - # command. - - commandResults = sysTools.call("ps -o ucomm=") + commandResults = sysTools.call(secondaryResolver) if commandResults: for cmd in commandResults:

1 0

[arm/master] Restricting OpenBSD to lsof connection resolution
by atagar＠torproject.org 11 Oct '11

11 Oct '11

commit b9446bdbb6df24fb0f042852a42e4d548c993263 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 11 09:10:40 2011 -0700 Restricting OpenBSD to lsof connection resolution Linux resolvers naturally fail on OpenBSD. I'm not sure if the bsd variants of procstat/sockstat are installable (they're definitely not around by default) so falling back ot only lsof like macs. Thanks to a test system from Jordi Espasa Clofent. --- src/util/connections.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/connections.py b/src/util/connections.py index 9350cb8..250b113 100644 --- a/src/util/connections.py +++ b/src/util/connections.py @@ -337,7 +337,7 @@ def getSystemResolvers(osType = None): if osType == "FreeBSD": resolvers = [Resolver.BSD_SOCKSTAT, Resolver.BSD_PROCSTAT, Resolver.LSOF] - elif osType == "Darwin": + elif osType in ("OpenBSD", "Darwin"): resolvers = [Resolver.LSOF] else: resolvers = [Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS]

1 0

[torbrowser/maint-2.2] add script to edit changelogs
by erinn＠torproject.org 11 Oct '11

11 Oct '11

commit ad8aa437c15a9a0943d64a9da5d163951d8f41a2 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:13:07 2011 +0100 add script to edit changelogs --- build-scripts/edit-changelog.sh | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/build-scripts/edit-changelog.sh b/build-scripts/edit-changelog.sh new file mode 100755 index 0000000..5d269de --- /dev/null +++ b/build-scripts/edit-changelog.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# Create a consistent template for adding changelog entries +# +# To use this script, simply run ./edit-changelog.sh osx (or linux, or windows) +# +# Copyright Erinn Clark 2011 <erinn(a)torproject.org> +# See LICENSE for licensing information + + +VERSION=$(make -f "$PWD"/$1.mk print-version) +TORNAME="Erinn Clark" +TOREMAIL="erinn(a)torproject.org" + +cat > $PWD/../tmp.changelog.$1 <<EOF +Tor Browser Bundle ($VERSION); suite=$1 + + * + * + * + + -- $TORNAME <$TOREMAIL> $(date) + +EOF + +mv ../changelog.$1-2.2 ../changelog.$1-2.2-old +cat ../tmp.changelog.$1 ../changelog.$1-2.2-old >> ../changelog.$1-2.2 +

1 0

[torbrowser/maint-2.2] add a recommended-versions file for mike's check.tpo user upgrade warning
by erinn＠torproject.org 11 Oct '11

11 Oct '11

commit 4fe8b9435ddef165a1b09ba7a05bfd83818ee579 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:13:26 2011 +0100 add a recommended-versions file for mike's check.tpo user upgrade warning --- build-scripts/recommended-versions | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions new file mode 100644 index 0000000..d04cab1 --- /dev/null +++ b/build-scripts/recommended-versions @@ -0,0 +1,7 @@ +[ +"2.2.33-3-Linux-i686", +"2.2.33-3-Linux-x86_64", +"2.2.33-3-MacOS-i386", +"2.2.33-3-MacOS-x86_64", +"2.2.32-3-Windows" +]

1 0

[torbrowser/maint-2.2] bump vidalia to 0.2.14, torbutton to 1.4.4., noscript to 2.1.4, all tbb build nums for 2.2.33-3
by erinn＠torproject.org 11 Oct '11

11 Oct '11

commit 637186da1c90fe0f41d724d13bb806124335922e Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:15:21 2011 +0100 bump vidalia to 0.2.14, torbutton to 1.4.4., noscript to 2.1.4, all tbb build nums for 2.2.33-3 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 11 +++++++++++ changelog.osx-2.2 | 11 +++++++++++ changelog.windows-2.2 | 11 +++++++++++ 10 files changed, 48 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 914b537..c6de227 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index dcb3e7e..1fa2a62 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 3cc6141..8faa57c 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,12 +4,12 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.14 (with Qt 4.6.2) +Vidalia 0.2.15 (with Qt 4.6.2) Tor 0.2.2.33 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0e) FirefoxPortable 7.0.1 \_ Firefox (Aurora) 7.0.1 - \_ Torbutton 1.4.3 - |_ NoScript 2.1.2.8 + \_ Torbutton 1.4.4 + |_ NoScript 2.1.4 |_ HTTPS-Everywhere 1.0.3 Usage diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 090ee8e..76949f5 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Linux ## Location of directory for source unpacking diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 5d5dbc1..d131e85 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=MacOS ## Location of directory for source unpacking diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index f36759c..035566b 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -6,14 +6,14 @@ HTTPSEVERY_VER=1.0.3 FIREFOX_VER=7.0.1 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 -NOSCRIPT_VER=2.1.2.8 +NOSCRIPT_VER=2.1.4 OPENSSL_VER=1.0.0e OTR_VER=3.2.0 PIDGIN_VER=2.6.4 QT_VER=4.6.2 TOR_VER=0.2.2.33 -TORBUTTON_VER=1.4.3 -VIDALIA_VER=0.2.14 +TORBUTTON_VER=1.4.4 +VIDALIA_VER=0.2.15 ZLIB_VER=1.2.5 ## Extension IDs diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1d9bd04..19c433f 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -31,7 +31,7 @@ ## Include versions include $(PWD)/versions.mk -BUILD_NUM=2 +BUILD_NUM=3 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 285914c..a6add26 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=linux + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn(a)torproject.org> Tue Oct 11 16:01:27 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=linux * Update Firefox to 7.0.1 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index ad31c2e..e9b6daa 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=osx + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn(a)torproject.org> Mon Oct 10 23:26:02 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=osx * Update Firefox to 7.0.1 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index f183ae4..4ccd526 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,14 @@ +Tor Browser Bundle (2.2.33-3); suite=windows + + * Update Vidalia to 0.2.15 + * Update Torbutton to 1.4.4 + * Update NoScript to 2.1.4 + * Remove trailing dash from Windows version number (closes: #4160) + * Make Tor Browser (Aurora) fail closed when not launched with a TBB profile + (closes: #4192) + + -- Erinn Clark <erinn(a)torproject.org> Tue Oct 11 16:00:57 BST 2011 + Tor Browser Bundle (2.2.33-2); suite=windows * Update Firefox to 7.0.1

1 0

[torbrowser/maint-2.2] add --enable-strip to windows and osx x86_64 mozconfigs, and remove --enable-update-channel=nightly from osx i386 mozconfig
by erinn＠torproject.org 11 Oct '11

11 Oct '11

commit e6f79a5dad3bdfe037673e44ba43e18ec1026a50 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:16:07 2011 +0100 add --enable-strip to windows and osx x86_64 mozconfigs, and remove --enable-update-channel=nightly from osx i386 mozconfig --- build-scripts/config/dot_mozconfig | 1 + build-scripts/config/mozconfig-osx-i386 | 2 -- build-scripts/config/mozconfig-osx-x86_64 | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/dot_mozconfig b/build-scripts/config/dot_mozconfig index 934e4f4..9333a6f 100755 --- a/build-scripts/config/dot_mozconfig +++ b/build-scripts/config/dot_mozconfig @@ -4,5 +4,6 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser ac_add_options --enable-optimize +ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug diff --git a/build-scripts/config/mozconfig-osx-i386 b/build-scripts/config/mozconfig-osx-i386 index 231bb9e..ffc90c5 100644 --- a/build-scripts/config/mozconfig-osx-i386 +++ b/build-scripts/config/mozconfig-osx-i386 @@ -23,8 +23,6 @@ ac_add_options --target=i386-apple-darwin$DARWIN_VERSION ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk ac_add_options --enable-macos-target=10.5 ac_add_options --enable-application=browser -ac_add_options --enable-update-packaging -ac_add_options --enable-update-channel=nightly ac_add_options --enable-optimize ac_add_options --enable-strip ac_add_options --disable-debug diff --git a/build-scripts/config/mozconfig-osx-x86_64 b/build-scripts/config/mozconfig-osx-x86_64 index f62f68b..febba50 100755 --- a/build-scripts/config/mozconfig-osx-x86_64 +++ b/build-scripts/config/mozconfig-osx-x86_64 @@ -23,5 +23,6 @@ ac_add_options --disable-crashreporter ac_add_options --enable-application=browser ac_add_options --enable-libzul ac_add_options --enable-optimize +ac_add_options --enable-strip ac_add_options --disable-tests ac_add_options --disable-debug

1 0

[torbrowser/maint-2.2] update winrar path in windows makefile
by erinn＠torproject.org 11 Oct '11

11 Oct '11

commit d535ee8f812ba769830d6fc203fe9654cbeaefc0 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 16:21:30 2011 +0100 update winrar path in windows makefile --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 19c433f..aec0239 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -53,7 +53,7 @@ SEVENZIP="/c/Program Files/7-Zip/7z.exe" PYGET=$(PYTHON) $(PWD)/pyget.py WGET=wget VIRUSSCAN=$(PYTHON) $(PWD)/virus-scan.py -WINRAR="/c/Program Files/WinRAR/WinRAR.exe" +WINRAR="/c/Program Files/WinRAR (x86)/WinRAR.exe" CC=gcc

1 0

[torbrowser/maint-2.2] add target to tag releases
by erinn＠torproject.org 11 Oct '11

11 Oct '11

commit 98e786ba3b1274809557b2f83c236d9f9dff32c5 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Oct 11 17:17:17 2011 +0100 add target to tag releases --- build-scripts/windows.mk | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index aec0239..302c631 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -472,6 +472,10 @@ write-tbb-version: printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)-$(BUILD_NUM)-$(PLATFORM)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js +## Tag the release +releasetag: + git tag -s torbrowser-$(VERSION) -m "tagging $(VERSION)" + ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp

1 0

[tor/master] Fix a bunch of whitespace errors
by nickm＠torproject.org 11 Oct '11

11 Oct '11

commit 69921837a743d551576b3b157657623a0bb96308 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 11 11:30:01 2011 -0400 Fix a bunch of whitespace errors --- src/common/tortls.h | 3 ++- src/or/buffers.c | 11 ++++++----- src/or/command.c | 6 +++--- src/or/config.c | 6 +++--- src/or/connection_or.c | 12 ++++++------ src/or/connection_or.h | 6 ++++-- src/or/hibernate.c | 1 + src/or/rendclient.c | 4 ++-- 8 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/common/tortls.h b/src/common/tortls.h index 90e76e4..d0a13cd 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -111,7 +111,8 @@ struct bufferevent *tor_tls_init_bufferevent(tor_tls_t *tls, #endif void tor_cert_free(tor_cert_t *cert); -tor_cert_t *tor_cert_decode(const uint8_t *certificate, size_t certificate_len); +tor_cert_t *tor_cert_decode(const uint8_t *certificate, + size_t certificate_len); void tor_cert_get_der(const tor_cert_t *cert, const uint8_t **encoded_out, size_t *size_out); const digests_t *tor_cert_get_id_digests(const tor_cert_t *cert); diff --git a/src/or/buffers.c b/src/or/buffers.c index c589fba..f4aac0f 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1005,14 +1005,15 @@ fetch_from_buf(char *string, size_t string_len, buf_t *buf) return (int)buf->datalen; } -/** True iff the cell command command is one that implies a variable-length - * cell in Tor link protocol linkproto. */ +/** True iff the cell command command is one that implies a + * variable-length cell in Tor link protocol linkproto. */ static inline int cell_command_is_var_length(uint8_t command, int linkproto) { - /* If linkproto is v2 (2), CELL_VERSIONS is the only variable-length cells work as - * implemented here. If it's 1, there are no variable-length cells. Tor - * does not support other versions right now, and so can't negotiate them. + /* If linkproto is v2 (2), CELL_VERSIONS is the only variable-length cells + * work as implemented here. If it's 1, there are no variable-length cells. + * Tor does not support other versions right now, and so can't negotiate + * them. */ switch (linkproto) { case 1: diff --git a/src/or/command.c b/src/or/command.c index a511156..1b8ddb3 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -1016,7 +1016,6 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) if (! tor_tls_cert_is_valid(id_cert, id_cert, 1)) ERR("The ID certificate was not valid"); - log_info(LD_OR, "Got some good certificates from %s:%d: " "Waiting for AUTHENTICATE.", safe_str(conn->_base.address), conn->_base.port); @@ -1026,7 +1025,7 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) } conn->handshake_state->received_cert_cell = 1; -err: + err: tor_cert_free(id_cert); tor_cert_free(link_cert); tor_cert_free(auth_cert); @@ -1100,7 +1099,8 @@ command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn) return; } } else { - log_info(LD_OR, "Got an AUTH_CHALLENGE cell from %s:%d: Not authenticating", + log_info(LD_OR, "Got an AUTH_CHALLENGE cell from %s:%d: Not " + "authenticating", safe_str(conn->_base.address), conn->_base.port); } #undef ERR diff --git a/src/or/config.c b/src/or/config.c index 1304c46..e72630d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5134,9 +5134,9 @@ warn_nonlocal_client_ports(const smartlist_t *ports, const char *portname) "use it as an open proxy. Please don't allow this unless you " "have a good reason.", portname); } else if (!tor_addr_is_loopback(&port->addr)) { - log_notice(LD_CONFIG, "You configured a non-loopback address for %sPort. " - "This allows everybody on your local network to use your " - "machine as a proxy. Make sure this is what you wanted.", + log_notice(LD_CONFIG, "You configured a non-loopback address for " + "%sPort. This allows everybody on your local network to use " + "your machine as a proxy. Make sure this is what you wanted.", portname); } } SMARTLIST_FOREACH_END(port); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index bcae075..14da698 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1185,8 +1185,8 @@ connection_tls_continue_handshake(or_connection_t *conn) "handshake."); return connection_or_launch_v3_or_handshake(conn); } else { - log_debug(LD_OR, "Done with initial SSL handshake (client-side). " - "Requesting renegotiation."); + log_debug(LD_OR, "Done with initial SSL handshake (client-side)." + " Requesting renegotiation."); conn->_base.state = OR_CONN_STATE_TLS_CLIENT_RENEGOTIATING; goto again; } @@ -1564,7 +1564,6 @@ connection_or_launch_v3_or_handshake(or_connection_t *conn) return connection_or_send_versions(conn, 1); } - /** Allocate a new connection handshake state for the connection * conn. Return 0 on success, -1 on failure. */ int @@ -1964,8 +1963,8 @@ connection_or_send_cert_cell(or_connection_t *conn) tor_cert_get_der(link_cert, &link_encoded, &link_len); tor_cert_get_der(id_cert, &id_encoded, &id_len); - cell_len = 1 /* 1 octet: num certs in cell */ + - 2 * ( 1 + 2 ) /* For each cert: 1 octet for type, 2 for length */ + + cell_len = 1 /* 1 byte: num certs in cell */ + + 2 * ( 1 + 2 ) /* For each cert: 1 byte for type, 2 for length */ + link_len + id_len; cell = var_cell_new(cell_len); cell->command = CELL_CERT; @@ -2178,7 +2177,7 @@ connection_or_send_authenticate_cell(or_connection_t *conn, int authtype) /* XXXX make sure we're actually supposed to send this! */ if (!pk) { - log_warn(LD_BUG, "Unable to compute authenticate cell: no client auth key"); + log_warn(LD_BUG, "Can't compute authenticate cell: no client auth key"); return -1; } if (authtype != AUTHTYPE_RSA_SHA256_TLSSECRET) { @@ -2216,3 +2215,4 @@ connection_or_send_authenticate_cell(or_connection_t *conn, int authtype) return 0; } + diff --git a/src/or/connection_or.h b/src/or/connection_or.h index de3a989..df009ab 100644 --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@ -41,9 +41,11 @@ void connection_or_report_broken_states(int severity, int domain); int connection_tls_start_handshake(or_connection_t *conn, int receiving); int connection_tls_continue_handshake(or_connection_t *conn); -int connection_init_or_handshake_state(or_connection_t *conn, int started_here); +int connection_init_or_handshake_state(or_connection_t *conn, + int started_here); void connection_or_init_conn_from_address(or_connection_t *conn, - const tor_addr_t *addr, uint16_t port, + const tor_addr_t *addr, + uint16_t port, const char *id_digest, int started_here); int connection_or_client_learned_peer_id(or_connection_t *conn, diff --git a/src/or/hibernate.c b/src/or/hibernate.c index c8357e5..6e4c9f2 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -1017,3 +1017,4 @@ hibernate_set_state_for_testing_(hibernate_state_t newstate) { hibernate_state = newstate; } + diff --git a/src/or/rendclient.c b/src/or/rendclient.c index fc2657d..1038378 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -366,8 +366,8 @@ rend_client_introduction_acked(origin_circuit_t *circ, safe_str_client(circ->rend_data->onion_address), safe_str_client(extend_info_describe(circ->build_state->chosen_exit))); if (rend_client_report_intro_point_failure(circ->build_state->chosen_exit, - circ->rend_data, - INTRO_POINT_FAILURE_GENERIC)>0){ + circ->rend_data, + INTRO_POINT_FAILURE_GENERIC)>0) { /* There are introduction points left. Re-extend the circuit to * another intro point and try again. */ int result = rend_client_reextend_intro_circuit(circ);

1 0

[stem/master] Basic unit tests for ControlMessage
by atagar＠torproject.org 11 Oct '11

11 Oct '11

commit 5b1a7e8f2d375db5ad4d3c212fbae93ed4724277 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 10 21:24:58 2011 -0700 Basic unit tests for ControlMessage Just some sanity checks that ControlMessage parses common GETINFO responses. I'll expand on these including some error cases next. --- run_tests.py | 32 ++++++++++++++--- stem/connection.py | 9 +++-- stem/types.py | 9 +++-- test/unit/__init__.py | 2 +- test/unit/message.py | 87 +++++++++++++++++++++++++++++++++++++++++++++++++ test/unit/version.py | 2 +- 6 files changed, 125 insertions(+), 16 deletions(-) diff --git a/run_tests.py b/run_tests.py index e1c0811..78f392d 100755 --- a/run_tests.py +++ b/run_tests.py @@ -7,13 +7,19 @@ Runs unit and integration tests. import sys import getopt import unittest +import test.unit.message import test.unit.version from stem.util import enum, term OPT = "uit:h" OPT_EXPANDED = ["unit", "integ", "targets=", "help"] -DIVIDER = "=" * 80 +DIVIDER = "=" * 70 + +# (name, class) tuples for all of our unit tests +UNIT_TESTS = (("stem.types.ControlMessage", test.unit.message.TestMessageFunctions), + ("stem.types.Version", test.unit.version.TestVerionFunctions), + ) # Configurations that the intergration tests can be ran with. Attributs are # tuples of the test runner and description. @@ -87,15 +93,29 @@ if __name__ == '__main__': sys.exit() if run_unit_tests: - print "%s\nUnit Tests\n%s\n" % (DIVIDER, DIVIDER) + print "%s\n%s\n%s\n" % (DIVIDER, "UNIT TESTS".center(70), DIVIDER) + + for name, test_class in UNIT_TESTS: + print "%s\n%s\n%s\n" % (DIVIDER, name, DIVIDER) + #print name + suite = unittest.TestLoader().loadTestsFromTestCase(test_class) + unittest.TextTestRunner(verbosity=2).run(suite) + print + + #import test.unit + #suite = unittest.TestLoader().loadTestsFromTestCase(test.unit.version.TestVerionFunctions) + #suite = unittest.TestLoader().discover("test/unit/", "*.py") + #suite.addTests(unittest.loader.loadTestsFromTestCase(test.unit.message.TestMessageFunctions)) - suite = unittest.TestLoader().loadTestsFromTestCase(test.unit.version.TestVerionFunctions) - unittest.TextTestRunner(verbosity=2).run(suite) + #suite = unittest.TestLoader() + #suite.loadTestsFromTestCase(test.unit.message.TestMessageFunctions) + #suite.loadTestsFromTestCase(test.unit.version.TestVerionFunctions) + #unittest.TextTestRunner(verbosity=2).run(suite) - print "" + print if run_integ_tests: - print "%s\nIntegration Tests\n%s\n" % (DIVIDER, DIVIDER) + print "%s\n%s\n%s\n" % (DIVIDER, "INTEGRATION TESTS".center(70), DIVIDER) for target in integ_targets: runner, description = TARGET_ATTR[target] diff --git a/stem/connection.py b/stem/connection.py index 5e1fe5e..4853864 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -14,7 +14,7 @@ class ControlConnection: """ Connection to a Tor control port. This is a very lightweight wrapper around the socket, providing basic process communication and event listening. Don't - use this directly - subclasses provide frendlier controller access. + use this directly - subclasses provide friendlier controller access. """ def __init__(self, control_socket): @@ -59,7 +59,8 @@ class ControlConnection: whenever we receive an event from the control socket. Arguments: - event_message (ControlMessage) - message received from the control socket + event_message (types.ControlMessage) - message received from the control + socket """ pass @@ -72,7 +73,7 @@ class ControlConnection: message (str) - message to be sent to the control socket Returns: - ControlMessage with the response from the control socket + types.ControlMessage with the response from the control socket """ # makes sure that the message ends with a CRLF @@ -88,7 +89,7 @@ class ControlConnection: def _event_loop(self): """ Continually pulls messages from the _event_thread and sends them to - handle_event. This is done via its own thread so subclasses with a lenghty + handle_event. This is done via its own thread so subclasses with a lengthy handle_event implementation don't block further reading from the socket. """ diff --git a/stem/types.py b/stem/types.py index c73a769..d37f9a1 100644 --- a/stem/types.py +++ b/stem/types.py @@ -1,5 +1,6 @@ """ -Classes for miscellaneous tor object. This includes... +Class representations for a variety of tor objects. These are most commonly +return values rather than being instantiated by users directly. ProtocolError - Malformed socket data. ControlSocketClosed - Socket terminated. @@ -92,12 +93,12 @@ def read_message(control_file): line = line[:-2] # strips off the CRLF - # lines starting with a pariod are escaped by a second period (as per + # lines starting with a period are escaped by a second period (as per # section 2.4 of the control-spec) if line.startswith(".."): line = line[1:] # appends to previous content, using a newline rather than CRLF - # separator (more contentional for multi-line string content outside + # separator (more conventional for multi-line string content outside # the windows world) content += "\n" + line @@ -247,7 +248,7 @@ class Version: def __cmp__(self, other): """ - Simple comparision of versions. An undefined patch level is treated as zero + Simple comparison of versions. An undefined patch level is treated as zero and status tags are compared lexically (as per the version spec). """ diff --git a/test/unit/__init__.py b/test/unit/__init__.py index d7db1bd..52a6924 100644 --- a/test/unit/__init__.py +++ b/test/unit/__init__.py @@ -2,5 +2,5 @@ Unit tests for the stem library. """ -__all__ = ["version"] +__all__ = ["message", "version"] diff --git a/test/unit/message.py b/test/unit/message.py new file mode 100644 index 0000000..dde2c9c --- /dev/null +++ b/test/unit/message.py @@ -0,0 +1,87 @@ +""" +Unit tests for the types.ControlMessage parsing and class. +""" + +import StringIO +import unittest +import stem.types + +GETINFO_VERSION_REPLY = """250-version=0.2.2.23-alpha (git-b85eb949b528f4d7)\r +250 OK\r +""" + +GETINFO_INFONAMES_REPLY = """250+info/names=\r +accounting/bytes -- Number of bytes read/written so far in the accounting interval.\r +accounting/bytes-left -- Number of bytes left to write/read so far in the accounting interval.\r +accounting/enabled -- Is accounting currently enabled?\r +accounting/hibernating -- Are we hibernating or awake?\r +stream-status -- List of current streams.\r +version -- The current version of Tor.\r +.\r +250 OK\r +""" + +class TestMessageFunctions(unittest.TestCase): + """ + Tests methods and functions related to 'types.ControlMessage'. This uses + StringIO to make 'files' to mock socket input. + """ + + def test_getinfo_results(self): + """ + Checks parsing against some actual GETINFO responses. + """ + + # GETINFO version (basic single-line results) + message = self.assert_message_parses(GETINFO_VERSION_REPLY) + self.assertEquals(2, len(list(message))) + self.assertEquals(2, len(str(message).split("\n"))) + + # manually checks the contents + contents = message.content() + self.assertEquals(2, len(contents)) + self.assertEquals(("250", "-", "version=0.2.2.23-alpha (git-b85eb949b528f4d7)"), contents[0]) + self.assertEquals(("250", " ", "OK"), contents[1]) + + # GETINFO info/names (data entry) + message = self.assert_message_parses(GETINFO_INFONAMES_REPLY) + self.assertEquals(2, len(list(message))) + self.assertEquals(8, len(str(message).split("\n"))) + + # manually checks the contents + contents = message.content() + self.assertEquals(2, len(contents)) + + first_entry = (contents[0][0], contents[0][1], contents[0][2][:contents[0][2].find("\n")]) + self.assertEquals(("250", "+", "info/names="), first_entry) + self.assertEquals(("250", " ", "OK"), contents[1]) + + def assert_message_parses(self, controller_reply): + """ + Performs some basic sanity checks that a reply mirrors its parsed result. + + Returns: + types.ControlMessage for the given input + """ + + message = stem.types.read_message(StringIO.StringIO(controller_reply)) + + # checks that the raw_content equals the input value + self.assertEqual(controller_reply, message.raw_content()) + + # checks that the contents match the input + message_lines = str(message).split("\n") + controller_lines = controller_reply.split("\r\n") + controller_lines.pop() # the ControlMessage won't have a trailing newline + + while controller_lines: + line = controller_lines.pop(0) + + # mismatching lines with just a period are probably data termination + if line == "." and (not message_lines or line != message_lines[0]): + continue + + self.assertTrue(line.endswith(message_lines.pop(0))) + + return message + diff --git a/test/unit/version.py b/test/unit/version.py index f241a8c..0c4a34a 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -1,5 +1,5 @@ """ -Unit tests for types functions and classes. +Unit tests for the types.Version parsing and class. """ import unittest

1 0