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

[ooni-probe/master] Add support for specifying a settings.ini file via environment variables
by art＠torproject.org 13 Jan '17

13 Jan '17

commit ee68602abac9c5f66ba81c4df95822a3ccd87bda Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Oct 26 17:12:03 2016 +0200 Add support for specifying a settings.ini file via environment variables When doing end to end testing for the homebrew package it's required to have the ability to overwrite the paths used by ooniprobe. --- ooni/settings.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ooni/settings.py b/ooni/settings.py index ef220ca..48dd1f3 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -156,6 +156,9 @@ if hasattr(sys, 'real_prefix'): # These are the the embedded settings _SETTINGS_INI = os.path.join(OONIPROBE_ROOT, 'settings.ini') +# This can be overridden by an environment variable for end to end testing +if 'OONIPROBE_SETTINGS' in os.environ: + _SETTINGS_INI = os.environ['OONIPROBE_SETTINGS'] USR_SHARE_PATH = '/usr/share/ooni' VAR_LIB_PATH = '/var/lib/ooni'

1 0

[ooni-probe/master] Fix invalid python classifier
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 1992a8ce079fd12c06a1276b65f5b287f363d5d2 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Oct 14 21:16:19 2016 +0200 Fix invalid python classifier --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4acbe77..26ed2a1 100644 --- a/setup.py +++ b/setup.py @@ -110,7 +110,7 @@ Intended Audience :: End Users/Desktop Intended Audience :: Information Technology Intended Audience :: Science/Research Intended Audience :: Telecommunications Industry -License :: OSI Approved :: BSD Licens +License :: OSI Approved :: BSD License Programming Language :: Python Programming Language :: Python :: 2 Programming Language :: Python :: 2 :: Only

1 0

