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

[ooni-probe/master] Implement a hotfix for https://github.com/habnabit/txsocksx/issues/9
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 96391035de250a2d5842c5c0e68879f1838eb874 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 4 11:18:05 2015 +0100 Implement a hotfix for https://github.com/habnabit/txsocksx/issues/9 --- ooni/oonibclient.py | 3 ++- ooni/reporter.py | 2 +- ooni/utils/hacks.py | 29 +++++++++++++++++++++++++++++ ooni/utils/trueheaders.py | 2 +- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py index a26b771..126eeb7 100644 --- a/ooni/oonibclient.py +++ b/ooni/oonibclient.py @@ -203,7 +203,8 @@ class OONIBClient(object): try: test_collector = yield self.queryBackend('POST', '/bouncer/net-tests', query={'net-tests': net_tests}) - except Exception: + except Exception as exc: + log.exception(exc) raise e.CouldNotFindTestCollector defer.returnValue(test_collector) diff --git a/ooni/reporter.py b/ooni/reporter.py index 34ff333..bf4a645 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -287,7 +287,7 @@ class OONIBReporter(OReporter): # do this with some deferred kung foo or instantiate the reporter after # tor is started. - from txsocksx.http import SOCKS5Agent + from ooni.utils.hacks import SOCKS5Agent from twisted.internet import reactor if self.collectorAddress.startswith('httpo://'): diff --git a/ooni/utils/hacks.py b/ooni/utils/hacks.py index 2c84a23..e001d3f 100644 --- a/ooni/utils/hacks.py +++ b/ooni/utils/hacks.py @@ -2,6 +2,9 @@ # hackish way, we put it in here. This one day will be empty. import copy_reg +from twisted.web.client import SchemeNotSupported + +from txsocksx.http import SOCKS5Agent as SOCKS5AgentOriginal def patched_reduce_ex(self, proto): @@ -56,3 +59,29 @@ def patched_reduce_ex(self, proto): else: return copy_reg._reconstructor, args + +class SOCKS5Agent(SOCKS5AgentOriginal): + """ + This is a quick hack to fix: + https://github.com/habnabit/txsocksx/issues/9 + """ + def _getEndpoint(self, scheme_or_uri, host=None, port=None): + if host is not None: + scheme = scheme_or_uri + else: + scheme = scheme_or_uri.scheme + host = scheme_or_uri.host + port = scheme_or_uri.port + if scheme not in ('http', 'https'): + raise SchemeNotSupported('unsupported scheme', scheme) + endpoint = self.endpointFactory( + host, port, self.proxyEndpoint, **self.endpointArgs) + if scheme == 'https': + if hasattr(self, '_wrapContextFactory'): + tlsPolicy = self._wrapContextFactory(host, port) + elif hasattr(self, '_policyForHTTPS'): + tlsPolicy = self._policyForHTTPS.creatorForNetloc(host, port) + else: + raise NotImplementedError("can't figure out how to make a context factory") + endpoint = self._tlsWrapper(tlsPolicy, endpoint) + return endpoint diff --git a/ooni/utils/trueheaders.py b/ooni/utils/trueheaders.py index e5dcd0a..f015b62 100644 --- a/ooni/utils/trueheaders.py +++ b/ooni/utils/trueheaders.py @@ -12,7 +12,7 @@ from twisted.web._newclient import RequestNotSent, RequestGenerationFailed, Tran from twisted.internet import reactor from twisted.internet.defer import Deferred, fail, maybeDeferred, failure -from txsocksx.http import SOCKS5Agent +from ooni.utils.hacks import SOCKS5Agent from txsocksx.client import SOCKS5ClientFactory SOCKS5ClientFactory.noisy = False

1 0

[ooni-probe/master] Tag release candiate
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 5ad2ba0e790753b702e518ec2bd3c659d1989f59 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 4 12:39:47 2015 +0100 Tag release candiate --- ooni/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 305222c..a83105a 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.2.2" +__version__ = "1.2.3-rc1" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter',

1 0

[ooni-probe/master] Set a default bouncer
by art＠torproject.org 04 Feb '15

04 Feb '15

