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

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 528e261c5a9e5da52e223cc02d58ea3652220398 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 18:15:36 2014 +0000 Update translations for tails-misc --- cy.po | 26 +++++++++++++------------- de.po | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cy.po b/cy.po index fec5944..918d7ee 100644 --- a/cy.po +++ b/cy.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-26 17:45+0000\n" +"PO-Revision-Date: 2014-03-26 18:00+0000\n" "Last-Translator: littlegreykida <theinfinitygap(a)gmail.com>\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" "MIME-Version: 1.0\n" @@ -198,11 +198,11 @@ msgstr "Canlyniadau GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:819 msgid "Output of GnuPG:" -msgstr "" +msgstr "Allbwn o GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:844 msgid "Other messages provided by GnuPG:" -msgstr "" +msgstr "Negeseuon eraill a ddarperir gan GnuPG:" #: config/chroot_local-includes/usr/local/bin/iceweasel:12 msgid "Tor is not ready" @@ -222,19 +222,19 @@ msgstr "Canslo" #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:34 msgid "Shutdown Immediately" -msgstr "" +msgstr "Cau lawr ar unwaith" #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:35 msgid "Reboot Immediately" -msgstr "" +msgstr "Ailgychwynwch ar unwaith" #: config/chroot_local-includes/usr/local/bin/shutdown_helper_applet:72 msgid "Shutdown Helper" -msgstr "" +msgstr "Cynorthwydd cau lawr" #: config/chroot_local-includes/usr/local/bin/tails-about:13 msgid "not available" -msgstr "" +msgstr "ddim ar gael" #: config/chroot_local-includes/usr/local/bin/tails-about:16 #: ../config/chroot_local-includes/usr/share/desktop-directories/Tails.directory.in.h:1 @@ -243,24 +243,24 @@ msgstr "Tails" #: config/chroot_local-includes/usr/local/bin/tails-about:17 msgid "The Amnesic Incognito Live System" -msgstr "" +msgstr "Y System Cyddiad Collcof Fyw" #: config/chroot_local-includes/usr/local/bin/tails-about:18 #, python-format msgid "" "Build information:\n" "%s" -msgstr "" +msgstr "Gwybodaeth adeilad:\n%s" #: config/chroot_local-includes/usr/local/bin/tails-about:20 msgid "About Tails" -msgstr "" +msgstr "Amdan Tails" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" -msgstr "" +msgstr "Eich meddalwedd ychwanegol" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 @@ -272,11 +272,11 @@ msgstr "" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." -msgstr "" +msgstr "Roedd yr uwchraddiad yn llwyddianus." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" -msgstr "" +msgstr "Cydsoni cloc y system" #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:53 msgid "" diff --git a/de.po b/de.po index d01d2cc..83ac5b5 100644 --- a/de.po +++ b/de.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-26 17:40+0000\n" +"PO-Revision-Date: 2014-03-26 17:50+0000\n" "Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Fix version number in changes/bug11296
by nickm＠torproject.org 26 Mar '14

26 Mar '14

commit cd15172444e0f8e34d1adcd84034c40893cd6c0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 26 14:10:07 2014 -0400 Fix version number in changes/bug11296 --- changes/bug11296 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug11296 b/changes/bug11296 index a281e39..1567497 100644 --- a/changes/bug11296 +++ b/changes/bug11296 @@ -1,3 +1,3 @@ o Minor bugfixes: - Allow tor-fw-helper to build again by adding src/ext to its - CPPFLAGS. Fixes bug 11296; bugfix on 0.2.5.4-alpha. + CPPFLAGS. Fixes bug 11296; bugfix on 0.2.5.3-alpha.

1 0

[oonib/master] Add libffi-dev to the dependencies.
by art＠torproject.org 26 Mar '14

26 Mar '14

commit f52cf055bca90f87e1fff3a9d87176658e4472b5 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Mon Mar 10 01:33:34 2014 +0100 Add libffi-dev to the dependencies. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8504d05..f11e4a0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ There are a few dependencies which we recommend you get from your distribution's archives. ``` -sudo apt-get install build-essential python-dev python-setuptools openssl libsqlite3-dev +sudo apt-get install build-essential python-dev python-setuptools openssl libsqlite3-dev libffi-dev ``` ### Tor

1 0

[oonib/master] Implement checking of paths before starting oonib.
by art＠torproject.org 26 Mar '14

26 Mar '14

