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

[stem/master] Unable to call socket.gethostbyname() when disconnected
by atagar＠torproject.org 07 Dec '14

07 Dec '14

commit 2ee4e95ab0f2640674c1074ce26e2f09ce9bdf26 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 6 16:45:24 2014 -0800 Unable to call socket.gethostbyname() when disconnected A Gentoo ticket notes an interesting stacktrace... https://bugs.gentoo.org/show_bug.cgi?id=527072 ====================================================================== ERROR: test_all_private_policy ---------------------------------------------------------------------- Traceback (most recent call last): File "/tmp/portage/net-libs/stem-1.2.2_p20141018/work/stem-1.2.2_p20141018/test/unit/exit_policy/policy.py", line 115, in test_all_private_policy private_policy = get_config_policy('reject private:%s' % port) File "/tmp/portage/net-libs/stem-1.2.2_p20141018/work/stem-1.2.2_p20141018/stem/exit_policy.py", line 141, in get_config_policy ip_address = socket.gethostbyname(socket.gethostname()) gaierror: [Errno -3] Temporary failure in name resolution ====================================================================== I wasn't able to repro this by simply disconnecting, but oh well. Easy enough to suppress the exception. --- stem/exit_policy.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 0b7bea7..9bc8ccb 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -136,11 +136,17 @@ def get_config_policy(rules, ip_address = None): if 'private' in rule: acceptance = rule.split(' ', 1)[0] port = rule.split(':', 1)[1] + addresses = list(PRIVATE_ADDRESSES) - if ip_address is None: - ip_address = socket.gethostbyname(socket.gethostname()) + if ip_address: + addresses.append(ip_address) + else: + try: + addresses.append(socket.gethostbyname(socket.gethostname())) + except: + pass # we might not have a network connection - for private_addr in PRIVATE_ADDRESSES + (ip_address,): + for private_addr in addresses: result.append(ExitPolicyRule("%s %s:%s" % (acceptance, private_addr, port))) else: result.append(ExitPolicyRule(rule))

1 0

[stem/master] Descriptor integ tests require a connection
by atagar＠torproject.org 07 Dec '14

07 Dec '14

commit 4e2473d98c88399d1fd00e4c92ae215c092188b7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 6 16:52:14 2014 -0800 Descriptor integ tests require a connection Oops, these tests should require a connection. This one was easy to repro by simply disconnecting. --- test/integ/control/controller.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index cc4d12c..adaaf8d 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -996,6 +996,8 @@ class TestController(unittest.TestCase): return elif test.runner.require_version(self, Requirement.MICRODESCRIPTOR_IS_DEFAULT): return + elif test.runner.require_online(self): + return with test.runner.get_runner().get_tor_controller() as controller: # we should balk at invalid content @@ -1103,6 +1105,8 @@ class TestController(unittest.TestCase): if test.runner.require_control(self): return + elif test.runner.require_online(self): + return with test.runner.get_runner().get_tor_controller() as controller: # we should balk at invalid content @@ -1130,6 +1134,8 @@ class TestController(unittest.TestCase): if test.runner.require_control(self): return + elif test.runner.require_online(self): + return with runner.get_tor_controller() as controller: count = 0

1 0

[stem/master] Adding Gentoo to the download page
by atagar＠torproject.org 07 Dec '14

07 Dec '14

