January 2015 - tor-commits - lists.torproject.org

[ooni-probe/master] Merge pull request #360 from kraai/fix-typos
by art＠torproject.org 03 Jan '15

03 Jan '15

commit a6de7b7baef3b52e568963599d3ed7bcdf178a9b Merge: a3ac049 c4efd77 Author: Arturo Filastò <arturo(a)filasto.net> Date: Sat Oct 25 16:38:35 2014 +0200 Merge pull request #360 from kraai/fix-typos Fix typos README.rst | 6 +++--- data/ooniprobe.conf.sample | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[ooni-probe/master] Check for ability to capture, not a specific uid
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 3ca49d4a2c6701075452c39c3af0f0284839552e Author: Debian Live user <amnesia(a)localhost.localdomain> Date: Sat Oct 25 10:21:35 2014 +0000 Check for ability to capture, not a specific uid --- ooni/geoip.py | 6 ++++-- ooni/nettest.py | 7 ++++--- ooni/oonicli.py | 9 +++++---- ooni/tests/test_oonicli.py | 9 ++++----- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ooni/geoip.py b/ooni/geoip.py index 86383d0..9cb5da3 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -9,7 +9,7 @@ client._HTTP11ClientFactory.noisy = False from twisted.internet import reactor, defer -from ooni.utils import log, checkForRoot +from ooni.utils import log from ooni import errors try: @@ -243,7 +243,9 @@ class ProbeIP(object): """ Perform a UDP traceroute to determine the probes IP address. """ - checkForRoot() + from ooni.utils.txscapy import hasRawSocketPermission + if not hasRawSocketPermission(): + raise errors.InsufficientPrivileges raise NotImplemented def askTor(self): diff --git a/ooni/nettest.py b/ooni/nettest.py index 1a780fd..12fb2fb 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -10,7 +10,8 @@ from twisted.python import usage, reflect from ooni import otime from ooni.tasks import Measurement -from ooni.utils import log, checkForRoot, sanitize_options +from ooni.utils import log, sanitize_options +from ooni.utils.txscapy import hasRawSocketPermission from ooni.settings import config from ooni import errors as e @@ -339,8 +340,8 @@ class NetTestLoader(object): klass.localOptions = options test_instance = klass() - if test_instance.requiresRoot: - checkForRoot() + if test_instance.requiresRoot and not hasRawSocketPermission(): + raise errors.InsufficientPrivileges if test_instance.requiresTor: self.requiresTor = True test_instance.requirements() diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 6505584..8997fca 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -13,7 +13,8 @@ from ooni.director import Director from ooni.deck import Deck, nettest_to_path from ooni.nettest import NetTestLoader -from ooni.utils import log, checkForRoot +from ooni.utils import log +from ooni.utils.txscapy import hasRawSocketPermission class Options(usage.Options): @@ -125,11 +126,11 @@ def runWithDirector(logging=True, start_tor=True, check_incoherences=True): log.start(global_options['logfile']) if config.privacy.includepcap: - try: - checkForRoot() + if hasRawSocketPermission(): + from ooni.utils.txscapy import hasRawSocketPermission from ooni.utils.txscapy import ScapyFactory config.scapyFactory = ScapyFactory(config.advanced.interface) - except errors.InsufficientPrivileges: + else: log.err("Insufficient Privileges to capture packets." " See ooniprobe.conf privacy.includepcap") sys.exit(2) diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index 3d5fdeb..89c4234 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -8,8 +8,8 @@ from ooni.tests import is_internet_connected from ooni.tests.bases import ConfigTestCase from ooni.settings import config from ooni.oonicli import runWithDirector -from ooni.utils import checkForRoot from ooni.errors import InsufficientPrivileges +from ooni.utils.txscapy import hasRawSocketPermission def verify_header(header): @@ -63,10 +63,9 @@ class TestRunDirector(ConfigTestCase): super(TestRunDirector, self).setUp() if not is_internet_connected(): self.skipTest("You must be connected to the internet to run this test") - try: - checkForRoot() - except InsufficientPrivileges: - self.skipTest("You must be root to run this test") + elif not hasRawSocketPermission(): + self.skipTest("You must run this test as root or have the capabilities " + "cap_net_admin,cap_net_raw+eip") config.tor.socks_port = 9050 config.tor.control_port = None self.filenames = ['example-input.txt']

1 0