commit bc638e8c477b87933cf31bd6f5623a5dfeeb7630 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 4 14:19:00 2015 +0100 Set a default bouncer --- ooni/report/cli.py | 2 +- ooni/report/tool.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/report/cli.py b/ooni/report/cli.py index e52b022..c1b4a22 100644 --- a/ooni/report/cli.py +++ b/ooni/report/cli.py @@ -20,7 +20,7 @@ class Options(usage.Options): "Specify the configuration file to use."], ["collector", "c", None, "Specify the collector to upload the result to."], - ["bouncer", "b", None, + ["bouncer", "b", "httpo://nkvphnp3p6agi5qq.onion", "Specify the bouncer to query for a collector."] ] diff --git a/ooni/report/tool.py b/ooni/report/tool.py index 9eaad5e..a16794a 100644 --- a/ooni/report/tool.py +++ b/ooni/report/tool.py @@ -20,7 +20,7 @@ def upload(report_file, collector=None, bouncer=None): report_log = yaml.safe_load(f) report = parser.ReportLoader(report_file) - if bouncer: + if bouncer and not collector: oonib_client = OONIBClient(bouncer) net_tests = [{ 'test-helpers': [],

1 0

[ooni-probe/master] Update changelog for ooniprobe 1.2.3-rc1
by art＠torproject.org 04 Feb '15

04 Feb '15

commit e358243b21fe8e88b8894cdd94aa4dab3d4f92ce Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 4 14:24:46 2015 +0100 Update changelog for ooniprobe 1.2.3-rc1 --- ChangeLog.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ChangeLog.rst b/ChangeLog.rst index cddf18f..92f5109 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,17 @@ Changelog ========= +v1.2.3-rc1 (Wed, 4 Feb 2015) +------------------------ +* Restructure directories where ooni software writes/reads from + https://trac.torproject.org/projects/tor/ticket/14086 + +* Properly set exit codes of oonideckgen + +* Exit cleanly if we can't find the probes IP address + +* Make the DNS Consistency test handle errors better + v1.2.2 (Fri, 17 Oct 2014) -------------------------

1 0

[ooni-probe/master] Fix some bugs in oonireport
by art＠torproject.org 04 Feb '15

04 Feb '15

commit eb1daf87240830d8c875455ad92a708ce8443d65 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 4 14:17:55 2015 +0100 Fix some bugs in oonireport --- ooni/report/tool.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ooni/report/tool.py b/ooni/report/tool.py index 11dbeda..9eaad5e 100644 --- a/ooni/report/tool.py +++ b/ooni/report/tool.py @@ -22,9 +22,16 @@ def upload(report_file, collector=None, bouncer=None): report = parser.ReportLoader(report_file) if bouncer: oonib_client = OONIBClient(bouncer) - collector = yield oonib_client.lookupTestCollector( - report.header['test_name'] + net_tests = [{ + 'test-helpers': [], + 'input-hashes': report.header['input_hashes'], + 'name': report.header['test_name'], + 'version': report.header['test_version'], + }] + result = yield oonib_client.lookupTestCollector( + net_tests ) + collector = str(result['net-tests'][0]['collector']) if collector is None: try: @@ -57,7 +64,7 @@ def upload_all(collector=None, bouncer=None): try: yield upload(report_file, collector, bouncer) except Exception as exc: - print exc + log.exception(exc) def print_report(report_file, value):

1 0

[ooni-probe/master] Merge pull request #376 from TheTorProject/fix/deckgen-stall
by art＠torproject.org 04 Feb '15

04 Feb '15

commit cd8618aee6ed78c0d223ff6448b339ef11b9c696 Merge: d3981af 9639103 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Feb 4 11:30:03 2015 +0100 Merge pull request #376 from TheTorProject/fix/deckgen-stall Fix/deckgen stall bin/oonideckgen | 10 ++++++++++ bin/oonireport | 19 ++++++++++++++++-- data/ooniprobe.conf.sample | 1 + ooni/deckgen/cli.py | 8 +++++++- ooni/nettests/blocking/dns_consistency.py | 31 +++++++++++++++++++---------- ooni/oonibclient.py | 3 ++- ooni/report/cli.py | 6 +++++- ooni/report/tool.py | 12 +++++++---- ooni/reporter.py | 6 ++++-- ooni/settings.py | 9 +++++++-- ooni/utils/hacks.py | 29 +++++++++++++++++++++++++++ ooni/utils/trueheaders.py | 2 +- 12 files changed, 112 insertions(+), 24 deletions(-)

1 0

[ooni-probe/master] Run ooniresources only in post install
by art＠torproject.org 04 Feb '15

04 Feb '15

commit f5ee5e39c337c31e75e011fc7dcec4e3cc8e342c Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 4 12:39:21 2015 +0100 Run ooniresources only in post install Fix inclusion of inputs in MANIFEST --- MANIFEST.in | 2 +- setup.py | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 71c4a58..920f933 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include README.rst ChangeLog.rst requirements.txt LICENSE recursive-include data/decks * -include data/inputs/ +recursive-include data/inputs * include data/oonideckgen.1 include data/ooniprobe.1 include data/oonireport.1 diff --git a/setup.py b/setup.py index 62335d9..54ec4ee 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ from ConfigParser import SafeConfigParser from os.path import join as pj from setuptools import setup from setuptools.command.install import install as _st_install - +from distutils.spawn import find_executable class install(_st_install): def gen_config(self, share_path): @@ -67,11 +67,18 @@ class install(_st_install): except OSError: pass + def ooniresources(self): + ooniresources = find_executable("ooniresources") + from subprocess import Popen, PIPE + process = Popen([ooniresources, '--update-inputs', '--update-geoip'], + stdout=sys.stdout.fileno(), stderr=sys.stderr.fileno()) + process.wait() + def run(self): prefix = os.path.abspath(self.prefix) self.set_data_files(prefix) self.do_egg_install() - + self.ooniresources() install_requires = [] dependency_links = [] @@ -163,8 +170,3 @@ setup( "Topic :: System :: Networking :: Monitoring", ) ) - -from subprocess import Popen, PIPE -process = Popen(['ooniresources', '--update-inputs', '--update-geoip'], - stdout=sys.stdout.fileno(), stderr=sys.stderr.fileno()) -process.wait()

1 0

[ooni-probe/master] Use the new function for determining the geoip data files path
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 6d2d12aee6513b69795777505a51685d3e5e06de Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 3 18:04:07 2015 +0100 Use the new function for determining the geoip data files path --- ooni/geoip.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ooni/geoip.py b/ooni/geoip.py index 9c3ee31..1ff90a7 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -81,12 +81,8 @@ def database_version(): } } - geoip_data_dir = config.advanced.get("geoip_data_dir") - if not geoip_data_dir: - return version - for key in version.keys(): - geoip_file = os.path.join(geoip_data_dir, key + ".dat") + geoip_file = config.get_data_file_path("GeoIP/" + key + ".dat") if not os.path.isfile(geoip_file): continue timestamp = os.stat(geoip_file).st_mtime