commit aebeb92b87bd7b4f19f8b1d0923efd4003a8df9a Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 24 12:34:59 2014 +0100 Implement checking of paths before starting oonib. This is a fix related to #34 --- bin/oonib | 28 ++++++++++++++- oonib/api.py | 2 +- oonib/bouncer/handlers.py | 7 +++- oonib/config.py | 70 ++++++++++++++++++++++++-------------- oonib/deck/api.py | 2 +- oonib/deck/handlers.py | 3 +- oonib/errors.py | 12 +++++++ oonib/input/api.py | 2 +- oonib/input/handlers.py | 3 +- oonib/log.py | 2 +- oonib/oonibackend.py | 2 +- oonib/options.py | 1 - oonib/policy/handlers.py | 9 ++--- oonib/report/handlers.py | 12 ++++--- oonib/runner.py | 3 +- oonib/testhelpers/dns_helpers.py | 2 +- oonib/testhelpers/ssl_helpers.py | 2 +- oonib/testhelpers/tcp_helpers.py | 5 +-- 18 files changed, 114 insertions(+), 53 deletions(-) diff --git a/bin/oonib b/bin/oonib index 554d3bb..7fb1c35 100755 --- a/bin/oonib +++ b/bin/oonib @@ -10,7 +10,33 @@ from twisted.application import app sys.path[:] = map(os.path.abspath, sys.path) sys.path.insert(0, os.path.abspath(os.getcwd())) -from oonib import runner, config +from oonib import errors as e +from oonib.config import config + +try: + config.load() +except e.ConfigFileNotSpecified: + print "Config file not specified!" + print "Use -c to specify one!" + config.usageOptions() + sys.exit(1) +except e.ConfigFileDoesNotExist, path: + print "Config file \"%s\" does not exist!" % path + sys.exit(2) +except e.InvalidReportDirectory, path: + print "Invalid report directory: %s!" % path + sys.exit(3) +except e.InvalidArchiveDirectory, path: + print "Invalid archive directory: %s!" % path + sys.exit(4) +except e.InvalidInputDirectory, path: + print "Invalid input directory: %s" % path + sys.exit(5) +except e.InvalidDeckDirectory, path: + print "Invalid deck directory: %s" % path + sys.exit(6) + +from oonib import runner from oonib.oonibackend import application if config.main.chroot: diff --git a/oonib/api.py b/oonib/api.py index 8b7ad4e..2427837 100644 --- a/oonib/api.py +++ b/oonib/api.py @@ -6,7 +6,7 @@ from oonib.input.api import inputAPI from oonib.policy.api import policyAPI from oonib.bouncer.api import bouncerAPI -from oonib import config +from oonib.config import config ooniBouncer = None ooniBackendAPI = [] diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py index c6b249d..38ac1f5 100644 --- a/oonib/bouncer/handlers.py +++ b/oonib/bouncer/handlers.py @@ -3,7 +3,7 @@ import random import yaml from oonib import errors as e from oonib.handlers import OONIBHandler -from oonib import config +from oonib.config import config class Bouncer(object): def __init__(self): @@ -138,6 +138,11 @@ class BouncerQueryHandler(OONIBHandler): requested_helpers = query['test-helpers'] except KeyError: raise e.TestHelpersKeyMissing + + try: + assert isinstance(requested_helpers, list) + except AssertionError: + raise e.InvalidRequest response = self.bouncer.filterHelperAddresses(requested_helpers) self.write(response) diff --git a/oonib/config.py b/oonib/config.py index a1a5e79..4f818b0 100644 --- a/oonib/config.py +++ b/oonib/config.py @@ -1,37 +1,55 @@ import yaml +from oonib import errors as e from oonib import Storage from oonib import __version__ from oonib.options import OONIBOptions import os -def get_root_path(): - this_directory = os.path.dirname(__file__) - root = os.path.join(this_directory, '..') - root = os.path.abspath(root) - return root - -def loadConfigFile(): +class Config(object): + main = None + helpers = None + reports = {} + backend_version = __version__ opts = OONIBOptions() - opts.parseOptions() - if 'config' in opts.keys(): - with open(opts['config']) as f: - config_file_contents = '\n'.join(f.readlines()) - configuration = yaml.safe_load(config_file_contents) - main = Storage(opts) - for k, v in configuration['main'].items(): - main[k] = v - helpers = Storage() - for k, v in configuration['helpers'].items(): - helpers[k] = Storage() - for k2, v2 in v.items(): - helpers[k][k2] = v2 - return main, helpers - return None, None - -main = None + + def __init__(self): + self.opts.parseOptions() + + def load(self): + try: + config_file = self.opts['config'] + except KeyError: + raise e.ConfigFileNotSpecified + + try: + with open(self.opts['config']) as f: + configuration = yaml.safe_load(f) + except IOError: + raise e.ConfigFileDoesNotExist(self.opts['config']) + + self.main = Storage() + for k, v in configuration['main'].items(): + self.main[k] = v + self.helpers = Storage() + for name, helper in configuration['helpers'].items(): + self.helpers[name] = Storage() + for k, v in helper.items(): + self.helpers[name][k] = v + self.check_paths() + + def check_paths(self): + if not self.main.report_dir or not os.path.isdir(self.main.report_dir): + raise e.InvalidReportDirectory(self.main.report_dir) + if not self.main.archive_dir or not os.path.isdir(self.main.archive_dir): + raise e.InvalidArchiveDirectory(self.main.report_dir) + + if self.main.input_dir and not os.path.isdir(self.main.input_dir): + raise e.InvalidInputDirectory(self.main.input_dir) + if self.main.deck_dir and not os.path.isdir(self.main.deck_dir): + raise e.InvalidDeckDirectory(self.main.deck_dir) + backend_version = __version__ reports = {} -if not main: - main, helpers = loadConfigFile() +config = Config() diff --git a/oonib/deck/api.py b/oonib/deck/api.py index ffccb0a..a2f1164 100644 --- a/oonib/deck/api.py +++ b/oonib/deck/api.py @@ -1,6 +1,6 @@ from cyclone import web from oonib.deck import handlers -from oonib import config +from oonib.config import config deckAPI = [ (r"/deck", handlers.DeckListHandler), diff --git a/oonib/deck/handlers.py b/oonib/deck/handlers.py index c8aed69..44ff24f 100644 --- a/oonib/deck/handlers.py +++ b/oonib/deck/handlers.py @@ -6,7 +6,8 @@ import yaml from oonib import errors as e from oonib.handlers import OONIBHandler -from oonib import config, log +from oonib import log +from oonib.config import config class DeckDescHandler(OONIBHandler): def get(self, deckID): diff --git a/oonib/errors.py b/oonib/errors.py index 8d6015e..6f768d0 100644 --- a/oonib/errors.py +++ b/oonib/errors.py @@ -73,3 +73,15 @@ class TestHelperNotFound(OONIBError): status_code = 404 log_message = "test-helper-not-found" +class ConfigFileNotSpecified(Exception): pass + +class ConfigFileDoesNotExist(Exception): pass + +class InvalidReportDirectory(Exception): pass + +class InvalidArchiveDirectory(Exception): pass + +class InvalidInputDirectory(Exception): pass + +class InvalidDeckDirectory(Exception): pass + diff --git a/oonib/input/api.py b/oonib/input/api.py index 88d85a2..811da29 100644 --- a/oonib/input/api.py +++ b/oonib/input/api.py @@ -1,6 +1,6 @@ from cyclone import web from oonib.input import handlers -from oonib import config +from oonib.config import config inputAPI = [ (r"/input", handlers.InputListHandler), diff --git a/oonib/input/handlers.py b/oonib/input/handlers.py index d467854..fce7451 100644 --- a/oonib/input/handlers.py +++ b/oonib/input/handlers.py @@ -4,7 +4,8 @@ import os import yaml from oonib.handlers import OONIBHandler -from oonib import config, log +from oonib import log +from oonib.config import config class InputDescHandler(OONIBHandler): def get(self, inputID): diff --git a/oonib/log.py b/oonib/log.py index b28b5bf..8229446 100644 --- a/oonib/log.py +++ b/oonib/log.py @@ -17,7 +17,7 @@ from twisted.python.failure import Failure from twisted.python.logfile import DailyLogFile from oonib import otime -from oonib import config +from oonib.config import config ## Get rid of the annoying "No route found for ## IPv6 destination warnings": diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index c5f96ee..a6654b8 100644 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -20,7 +20,7 @@ from oonib.testhelpers import http_helpers, tcp_helpers from oonib import log -from oonib import config +from oonib.config import config if config.main.uid and config.main.gid: application = service.Application('oonibackend', uid=config.main.uid, diff --git a/oonib/options.py b/oonib/options.py index cce1590..7acdc23 100644 --- a/oonib/options.py +++ b/oonib/options.py @@ -7,7 +7,6 @@ if platformType == "win32": else: from twisted.scripts._twistd_unix import ServerOptions -#class OONIBOptions(usage.Options): class OONIBOptions(usage.Options): synopsis = """%s [options] [path to test].py """ diff --git a/oonib/policy/handlers.py b/oonib/policy/handlers.py index abce0b3..913aeb1 100644 --- a/oonib/policy/handlers.py +++ b/oonib/policy/handlers.py @@ -1,11 +1,12 @@ -from oonib import errors as e -from oonib.handlers import OONIBHandler - -from oonib import config import json import os import yaml +from oonib import errors as e +from oonib.handlers import OONIBHandler + +from oonib.config import config + class Policy(object): nettest = None input = None diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index 2ee73ac..dea5326 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -1,18 +1,20 @@ -import json -import os import random -import re import string import time import yaml +import json +import os +import re + +from twisted.internet import fdesc, reactor from oonib import errors as e from oonib.handlers import OONIBHandler from oonib.policy.handlers import Policy from datetime import datetime -from oonib import randomStr, otime, config, log -from twisted.internet import fdesc, reactor +from oonib import randomStr, otime, log +from oonib.config import config class MissingField(Exception): pass diff --git a/oonib/runner.py b/oonib/runner.py index 1243ee8..57b0b9f 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -22,12 +22,11 @@ from txtorcon import launch_tor from oonib.report.api import reportAPI from oonib.api import ooniBackend, ooniBouncer +from oonib.config import config from oonib import oonibackend -from oonib import config from oonib import log - from txtorcon import __version__ as txtorcon_version if txtorcon_version < '0.9.0': """ diff --git a/oonib/testhelpers/dns_helpers.py b/oonib/testhelpers/dns_helpers.py index 8959215..9b2e5e3 100644 --- a/oonib/testhelpers/dns_helpers.py +++ b/oonib/testhelpers/dns_helpers.py @@ -3,7 +3,7 @@ from twisted.internet import reactor from twisted.names import dns from twisted.names import client, server -from oonib import config +from oonib.config import config class DNSTestHelper(server.DNSServerFactory): def __init__(self, authorities = None, diff --git a/oonib/testhelpers/ssl_helpers.py b/oonib/testhelpers/ssl_helpers.py index 5c74996..d511ddd 100644 --- a/oonib/testhelpers/ssl_helpers.py +++ b/oonib/testhelpers/ssl_helpers.py @@ -1,5 +1,5 @@ from twisted.internet import ssl -from oonib import config +from oonib.config import config class SSLContext(ssl.DefaultOpenSSLContextFactory): def __init__(self, *args, **kw): diff --git a/oonib/testhelpers/tcp_helpers.py b/oonib/testhelpers/tcp_helpers.py index ab3c835..91c334b 100644 --- a/oonib/testhelpers/tcp_helpers.py +++ b/oonib/testhelpers/tcp_helpers.py @@ -2,7 +2,7 @@ from twisted.internet.protocol import Protocol, Factory, ServerFactory from twisted.internet.error import ConnectionDone -from oonib import config +from oonib.config import config from oonib import log from oonib.daphn3 import Daphn3Protocol from oonib.daphn3 import read_pcap, read_yaml @@ -67,6 +67,3 @@ class Daphn3Server(ServerFactory): p.role = "server" p.factory = self return p - - -