commit a73b17f6db3942626943f8c3cdaa2ff76d1cafed Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 6 16:10:16 2014 -0800 Adding Gentoo to the download page --- docs/_static/label/gentoo.png | Bin 0 -> 1147 bytes docs/_static/label/resources/gentoo.xcf | Bin 0 -> 2779 bytes docs/_static/section/download/gentoo.png | Bin 0 -> 16245 bytes docs/download.rst | 15 +++++++++++++++ 4 files changed, 15 insertions(+) diff --git a/docs/_static/label/gentoo.png b/docs/_static/label/gentoo.png new file mode 100644 index 0000000..164aed8 Binary files /dev/null and b/docs/_static/label/gentoo.png differ diff --git a/docs/_static/label/resources/gentoo.xcf b/docs/_static/label/resources/gentoo.xcf new file mode 100644 index 0000000..eee000e Binary files /dev/null and b/docs/_static/label/resources/gentoo.xcf differ diff --git a/docs/_static/section/download/gentoo.png b/docs/_static/section/download/gentoo.png new file mode 100644 index 0000000..c96e01c Binary files /dev/null and b/docs/_static/section/download/gentoo.png differ diff --git a/docs/download.rst b/docs/download.rst index 849252f..1355968 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -28,6 +28,9 @@ Download License: GPL v2 File: NuoveXT/128x128/apps/fedora.png + * Gentoo + Source: https://www.gentoo.org/main/en/name-logo.xml + * Slackware Source: NuoveXT (http://nuovext.pwsp.net/) Author: Alexandre Moore (http://sa-ki.deviantart.com/) @@ -111,6 +114,18 @@ Download % yum install python-stem + * - .. image:: /_static/section/download/gentoo.png + :target: http://packages.gentoo.org/package/net-libs/stem + + - .. image:: /_static/label/gentoo.png + :target: http://packages.gentoo.org/package/net-libs/stem + + Package maintained by Anthony Basile for Gentoo. + + :: + + % emerge stem + * - .. image:: /_static/section/download/slackware.png :target: http://slackbuilds.org/repository/14.1/python/stem/

1 0

[webwml/staging] Bump TBB version
by sebastian＠torproject.org 07 Dec '14

07 Dec '14

commit d3eae0b135ec42421be86b88e2d87535be273fe8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 3 13:23:37 2014 +0000 Bump TBB version --- include/versions.wmi | 10 +++++----- projects/torbrowser/RecommendedTBBVersions | 12 ++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 0c9b10d..ace518b 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -23,10 +23,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>4.0.1</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>4.0.2</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>4.5-alpha-1</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>4.0.1</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>4.0.2</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>4.5-alpha-1</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> @@ -37,8 +37,8 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.1</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.1</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.2</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.2</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5-alpha-1</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5-alpha-1</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -47,7 +47,7 @@ <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.21</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.1</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.2</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5-alpha-1</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 65a0ea5..445021b 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -1,12 +1,8 @@ [ -"4.0", -"4.0-Linux", -"4.0-MacOS", -"4.0-Windows", -"4.0.1", -"4.0.1-Linux", -"4.0.1-MacOS", -"4.0.1-Windows", +"4.0.2", +"4.0.2-Linux", +"4.0.2-MacOS", +"4.0.2-Windows", "4.5-alpha-1", "4.5-alpha-1-Linux", "4.5-alpha-1-MacOS",

1 0

[webwml/staging] Bump TBB alpha version.
by sebastian＠torproject.org 07 Dec '14

07 Dec '14

commit 9e37ebb75c6bddf65dcdbac512fb80f2413f5a70 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 5 14:12:28 2014 +0000 Bump TBB alpha version. --- include/versions.wmi | 10 +++++----- projects/torbrowser/RecommendedTBBVersions | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index ace518b..48bc738 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -24,10 +24,10 @@ <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>4.0.2</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>4.5-alpha-1</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-torbrowserbundle whitespace=delete>4.0.2</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>4.5-alpha-1</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -39,8 +39,8 @@ <define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.2</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.2</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5-alpha-2</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -49,7 +49,7 @@ <define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.2</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5-alpha-1</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 445021b..c75968c 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,8 +3,8 @@ "4.0.2-Linux", "4.0.2-MacOS", "4.0.2-Windows", -"4.5-alpha-1", -"4.5-alpha-1-Linux", -"4.5-alpha-1-MacOS", -"4.5-alpha-1-Windows" +"4.5-alpha-2", +"4.5-alpha-2-Linux", +"4.5-alpha-2-MacOS", +"4.5-alpha-2-Windows" ]

