March 2013 - tor-commits - lists.torproject.org

[stem/master] Filling in a description for MEASURE_TIMEOUT
by atagar＠torproject.org 12 Mar '13

12 Mar '13

commit fb35fc7a9dd9d0217bedbc38bda51f58579d5f77 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 11 19:01:16 2013 -0700 Filling in a description for MEASURE_TIMEOUT Nick added a description to address... https://trac.torproject.org/7626 I'm not quite sure what it means (does "see how long it takes" mean measure the time to make the circuit? or the time it takes before being timed out like the name suggests?), so just copying what he put in the spec. --- stem/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index 510c46c..f1335ac 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -116,7 +116,7 @@ Library for working with the tor process. **HS_SERVICE_REND** server side hidden service rendezvous circuit **TESTING** testing to see if we're reachable, so we can be used as a relay **CONTROLLER** circuit that was built by a controller - **MEASURE_TIMEOUT** unknown (https://trac.torproject.org/7626) + **MEASURE_TIMEOUT** circuit being kept around to see how long it takes ==================== =========== .. data:: CircClosureReason (enum)

1 0

[ooni-probe/master] Test for raw socket permission
by isis＠torproject.org 12 Mar '13

12 Mar '13

commit 5eb60817a2ed1771adf2a11ba3fe4041ed5a3df8 Author: aagbsn <aagbsn(a)extc.org> Date: Mon Feb 18 02:23:11 2013 +0100 Test for raw socket permission --- ooni/utils/txscapy.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 62bde94..d57a54b 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -75,6 +75,14 @@ def getDefaultIface(): return net.iface raise IfaceError +def hasRawSocketPermission(): + from scapy.all import IP, send + try: + send(IP(src="1.2.3.4", dst="127.0.0.1")) + return True + except (socket.error, OSError): + return False + class ProtocolNotRegistered(Exception): pass

1 0

[ooni-probe/master] Don't ask for root if we have the power
by isis＠torproject.org 12 Mar '13

12 Mar '13

commit d707f5ab5b9c4abe129430297459d28477880d7a Author: aagbsn <aagbsn(a)extc.org> Date: Mon Feb 18 02:23:49 2013 +0100 Don't ask for root if we have the power --- ooni/templates/scapyt.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index 5f6c7c8..fab492c 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -11,6 +11,7 @@ from ooni.utils import log from ooni import config from ooni.utils.txscapy import ScapySender, getDefaultIface, ScapyFactory +from ooni.utils.txscapy import hasRawSocketPermission class BaseScapyTest(NetTestCase): """ @@ -26,7 +27,7 @@ class BaseScapyTest(NetTestCase): name = "Base Scapy Test" version = 0.1 - requiresRoot = True + requiresRoot = not hasRawSocketPermission() baseFlags = [ ['ipsrc', 's', 'Does *not* check if IP src and ICMP IP citation matches when processing answers'],

1 0

[ooni-probe/master] Update README.md with setcap instructions
by isis＠torproject.org 12 Mar '13

12 Mar '13

commit 7823c2baf22dc0c88fc3c31e8336b76a3ea21b07 Author: aagbsn <aagbsn(a)extc.org> Date: Mon Feb 18 02:33:20 2013 +0100 Update README.md with setcap instructions --- README.md | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/README.md b/README.md index 2c0935c..5ba014c 100644 --- a/README.md +++ b/README.md @@ -168,4 +168,8 @@ By default ooniprobe will not include personal identifying information in the test result, nor create a pcap file. This behavior can be personalized by editing your ooniprobe.conf configuration file. +## Setting capabilities on your virtualenv python binary +If your distributation supports capabilities you can avoid needing to run OONI as root: + + setcap cap_net_admin,cap_net_raw+eip /path/to/your/virtualenv's/python

1 0

[ooni-probe/master] Merge pull request #41 from aagbsn/check_raw_socket
by isis＠torproject.org 12 Mar '13

12 Mar '13

commit 325e0f26a704b87ec731451f9a1d570c5c169b0d Merge: 946a321 7823c2b Author: Isis Agora Lovecruft <isis(a)torproject.org> Date: Mon Mar 11 17:29:03 2013 -0700 Merge pull request #41 from aagbsn/check_raw_socket Check raw socket README.md | 4 ++++ ooni/templates/scapyt.py | 3 ++- ooni/utils/txscapy.py | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletions(-)

1 0

r26103: {website} 0.2.4.11-alpha tarball is up (in website/trunk: . include)
by Roger Dingledine 11 Mar '13

11 Mar '13

Author: arma Date: 2013-03-11 21:41:58 +0000 (Mon, 11 Mar 2013) New Revision: 26103 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: 0.2.4.11-alpha tarball is up Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2013-03-10 19:28:25 UTC (rev 26102) +++ website/trunk/Makefile 2013-03-11 21:41:58 UTC (rev 26103) @@ -11,7 +11,7 @@ # 5. ./publish export STABLETAG=tor-0.2.3.25 -export DEVTAG=tor-0.2.4.10-alpha +export DEVTAG=tor-0.2.4.11-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2013-03-10 19:28:25 UTC (rev 26102) +++ website/trunk/include/versions.wmi 2013-03-11 21:41:58 UTC (rev 26103) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.3.25</define-tag> -<define-tag version-alpha whitespace=delete>0.2.4.10-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.4.11-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.4.10-alpha</define-tag>

1 0