1 0

[oonib/master] Make probe CC conditional
by art＠torproject.org 26 Mar '14

26 Mar '14

commit dc9e53cd63866f894b73edaee630b64e739e5263 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 10 02:11:38 2014 +0100 Make probe CC conditional --- oonib/report/handlers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index 1c29392..2ee73ac 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -245,9 +245,12 @@ class NewReportHandlerFile(OONIBHandler, UpdateReportMixin): software_name = str(report_data['software_name']) software_version = str(report_data['software_version']) - + probe_asn = str(report_data['probe_asn']) - probe_cc = str(report_data['probe_cc']) + try: + probe_cc = str(report_data['probe_cc']) + except: + probe_cc = 'ZZ' self.testName = str(report_data['test_name']) self.testVersion = str(report_data['test_version'])

1 0

[oonib/master] Merge pull request #35 from TheTorProject/feature/path_checks
by art＠torproject.org 26 Mar '14

26 Mar '14

commit 755588b251db9b3ae5929dcf4fb33a692a9bb571 Merge: 5502131 aebeb92 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Wed Mar 26 18:51:11 2014 +0100 Merge pull request #35 from TheTorProject/feature/path_checks Implement checking of paths before starting oonib. bin/oonib | 28 ++++++++++++++- oonib/api.py | 2 +- oonib/bouncer/handlers.py | 7 +++- oonib/config.py | 70 ++++++++++++++++++++++++-------------- oonib/deck/api.py | 2 +- oonib/deck/handlers.py | 3 +- oonib/errors.py | 12 +++++++ oonib/input/api.py | 2 +- oonib/input/handlers.py | 3 +- oonib/log.py | 2 +- oonib/oonibackend.py | 2 +- oonib/options.py | 1 - oonib/policy/handlers.py | 9 ++--- oonib/report/handlers.py | 12 ++++--- oonib/runner.py | 3 +- oonib/testhelpers/dns_helpers.py | 2 +- oonib/testhelpers/ssl_helpers.py | 2 +- oonib/testhelpers/tcp_helpers.py | 5 +-- 18 files changed, 114 insertions(+), 53 deletions(-)