1 0

[ooni-probe/master] Re-add manpages to manifest
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 8d7a40ce66777b5ff49569c9ed2c51ed79b74159 Author: Arturo Filastò <art(a)fuffa.org> Date: Sun Jan 4 12:18:24 2015 +0100 Re-add manpages to manifest --- MANIFEST.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 9b70d09..71c4a58 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,9 @@ include README.rst ChangeLog.rst requirements.txt LICENSE recursive-include data/decks * include data/inputs/ +include data/oonideckgen.1 +include data/ooniprobe.1 +include data/oonireport.1 +include data/ooniresources.1 include data/ooniprobe.conf.sample include ooni/settings.ini

1 0

[ooni-probe/master] Restructure directories where ooni software writes/reads from
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 2db26224cc0e79a8b144bd590287cd688c7891e0 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Jan 3 17:48:18 2015 +0100 Restructure directories where ooni software writes/reads from This implements: https://trac.torproject.org/projects/tor/ticket/14086 --- data/ooniprobe.conf.sample | 2 - ooni/deckgen/cli.py | 4 +- ooni/deckgen/processors/citizenlab_test_lists.py | 16 ++-- ooni/deckgen/processors/namebench_dns_servers.py | 8 +- ooni/geoip.py | 6 +- ooni/resources/__init__.py | 24 ++++-- ooni/resources/update.py | 5 +- ooni/settings.py | 88 +++++++++++++++------- setup.py | 25 +++++- 9 files changed, 118 insertions(+), 60 deletions(-) diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 831525a..3c9cea9 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -45,8 +45,6 @@ advanced: reporting_retries: 3 # How many reports to perform concurrently reporting_concurrency: 15 - # Specify here a custom data_dir path - data_dir: /usr/share/ooni oonid_api_port: 8042 tor: #socks_port: 8801 diff --git a/ooni/deckgen/cli.py b/ooni/deckgen/cli.py index 216b9a7..3f4342a 100644 --- a/ooni/deckgen/cli.py +++ b/ooni/deckgen/cli.py @@ -118,6 +118,7 @@ def generate_deck(options): @defer.inlineCallbacks def get_user_country_code(): + config.privacy.includecountry = True probe_ip = ProbeIP() yield probe_ip.lookup() defer.returnValue(probe_ip.geodata['countrycode']) @@ -155,9 +156,6 @@ def run(): "deck-%s" % options['country-code']) options['output'] = output_dir - config.initialize_ooni_home() - config.read_config_file() - try: os.makedirs(options['output']) except OSError as exception: diff --git a/ooni/deckgen/processors/citizenlab_test_lists.py b/ooni/deckgen/processors/citizenlab_test_lists.py index b36e726..b455008 100644 --- a/ooni/deckgen/processors/citizenlab_test_lists.py +++ b/ooni/deckgen/processors/citizenlab_test_lists.py @@ -26,10 +26,10 @@ def generate_country_input(country_code, dst): country_code = country_code.lower() filename = os.path.join(dst, "citizenlab-urls-%s.txt" % country_code) - input_list = os.path.join(config.resources_directory, - "citizenlab-test-lists", - "test-lists-master", - "csv", country_code + ".csv") + input_list = config.get_data_file_path("resources/" + "citizenlab-test-lists/" + "test-lists-master/csv/" + + country_code + ".csv") if not os.path.exists(input_list): raise Exception("Could not find list for country %s" % country_code) @@ -42,10 +42,10 @@ def generate_country_input(country_code, dst): def generate_global_input(dst): filename = os.path.join(dst, "citizenlab-urls-global.txt") - input_list = os.path.join(config.resources_directory, - "citizenlab-test-lists", - "test-lists-master", - "csv", "global.csv") + input_list = config.get_data_file_path("resources/" + "citizenlab-test-lists/" + "test-lists-master/csv/" + "global.csv") load_input(input_list, filename) diff --git a/ooni/deckgen/processors/namebench_dns_servers.py b/ooni/deckgen/processors/namebench_dns_servers.py index e434f72..f35ca93 100644 --- a/ooni/deckgen/processors/namebench_dns_servers.py +++ b/ooni/deckgen/processors/namebench_dns_servers.py @@ -14,8 +14,7 @@ class GeoIPDB(object): self.__dict__ = self._borg if not self.country: try: - country_file = os.path.join(config.advanced.geoip_data_dir, - 'GeoIP.dat') + country_file = config.get_data_file_path('GeoIP/GeoIP.dat') self.country = GeoIP.open(country_file, GeoIP.GEOIP_STANDARD) except: @@ -25,8 +24,9 @@ class GeoIPDB(object): def generate_country_input(country_code, dst): - csv_file = os.path.join(config.resources_directory, - "namebench-dns-servers.csv") + csv_file = config.get_data_file_path("resources/" + "namebench-dns-servers.csv") + filename = os.path.join(dst, "dns-server-%s.txt" % country_code) fw = open(filename, "w") geoip_db = GeoIPDB() diff --git a/ooni/geoip.py b/ooni/geoip.py index 48e1134..9c3ee31 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -30,9 +30,9 @@ class GeoIPDataFilesNotFound(Exception): def IPToLocation(ipaddr): from ooni.settings import config - city_file = os.path.join(config.advanced.geoip_data_dir, 'GeoLiteCity.dat') - country_file = os.path.join(config.advanced.geoip_data_dir, 'GeoIP.dat') - asn_file = os.path.join(config.advanced.geoip_data_dir, 'GeoIPASNum.dat') + city_file = config.get_data_file_path('GeoIP/GeoLiteCity.dat') + country_file = config.get_data_file_path('GeoIP/GeoIP.dat') + asn_file = config.get_data_file_path('GeoIP/GeoIPASNum.dat') location = {'city': None, 'countrycode': 'ZZ', 'asn': 'AS0'} diff --git a/ooni/resources/__init__.py b/ooni/resources/__init__.py index 71e0a95..46fad05 100644 --- a/ooni/resources/__init__.py +++ b/ooni/resources/__init__.py @@ -1,14 +1,24 @@ +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 -config.initialize_ooni_home() -config.read_config_file() - __version__ = "0.0.1" +if os.access(config.var_lib_path, os.W_OK): + resources_directory = os.path.join(config.var_lib_path, + "resources") + geoip_directory = os.path.join(config.var_lib_path, + "GeoIP") +else: + resources_directory = os.path.join(config.ooni_home, + "resources") + geoip_directory = os.path.join(config.ooni_home, + "GeoIP") + inputs = { "namebench-dns-servers.csv": { "url": "https://namebench.googlecode.com/svn/trunk/config/servers.csv", @@ -19,7 +29,7 @@ inputs = { "citizenlab-test-lists.zip": { "url": "https://github.com/citizenlab/test-lists/archive/master.zip", "action": unzip, - "action_args": [config.resources_directory], + "action_args": [resources_directory], "processor": citizenlab_test_lists } } @@ -29,21 +39,21 @@ geoip = { "url": "https://geolite.maxmind.com/download/" "geoip/database/GeoLiteCity.dat.gz", "action": gunzip, - "action_args": [config.advanced.geoip_data_dir], + "action_args": [geoip_directory], "processor": None }, "GeoIPASNum.dat.gz": { "url": "https://geolite.maxmind.com/download/" "geoip/database/asnum/GeoIPASNum.dat.gz", "action": gunzip, - "action_args": [config.advanced.geoip_data_dir], + "action_args": [geoip_directory], "processor": None }, "GeoIP.dat.gz": { "url": "https://geolite.maxmind.com/" "download/geoip/database/GeoLiteCountry/GeoIP.dat.gz", "action": gunzip, - "action_args": [config.advanced.geoip_data_dir], + "action_args": [geoip_directory], "processor": None } } diff --git a/ooni/resources/update.py b/ooni/resources/update.py index 4017965..7a949c9 100644 --- a/ooni/resources/update.py +++ b/ooni/resources/update.py @@ -3,8 +3,7 @@ import os from twisted.internet import defer from twisted.web.client import downloadPage -from ooni.settings import config -from ooni.resources import inputs, geoip +from ooni.resources import inputs, geoip, resources_directory from ooni.utils import unzip, gunzip @@ -17,7 +16,7 @@ def download_resource(resources): dirname = resource["action_args"][0] filename = os.path.join(dirname, filename) else: - filename = os.path.join(config.resources_directory, filename) + filename = os.path.join(resources_directory, filename) if not os.path.exists(filename): directory = os.path.dirname(filename) if not os.path.isdir(directory): diff --git a/ooni/settings.py b/ooni/settings.py index 5ad622d..71b449e 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -32,21 +32,63 @@ class OConfig(object): self.privacy = Storage() self.set_paths() - @property - def data_directory(self): + def embedded_settings(self, category, option): embedded_settings = os.path.join(get_ooni_root(), 'settings.ini') - if os.getenv("OONI_DATA_DIR"): - return os.getenv("OONI_DATA_DIR") - elif self.global_options.get('datadir'): - return abspath(expanduser(self.global_options['datadir'])) - elif self.advanced.get('data_dir'): - return self.advanced['data_dir'] - elif os.path.isfile(embedded_settings): + if os.path.isfile(embedded_settings): settings = SafeConfigParser() with open(embedded_settings) as fp: settings.readfp(fp) - return os.path.abspath(settings.get("directories", "data_dir")) - return abspath(os.path.join(get_ooni_root(), '..', 'data')) + return settings.get(category, option) + return None + + @property + def var_lib_path(self): + var_lib_path = self.embedded_settings("directories", "var_lib") + if var_lib_path: + return os.path.abspath(var_lib_path) + return "/var/lib/ooni" + + @property + def usr_share_path(self): + usr_share_path = self.embedded_settings("directories", "usr_share") + if usr_share_path: + return os.path.abspath(usr_share_path) + return "/usr/share/ooni" + + @property + def data_directory_candidates(self): + dirs = [ + os.path.join(expanduser('~'+self.current_user), '.ooni'), + self.var_lib_path, + self.usr_share_path, + os.path.join(get_ooni_root(), '..', 'data'), + '/usr/share/' + ] + if os.getenv("OONI_DATA_DIR"): + dirs.insert(0, os.getenv("OONI_DATA_DIR")) + if self.global_options.get('datadir'): + dirs.insert(0, abspath(expanduser(self.global_options['datadir']))) + return dirs + + @property + def data_directory(self): + for target_dir in self.data_directory_candidates: + if os.path.isdir(target_dir): + return target_dir + return self.var_lib_path + + @property + def ooni_home(self): + if self._custom_home: + return self._custom_home + return os.path.join(expanduser('~'+self.current_user), + '.ooni') + + def get_data_file_path(self, file_name): + for target_dir in self.data_directory_candidates: + file_path = os.path.join(target_dir, file_name) + if os.path.isfile(file_path): + return file_path def set_paths(self, ooni_home=None): if ooni_home: @@ -54,15 +96,12 @@ class OConfig(object): self.nettest_directory = os.path.join(get_ooni_root(), 'nettests') - self.ooni_home = os.path.join(expanduser('~'+self.current_user), - '.ooni') - if self._custom_home: - self.ooni_home = self._custom_home self.inputs_directory = os.path.join(self.ooni_home, 'inputs') self.decks_directory = os.path.join(self.ooni_home, 'decks') self.reports_directory = os.path.join(self.ooni_home, 'reports') self.report_log_file = os.path.join(self.ooni_home, 'reporting.yml') - self.resources_directory = os.path.join(self.data_directory, "resources") + self.resources_directory = os.path.join(self.data_directory, + 'resources') if self.global_options.get('configfile'): config_file = self.global_options['configfile'] @@ -71,12 +110,8 @@ class OConfig(object): self.config_file = os.path.join(self.ooni_home, 'ooniprobe.conf') if 'logfile' in self.basic: - self.basic.logfile = expanduser(self.basic.logfile.replace('~','~'+self.current_user)) - - if not os.path.exists(self.data_directory): - log.err("Data directory %s does not exists" % self.data_directory) - log.err("Edit data_dir inside of %s" % self.config_file) - + self.basic.logfile = expanduser(self.basic.logfile.replace( + '~', '~'+self.current_user)) def initialize_ooni_home(self, ooni_home=None): if ooni_home: @@ -94,14 +129,15 @@ class OConfig(object): def _create_config_file(self): target_config_file = self.config_file print "Creating it for you in '%s'." % target_config_file - sample_config_file = os.path.join(self.data_directory, - 'ooniprobe.conf.sample') + sample_config_file = self.get_data_file_path('ooniprobe.conf.sample') with open(sample_config_file) as f: with open(target_config_file, 'w+') as w: for line in f: if line.startswith(' logfile: '): - w.write(' logfile: %s\n' % os.path.join(self.ooni_home, 'ooniprobe.log')) + w.write(' logfile: %s\n' % ( + os.path.join(self.ooni_home, 'ooniprobe.log')) + ) else: w.write(line) @@ -176,4 +212,4 @@ config = OConfig() if not os.path.isfile(config.config_file) \ and os.path.isfile('/etc/ooni/ooniprobe.conf'): config.global_options['configfile'] = '/etc/ooniprobe.conf' - config.set_paths(ooni_home=config.advanced.data_dir) + config.set_paths() diff --git a/setup.py b/setup.py index 9b66169..62335d9 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,13 @@ class install(_st_install): o.close() return config_file - def set_data_files(self, share_path): + def set_data_files(self, prefix): + share_path = pj(prefix, 'share') + if prefix.startswith("/usr"): + var_path = "/var/lib/" + else: + var_path = pj(prefix, 'var', 'lib') + for root, dirs, file_names in os.walk('data/'): files = [] for file_name in file_names: @@ -45,14 +51,25 @@ class install(_st_install): ) settings = SafeConfigParser() settings.add_section("directories") - settings.set("directories", "data_dir", + settings.set("directories", "usr_share", os.path.join(share_path, "ooni")) + settings.set("directories", "var_lib", + os.path.join(var_path, "ooni")) with open("ooni/settings.ini", "w+") as fp: settings.write(fp) + try: + os.makedirs(pj(var_path, 'ooni')) + except OSError: + pass + try: + os.makedirs(pj(share_path, 'ooni')) + except OSError: + pass + def run(self): - share_path = os.path.abspath(pj(self.prefix, 'share')) - self.set_data_files(share_path) + prefix = os.path.abspath(self.prefix) + self.set_data_files(prefix) self.do_egg_install()

1 0