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

[vidalia/alpha] Properly name a private member variable and mark the Torrc as changed if a key is cleared
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 3a56ccd23d99242bc51f935538b3491f2b8169f9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 17:17:24 2012 -0300 Properly name a private member variable and mark the Torrc as changed if a key is cleared --- src/vidalia/config/torrc/Torrc.cpp | 11 ++++++----- src/vidalia/config/torrc/Torrc.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/vidalia/config/torrc/Torrc.cpp b/src/vidalia/config/torrc/Torrc.cpp index 8e96f89..18dd64d 100644 --- a/src/vidalia/config/torrc/Torrc.cpp +++ b/src/vidalia/config/torrc/Torrc.cpp @@ -19,7 +19,7 @@ #include <QtGlobal> Torrc::Torrc(const QString &torrcPath, const QString &defaultsPath) : - QObject(), _torrcPath(torrcPath), changed(false) + QObject(), _torrcPath(torrcPath), _changed(false) { load(torrcPath, defaultsPath); } @@ -39,7 +39,7 @@ Torrc::load(const QString &torrcPath, const QString &defaultsPath) bool Torrc::apply(TorControl *tc, QString *errmsg) { - if(not changed) + if(not _changed) return true; QFile torrc(_torrcPath); @@ -70,7 +70,7 @@ Torrc::apply(TorControl *tc, QString *errmsg) clearAll(); load(_torrcPath); - changed = false; + _changed = false; bool ret = true; if(tc && tc->isConnected()) { @@ -155,7 +155,7 @@ Torrc::setValue(const QString &key, const QString &value, const QString &comment .arg(value)); if(not comment.isEmpty() and val.second.line()->comment().isEmpty()) val.second.line()->setComment(comment); - changed = true; + _changed = true; return; } else if(not val.second.isMultilined() and val.first == value) { // if it's the same, leave it like that @@ -164,7 +164,7 @@ Torrc::setValue(const QString &key, const QString &value, const QString &comment } } - changed = true; + _changed = true; TorrcLine *line = new TorrcLine(QString("%1 %2") .arg(key) @@ -212,6 +212,7 @@ Torrc::clear(QStringList &keys) } } _torrcMap.remove(key); + _changed = true; } } diff --git a/src/vidalia/config/torrc/Torrc.h b/src/vidalia/config/torrc/Torrc.h index fcdc6a3..9d45742 100644 --- a/src/vidalia/config/torrc/Torrc.h +++ b/src/vidalia/config/torrc/Torrc.h @@ -71,7 +71,7 @@ class Torrc : public QObject QString _torrcPath; /** True if the config options have been changed */ - bool changed; + bool _changed; }; #endif

1 0

[vidalia/alpha] Merge branch 'pickExitNodes' into alpha
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit ecf45324bec86c7c1a3a2b2ceb3ac441734cadda Merge: be9059d d7786e7 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 14:35:35 2012 -0300 Merge branch 'pickExitNodes' into alpha changes/pickExitNodes | 9 ++++ src/torcontrol/TorControl.cpp | 7 ++- src/vidalia/VMessageBox.cpp | 2 +- src/vidalia/config/AdvancedPage.cpp | 6 ++- src/vidalia/config/TorSettings.cpp | 50 +++++++++++++++++--- src/vidalia/config/TorSettings.h | 5 ++ src/vidalia/config/VidaliaSettings.cpp | 13 +++++ src/vidalia/config/VidaliaSettings.h | 10 ++++- src/vidalia/network/NetViewer.cpp | 2 + src/vidalia/network/RouterListItem.cpp | 57 ++++++++++++++++++++++ src/vidalia/network/RouterListItem.h | 13 +++++ src/vidalia/network/RouterListWidget.cpp | 75 +++++++++++++++++++++++++++++- src/vidalia/network/RouterListWidget.h | 7 +++ 13 files changed, 241 insertions(+), 15 deletions(-)

1 0

[vidalia/alpha] Merge branch 'fixRouterOfflineNotification' into alpha
by chiiph＠torproject.org 12 Jun '12

12 Jun '12