1 0

[oonib/master] Merge pull request #33 from TheTorProject/feature/oonibadmin
by art＠torproject.org 26 Mar '14

26 Mar '14

commit 55021316b1d6e62216c12f0c13c44b71138f948b Merge: dc9e53c 25fd345 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Wed Mar 26 18:50:56 2014 +0100 Merge pull request #33 from TheTorProject/feature/oonibadmin Add script for administering oonib installations. bin/oonibadmin | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 2 +- 2 files changed, 114 insertions(+), 1 deletion(-)

1 0

[oonib/master] Merge pull request #31 from TheTorProject/fix/no_content
by art＠torproject.org 26 Mar '14

26 Mar '14

commit 0aaebd2351a8664d9a0998f5bc00c6b9134da672 Merge: 34fdadd c869eb2 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Feb 5 18:04:17 2014 +0000 Merge pull request #31 from TheTorProject/fix/no_content Support also not specifying content. oonib/report/handlers.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)

1 0

[oonib/master] Support also not specifying content.
by art＠torproject.org 26 Mar '14

26 Mar '14

commit c869eb2e2eb8dc6d13da762c7935feb255f725df Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Jan 29 21:21:51 2014 +0100 Support also not specifying content. For testing see ooniprobe test code. --- oonib/report/handlers.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/oonib/report/handlers.py b/oonib/report/handlers.py index 39fa1de..1c29392 100644 --- a/oonib/report/handlers.py +++ b/oonib/report/handlers.py @@ -47,8 +47,8 @@ class Report(object): report_filename = get_report_path(self.report_id) try: with open(report_filename) as fd: - yaml_data = ''.join(fd.readline() for _ in range(12)) - report_details = yaml.safe_load(yaml_data) + g = yaml.safe_load_all(fd) + report_details = g.next() except IOError: raise ReportNotFound @@ -243,13 +243,14 @@ class NewReportHandlerFile(OONIBHandler, UpdateReportMixin): log.debug("Parsed this data %s" % report_data) - software_name = report_data['software_name'] - software_version = report_data['software_version'] + software_name = str(report_data['software_name']) + software_version = str(report_data['software_version']) - probe_asn = report_data['probe_asn'] + probe_asn = str(report_data['probe_asn']) + probe_cc = str(report_data['probe_cc']) - self.testName = report_data['test_name'] - self.testVersion = report_data['test_version'] + self.testName = str(report_data['test_name']) + self.testVersion = str(report_data['test_version']) if config.main.policy_file: try: @@ -273,14 +274,16 @@ class NewReportHandlerFile(OONIBHandler, UpdateReportMixin): 'software_name': software_name, 'software_version': software_version, 'probe_asn': probe_asn, + 'probe_cc': probe_cc, 'test_name': self.testName, 'test_version': self.testVersion, - 'input_hashes': self.inputHashes + 'input_hashes': self.inputHashes, + 'start_time': time.time() } content['backend_version'] = config.backend_version - report_header = yaml.dump(report_header) + report_header = yaml.dump(content) content = "---\n" + report_header + '...\n' if not probe_asn:

1 0

[oonib/master] Add script for administering oonib installations.
by art＠torproject.org 26 Mar '14

26 Mar '14

commit 25fd345bedcabdc61584514001284a2a15417593 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 7 19:42:59 2014 +0100 Add script for administering oonib installations. --- bin/oonibadmin | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 2 +- 2 files changed, 114 insertions(+), 1 deletion(-) diff --git a/bin/oonibadmin b/bin/oonibadmin new file mode 100755 index 0000000..b8ba63b --- /dev/null +++ b/bin/oonibadmin @@ -0,0 +1,113 @@ +#!/usr/bin/env python +from time import strftime +import argparse +import hashlib +import shutil +import yaml +import sys +import os + +# Hack to set the proper sys.path. Overcomes the export PYTHONPATH pain. +sys.path[:] = map(os.path.abspath, sys.path) +sys.path.insert(0, os.path.abspath(os.getcwd())) + +class OBAdmin(object): + def __init__(self, config_file): + with open(config_file) as f: + self.config = yaml.safe_load(f) + self.input_dir = self.config['main']['input_dir'] + self.deck_dir = self.config['main']['deck_dir'] + self.policy_file = self.config['main']['policy_file'] + + def digest(self, file_path): + with open(file_path) as f: + file_hash = hashlib.sha256(f.read()) + return file_hash.hexdigest() + + def read_descriptor(self): + descriptor = { + 'date': strftime("%Y-%m-%dT%H:%M:%S"), + } + descriptor['name'] = raw_input('name: ') + descriptor['description'] = raw_input('description: ') + descriptor['version'] = raw_input('version: ') + descriptor['author'] = raw_input('author: ') + + return descriptor + + def add_deck(self, file_path): + digest = self.digest(file_path) + dst_path = os.path.join(self.deck_dir, digest) + if os.path.exists(dst_path): + print "Deck already present at %s" % dst_path + return + shutil.copyfile(file_path, dst_path) + descriptor = self.read_descriptor() + descriptor['id'] = digest + with open(dst_path + '.desc', 'w+') as f: + yaml.dump(descriptor, f) + + self.add_deck_to_policy(file_path) + + def add_deck_to_policy(self, deck_path): + with open(self.policy_file) as f: + policy = yaml.safe_load(f) + with open(deck_path) as f: + deck = yaml.safe_load(f) + + def test_in_policy(test_name): + for test in policy['nettest']: + if test['name'] == test_name: + return True + return False + + for test in deck: + test_name = test['options']['test_file'].split('/')[-1] + if not test_in_policy(test_name): + policy['nettest'].append({'name': test_name, 'version': '0.1'}) + + with open(self.policy_file, 'w+') as f: + yaml.dump(policy, f) + + def add_input_to_policy(self, digest): + with open(self.policy_file) as f: + policy = yaml.safe_load(f) + policy['input'].append({'id': digest}) + with open(self.policy_file, 'w+') as f: + yaml.dump(policy, f) + + def add_input(self, file_path): + digest = self.digest(file_path) + dst_path = os.path.join(self.input_dir, digest) + if os.path.exists(dst_path): + print "Input already present at %s" % dst_path + return + shutil.copyfile(file_path, dst_path) + descriptor = self.read_descriptor() + descriptor['id'] = digest + with open(dst_path + '.desc', 'w+') as f: + yaml.dump(descriptor, f) + self.add_input_to_policy(digest) + +parser = argparse.ArgumentParser(description='Administer oonib') +parser.add_argument('-c', '--config', default='oonib.conf', + help="Specify the config file to read from") + +subparsers = parser.add_subparsers(dest='command', + help='Run the specified operation on the current oonib installation') +parser_add_input = subparsers.add_parser('add_input', + help="add an input to the list of inputs offerred by this collector") +parser_add_input.add_argument('file', help="path to the input to add") + +parser_add_deck = subparsers.add_parser('add_deck', + help="add a deck the list of decks offerred by this collector") +parser_add_deck.add_argument('file', help="path to the deck to add") + +args = parser.parse_args() + +ob_admin = OBAdmin(args.config) + +if args.command == 'add_deck': + ob_admin.add_deck(args.file) +elif args.command == 'add_input': + ob_admin.add_input(args.file) diff --git a/setup.py b/setup.py index 0659d48..c9a2dc4 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ setup( url="https://ooni.torproject.org", license="LICENSE", description="OONI-Probe Backend", - scripts=["bin/oonib", "bin/archive_oonib_reports"], + scripts=["bin/oonib", "bin/oonibadmin", "bin/archive_oonib_reports"], packages=find_packages(), install_requires=install_requires, dependency_links=dependency_links,

1 0