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

[ooni-probe/develop] Merge pull request #78 from isislovecruft/feature/lua-scripts
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 80c99cb5a9b34f3e3b783fbb1b2e709a14a69d42 Merge: 5856e93 df4601a Author: Isis Agora Lovecruft <isis(a)torproject.org> Date: Thu May 9 01:43:54 2013 -0700 Merge pull request #78 from isislovecruft/feature/lua-scripts Add Dominic Hamon's nettest for running tests written with other interpreters nettests/experimental/script.py | 90 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)

1 0

[ooni-probe/develop] Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit f5fd154d8f34447f513664deb39fd7bd12363741 Merge: ea4cf26 80c99cb Author: Arturo Filastò <art(a)fuffa.org> Date: Tue May 14 17:50:27 2013 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/ooni-probe * 'master' of ssh://git-rw.torproject.org/ooni-probe: Add Dominic Hamon's nettest for running tests written with other interpreters. nettests/experimental/script.py | 90 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)

1 0

[ooni-probe/develop] Fix import error for pushFilenameStack
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit b96afa0c86bbae5df3681bccf6fe8fe86059d985 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue May 14 17:48:37 2013 +0200 Fix import error for pushFilenameStack --- ooni/director.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/director.py b/ooni/director.py index 93134af..4e04222 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -7,7 +7,7 @@ from ooni import config from ooni import geoip from ooni.managers import ReportEntryManager, MeasurementManager from ooni.reporter import Report -from ooni.utils import log, checkForRoot +from ooni.utils import log, checkForRoot, pushFilenameStack from ooni.utils.net import randomFreePort from ooni.nettest import NetTest from ooni import errors

1 0

[ooni-probe/develop] Merge branch 'fix_pcap_filename'
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit ea4cf26068195e30caf62be695f5febfc2b46d47 Merge: 5856e93 b96afa0 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue May 14 17:48:43 2013 +0200 Merge branch 'fix_pcap_filename' * fix_pcap_filename: Fix import error for pushFilenameStack Set pcap name for each NetTest, and use consistent timestamps. ooni/config.py | 23 ++++------------------- ooni/director.py | 22 +++++++++++++--------- ooni/nettest.py | 5 ++--- ooni/otime.py | 2 ++ 4 files changed, 21 insertions(+), 31 deletions(-) diff --cc ooni/nettest.py index f31488e,cd8ab05..6bbb99e --- a/ooni/nettest.py +++ b/ooni/nettest.py @@@ -7,11 -7,9 +7,10 @@@ from twisted.python import usage, refle from ooni import geoip from ooni.tasks import Measurement -from ooni.utils import log, checkForRoot, geodata +from ooni.utils import log, checkForRoot +from ooni import geoip from ooni import config - from ooni import otime - + import time from ooni import errors as e from inspect import getmembers

1 0

[ooni-probe/develop] Merge branch 'add_inputProcessors_to_nettests'
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 73a3f6f806b0ab0750beb15bfe62ab5a1b854fcb Merge: f5fd154 16f41c0 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed May 15 16:41:44 2013 +0200 Merge branch 'add_inputProcessors_to_nettests' * add_inputProcessors_to_nettests: Add URL inputProcessor to tcpconnect Add inputProcessor to http_host nettests/blocking/tcpconnect.py | 18 ++++++++++++++++++ nettests/manipulation/http_host.py | 10 ++++++++++ 2 files changed, 28 insertions(+)

1 0

