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

[torbrowser/master] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 10 Dec '12

10 Dec '12

commit b2e32f48ed60e38c64c8f65d1a3e8b3ad7fd08a3 Merge: cd8ddac d986c08 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 10 16:07:05 2012 +0000 Merge branch 'maint-2.3' into maint-2.4 build-scripts/linux.mk | 4 ++-- build-scripts/osx.mk | 4 ++-- build-scripts/windows.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)

1 0

[stem/master] Add enumeration of RELAY_END reasons
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 69a2c8193fd613ce057b6d0adb466a21437ef5ff Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 8 19:20:38 2012 -0700 Add enumeration of RELAY_END reasons This is for the reason to be given with the CLOSESTREAM command. NONE is a filler to make the remaining reasons start at offset one and will be rejected by the server, so it is not listed in the pydoc. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/__init__.py | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index cddf033..5eb6737 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -159,6 +159,29 @@ Library for working with the tor process. **HSSR_JOINED** connected to the rendezvous-point ============================= =========== +.. data:: RelayEndReason (enum) + + Enumeration for possible reasons to close a stream. + + =================== =========== + RelayEndReason Description + =================== =========== + **MISC** catch-all for unlisted reasons + **RESOLVEFAILED** couldn't look up hostname + **CONNECTREFUSED** remote host refused connection + **EXITPOLICY** OR refuses to connect to host or port + **DESTROY** Circuit is being destroyed + **DONE** Anonymized TCP connection was closed + **TIMEOUT** Connection timed out, or OR timed out while connecting + **NOROUTE** Routing error while attempting to contact destination + **HIBERNATING** OR is temporarily hibernating + **INTERNAL** Internal error at the OR + **RESOURCELIMIT** OR has no resources to fulfill request + **CONNRESET** Connection was unexpectedly reset + **TORPROTOCOL** Sent when closing connection because of Tor protocol violations. + **NOTDIRECTORY** Client sent RELAY_BEGIN_DIR to a non-directory relay. + =================== =========== + .. data:: StreamStatus (enum) State that a stream going through tor can have. Tor may provide states not in @@ -521,6 +544,24 @@ HiddenServiceState = stem.util.enum.UppercaseEnum( "HSSR_JOINED", ) +RelayEndReason = stem.util.enum.UppercaseEnum( + "NONE", + "MISC", + "RESOLVEFAILED", + "CONNECTREFUSED", + "EXITPOLICY", + "DESTROY", + "DONE", + "TIMEOUT", + "NOROUTE", + "HIBERNATING", + "INTERNAL", + "RESOURCELIMIT", + "CONNRESET", + "TORPROTOCOL", + "NOTDIRECTORY", +) + StreamStatus = stem.util.enum.UppercaseEnum( "NEW", "NEWRESOLVE",

1 0

[stem/master] Consolidating how StreamClosureReason is made
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 786624951b627ae76370ab3afe38997552b80ae2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 9 14:23:42 2012 -0800 Consolidating how StreamClosureReason is made --- stem/__init__.py | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 092413b..9dd0cb5 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -574,16 +574,11 @@ StreamStatus = stem.util.enum.UppercaseEnum( "CLOSED", ) -# add STREAM event specific reasons to the list of RELAY_END reasons -_tmp_StreamClosureReason = [v for v in RelayEndReason] -_tmp_StreamClosureReason.extend(( +# StreamClosureReason is a superset of RelayEndReason +StreamClosureReason = stem.util.enum.UppercaseEnum(*(RelayEndReason.keys() + ( "END", "PRIVATE_ADDR", -)) -# build UppercaseEnum from extended list -StreamClosureReason = stem.util.enum.UppercaseEnum(*_tmp_StreamClosureReason) -# remove temporary list -del _tmp_StreamClosureReason +))) StreamSource = stem.util.enum.UppercaseEnum( "CACHE",

1 0