1 0

[webwml/staging] Update the core people page.
by sebastian＠torproject.org 07 Dec '14

07 Dec '14

commit 712960d330e12d3873d51e02d11e4246ed753407 Author: Matt Pagan <matt(a)pagan.io> Date: Sat Dec 6 16:26:11 2014 -0600 Update the core people page. --- about/en/corepeople.wml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 008feab..2b30f05 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -345,10 +345,6 @@ annual reports, and brochures. His other work can be found at <a href="http://jmtodaro.com/">http://jmtodaro.com/</a>.</dd> - <dt>Jason Tsai, Support</dt> - <dd>Chinese translator; helps answer all the users who contact - the support desk.</dd> - <dt>Nicolas Vigier, Developer</dt> <dd>Working on build automation, particularly around the Tor Browser.</dd>

1 0

[webwml/master] Update the core people page.
by sebastian＠torproject.org 07 Dec '14

07 Dec '14

commit 712960d330e12d3873d51e02d11e4246ed753407 Author: Matt Pagan <matt(a)pagan.io> Date: Sat Dec 6 16:26:11 2014 -0600 Update the core people page. --- about/en/corepeople.wml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 008feab..2b30f05 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -345,10 +345,6 @@ annual reports, and brochures. His other work can be found at <a href="http://jmtodaro.com/">http://jmtodaro.com/</a>.</dd> - <dt>Jason Tsai, Support</dt> - <dd>Chinese translator; helps answer all the users who contact - the support desk.</dd> - <dt>Nicolas Vigier, Developer</dt> <dd>Working on build automation, particularly around the Tor Browser.</dd>

1 0

[stem/master] Noting list and irc in contact menu
by atagar＠torproject.org 06 Dec '14

06 Dec '14

commit 7e1ed96141792ccaff25ff69e0a74fedadd2ecc2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 6 14:47:19 2014 -0800 Noting list and irc in contact menu I'd rather if people use tor-dev@ rather than contacting me directly, but on the other hand having a direct contact link lowers the bar for people to reach out. Changing the menu to subtly encourage the former. --- docs/_templates/layout.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index 450bb4f..3884fc0 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -53,7 +53,13 @@ <li><a href="{{ pathto('download') }}">Download</a></li> </ul> </li> - <li><a href="https://www.atagar.com/contact/">Contact</a></li> + <li><a href="{{ pathto('faq') }}#where-can-i-get-help">Contact</a> + <ul> + <li><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">Email List</a></li> + <li><a href="https://www.torproject.org/about/contact.html.en#irc">IRC</a></li> + <li><a href="https://www.atagar.com/contact/">Author</a></li> + </ul> + </li> </ul> {%- block haikurel2 %}

1 0

[stem/master] Dropping subsections from the main page
by atagar＠torproject.org 06 Dec '14

06 Dec '14