[ooni-probe/develop] Strip superflous data from ASN number
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 3ae947b87863a228ac162934471a4a81923f07dd Author: Arturo Filastò <art(a)fuffa.org> Date: Fri May 17 20:03:41 2013 +0200 Strip superflous data from ASN number Fixes bug in validating ASN in backend (thank kheops for reporting it). --- ooni/geoip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/geoip.py b/ooni/geoip.py index 1e6f6e9..875ed07 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -36,7 +36,7 @@ def IPToLocation(ipaddr): location['countrycode'] = country_dat.country_code_by_addr(ipaddr) asn_dat = GeoIP(asn_file) - location['asn'] = asn_dat.org_by_addr(ipaddr) + location['asn'] = asn_dat.org_by_addr(ipaddr).split(' ')[0] except IOError: log.err("Could not find GeoIP data files. Go into data/ "

1 0

[ooni-probe/develop] Merge remote-tracking branch 'tpo-common/master'
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit e6e679d10c90be096243b9bf5cc572ce1fe1068d Merge: 80c99cb 59d6fad Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 18 15:47:11 2013 +0000 Merge remote-tracking branch 'tpo-common/master' nettests/blocking/tcpconnect.py | 18 ++++++++++++++++++ nettests/manipulation/http_host.py | 10 ++++++++++ ooni/config.py | 23 ++++------------------- ooni/director.py | 23 ++++++++++++++--------- ooni/geoip.py | 2 +- ooni/nettest.py | 5 ++--- ooni/otime.py | 2 ++ 7 files changed, 51 insertions(+), 32 deletions(-)

1 0

[ooni-probe/develop] Stop reactor when we can't start the sniffer.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 59d6fad8a19dd6f3a971c84474e977a886221129 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri May 17 20:04:21 2013 +0200 Stop reactor when we can't start the sniffer. --- ooni/director.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ooni/director.py b/ooni/director.py index 1a3bfc1..809eae4 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -221,6 +221,7 @@ class Director(object): except errors.InsufficientPrivileges: print "[!] Includepcap options requires root priviledges to run" print " you should run ooniprobe as root or disable the options in ooniprobe.conf" + reactor.stop() sys.exit(1) print "Starting sniffer"

1 0

[ooni-probe/develop] Remove old bin/oonib script.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 9a32c80096c3e6cf2acf8498dfc5d5b913b1b1a6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 18 15:52:50 2013 +0000 Remove old bin/oonib script. --- bin/oonib | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/bin/oonib b/bin/oonib deleted file mode 100755 index 79885ba..0000000 --- a/bin/oonib +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - -import sys -import os -# Avoid the export PYTHONPATH insanity -sys.path[:] = map(os.path.abspath, sys.path) -this_directory = os.path.dirname(__file__) -root = os.path.abspath(os.path.join(this_directory, '..')) -sys.path.insert(0, root) - -backend_script = os.path.join(root, 'oonib', 'oonibackend.py') - -from twisted.python import log, usage -from twisted.internet import reactor -from twisted.application import app - -from oonib import runner -from oonib.oonibackend import application - -sys.argv[1:] = ['-ny', backend_script] - -# Uncomment this line to daemonize -#sys.argv[1:] = ['-y', backend_script] - -def runApp(config): - runner.OBaseRunner(config).run() - -config = runner.ServerOptions() -try: - config.parseOptions() -except usage.error, ue: - print config - print "%s: %s" % (sys.argv[0], ue) -else: - runApp(config) -

1 0

[ooni-probe/develop] Remove log factory for oonib from ooni/utils/log.py.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit b6412fb39a30e001d50d10ed555cd767e3dfa7b6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat May 18 15:53:21 2013 +0000 Remove log factory for oonib from ooni/utils/log.py. --- ooni/utils/log.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ooni/utils/log.py b/ooni/utils/log.py index 0740c10..8779fdb 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -64,18 +64,3 @@ def exception(error): else: exc_type, exc_value, exc_traceback = sys.exc_info() traceback.print_exception(exc_type, exc_value, exc_traceback) - -class LoggerFactory(object): - """ - This is a logger factory to be used by oonib - """ - def __init__(self, options): - pass - - def start(self, application): - # XXX parametrize this - start('oonib.log', "OONIB") - - def stop(self): - txlog.msg("Stopping OONIB") -

1 0