[ooni-probe/master] Explicitly test all Twisted versions, add pip list, format template (#637)
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 1dcdce1cce0550a011e5f61f38d36c71361dd991 Author: anadahz <anadahz(a)users.noreply.github.com> Date: Wed Oct 26 13:49:59 2016 +0000 Explicitly test all Twisted versions, add pip list, format template (#637) * Explicitly test all Twisted versions, add pip list, format template Successfully debugging an ooniprobe build/run implies that we know the specific package and version dependency of a build. * Add missing Twisted versions from travis environment * Add the output of pip list to the travis build log * Minor fixes to irc template format * Fix YAML syntax: add missing dash (-) --- .travis.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1adfd29..899d925 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,15 @@ env: - TWISTED=Twisted==15.3.0 - TWISTED=Twisted==15.4.0 - TWISTED=Twisted==15.5.0 + - TWISTED=Twisted==16.0.0 + - TWISTED=Twisted==16.1.0 + - TWISTED=Twisted==16.1.1 + - TWISTED=Twisted==16.2.0 + - TWISTED=Twisted==16.3.0 + - TWISTED=Twisted==16.3.1 + - TWISTED=Twisted==16.3.2 + - TWISTED=Twisted==16.4.0 + - TWISTED=Twisted==16.4.1 - TWISTED=Twisted before_install: - sudo apt-get update @@ -30,6 +39,7 @@ install: # command to run tests, e.g. python setup.py test script: - sudo $(which coverage) run $(which trial) ooni + - pip list after_success: - coveralls notifications: @@ -40,5 +50,5 @@ notifications: on_failure: change skip_join: true template: - - "%{repository} (%{commit}) : %{message} Diff:%{compare_url}, - Build %{build_url}" + - "%{repository} (%{commit}): %{message} Diff: %{compare_url}" + - "Build: %{build_url}"

1 0

[ooni-probe/master] Pass the missing start_tor argument to director start command
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 9d447a62cce61e566f83b3a2fe39421aefc01bda Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Oct 28 14:26:18 2016 +0200 Pass the missing start_tor argument to director start command --- ooni/ui/cli.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ooni/ui/cli.py b/ooni/ui/cli.py index c16173b..edb97b3 100644 --- a/ooni/ui/cli.py +++ b/ooni/ui/cli.py @@ -365,7 +365,8 @@ def runTestWithDirector(director, global_options, url=None, create_input_store=True): deck = createDeck(global_options, url=url) - d = director.start(create_input_store=create_input_store) + d = director.start(create_input_store=create_input_store, + start_tor=start_tor) @defer.inlineCallbacks def post_director_start(_): try:

1 0

[ooni-probe/master] Bump version number in master (#661)
by art＠torproject.org 13 Jan '17

13 Jan '17

commit ae8868136f90eca57ab4720211cea68b4a2ac5b1 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Oct 28 17:14:30 2016 +0200 Bump version number in master (#661) --- ooni/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 98151f8..afa377e 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "2.0.0" +__version__ = "2.0.1.dev0" __all__ = [ 'agent',

1 0

[ooni-probe/master] Add info flag to list paths for the current ooniprobe installation
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 7f317fbadccee8566b3c2fd3c8b3ba2bb5fa3b00 Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Oct 27 23:04:03 2016 +0200 Add info flag to list paths for the current ooniprobe installation --- ooni/scripts/ooniprobe.py | 5 +++++ ooni/settings.py | 21 +++++++++++++++++++++ ooni/ui/cli.py | 7 +++++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ooni/scripts/ooniprobe.py b/ooni/scripts/ooniprobe.py index e8b9af4..9459813 100644 --- a/ooni/scripts/ooniprobe.py +++ b/ooni/scripts/ooniprobe.py @@ -7,9 +7,14 @@ from twisted.internet import task, defer def ooniprobe(reactor): from ooni.ui.cli import runWithDaemonDirector, runWithDirector from ooni.ui.cli import setupGlobalOptions, initializeOoniprobe + from ooni.settings import config global_options = setupGlobalOptions(logging=True, start_tor=True, check_incoherences=True) + if global_options['info']: + config.log_info() + return defer.succeed(None) + if global_options['queue']: return runWithDaemonDirector(global_options) diff --git a/ooni/settings.py b/ooni/settings.py index 48dd1f3..ed2d1e1 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -349,6 +349,27 @@ class OConfig(object): if os.path.isfile(file_path): return file_path + def log_info(self): + log.msg("Paths") + log.msg("-----") + log.msg("inputs directory: %s" % self.inputs_directory) + log.msg("scheduler directory: %s" % self.scheduler_directory) + log.msg("resources directory: %s" % self.resources_directory) + log.msg("decks available directory: %s" % self.decks_available_directory) + log.msg("decks enabled directory: %s" % self.decks_enabled_directory) + log.msg("measurements directory: %s" % self.measurements_directory) + + log.msg("running path: %s" % self.running_path) + log.msg("config files: %s" % ','.join(self.config_files)) + log.msg("ooni home: %s" % self.ooni_home) + log.msg("var_lib path: %s" % VAR_LIB_PATH) + log.msg("etc path: %s" % ETC_PATH) + log.msg("usr_share path: %s" % USR_SHARE_PATH) + + log.debug("nettest directory: %s" % self.nettest_directory) + log.debug("web ui directory: %s" % self.web_ui_directory) + + def set_paths(self): self.nettest_directory = os.path.join(OONIPROBE_ROOT, 'nettests') self.web_ui_directory = os.path.join(OONIPROBE_ROOT, 'ui', 'web', diff --git a/ooni/ui/cli.py b/ooni/ui/cli.py index fed9606..6228d2f 100644 --- a/ooni/ui/cli.py +++ b/ooni/ui/cli.py @@ -33,6 +33,7 @@ class Options(usage.Options): ["web-ui", "w", "Start the web UI"], ["initialize", "z", "Initialize ooniprobe to begin running " "it"], + ["info", None, "Print system wide info and exit"] ] optParameters = [ @@ -61,7 +62,8 @@ class Options(usage.Options): "communicating with test helpers. " "Can be either onion, " "https or cloudfront"], - ["queue", "Q", None, "AMQP Queue URL amqp://user:pass@host:port/vhost/queue"] + ["queue", "Q", None, "AMQP Queue URL " + "amqp://user:pass@host:port/vhost/queue"] ] compData = usage.Completions( @@ -90,7 +92,8 @@ class Options(usage.Options): sys.exit(0) def parseArgs(self, *args): - if self['testdeck'] or self['list'] or self['web-ui']: + flag_opts = ['testdeck', 'list', 'web-ui', 'info'] + if any([self[opt] for opt in flag_opts]): return try: self['test_file'] = args[0]

1 0

[ooni-probe/master] Bump to v2.0.1
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 123acc17ac63d8d45238be03d63982a6949b5088 Author: Arturo Filastò <arturo(a)filasto.net> Date: Sat Oct 29 21:13:18 2016 +0200 Bump to v2.0.1 --- ChangeLog.rst | 16 ++++++++++++++++ ooni/__init__.py | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 42026c1..528ef62 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,22 @@ Changelog ========= +v2.0.1 (Sat, 29 Oct 2016) +-------------------------- + +Improvements: + +* Add `--info` command line option to print paths of ooniprobe + +* Support specifying a `settings.ini` via an environment variable to facilitate + testing. + +Bug fixes: + +* Fix https://github.com/TheTorProject/ooni-probe/issues/636 + +* Fix https://github.com/TheTorProject/ooni-probe/issues/650 + v2.0.0 (Fri, 14 Oct 2016) ------------------------------ codename: mezzanine diff --git a/ooni/__init__.py b/ooni/__init__.py index afa377e..c2d5fdf 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "2.0.1.dev0" +__version__ = "2.0.1" __all__ = [ 'agent',

1 0

[ooni-probe/master] When ooniprobe is run for the first time. Initialize it and then run the command the user wanted.
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 65ea56a1f7ed97466b3039197b944bd24b86fac8 Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Oct 27 22:54:23 2016 +0200 When ooniprobe is run for the first time. Initialize it and then run the command the user wanted. This fixes: https://github.com/TheTorProject/ooni-probe/issues/650 --- ooni/ui/cli.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ooni/ui/cli.py b/ooni/ui/cli.py index edb97b3..fed9606 100644 --- a/ooni/ui/cli.py +++ b/ooni/ui/cli.py @@ -224,18 +224,13 @@ def initializeOoniprobe(global_options): should_upload=should_upload, preferred_backend=preferred_backend) config.set_initialized() + print("ooniprobe is now initialized. You can begin using it!") def setupGlobalOptions(logging, start_tor, check_incoherences): global_options = parseOptions() config.global_options = global_options - if not config.is_initialized(): - log.err("You first need to agree to the informed consent and setup " - "ooniprobe to run it.") - global_options['initialize'] = True - return global_options - config.set_paths() config.initialize_ooni_home() try: @@ -243,6 +238,9 @@ def setupGlobalOptions(logging, start_tor, check_incoherences): except errors.ConfigFileIncoherent: sys.exit(6) + if not config.is_initialized(): + initializeOoniprobe(global_options) + if global_options['verbose']: config.advanced.debug = True

1 0

[ooni-probe/master] When stdin is not attached to a tty exit early
by art＠torproject.org 13 Jan '17

13 Jan '17

commit ea12da31eceb3c79b259da5edb562a282022a7d8 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Oct 28 19:24:34 2016 +0200 When stdin is not attached to a tty exit early --- ooni/ui/cli.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ooni/ui/cli.py b/ooni/ui/cli.py index 6228d2f..c545d82 100644 --- a/ooni/ui/cli.py +++ b/ooni/ui/cli.py @@ -174,6 +174,10 @@ def director_startup_other_failures(failure): def initializeOoniprobe(global_options): print("It looks like this is the first time you are running ooniprobe") + if not sys.stdin.isatty(): + print("ERROR: STDIN is not attached to a tty. Quiting.") + sys.exit(8) + print("Please take a minute to read through the informed consent documentation and " "understand what are the risks associated with running ooniprobe.") print("Press enter to continue...")

1 0

[ooni-probe/master] [hotfix] fix syntax error in oonideckgen
by art＠torproject.org 13 Jan '17

13 Jan '17

commit 083b779101c45a56cc8be84fe944296cb5b85e31 Author: Arturo Filastò <arturo(a)filasto.net> Date: Sat Oct 29 21:53:15 2016 +0200 [hotfix] fix syntax error in oonideckgen This closes: https://github.com/TheTorProject/ooni-probe/issues/651 --- ooni/scripts/oonideckgen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/scripts/oonideckgen.py b/ooni/scripts/oonideckgen.py index 89541d7..39bce74 100644 --- a/ooni/scripts/oonideckgen.py +++ b/ooni/scripts/oonideckgen.py @@ -30,7 +30,7 @@ class Options(usage.Options): ] def opt_version(self): - print("oonideckgen version: " % __version__) + print("oonideckgen version: %s" % __version__) sys.exit(0) def generate_deck(options):

1 0