[stem/master] Deduplicating RelayEndReason vs StreamClosureReason
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 33547a2b346b07f900d81be08f2dcd19451ea434 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 9 14:33:21 2012 -0800 Deduplicating RelayEndReason vs StreamClosureReason StreamClosureReason is a superset of RelayEndReason so there's no need to list both. Merging the enum descriptions and having StreamClosureReason refer to RelayEndReason. Also added RelayEndReason to __all__ so wildcard imports will pick it up. --- stem/__init__.py | 46 +++++++++++++++++----------------------------- 1 files changed, 17 insertions(+), 29 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 9dd0cb5..5d6d8fb 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -166,20 +166,20 @@ Library for working with the tor process. =================== =========== RelayEndReason Description =================== =========== - **MISC** catch-all for unlisted reasons - **RESOLVEFAILED** couldn't look up hostname - **CONNECTREFUSED** remote host refused connection - **EXITPOLICY** OR refuses to connect to host or port - **DESTROY** Circuit is being destroyed - **DONE** Anonymized TCP connection was closed - **TIMEOUT** Connection timed out, or OR timed out while connecting - **NOROUTE** Routing error while attempting to contact destination - **HIBERNATING** OR is temporarily hibernating - **INTERNAL** Internal error at the OR - **RESOURCELIMIT** OR has no resources to fulfill request - **CONNRESET** Connection was unexpectedly reset - **TORPROTOCOL** Sent when closing connection because of Tor protocol violations. - **NOTDIRECTORY** Client sent RELAY_BEGIN_DIR to a non-directory relay. + **MISC** none of the following reasons + **RESOLVEFAILED** unable to resolve the hostname + **CONNECTREFUSED** remote host refused the connection + **EXITPOLICY** OR refuses to connect to the destination + **DESTROY** circuit is being shut down + **DONE** connection has been closed + **TIMEOUT** connection timed out + **NOROUTE** routing error while contacting the destination + **HIBERNATING** relay is temporarily hibernating + **INTERNAL** internal error at the relay + **RESOURCELIMIT** relay has insufficient resources to service the request + **CONNRESET** connection was unexpectedly reset + **TORPROTOCOL** violation in the tor protocol + **NOTDIRECTORY** directory information requested from a relay that isn't mirroring it =================== =========== .. data:: StreamStatus (enum) @@ -203,26 +203,13 @@ Library for working with the tor process. .. data:: StreamClosureReason (enum) - Reason that a stream is being closed or failed to be established. Tor may + Reason that a stream is being closed or failed to be established. This + includes all values in the :data:`~stem.RelayEndReason` enumeration. Tor may provide reasons not in this enum. ===================== =========== StreamClosureReason Description ===================== =========== - **MISC** none of the following reasons - **RESOLVEFAILED** unable to resolve the hostname - **CONNECTREFUSED** remote host refused the connection - **EXITPOLICY** rejected by the exit due to its exit policy - **DESTROY** circuit is being shut down - **DONE** connection has been closed - **TIMEOUT** connection timed out - **NOROUTE** routing error while contacting the destination - **HIBERNATING** relay is hibernating - **INTERNAL** internal error - **RESOURCELIMIT** relay has insufficient resources to service the request - **CONNRESET** connection has been reset - **TORPROTOCOL** violation in the tor protocol - **NOTDIRECTORY** directory information requested from a relay that isn't mirroring it **END** endpoint has sent a RELAY_END cell **PRIVATE_ADDR** endpoint was a private address (127.0.0.1, 10.0.0.1, etc) ===================== =========== @@ -393,6 +380,7 @@ __all__ = [ "CircClosureReason", "CircEvent", "HiddenServiceState", + "RelayEndReason", "StreamStatus", "StreamClosureReason", "StreamSource",

1 0

[stem/master] Build StreamClosureReason as a superset of RelayEndReason
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 545f251b698281b5cd6bd3f704242c9fdafaa36b Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 8 19:24:28 2012 -0700 Build StreamClosureReason as a superset of RelayEndReason Explicitly make StreamClosureReason rely on RelayEndReason for its contents. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/__init__.py | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 5eb6737..092413b 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -574,24 +574,16 @@ StreamStatus = stem.util.enum.UppercaseEnum( "CLOSED", ) -StreamClosureReason = stem.util.enum.UppercaseEnum( - "MISC", - "RESOLVEFAILED", - "CONNECTREFUSED", - "EXITPOLICY", - "DESTROY", - "DONE", - "TIMEOUT", - "NOROUTE", - "HIBERNATING", - "INTERNAL", - "RESOURCELIMIT", - "CONNRESET", - "TORPROTOCOL", - "NOTDIRECTORY", +# add STREAM event specific reasons to the list of RELAY_END reasons +_tmp_StreamClosureReason = [v for v in RelayEndReason] +_tmp_StreamClosureReason.extend(( "END", "PRIVATE_ADDR", -) +)) +# build UppercaseEnum from extended list +StreamClosureReason = stem.util.enum.UppercaseEnum(*_tmp_StreamClosureReason) +# remove temporary list +del _tmp_StreamClosureReason StreamSource = stem.util.enum.UppercaseEnum( "CACHE",

1 0

[stem/master] Add a close_stream method to Controller
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 77481da93b23a54d339133ba379c0a6f3741f799 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Dec 8 19:46:56 2012 -0700 Add a close_stream method to Controller Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/control.py | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index 3572987..cdcbe29 100644 --- a/stem/control.py +++ b/stem/control.py @@ -32,6 +32,7 @@ providing its own for interacting at a higher level. |- new_circuit - create new circuits |- extend_circuit - create new circuits and extend existing ones |- close_circuit - close a circuit + |- close_stream - close a stream |- repurpose_circuit - change a circuit's purpose |- map_address - maps one address to another such that connections to the original are replaced with the other |- get_version - convenience method to get tor version @@ -1477,6 +1478,31 @@ class Controller(BaseController): else: raise stem.ProtocolError("CLOSECIRCUIT returned unexpected response code: %s" % response.code) + def close_stream(self, stream_id, reason = stem.RelayEndReason.MISC, flag = ''): + """ + Closes the specified stream. + + :param int stream_id: id of the stream to be closed + :param int reason: reason the stream is closing (see RelayEndReason) + :param str flag: not currently used + + :raises: :class:`stem.InvalidArguments` if the stream or reason are not recognized + :raises: :class:`stem.InvalidRequest` if the stream and/or reason are missing + """ + + response = self.msg("CLOSESTREAM %s %s %s"% (str(stream_id), str(stem.RelayEndReason.index_of(reason)), flag)) + stem.response.convert("SINGLELINE", response) + + if not response.is_ok(): + if response.code in ('512', '552'): + if response.message.startswith("Unknown stream "): + raise stem.InvalidArguments(response.code, response.message, [stream_id]) + elif response.message.startswith("Unrecognized reason "): + raise stem.InvalidArguments(response.code, response.message, [reason]) + raise stem.InvalidRequest(response.code, response.message) + else: + raise stem.ProtocolError("CLOSESTREAM returned unexpected response code: %s" % response.code) + def map_address(self, mapping): """ Map addresses to replacement addresses. Tor replaces subseqent connections

1 0

[stem/master] Minor revisions to the previous close_stream() revisions
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 6176abb3f1c46192126a256aea6d6b27b4d66df9 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sun Dec 9 18:38:47 2012 -0700 Minor revisions to the previous close_stream() revisions These tweaks change some pydoc verbiage and put NONE back in CircClosureReason while removing it from RelayEndReason. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/__init__.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 3e23d26..42b7b29 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -161,7 +161,7 @@ Library for working with the tor process. .. data:: RelayEndReason (enum) - Enumeration for possible reasons to close a stream. + Reasons why the stream is to be closed. =================== =========== RelayEndReason Description @@ -204,8 +204,8 @@ Library for working with the tor process. .. data:: StreamClosureReason (enum) Reason that a stream is being closed or failed to be established. This - includes all values in the :data:`~stem.RelayEndReason` enumeration. Tor may - provide reasons not in this enum. + includes all values in the :data:`~stem.RelayEndReason` enumeration as + well as the following. Tor may provide reasons not in this enum. ===================== =========== StreamClosureReason Description @@ -496,6 +496,7 @@ CircPurpose = stem.util.enum.UppercaseEnum( ) CircClosureReason = stem.util.enum.UppercaseEnum( + "NONE", "TORPROTOCOL", "INTERNAL", "REQUESTED", @@ -532,7 +533,6 @@ HiddenServiceState = stem.util.enum.UppercaseEnum( ) RelayEndReason = stem.util.enum.UppercaseEnum( - "NONE", "MISC", "RESOLVEFAILED", "CONNECTREFUSED",

1 0

[stem/master] Minor revisions to close_stream()
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit 29a6d14fa054c05e4c3c6bb97b0a91fd2fe3569a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 9 14:41:53 2012 -0800 Minor revisions to close_stream() * Dropping the NONE RelayEndReason. It feels a little hacky to include it just so the index_of() will align with the integer values. Instead having close_stream() account for the offset. * The reason parameter of close_stream() is a stem.RelayEndReason rather than int so fixing its pydocs. * When doing formatted strings it's not necessary to wrap values in str(). If it's being assigned to a '%s' then that happens as part of the insertion. --- stem/__init__.py | 1 - stem/control.py | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 5d6d8fb..3e23d26 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -496,7 +496,6 @@ CircPurpose = stem.util.enum.UppercaseEnum( ) CircClosureReason = stem.util.enum.UppercaseEnum( - "NONE", "TORPROTOCOL", "INTERNAL", "REQUESTED", diff --git a/stem/control.py b/stem/control.py index cdcbe29..4b41e1c 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1483,14 +1483,17 @@ class Controller(BaseController): Closes the specified stream. :param int stream_id: id of the stream to be closed - :param int reason: reason the stream is closing (see RelayEndReason) + :param stem.RelayEndReason reason: reason the stream is closing :param str flag: not currently used :raises: :class:`stem.InvalidArguments` if the stream or reason are not recognized :raises: :class:`stem.InvalidRequest` if the stream and/or reason are missing """ - response = self.msg("CLOSESTREAM %s %s %s"% (str(stream_id), str(stem.RelayEndReason.index_of(reason)), flag)) + # there's a single value offset between RelayEndReason.index_of() and the + # value that tor expects since tor's value starts with the index of one + + response = self.msg("CLOSESTREAM %s %s %s"% (stream_id, stem.RelayEndReason.index_of(reason) + 1, flag)) stem.response.convert("SINGLELINE", response) if not response.is_ok():

1 0

[stem/master] Adding a close_stream() to the Controller
by atagar＠torproject.org 10 Dec '12

10 Dec '12

commit f4061ace5d87f2b0d4b47fb2a0aabbdcbd97b964 Merge: a8b20ad 6176abb Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 10 07:47:52 2012 -0800 Adding a close_stream() to the Controller Feature being discussed on... https://trac.torproject.org/7687 stem/__init__.py | 75 ++++++++++++++++++++++++++++++++--------------------- stem/control.py | 29 +++++++++++++++++++++ 2 files changed, 74 insertions(+), 30 deletions(-)

1 0

[torspec/master] Say when config-defaults-file was added in control-spec.txt
by nickm＠torproject.org 10 Dec '12

10 Dec '12

commit 102418a56b4961a8a815c6135e06fc3149b5a46c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 10 00:59:22 2012 -0500 Say when config-defaults-file was added in control-spec.txt Fixes bug 7684. --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 7393549..f9bc700 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -469,7 +469,7 @@ "config-defaults-file" -- The location of Tor's configuration defaults file ("torrc.defaults"). This file gets parsed before torrc, and is typically used to replace Tor's default - configuration values. + configuration values. [First implemented in 0.2.3.9-alpha.] "config-text" -- The contents that Tor would write if you send it a SAVECONF command, so the controller can write the file to

1 0