[torspec/master] Correct when authorities assign the HSDir flag
by nickm＠torproject.org 11 Mar '13

11 Mar '13

commit 5bab273834577728f3df930cc33a914454b5b215 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 17:39:10 2013 -0400 Correct when authorities assign the HSDir flag Fixes 8242. --- dir-spec.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 2e99802..4a8f007 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1697,8 +1697,9 @@ 0.2.0.?????-alpha or later.) "HSDir" -- A router is a v2 hidden service directory if it stores and - serves v2 hidden service descriptors and the authority managed to connect - to it successfully within the last 24 hours. + serves v2 hidden service descriptors, and the authority believes that it's + been up for at least 25 hours (or the current value of + MinUptimeHidServDirectoryV2). Directory server administrators may label some relays or IPs as blacklisted, and elect not to include them in their network-status lists.

1 0

[tor/maint-0.2.4] Look at the right variable when warning about signed size_t.
by nickm＠torproject.org 11 Mar '13

11 Mar '13

commit 051b1e8ac4114fb23904cdf8dead72d585904e0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 16:29:06 2013 -0400 Look at the right variable when warning about signed size_t. In 81d69f4c2d8a451 (0.2.21-alpha) we added a compile-time check for a (totally broken) signed size_t. In 0e597471af (not yet released) I switched to a better configure-time check, which stored its output in a different variable. I didn't change the code which looked at the output, however. This bug is not in any released version of Tor, and would not affect anybody with a working Tor. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 864477b..4bc0db3 100644 --- a/configure.ac +++ b/configure.ac @@ -980,7 +980,7 @@ AX_CHECK_SIGN([size_t], #endif ]) -if test "$tor_cv_size_t_signed" = yes; then +if test "$ax_cv_decl_size_t_signed" = yes; then AC_MSG_ERROR([You have a signed size_t; that's grossly nonconformant.]) fi

1 0

[ooni-probe/master] Refactor setup.py script
by isis＠torproject.org 11 Mar '13

11 Mar '13

commit 957f20d5c3a590bf2c9db3f15dcbc6c0daa1be73 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 7 01:53:16 2012 +0100 Refactor setup.py script (cherry picked from commit a3b8bb52711537e1db8770bf447230f812b68166) --- setup.py | 44 ++++++++++++-------------------------------- 1 files changed, 12 insertions(+), 32 deletions(-) diff --git a/setup.py b/setup.py index 1b8ecc3..3844036 100644 --- a/setup.py +++ b/setup.py @@ -1,37 +1,17 @@ -from __future__ import with_statement -from setuptools import setup, find_packages +#!/usr/bin/env python +#-*- coding: utf-8 -*- -def get_requirements(): - with open('requirements.txt', 'r') as f: - requirements = f.read().splitlines() - - with open('oonib/requirements.txt', 'r') as f: - requirements += f.read().splitlines() - - # For urls such as https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy in - # requirements.txt we need to add the package name to install_requires and - # the entire url to dependency_links. That way setuptools will be able to - # satisfy the dependency using that url (as long as it is in standard sdist - # format, a single .py file or an egg). - pypi_packages = [] - dependency_links = [] - for package_desc in requirements: - if '#egg=' in package_desc: - dependency_links.append(package_desc) - pypi_packages.append(package_desc.split('#egg=')[-1]) - else: - pypi_packages.append(package_desc) - - return pypi_packages, dependency_links - -install_requires, dependency_links = get_requirements() +from distutils.core import setup setup( name="ooni-probe", - version="0.6", - url="http://ooni.nu/", - packages=find_packages(), - scripts=["bin/canary", "bin/oonib", "bin/ooniprobe"], - install_requires=install_requires, - dependency_links=dependency_links, + version="0.0.8", + author="Arturo Filastò", + author_email = "art(a)torproject.org", + url="https://ooni.torproject.org/", + package_dir={'ooni': 'ooni'}, + packages=['ooni', 'ooni.templates', 'ooni.utils'], + scripts=["bin/ooniprobe"], + install_requires=open('requirements.txt').readlines(), + dependency_links=["https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy"] )

1 0

[ooni-probe/master] Txscapy is now in pypi, no need to have it mirrored on tpo
by isis＠torproject.org 11 Mar '13

11 Mar '13

commit 1d93ef03802485da67848cbab918b1edc01669df Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 15:58:29 2013 +0100 Txscapy is now in pypi, no need to have it mirrored on tpo (cherry picked from commit e74ea0cbd7816bda547dced875523253ca6d312a) Conflicts: requirements.txt --- requirements.txt | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0583467..bdf4cd0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ pyOpenSSL>=0.13 pygeoip>=0.2.5 transaction>=1.3.0 txtorcon>=0.7 +txsocksx>=0.0.2 zope.component>=4.0.0 zope.event>=4.0.0 zope.interface>=4.0.1 @@ -24,10 +25,6 @@ https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/Parsley-1.1pre… # https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy # Mirrored on Tor's webserver: https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/scapy-02-25-20… -# Originally fetched from github: -# https://github.com/hellais/txsocksx/archive/master.zip -# Mirrored on Tor's webserver: -https://people.torproject.org/~ioerror/src/mirrors/ooniprobe/hellais-txsocksx-02-25-2013-master.zip # This was 'dnspython>=1.10.0' above until it failed to download many times. # Originally fetched from dnspython but it timed out often: # http://www.dnspython.org/kits/1.10.0/dnspython-1.10.0.zip

1 0