commit 6278c9ecac595e91af7c9f10d25144f454d53075 Merge: 3a56ccd 0c5f2db Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sat Jun 9 17:18:13 2012 -0300 Merge branch 'fixRouterOfflineNotification' into alpha changes/fixRouterOfflineNotification | 3 +++ src/vidalia/network/NetViewer.cpp | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-)

1 0

[tor/master] forward-port the 0.2.2.37 changelog
by arma＠torproject.org 12 Jun '12

12 Jun '12

commit 7516b4ac99fddf05f54dadaeaee95e49c729a36c Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 12 07:50:34 2012 -0400 forward-port the 0.2.2.37 changelog --- ChangeLog | 27 +++++++++++++++++++++++++++ ReleaseNotes | 27 +++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72a3f2e..cc7663c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,33 @@ Changes in version 0.2.3.17-alpha - 2012-06-?? CircuitBuildTimeout is set unreasonably low. Resolves ticket 5452. +Changes in version 0.2.2.37 - 2012-06-06 + Tor 0.2.2.37 introduces a workaround for a critical renegotiation + bug in OpenSSL 1.0.1 (where 20% of the Tor network can't talk to itself + currently). + + o Major bugfixes: + - Work around a bug in OpenSSL that broke renegotiation with TLS + 1.1 and TLS 1.2. Without this workaround, all attempts to speak + the v2 Tor connection protocol when both sides were using OpenSSL + 1.0.1 would fail. Resolves ticket 6033. + - When waiting for a client to renegotiate, don't allow it to add + any bytes to the input buffer. This fixes a potential DoS issue. + Fixes bugs 5934 and 6007; bugfix on 0.2.0.20-rc. + - Fix an edge case where if we fetch or publish a hidden service + descriptor, we might build a 4-hop circuit and then use that circuit + for exiting afterwards -- even if the new last hop doesn't obey our + ExitNodes config option. Fixes bug 5283; bugfix on 0.2.0.10-alpha. + + o Minor bugfixes: + - Fix a build warning with Clang 3.1 related to our use of vasprintf. + Fixes bug 5969. Bugfix on 0.2.2.11-alpha. + + o Minor features: + - Tell GCC and Clang to check for any errors in format strings passed + to the tor_v*(print|scan)f functions. + + Changes in version 0.2.3.16-alpha - 2012-06-05 Tor 0.2.3.16-alpha introduces a workaround for a critical renegotiation bug in OpenSSL 1.0.1 (where 20% of the Tor network can't talk to itself diff --git a/ReleaseNotes b/ReleaseNotes index 563f94d..93e38fa 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,33 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.2.37 - 2012-06-06 + Tor 0.2.2.37 introduces a workaround for a critical renegotiation + bug in OpenSSL 1.0.1 (where 20% of the Tor network can't talk to itself + currently). + + o Major bugfixes: + - Work around a bug in OpenSSL that broke renegotiation with TLS + 1.1 and TLS 1.2. Without this workaround, all attempts to speak + the v2 Tor connection protocol when both sides were using OpenSSL + 1.0.1 would fail. Resolves ticket 6033. + - When waiting for a client to renegotiate, don't allow it to add + any bytes to the input buffer. This fixes a potential DoS issue. + Fixes bugs 5934 and 6007; bugfix on 0.2.0.20-rc. + - Fix an edge case where if we fetch or publish a hidden service + descriptor, we might build a 4-hop circuit and then use that circuit + for exiting afterwards -- even if the new last hop doesn't obey our + ExitNodes config option. Fixes bug 5283; bugfix on 0.2.0.10-alpha. + + o Minor bugfixes: + - Fix a build warning with Clang 3.1 related to our use of vasprintf. + Fixes bug 5969. Bugfix on 0.2.2.11-alpha. + + o Minor features: + - Tell GCC and Clang to check for any errors in format strings passed + to the tor_v*(print|scan)f functions. + + Changes in version 0.2.2.36 - 2012-05-24 Tor 0.2.2.36 updates the addresses for two of the eight directory authorities, fixes some potential anonymity and security issues,

1 0

r25674: {website} tag and upload 0.2.2.37, since i see signed packages for it (website/trunk/include)
by Roger Dingledine 12 Jun '12

12 Jun '12

Author: arma Date: 2012-06-12 11:40:14 +0000 (Tue, 12 Jun 2012) New Revision: 25674 Modified: website/trunk/include/versions.wmi Log: tag and upload 0.2.2.37, since i see signed packages for it Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-06-05 22:31:26 UTC (rev 25673) +++ website/trunk/include/versions.wmi 2012-06-12 11:40:14 UTC (rev 25674) @@ -1,4 +1,4 @@ -<define-tag version-stable whitespace=delete>0.2.2.36</define-tag> +<define-tag version-stable whitespace=delete>0.2.2.37</define-tag> <define-tag version-alpha whitespace=delete>0.2.3.16-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.36</define-tag>

1 0

[torspec/master] tiny touchups to proposal 189
by arma＠torproject.org 12 Jun '12

12 Jun '12

commit f72544e7cd1b881b460413dc9c9683223e39c012 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 12 06:36:25 2012 -0400 tiny touchups to proposal 189 --- proposals/189-authorize-cell.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/189-authorize-cell.txt b/proposals/189-authorize-cell.txt index 09f74e6..87bffe0 100644 --- a/proposals/189-authorize-cell.txt +++ b/proposals/189-authorize-cell.txt @@ -108,13 +108,13 @@ Status: Open 4.3. How should multiple round-trip authorization protocols be handled? - Protocols that require multiple-round trips between the client and + Protocols that require multiple round trips between the client and the bridge should use AUTHORIZE cells for communication. The format of the AUTHORIZE cell is flexible enough to support messages from the client to the bridge and the reverse. - At the end of a successful multiple round-trip protocol, an + At the end of a successful multiple-round-trip protocol, an AUTHORIZED cell must be issued from the bridge to the client. 4.4. AUTHORIZED seems useless. Why not use VPADDING instead?

1 0

[torspec/master] add in a point that rransom and i independently came up with
by arma＠torproject.org 12 Jun '12

12 Jun '12

commit 37c8237aafdb416507be0eeb8638ec0c9f01e5a4 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 12 06:32:01 2012 -0400 add in a point that rransom and i independently came up with --- proposals/188-bridge-guards.txt | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/proposals/188-bridge-guards.txt b/proposals/188-bridge-guards.txt index 3c53cfb..5a5a005 100644 --- a/proposals/188-bridge-guards.txt +++ b/proposals/188-bridge-guards.txt @@ -32,7 +32,7 @@ Status: Open same way clients do. This has been a known attack since early versions {XXXX check} of the design document; let's try to fix it. -2.1. Related ideas: Guard nodes +2.1. Related idea: Guard nodes The idea of guard nodes isn't new: since 0.1.1, Tor has used guard nodes (first designed as "Helper" nodes by Wright et al in {XXXX}) @@ -203,6 +203,12 @@ Status: Open from learning that we're a bridge... but another set of nodes will learn that anyway, so it's not clear what we'd gain. + One good reason to keep separate guard lists is to prevent the + *client* of the bridge from being able to enumerate the guards that + the bridge uses to protect its own traffic (by extending a circuit + through the bridge to a node it controls, and finding out where the + extend request arrives from). + 5. Other considerations What fraction of our traffic is bridge traffic? Will this alter

1 0

[tor/master] fold in changes files so far
by arma＠torproject.org 12 Jun '12

12 Jun '12

commit 2294d16113e65a935cb07aa4a1f918b3bdf73d44 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 12 04:21:39 2012 -0400 fold in changes files so far --- ChangeLog | 38 ++++++++++++++++++++++++++++++++++++++ changes/bug2865 | 4 ---- changes/bug3886 | 5 ----- changes/bug4592 | 3 --- changes/bug5235_log | 4 ---- changes/bug5452 | 4 ---- changes/bug5598 | 5 ----- changes/bug5909 | 5 ----- changes/bug6094 | 8 -------- changes/fix_unicode | 3 --- 10 files changed, 38 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index de1861d..72a3f2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +Changes in version 0.2.3.17-alpha - 2012-06-?? + + o Major bugfixes: + - When building Tor on Windows with -DUNICODE (not default), ensure + that error messages, filenames, and DNS server names are always + NUL-terminated when we convert them to a single-byte encoding. + Fixes bug 5909; bugfix on 0.2.2.16-alpha. + - Change the default value for DynamicDHGroups (introduced in + 0.2.3.9-alpha) to 0. This feature can make Tor relays less + identifiable by their use of the mod_ssl DH group, but at + the cost of some usability (#4721) and bridge tracing (#6087) + regressions. Resolves ticket 5598. + - Send a CRLF at the end of each STATUS_* control protocol event. This + bug tickled a bug in Vidalia which would make it freeze. Fixes + bug 6094; bugfix on 0.2.3.16-alpha. + + o Minor bugfixes: + - Detect SSL handshake even when the initial attempt to write the + server hello fails. Fixes bug 4592; bugfix on 0.2.0.13-alpha. + - Make Tor build correctly again with -DUNICODE -D_UNICODE defined. + Fixes bug 6097; bugfix on 0.2.2.16-alpha. + - Fix an edge case where TestingTorNetwork is set but the authorities + and relays all have an uptime of zero, where the private Tor network + could briefly lack support for hidden services. Fixes bug 3886; + bugfix on 0.2.2.18-alpha. + - Correct the manpage's descriptions for the default values of + DirReqStatistics and ExtraInfoStatistics. Fixes bug 2865; bugfix + on 0.2.3.1-alpha. + + o Minor features: + - Rate-limit the "Weighted bandwidth is 0.000000" message, and add + more information to it, so that we can track it down in case it + returns again. Mitigates bug 5235. + - Check CircuitBuildTimeout and LearnCircuitBuildTimeout in + options_validate(); warn if LearnCircuitBuildTimeout is disabled and + CircuitBuildTimeout is set unreasonably low. Resolves ticket 5452. + + Changes in version 0.2.3.16-alpha - 2012-06-05 Tor 0.2.3.16-alpha introduces a workaround for a critical renegotiation bug in OpenSSL 1.0.1 (where 20% of the Tor network can't talk to itself diff --git a/changes/bug2865 b/changes/bug2865 deleted file mode 100644 index 4a7a332..0000000 --- a/changes/bug2865 +++ /dev/null @@ -1,4 +0,0 @@ - o Documentation fixes: - - Correct the manpage's descriptions for the default values of - DirReqStatistics and ExtraInfoStatistics. Fixes bug 2865; bugfix - on 0.2.3.1-alpha. diff --git a/changes/bug3886 b/changes/bug3886 deleted file mode 100644 index 691d4ef..0000000 --- a/changes/bug3886 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix an edge case where TestingTorNetwork is set but the authorities - and relays all have an uptime of zero, where the private Tor network - could briefly lack support for hidden services. Fixes bug 3886; - bugfix on 0.2.2.18-alpha. diff --git a/changes/bug4592 b/changes/bug4592 deleted file mode 100644 index 31140b0..0000000 --- a/changes/bug4592 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Detect SSL handshake even when the initial attempt to write the - server hello fails. Fix for bug 4592; bugfix on 0.2.0.13-alpha. diff --git a/changes/bug5235_log b/changes/bug5235_log deleted file mode 100644 index 2448a00..0000000 --- a/changes/bug5235_log +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Rate-limit the "Weighted bandwidth is 0.000000" message, and add - more information to it, so that we can track it down in case it - returns again. Mitigates bug 5235. diff --git a/changes/bug5452 b/changes/bug5452 deleted file mode 100644 index 8e1d9ad..0000000 --- a/changes/bug5452 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Check CircuitBuildTimeout and LearnCircuitBuildTimeout in - options_validate(); warn if LearnCircuitBuildTimeout is disabled - and CircuitBuildTimeout is set unreasonably low. Fixes bug 5452. diff --git a/changes/bug5598 b/changes/bug5598 deleted file mode 100644 index e8e6741..0000000 --- a/changes/bug5598 +++ /dev/null @@ -1,5 +0,0 @@ - o Changed defaults: - - Change the default value for DynamicDHGroups to 0. This feature can - make Tor relays less identifiable by their use of the mod_ssl DH - group, but at the cost of some usability (#4721) and bridge tracing - (#6087) regressions. Resolves ticket #5598. diff --git a/changes/bug5909 b/changes/bug5909 deleted file mode 100644 index 61990fa..0000000 --- a/changes/bug5909 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - When building Tor on Windows with -DUNICODE (not default), - ensure that error messages, filenames, and DNS server names are - always NUL-terminated when we convert them to a single-byte - encoding. Fixes bug 5909; bugfix on 0.2.2.16-alpha. diff --git a/changes/bug6094 b/changes/bug6094 deleted file mode 100644 index 835d127..0000000 --- a/changes/bug6094 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes: - - - Send a CRLF at the end of each STATUS_* control-port event. A - change introduced in 0.2.3.16-alpha caused Tor to emit the CRLF - in the middle of a STATUS_* event; among other things, this - caused Vidalia to freeze. Fixes bug 6094; bugfix on - 0.2.3.16-alpha. - diff --git a/changes/fix_unicode b/changes/fix_unicode deleted file mode 100644 index b97c393..0000000 --- a/changes/fix_unicode +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Make Tor build correctly again with -DUNICODE -D_UNICODE defined. - Bugfix on 0.2.2.16-alpha; fixes bug 6097.

1 0

[stem/master] Adding future 'with' import and checking for it
by atagar＠torproject.org 12 Jun '12

12 Jun '12

commit c52042c44b5a157dceb6013743fdea40bbc3f52c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 11 10:01:17 2012 -0700 Adding future 'with' import and checking for it Stem aims for python 2.5 compatability, but in that version the 'with' keyword wasn't available by default and would only function with a 'future' import. This has the possability of being a continuing pain in our ass so adding this as a check to the check_whitespace module. Admittedly this isn't a whitespace issue, but that module is just so damn conveninent for lintian style issues too... While doing this I discovered that we aren't running the checker over the stem module (just the tests, it seems), so something else to fix... --- test/check_whitespace.py | 14 ++++++++++++++ test/integ/connection/authentication.py | 2 ++ test/integ/control/base_controller.py | 2 ++ test/integ/control/controller.py | 2 ++ test/integ/descriptor/extrainfo_descriptor.py | 2 ++ test/integ/descriptor/reader.py | 2 ++ test/integ/descriptor/server_descriptor.py | 2 ++ test/integ/response/protocolinfo.py | 2 ++ test/integ/socket/control_message.py | 2 ++ test/integ/socket/control_socket.py | 2 ++ test/runner.py | 2 ++ 11 files changed, 34 insertions(+), 0 deletions(-) diff --git a/test/check_whitespace.py b/test/check_whitespace.py index db97130..5aed7fa 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -6,6 +6,12 @@ which are... * tabs are the root of all evil and should be shot on sight * no trailing whitespace unless the line is empty, in which case it should have the same indentation as the surrounding code + +This also checks for 2.5 compatability issues (yea, they're not whitespace but +it's so much easier to do here...): + +* checks that anything using the 'with' keyword has... + from __future__ import with_statement """ import re @@ -32,10 +38,18 @@ def get_issues(base_path = DEFAULT_TARGET): for file_path in _get_python_files(base_path): with open(file_path) as f: file_contents = f.read() lines, file_issues, prev_indent = file_contents.splitlines(), [], 0 + has_with_import, given_with_warning = False, False for i in xrange(len(lines)): whitespace, content = re.match("^(\s*)(.*)$", lines[i]).groups() + if content == "from __future__ import with_statement": + has_with_import = True + elif content.startswith("with ") and content.endswith(":") \ + and not has_with_import and not given_with_warning: + file_issues.append((i + 1, "missing 'with' import (from __future__ import with_statement)")) + given_with_warning = True + if "\t" in whitespace: file_issues.append((i + 1, "indentation has a tab")) elif content != content.rstrip(): diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index 4f1d504..31407a3 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -3,6 +3,8 @@ Integration tests for authenticating to the control socket via stem.connection.authenticate* functions. """ +from __future__ import with_statement + import os import unittest diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index 32239d2..ab5ded5 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -2,6 +2,8 @@ Integration tests for the stem.control.BaseController class. """ +from __future__ import with_statement + import re import time import unittest diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 1b743e1..b3eb523 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -2,6 +2,8 @@ Integration tests for the stem.control.Controller class. """ +from __future__ import with_statement + import unittest import stem.control diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index d7244a9..45d1a2b 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -2,6 +2,8 @@ Integration tests for stem.descriptor.extrainfo_descriptor. """ +from __future__ import with_statement + import os import datetime import unittest diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 0e6c867..bebb917 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -2,6 +2,8 @@ Integration tests for stem.descriptor.reader. """ +from __future__ import with_statement + import os import sys import time diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 449fb2f..0af3cdf 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -2,6 +2,8 @@ Integration tests for stem.descriptor.server_descriptor. """ +from __future__ import with_statement + import os import datetime import unittest diff --git a/test/integ/response/protocolinfo.py b/test/integ/response/protocolinfo.py index 6b7e397..a80f406 100644 --- a/test/integ/response/protocolinfo.py +++ b/test/integ/response/protocolinfo.py @@ -3,6 +3,8 @@ Integration tests for the stem.response.protocolinfo.ProtocolInfoResponse class and related functions. """ +from __future__ import with_statement + import unittest import test.runner diff --git a/test/integ/socket/control_message.py b/test/integ/socket/control_message.py index c148605..1578917 100644 --- a/test/integ/socket/control_message.py +++ b/test/integ/socket/control_message.py @@ -2,6 +2,8 @@ Integration tests for the stem.response.ControlMessage class. """ +from __future__ import with_statement + import re import unittest diff --git a/test/integ/socket/control_socket.py b/test/integ/socket/control_socket.py index b00e381..1f06027 100644 --- a/test/integ/socket/control_socket.py +++ b/test/integ/socket/control_socket.py @@ -8,6 +8,8 @@ those focus on parsing and correctness of the content these are more concerned with the behavior of the socket itself. """ +from __future__ import with_statement + import unittest import stem.connection diff --git a/test/runner.py b/test/runner.py index 8c01c3e..7d053cb 100644 --- a/test/runner.py +++ b/test/runner.py @@ -33,6 +33,8 @@ about the tor test instance they're running against. +- get_tor_command - provides the command used to start tor """ +from __future__ import with_statement + import os import sys import time

1 0

[stem/master] Whitespace checker wasn't checking non-tests
by atagar＠torproject.org 12 Jun '12

12 Jun '12

commit c1450e440e388295a329e84b3e935bf86f88e673 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 11 19:01:34 2012 -0700 Whitespace checker wasn't checking non-tests The whitespace checker was being ran with its default target, which is the directory of that file (in this case, test). Explicitely running over everything else, and fixing the issues that it found. --- run_tests.py | 4 +++- stem/connection.py | 4 +++- stem/control.py | 2 ++ stem/descriptor/reader.py | 2 ++ stem/descriptor/server_descriptor.py | 2 +- stem/process.py | 2 ++ stem/response/__init__.py | 2 ++ stem/socket.py | 2 ++ stem/util/conf.py | 2 ++ stem/util/system.py | 6 +++--- test/check_whitespace.py | 6 +++++- 11 files changed, 27 insertions(+), 7 deletions(-) diff --git a/run_tests.py b/run_tests.py index 6a6aa09..3029094 100755 --- a/run_tests.py +++ b/run_tests.py @@ -369,7 +369,9 @@ if __name__ == '__main__': # TODO: note unused config options afterward? - whitespace_issues = test.check_whitespace.get_issues() + whitespace_issues = test.check_whitespace.get_issues("stem") + whitespace_issues.update(test.check_whitespace.get_issues("test")) + whitespace_issues.update(test.check_whitespace.get_issues("run_tests.py")) if whitespace_issues: test.output.print_line("WHITESPACE ISSUES", term.Color.BLUE, term.Attr.BOLD) diff --git a/stem/connection.py b/stem/connection.py index ddd4be3..e22a2d0 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -84,6 +84,8 @@ the authentication process. For instance... +- NoAuthCookie - Supports cookie auth but doesn't have its path. """ +from __future__ import with_statement + import os import getpass import binascii @@ -549,7 +551,7 @@ def authenticate_safecookie(controller, cookie_path, suppress_ctl_errors = True) 2. generate a hash digest using the challenge received in the first step, and use it to authenticate the controller - The IncorrectCookieSize and UnreadableCookieFile exceptions take + The IncorrectCookieSize and UnreadableCookieFile exceptions take precedence over the other exception types. The AuthChallengeUnsupported, UnrecognizedAuthChallengeMethod, diff --git a/stem/control.py b/stem/control.py index dbad4da..71b81bc 100644 --- a/stem/control.py +++ b/stem/control.py @@ -26,6 +26,8 @@ interacting at a higher level. +- __enter__ / __exit__ - manages socket connection """ +from __future__ import with_statement + import time import Queue import threading diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 499ded1..01f77df 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -71,6 +71,8 @@ again... +- FileMissing - File does not exist. """ +from __future__ import with_statement + import os import tarfile import threading diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index ec49a55..99080ab 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -438,7 +438,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): elif keyword == "uptime": # We need to be tolerant of negative uptimes to accomidate a past tor # bug... - # + # # Changes in version 0.1.2.7-alpha - 2007-02-06 # - If our system clock jumps back in time, don't publish a negative # uptime in the descriptor. Also, don't let the global rate limiting diff --git a/stem/process.py b/stem/process.py index b0e5015..36ef7b9 100644 --- a/stem/process.py +++ b/stem/process.py @@ -15,6 +15,8 @@ Helper functions for working with tor as a process. launch_tor_with_config - starts a tor process with a custom torrc """ +from __future__ import with_statement + import re import os import signal diff --git a/stem/response/__init__.py b/stem/response/__init__.py index a4eac7a..dfae1d3 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -23,6 +23,8 @@ Parses replies from the control socket. +- pop_mapping - removes and returns the next entry as a KEY=VALUE mapping """ +from __future__ import with_statement + __all__ = ["getinfo", "protocolinfo", "authchallenge", "convert", "ControlMessage", "ControlLine"] import re diff --git a/stem/socket.py b/stem/socket.py index 2a9e737..1a14c82 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -32,7 +32,9 @@ as instances of the :class:`stem.response.ControlMessage` class. +- SocketClosed - Socket has been shut down. """ +from __future__ import with_statement from __future__ import absolute_import + import re import socket import threading diff --git a/stem/util/conf.py b/stem/util/conf.py index 1c67696..70287c2 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -64,6 +64,8 @@ There are many ways of using the Config class but the most common ones are... +- get_int_csv - gets a value as a comma separated list of integers """ +from __future__ import with_statement + import threading import stem.util.log as log diff --git a/stem/util/system.py b/stem/util/system.py index 559eaa0..a27d121 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -192,7 +192,7 @@ def get_pid_by_name(process_name): # PID # 3283 # 3392 - # + # # atagar$ ps axc # PID TT STAT TIME COMMAND # 1 ?? Ss 9:00.22 launchd @@ -309,7 +309,7 @@ def get_pid_by_port(port): # # TODO: We need an example for the actual command we're using. I'm # # suspecting that replacing the grep with checking the local port works, # # but should double check. - # + # # # sockstat -4 | grep tor # _tor tor 4397 7 tcp4 51.64.7.84:9050 *:* # _tor tor 4397 8 udp4 51.64.7.84:53 *:* @@ -469,7 +469,7 @@ def get_bsd_jail_id(pid): # Output when called from a FreeBSD jail or when Tor isn't jailed: # JID # 0 - # + # # Otherwise it's something like: # JID # 1 diff --git a/test/check_whitespace.py b/test/check_whitespace.py index 5aed7fa..6c47cab 100644 --- a/test/check_whitespace.py +++ b/test/check_whitespace.py @@ -39,14 +39,18 @@ def get_issues(base_path = DEFAULT_TARGET): with open(file_path) as f: file_contents = f.read() lines, file_issues, prev_indent = file_contents.splitlines(), [], 0 has_with_import, given_with_warning = False, False + is_block_comment = False for i in xrange(len(lines)): whitespace, content = re.match("^(\s*)(.*)$", lines[i]).groups() + if '"""' in content: + is_block_comment = not is_block_comment + if content == "from __future__ import with_statement": has_with_import = True elif content.startswith("with ") and content.endswith(":") \ - and not has_with_import and not given_with_warning: + and not has_with_import and not given_with_warning and not is_block_comment: file_issues.append((i + 1, "missing 'with' import (from __future__ import with_statement)")) given_with_warning = True

1 0