commit 38fec343eaacd0c80f5cc5a378a71f3b2d0835b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 6 14:12:08 2014 -0800 Dropping subsections from the main page On reflection just about none of these were really useful... * Development Wiki - Not useful to anyone except me. It's hardly used any longer, and the only handy bit is the release checklist. Moved into the menu. * Contact - Ok, this one *is* useful. Moved to be a top level menu item so it's even more visible. * Index, Module Index, Search, and Contents - *shrug* * Automated Testing - Nobody except me has a reason to care about this. Moved the link to the wiki. I also tweaked the wording on the page to make it even shorter. Short is good, and there's no reason to continue to mention TorCtl. --- docs/_templates/layout.html | 2 ++ docs/contents.rst | 1 + docs/index.rst | 14 +------------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index 00caace..450bb4f 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -49,9 +49,11 @@ <li><a href="{{ pathto('faq') }}">FAQ</a></li> <li><a href="{{ pathto('change_log') }}">Change Log</a></li> <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs">Bug Tracker</a></li> + <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/stem">Wiki</a></li> <li><a href="{{ pathto('download') }}">Download</a></li> </ul> </li> + <li><a href="https://www.atagar.com/contact/">Contact</a></li> </ul> {%- block haikurel2 %} diff --git a/docs/contents.rst b/docs/contents.rst index f7a49d2..cb4e578 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -18,6 +18,7 @@ Contents tutorials/examples/list_circuits tutorials/examples/outdated_relays tutorials/examples/persisting_a_consensus + tutorials/examples/votes_by_bandwidth_authorities change_log download diff --git a/docs/index.rst b/docs/index.rst index 78920bc..bcc2269 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ Welcome to Stem! ================ -Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://gitweb.torproject.org/pytorctl.git>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.2** (released June 7th, 2014). +Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. With it you can use Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to script against the Tor process, or build things similar to `Vidalia <https://www.torproject.org/projects/vidalia.html.en>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.2** (released June 7th, 2014). .. Main Stem Logo Source: http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html @@ -64,18 +64,6 @@ Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Li .. image:: /_static/buttons/download.png :target: download.html -Subsections -=========== - -* `Development Wiki <https://trac.torproject.org/projects/tor/wiki/doc/stem>`_ -* `Contact <https://www.atagar.com/contact/>`_ -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` -* `Automated Testing <https://jenkins.torproject.org/job/stem-tor-ci/>`_ - .. toctree:: :maxdepth: 1 - contents -

1 0

[stem/master] Don't use the socket module to validate that IP addresses are valid
by atagar＠torproject.org 06 Dec '14

06 Dec '14

commit 91f6c3bb2a5a4f4bb9a822f1280a4c250aeacdcd Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 6 12:50:14 2014 -0800 Don't use the socket module to validate that IP addresses are valid This largely reverts commit 25771fe. Evidently the socket builtin doens't always know what an IPv6 address looks like... https://trac.torproject.org/projects/tor/ticket/13904 --- stem/util/connection.py | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index df918d2..f5ca3f4 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -46,7 +46,6 @@ import hmac import os import platform import re -import socket import stem.util.proc import stem.util.system @@ -334,12 +333,23 @@ def is_valid_ipv4_address(address): :returns: **True** if input is a valid IPv4 address, **False** otherwise """ - try: - packed = socket.inet_pton(socket.AF_INET, address) - return socket.inet_ntop(socket.AF_INET, packed) == address - except (TypeError, socket.error): + if not isinstance(address, (bytes, unicode)): return False + # checks if theres four period separated values + + if address.count('.') != 3: + return False + + # checks that each value in the octet are decimal values between 0-255 + for entry in address.split('.'): + if not entry.isdigit() or int(entry) < 0 or int(entry) > 255: + return False + elif entry[0] == '0' and len(entry) > 1: + return False # leading zeros, for instance in '1.2.3.001' + + return True + def is_valid_ipv6_address(address, allow_brackets = False): """ @@ -355,11 +365,24 @@ def is_valid_ipv6_address(address, allow_brackets = False): if address.startswith('[') and address.endswith(']'): address = address[1:-1] - try: - socket.inet_pton(socket.AF_INET6, address) - return True - except (TypeError, socket.error): - return False + # addresses are made up of eight colon separated groups of four hex digits + # with leading zeros being optional + # https://en.wikipedia.org/wiki/IPv6#Address_format + + colon_count = address.count(':') + + if colon_count > 7: + return False # too many groups + elif colon_count != 7 and '::' not in address: + return False # not enough groups and none are collapsed + elif address.count('::') > 1 or ':::' in address: + return False # multiple groupings of zeros can't be collapsed + + for entry in address.split(':'): + if not re.match('^[0-9a-fA-f]{0,4}$', entry): + return False + + return True def is_valid_port(entry, allow_zero = False):

1 0