[ooni-probe/master] Use HTTPS URLs for MaxMind resources
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 318e322fbc29dd20d56dc311c71ae60e010a7cdf Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 11:24:49 2014 +0000 Use HTTPS URLs for MaxMind resources --- ooni/resources/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/resources/__init__.py b/ooni/resources/__init__.py index e60784f..a59ea2f 100644 --- a/ooni/resources/__init__.py +++ b/ooni/resources/__init__.py @@ -25,14 +25,14 @@ inputs = { geoip = { "GeoIPASNum.dat.gz": { - "url": "http://www.maxmind.com/download/" + "url": "https://www.maxmind.com/download/" "geoip/database/asnum/GeoIPASNum.dat.gz", "action": gunzip, "action_args": [config.advanced.geoip_data_dir], "processor": None }, "GeoIP.dat.gz": { - "url": "http://geolite.maxmind.com/" + "url": "https://geolite.maxmind.com/" "download/geoip/database/GeoLiteCountry/GeoIP.dat.gz", "action": gunzip, "action_args": [config.advanced.geoip_data_dir],

1 0

[ooni-probe/master] Check for system-wide configuration
by art＠torproject.org 03 Jan '15

03 Jan '15

commit eee11a20b89c64c1c8376b72f498c0a337bf10ba Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 12:22:12 2014 +0000 Check for system-wide configuration --- ooni/resources/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ooni/resources/__init__.py b/ooni/resources/__init__.py index a59ea2f..748381a 100644 --- a/ooni/resources/__init__.py +++ b/ooni/resources/__init__.py @@ -1,9 +1,16 @@ +import os + from ooni.settings import config from ooni.utils import unzip, gunzip from ooni.deckgen.processors import citizenlab_test_lists from ooni.deckgen.processors import namebench_dns_servers +# Use the system configuration if no user configuration exists +if not os.path.isfile(config.config_file) \ + and os.path.isfile('/etc/ooniprobe.conf'): + config.global_options['configfile'] = '/etc/ooniprobe.conf' + config.set_paths(ooni_home=config.advanced.data_dir) config.read_config_file() __version__ = "0.0.1"

1 0

[ooni-probe/master] Set system-wide defaults for logfile, use /var/lib/ooni instead of /usr/share/ooni
by art＠torproject.org 03 Jan '15

03 Jan '15

commit d3ffbb39c4f6efcdc1e0a1705de6ef71987d46ae Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 12:24:45 2014 +0000 Set system-wide defaults for logfile, use /var/lib/ooni instead of /usr/share/ooni --- data/ooniprobe.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 8e19995..df92fbd 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -4,7 +4,7 @@ basic: # Where OONIProbe should be writing it's log file - logfile: ~/.ooni/ooniprobe.log + logfile: /var/log/ooniprobe.log privacy: # Should we include the IP address of the probe in the report? includeip: false @@ -46,7 +46,7 @@ advanced: # How many reports to perform concurrently reporting_concurrency: 15 # Specify here a custom data_dir path - data_dir: /usr/share/ooni + data_dir: /var/lib/ooni oonid_api_port: 8042 tor: #socks_port: 8801

1 0

[ooni-probe/master] Set user's logfile
by art＠torproject.org 03 Jan '15

03 Jan '15

commit d2f0198875813440a4be0ebb1d7d34934e7dad33 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 12:30:18 2014 +0000 Set user's logfile --- ooni/settings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ooni/settings.py b/ooni/settings.py index 8da250f..bc3d2e5 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -107,6 +107,8 @@ class OConfig(object): w.write(' data_dir: %s\n' % self.data_directory) elif line.startswith(' geoip_data_dir: '): w.write(' geoip_data_dir: %s\n' % os.path.join(usr_share_path, 'GeoIP')) + elif line.startswith(' logfile: '): + w.write(' logfile: %s\n' % os.path.join(self.ooni_home, 'ooniprobe.log')) else: w.write(line)

1 0

[ooni-probe/master] Display correct download path
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 9bb914c7a46b78feb2a1fb770f1f4b76a2149d05 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 13:13:26 2014 +0000 Display correct download path --- ooni/resources/update.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ooni/resources/update.py b/ooni/resources/update.py index 6479aa9..4017965 100644 --- a/ooni/resources/update.py +++ b/ooni/resources/update.py @@ -5,6 +5,7 @@ from twisted.web.client import downloadPage from ooni.settings import config from ooni.resources import inputs, geoip +from ooni.utils import unzip, gunzip @defer.inlineCallbacks @@ -12,7 +13,11 @@ def download_resource(resources): for filename, resource in resources.items(): print "Downloading %s" % filename - filename = os.path.join(config.resources_directory, filename) + if resource["action"] in [unzip, gunzip] and resource["action_args"]: + dirname = resource["action_args"][0] + filename = os.path.join(dirname, filename) + else: + filename = os.path.join(config.resources_directory, filename) if not os.path.exists(filename): directory = os.path.dirname(filename) if not os.path.isdir(directory):

1 0

[ooni-probe/master] Check for system-config globally, use /var/lib/ooni
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 98259a39aec8826f32ce83aef1f85d8e1b5880ac Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 13:29:09 2014 +0000 Check for system-config globally, use /var/lib/ooni --- ooni/resources/__init__.py | 8 ++++---- ooni/settings.py | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ooni/resources/__init__.py b/ooni/resources/__init__.py index 7297be5..4e60c78 100644 --- a/ooni/resources/__init__.py +++ b/ooni/resources/__init__.py @@ -7,10 +7,10 @@ from ooni.deckgen.processors import citizenlab_test_lists from ooni.deckgen.processors import namebench_dns_servers # Use the system configuration if no user configuration exists -if not os.path.isfile(config.config_file) \ - and os.path.isfile('/etc/ooniprobe.conf'): - config.global_options['configfile'] = '/etc/ooniprobe.conf' - config.set_paths(ooni_home=config.advanced.data_dir) +#if not os.path.isfile(config.config_file) \ +# and os.path.isfile('/etc/ooniprobe.conf'): +# config.global_options['configfile'] = '/etc/ooniprobe.conf' +# config.set_paths(ooni_home=config.advanced.data_dir) config.read_config_file() __version__ = "0.0.1" diff --git a/ooni/settings.py b/ooni/settings.py index bc3d2e5..342ec4e 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -45,7 +45,7 @@ class OConfig(object): elif hasattr(sys, 'real_prefix'): data_directory = os.path.abspath(os.path.join(sys.prefix, 'share', 'ooni')) elif not os.path.exists(data_directory): - data_directory = '/usr/share/ooni/' + data_directory = '/var/lib/ooni/' return data_directory @@ -94,7 +94,7 @@ class OConfig(object): def _create_config_file(self): target_config_file = self.config_file print "Creating it for you in '%s'." % target_config_file - usr_share_path = '/usr/share' + usr_share_path = '/var/lib/ooni' if hasattr(sys, 'real_prefix'): usr_share_path = os.path.abspath(os.path.join(sys.prefix, 'share')) sample_config_file = os.path.join(self.data_directory, @@ -180,3 +180,7 @@ class OConfig(object): self.log_incoherences(incoherent) config = OConfig() +if not os.path.isfile(config.config_file) \ + and os.path.isfile('/etc/ooniprobe.conf'): + config.global_options['configfile'] = '/etc/ooniprobe.conf' + config.set_paths(ooni_home=config.advanced.data_dir)

1 0

[ooni-probe/master] Remove comment
by art＠torproject.org 03 Jan '15

03 Jan '15

commit fb07d4954ff6749cc3e2af9611b27e75473222f5 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 14:04:06 2014 +0000 Remove comment --- ooni/resources/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ooni/resources/__init__.py b/ooni/resources/__init__.py index 4e60c78..0517252 100644 --- a/ooni/resources/__init__.py +++ b/ooni/resources/__init__.py @@ -6,11 +6,6 @@ from ooni.utils import unzip, gunzip from ooni.deckgen.processors import citizenlab_test_lists from ooni.deckgen.processors import namebench_dns_servers -# Use the system configuration if no user configuration exists -#if not os.path.isfile(config.config_file) \ -# and os.path.isfile('/etc/ooniprobe.conf'): -# config.global_options['configfile'] = '/etc/ooniprobe.conf' -# config.set_paths(ooni_home=config.advanced.data_dir) config.read_config_file() __version__ = "0.0.1"

1 0

[ooni-probe/master] Update MaxMind URL
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 2e37c525ca3692eec461e81a4abcaea783fe4a04 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 13:12:46 2014 +0000 Update MaxMind URL --- ooni/resources/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/resources/__init__.py b/ooni/resources/__init__.py index 748381a..7297be5 100644 --- a/ooni/resources/__init__.py +++ b/ooni/resources/__init__.py @@ -32,7 +32,7 @@ inputs = { geoip = { "GeoIPASNum.dat.gz": { - "url": "https://www.maxmind.com/download/" + "url": "https://geolite.maxmind.com/download/" "geoip/database/asnum/GeoIPASNum.dat.gz", "action": gunzip, "action_args": [config.advanced.geoip_data_dir],

1 0