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

[ooni-probe/master] Add GeoLiteCity dataset to ooniresources
by art＠torproject.org 03 Jan '15

03 Jan '15

commit d4000ce10305b7e3580e7e420b67a8bed2b4e50e Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 16:25:07 2014 +0000 Add GeoLiteCity dataset to ooniresources --- ooni/resources/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ooni/resources/__init__.py b/ooni/resources/__init__.py index 0517252..d0f0cb9 100644 --- a/ooni/resources/__init__.py +++ b/ooni/resources/__init__.py @@ -26,6 +26,13 @@ inputs = { } geoip = { + "GeoLiteCity.dat.gz": { + "url": "https://geolite.maxmind.com/download/" + "geoip/database/GeoLiteCity.dat.gz", + "action": gunzip, + "action_args": [config.advanced.geoip_data_dir], + "processor": None + }, "GeoIPASNum.dat.gz": { "url": "https://geolite.maxmind.com/download/" "geoip/database/asnum/GeoIPASNum.dat.gz",

1 0

[ooni-probe/master] Point to new test helper address
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 7973c090a4ddd462d28ea4545c1992092a7ead1a Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 3 15:06:11 2014 +0100 Point to new test helper address --- ooni/tests/test_oonicli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index 3d5fdeb..1d095f3 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -164,7 +164,7 @@ class TestRunDirector(ConfigTestCase): assert 'total' in entry['tampering'] yield self.run_helper('manipulation/http_header_field_manipulation', - ['-b', 'http://64.9.225.221'], + ['-b', 'http://64.9.225.208'], verify_function) @defer.inlineCallbacks

1 0

[ooni-probe/master] Fix unassigned variable use
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 3c864e75f9bd2892770bcf5952308492ea2d9d99 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Nov 2 19:51:27 2014 +0000 Fix unassigned variable use --- ooni/api/spec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/api/spec.py b/ooni/api/spec.py index ed5cd44..9756468 100644 --- a/ooni/api/spec.py +++ b/ooni/api/spec.py @@ -136,7 +136,7 @@ def get_reporters(net_test_loader): reporters.append(yaml_reporter) if config.reports.collector and collector_supported(config.reports.collector): - oonib_reporter = OONIBReporter(test_details, collector) + oonib_reporter = OONIBReporter(test_details, config.reports.collector) reporters.append(oonib_reporter) return reporters

1 0

[ooni-probe/master] Merge pull request #359 from TheTorProject/fix/13497-raw_sockets_not_root
by art＠torproject.org 03 Jan '15

03 Jan '15

commit f3bfa7d9ebd1b6fb6206f64d1c6d66d190a4a26a Merge: a6de7b7 d0ff457 Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Nov 3 14:33:57 2014 +0100 Merge pull request #359 from TheTorProject/fix/13497-raw_sockets_not_root Check for ability to capture, not a specific uid ooni/geoip.py | 6 ++++-- ooni/nettest.py | 7 ++++--- ooni/oonicli.py | 8 ++++---- ooni/tests/test_oonicli.py | 9 ++++----- 4 files changed, 16 insertions(+), 14 deletions(-)

1 0

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

03 Jan '15

commit 6fc723f9fe3503acc3d48c9778d9c1dfd0793b64 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Nov 2 21:08:43 2014 +0000 Remove dead code --- ooni/utils/net.py | 124 ----------------------------------------------------- 1 file changed, 124 deletions(-) diff --git a/ooni/utils/net.py b/ooni/utils/net.py index fbd0fb5..2f1a2c6 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -37,18 +37,6 @@ userAgents = ("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.7) Gecko "Gecko/20091221 Firefox/3.5.7 (.NET CLR 3.5.30729)") -class UnsupportedPlatform(Exception): - """Support for this platform is not currently available.""" - - -class IfaceError(Exception): - """Could not find default network interface.""" - - -class PermissionsError(SystemExit): - """This test requires admin or root privileges to run. Exiting...""" - - PLATFORMS = {'LINUX': sys.platform.startswith("linux"), 'OPENBSD': sys.platform.startswith("openbsd"), 'FREEBSD': sys.platform.startswith("freebsd"), @@ -125,51 +113,6 @@ class ConnectAndCloseProtocol(protocol.Protocol): def connectionMade(self): self.transport.loseConnection() -def getSystemResolver(): - """ - XXX implement a function that returns the resolver that is currently - default on the system. - """ - - -def getClientPlatform(platform_name=None): - for name, test in PLATFORMS.items(): - if not platform_name or platform_name.upper() == name: - if test: - return name, test - - -def getPosixIfaces(): - from twisted.internet.test import _posixifaces - - log.msg("Attempting to discover network interfaces...") - ifaces = _posixifaces._interfaces() - ifup = tryInterfaces(ifaces) - return ifup - - -def getWindowsIfaces(): - from twisted.internet.test import _win32ifaces - - log.msg("Attempting to discover network interfaces...") - ifaces = _win32ifaces._interfaces() - ifup = tryInterfaces(ifaces) - return ifup - - -def getIfaces(platform_name=None): - client, test = getClientPlatform(platform_name) - if client: - if client == ('LINUX' or 'DARWIN') or client[-3:] == 'BSD': - return getPosixIfaces() - elif client == 'WINDOWS': - return getWindowsIfaces() - ## XXX fixme figure out how to get iface for Solaris - else: - return None - else: - raise UnsupportedPlatform - def randomFreePort(addr="127.0.0.1"): """ @@ -193,70 +136,3 @@ def randomFreePort(addr="127.0.0.1"): pass s.close() return port - - -def checkInterfaces(ifaces=None, timeout=1): - """ - @param ifaces: - A dictionary in the form of ifaces['if_name'] = 'if_addr'. - """ - try: - from scapy.all import IP, ICMP - from scapy.all import sr1 ## we want this check to be blocking - except: - log.msg(("Scapy required: www.secdev.org/projects/scapy")) - - ifup = {} - if not ifaces: - log.debug("checkInterfaces(): no interfaces specified!") - return None - - for iface in ifaces: - for ifname, ifaddr in iface: - log.debug("checkInterfaces(): testing iface {} by pinging" - + " local address {}".format(ifname, ifaddr)) - try: - pkt = IP(dst=ifaddr) / ICMP() - ans, unans = sr1(pkt, iface=ifname, timeout=5, retry=3) - except Exception, e: - raise PermissionsError if e.find("Errno 1") else log.err(e) - else: - if ans.summary(): - log.debug("checkInterfaces(): got answer on interface %s" - + ":\n%s".format(ifname, ans.summary())) - ifup.update(ifname, ifaddr) - else: - log.debug("Interface test packet was unanswered:\n%s" - % unans.summary()) - if len(ifup) > 0: - log.msg("Discovered working network interfaces: %s" % ifup) - return ifup - else: - raise IfaceError - - -def getNonLoopbackIfaces(platform_name=None): - try: - ifaces = getIfaces(platform_name) - except UnsupportedPlatform, up: - log.err(up) - - if not ifaces: - log.msg("Unable to discover network interfaces...") - return None - else: - found = [{i[0]: i[2]} for i in ifaces if i[0] != 'lo'] - log.debug("getNonLoopbackIfaces: Found non-loopback interfaces: %s" - % found) - try: - interfaces = checkInterfaces(found) - except IfaceError, ie: - log.err(ie) - return None - else: - return interfaces - - -def getLocalAddress(): - default_iface = getDefaultIface() - return default_iface.ipaddr

1 0

[ooni-probe/master] Remove unused imports (pyflakes)
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 0fd1dd595d11a6b9c066e26f07da07b70122fabb Author: aagbsn <aagbsn(a)extc.org> Date: Sun Nov 2 20:19:23 2014 +0000 Remove unused imports (pyflakes) --- ooni/kit/daphn3.py | 2 -- ooni/kit/domclass.py | 3 --- ooni/nettests/blocking/bridge_reachability.py | 3 +-- ooni/nettests/experimental/dns_injection.py | 1 - ooni/nettests/experimental/domclass_collector.py | 2 -- ooni/nettests/experimental/http_filtering_bypassing.py | 2 +- ooni/nettests/experimental/http_trix.py | 1 - ooni/nettests/experimental/http_uk_mobile_networks.py | 1 - ooni/nettests/experimental/keyword_filtering.py | 2 -- ooni/nettests/experimental/parasitictraceroute.py | 1 - ooni/nettests/experimental/squid.py | 1 + ooni/nettests/scanning/http_url_list.py | 1 - ooni/nettests/third_party/netalyzr.py | 2 +- ooni/oonid.py | 5 ----- ooni/reporter.py | 1 - ooni/tests/disable_test_dns.py | 4 ---- ooni/tests/test_managers.py | 8 +++----- ooni/tests/test_reporter.py | 1 - ooni/utils/net.py | 2 -- ooni/utils/txscapy.py | 1 - 20 files changed, 7 insertions(+), 37 deletions(-) diff --git a/ooni/kit/daphn3.py b/ooni/kit/daphn3.py index ffe04f6..6abe2fd 100644 --- a/ooni/kit/daphn3.py +++ b/ooni/kit/daphn3.py @@ -1,8 +1,6 @@ -import sys import yaml from twisted.internet import protocol, defer -from twisted.internet.error import ConnectionDone from ooni.utils import log diff --git a/ooni/kit/domclass.py b/ooni/kit/domclass.py index ea68808..feeb22e 100644 --- a/ooni/kit/domclass.py +++ b/ooni/kit/domclass.py @@ -21,7 +21,6 @@ The procedure we use is the following: probability matrix B. """ -import yaml import numpy import time @@ -63,8 +62,6 @@ def compute_probability_matrix(dataset): :dataset: an array of pairs representing the parent child relationships. """ - import itertools - ret = {} matrix = numpy.zeros((len(thetags) + 1, len(thetags) + 1)) for data in dataset: diff --git a/ooni/nettests/blocking/bridge_reachability.py b/ooni/nettests/blocking/bridge_reachability.py index b9aec33..e282853 100644 --- a/ooni/nettests/blocking/bridge_reachability.py +++ b/ooni/nettests/blocking/bridge_reachability.py @@ -9,9 +9,8 @@ from twisted.internet import reactor, error import txtorcon -from ooni.settings import config from ooni.utils import log, onion -from ooni import nettest, errors +from ooni import nettest class TorIsNotInstalled(Exception): diff --git a/ooni/nettests/experimental/dns_injection.py b/ooni/nettests/experimental/dns_injection.py index cf25539..0a5c94e 100644 --- a/ooni/nettests/experimental/dns_injection.py +++ b/ooni/nettests/experimental/dns_injection.py @@ -3,7 +3,6 @@ from twisted.python import usage from twisted.internet import defer from ooni.templates import dnst -from ooni import nettest from ooni.utils import log class UsageOptions(usage.Options): diff --git a/ooni/nettests/experimental/domclass_collector.py b/ooni/nettests/experimental/domclass_collector.py index 6384e62..efd5dbc 100644 --- a/ooni/nettests/experimental/domclass_collector.py +++ b/ooni/nettests/experimental/domclass_collector.py @@ -7,8 +7,6 @@ # :authors: Arturo Filastò # :licence: see LICENSE -from twisted.internet import threads, defer - from ooni.kit import domclass from ooni.templates import httpt diff --git a/ooni/nettests/experimental/http_filtering_bypassing.py b/ooni/nettests/experimental/http_filtering_bypassing.py index 1faed37..18501fb 100644 --- a/ooni/nettests/experimental/http_filtering_bypassing.py +++ b/ooni/nettests/experimental/http_filtering_bypassing.py @@ -2,7 +2,7 @@ from twisted.python import usage from ooni.utils import log -from ooni.utils import randomStr, randomSTR +from ooni.utils import randomStr from ooni.templates import tcpt class UsageOptions(usage.Options): diff --git a/ooni/nettests/experimental/http_trix.py b/ooni/nettests/experimental/http_trix.py index b5c9ae2..6d11bbb 100644 --- a/ooni/nettests/experimental/http_trix.py +++ b/ooni/nettests/experimental/http_trix.py @@ -2,7 +2,6 @@ from twisted.python import usage from ooni.utils import log -from ooni.utils import randomStr, randomSTR from ooni.templates import tcpt class UsageOptions(usage.Options): diff --git a/ooni/nettests/experimental/http_uk_mobile_networks.py b/ooni/nettests/experimental/http_uk_mobile_networks.py index cc00fdc..2ac0bd9 100644 --- a/ooni/nettests/experimental/http_uk_mobile_networks.py +++ b/ooni/nettests/experimental/http_uk_mobile_networks.py @@ -2,7 +2,6 @@ import yaml from twisted.python import usage -from twisted.plugin import IPlugin from ooni.templates import httpt from ooni.utils import log diff --git a/ooni/nettests/experimental/keyword_filtering.py b/ooni/nettests/experimental/keyword_filtering.py index b54ba0d..cd83da1 100644 --- a/ooni/nettests/experimental/keyword_filtering.py +++ b/ooni/nettests/experimental/keyword_filtering.py @@ -4,9 +4,7 @@ # :licence: see LICENSE from twisted.python import usage -from twisted.internet import defer -from ooni.utils import log from ooni.templates import scapyt from scapy.layers.inet import TCP, IP diff --git a/ooni/nettests/experimental/parasitictraceroute.py b/ooni/nettests/experimental/parasitictraceroute.py index 882d25a..7d57304 100644 --- a/ooni/nettests/experimental/parasitictraceroute.py +++ b/ooni/nettests/experimental/parasitictraceroute.py @@ -1,4 +1,3 @@ -from twisted.python import usage from twisted.internet import defer, reactor from ooni.errors import handleAllFailures from ooni.templates import scapyt diff --git a/ooni/nettests/experimental/squid.py b/ooni/nettests/experimental/squid.py index 17255e5..cf976ba 100644 --- a/ooni/nettests/experimental/squid.py +++ b/ooni/nettests/experimental/squid.py @@ -9,6 +9,7 @@ from ooni import utils from ooni.utils import log from ooni.templates import httpt +import re class SquidTest(httpt.HTTPTest): """ diff --git a/ooni/nettests/scanning/http_url_list.py b/ooni/nettests/scanning/http_url_list.py index 98e4ba0..f89def4 100644 --- a/ooni/nettests/scanning/http_url_list.py +++ b/ooni/nettests/scanning/http_url_list.py @@ -3,7 +3,6 @@ # :authors: Arturo Filastò # :licence: see LICENSE -from twisted.internet import defer from twisted.python import usage from ooni.templates import httpt from ooni.utils import log diff --git a/ooni/nettests/third_party/netalyzr.py b/ooni/nettests/third_party/netalyzr.py index 63ab3c7..3154af7 100644 --- a/ooni/nettests/third_party/netalyzr.py +++ b/ooni/nettests/third_party/netalyzr.py @@ -10,7 +10,7 @@ from ooni import nettest from ooni.utils import log import time import os -from twisted.internet import reactor, threads, defer +from twisted.internet import reactor, threads class NetalyzrWrapperTest(nettest.NetTestCase): name = "NetalyzrWrapper" diff --git a/ooni/oonid.py b/ooni/oonid.py index cc71d47..c04cadc 100644 --- a/ooni/oonid.py +++ b/ooni/oonid.py @@ -1,13 +1,8 @@ -import os -import random - from twisted.application import service, internet -from twisted.web import static, server from ooni.settings import config from ooni.api.spec import oonidApplication from ooni.director import Director -from ooni.reporter import YAMLReporter, OONIBReporter def getOonid(): director = Director() diff --git a/ooni/reporter.py b/ooni/reporter.py index 06f866e..cbea9f7 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -1,4 +1,3 @@ -import time import yaml import json import os diff --git a/ooni/tests/disable_test_dns.py b/ooni/tests/disable_test_dns.py index 13b1ae8..7ddae3d 100644 --- a/ooni/tests/disable_test_dns.py +++ b/ooni/tests/disable_test_dns.py @@ -2,11 +2,7 @@ # This unittest is to verify that our usage of the twisted DNS resolver does # not break with new versions of twisted. -import pdb from twisted.trial import unittest - -from twisted.internet import reactor - from twisted.names import dns from twisted.names.client import Resolver diff --git a/ooni/tests/test_managers.py b/ooni/tests/test_managers.py index d7f3177..29b7cc3 100644 --- a/ooni/tests/test_managers.py +++ b/ooni/tests/test_managers.py @@ -1,18 +1,16 @@ import os from twisted.trial import unittest -from twisted.python import failure from twisted.internet import defer, task -from ooni.tasks import BaseTask, TaskWithTimeout -from ooni.managers import TaskManager, MeasurementManager +from ooni.managers import MeasurementManager from ooni.tests.mocks import MockSuccessTask, MockFailTask, MockFailOnceTask, MockFailure from ooni.tests.mocks import MockSuccessTaskWithTimeout, MockFailTaskThatTimesOut from ooni.tests.mocks import MockTimeoutOnceTask, MockFailTaskWithTimeout from ooni.tests.mocks import MockTaskManager, mockFailure, MockDirector -from ooni.tests.mocks import MockNetTest, MockMeasurement, MockSuccessMeasurement -from ooni.tests.mocks import MockFailMeasurement, MockFailOnceMeasurement +from ooni.tests.mocks import MockNetTest, MockSuccessMeasurement +from ooni.tests.mocks import MockFailMeasurement from ooni.settings import config diff --git a/ooni/tests/test_reporter.py b/ooni/tests/test_reporter.py index 64b3623..454fbef 100644 --- a/ooni/tests/test_reporter.py +++ b/ooni/tests/test_reporter.py @@ -2,7 +2,6 @@ import os import yaml import json import time -import os from mock import MagicMock from twisted.internet import defer diff --git a/ooni/utils/net.py b/ooni/utils/net.py index ad19b49..fbd0fb5 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -16,8 +16,6 @@ except ImportError: return protocol return endpoint.connect(OneShotFactory()) -from ooni.utils import log - # if sys.platform.system() == 'Windows': # import _winreg as winreg diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index e8a27b6..d0f58ba 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -8,7 +8,6 @@ from twisted.internet import reactor from twisted.internet import defer, abstract from scapy.config import conf -from scapy.supersocket import L3RawSocket from scapy.all import RandShort, IP, IPerror, ICMP, ICMPerror, TCP, TCPerror, UDP, UDPerror from ooni.utils import log

1 0

[ooni-probe/master] Set ooni systemwide config to /etc/ooni/ooniprobe.conf
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 7f2d1c8bce717df226b73514284424002a4ba899 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 18:30:03 2014 +0000 Set ooni systemwide config to /etc/ooni/ooniprobe.conf --- ooni/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/settings.py b/ooni/settings.py index 92cedb9..51eef07 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -176,6 +176,6 @@ class OConfig(object): config = OConfig() if not os.path.isfile(config.config_file) \ - and os.path.isfile('/etc/ooniprobe.conf'): + and os.path.isfile('/etc/ooni/ooniprobe.conf'): config.global_options['configfile'] = '/etc/ooniprobe.conf' config.set_paths(ooni_home=config.advanced.data_dir)

1 0

[ooni-probe/master] Leave GeoIP data in /usr/share/GeoIP
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 8c8a8a3c6af62ce8b2d3e6b6e5812572f742fe05 Author: aagbsn <aagbsn(a)extc.org> Date: Sun Oct 26 18:02:45 2014 +0000 Leave GeoIP data in /usr/share/GeoIP --- ooni/settings.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ooni/settings.py b/ooni/settings.py index 342ec4e..92cedb9 100644 --- a/ooni/settings.py +++ b/ooni/settings.py @@ -94,9 +94,6 @@ 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 = '/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, 'ooniprobe.conf.sample') @@ -105,8 +102,6 @@ class OConfig(object): for line in f: if line.startswith(' data_dir: '): 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:

1 0

[ooni-probe/master] refactoring of net and txscapy utils
by art＠torproject.org 03 Jan '15

03 Jan '15

commit fb4bfce377026b9341ce819d2c8d6e1a345d315c Author: kudrom <kudrom(a)riseup.net> Date: Wed Nov 5 20:30:28 2014 +0100 refactoring of net and txscapy utils --- ooni/errors.py | 16 +++++ ooni/geoip.py | 3 +- ooni/nettest.py | 2 +- .../experimental/bridge_reachability/echo.py | 62 ++++++++--------- ooni/oonicli.py | 2 +- ooni/templates/scapyt.py | 2 +- ooni/tests/test_oonicli.py | 2 +- ooni/tests/test_txscapy.py | 13 ---- ooni/tests/test_utils.py | 6 +- ooni/utils/net.py | 34 +++++++++ ooni/utils/txscapy.py | 73 ++------------------ 11 files changed, 96 insertions(+), 119 deletions(-) diff --git a/ooni/errors.py b/ooni/errors.py index 081c4ac..ada7ce0 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -331,3 +331,19 @@ def get_error(error_key): return Error("%d" % error_key) else: return OONIBError + + +class IfaceError(Exception): + pass + + +class ProtocolNotRegistered(Exception): + pass + + +class ProtocolAlreadyRegistered(Exception): + pass + + +class LibraryNotInstalledError(Exception): + pass \ No newline at end of file diff --git a/ooni/geoip.py b/ooni/geoip.py index 9cb5da3..48e1134 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -5,6 +5,8 @@ import random from hashlib import sha256 from twisted.web import client, http_headers +from ooni.utils.net import hasRawSocketPermission + client._HTTP11ClientFactory.noisy = False from twisted.internet import reactor, defer @@ -243,7 +245,6 @@ class ProbeIP(object): """ Perform a UDP traceroute to determine the probes IP address. """ - from ooni.utils.txscapy import hasRawSocketPermission if not hasRawSocketPermission(): raise errors.InsufficientPrivileges raise NotImplemented diff --git a/ooni/nettest.py b/ooni/nettest.py index 12fb2fb..71cb94f 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -11,7 +11,7 @@ from twisted.python import usage, reflect from ooni import otime from ooni.tasks import Measurement from ooni.utils import log, sanitize_options -from ooni.utils.txscapy import hasRawSocketPermission +from ooni.utils.net import hasRawSocketPermission from ooni.settings import config from ooni import errors as e diff --git a/ooni/nettests/experimental/bridge_reachability/echo.py b/ooni/nettests/experimental/bridge_reachability/echo.py index d4033dd..e64a604 100644 --- a/ooni/nettests/experimental/bridge_reachability/echo.py +++ b/ooni/nettests/experimental/bridge_reachability/echo.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- # -# +---------+ +# +---------+ # | echo.py | # +---------+ # A simple ICMP-8 ping test. @@ -13,22 +13,21 @@ # import os -import sys -from twisted.python import usage -from twisted.internet import reactor, defer -from ooni import nettest -from ooni.utils import log, net, Storage, txscapy +from twisted.python import usage +from ooni import nettest +from ooni.utils import log, net try: - from scapy.all import IP, ICMP - from scapy.all import sr1 - from ooni.lib import txscapy - from ooni.lib.txscapy import txsr, txsend + from scapy.all import IP, ICMP + from scapy.all import sr1 + from ooni.lib import txscapy + from ooni.lib.txscapy import txsr, txsend from ooni.templates.scapyt import BaseScapyTest except: log.msg("This test requires scapy, see www.secdev.org/projects/scapy") + class UsageOptions(usage.Options): optParameters = [ ['dst', 'd', None, 'Host IP to ping'], @@ -41,17 +40,18 @@ class UsageOptions(usage.Options): ['pcap', 'p', None, 'Save pcap to this file'], ['receive', 'r', True, 'Receive response packets']] + class EchoTest(nettest.NetTestCase): """ xxx fill me in """ - name = 'echo' - author = 'Isis Lovecruft <isis(a)torproject.org>' - description = 'A simple ping test to see if a host is reachable.' - version = '0.0.2' + name = 'echo' + author = 'Isis Lovecruft <isis(a)torproject.org>' + description = 'A simple ping test to see if a host is reachable.' + version = '0.0.2' requiresRoot = True - usageOptions = UsageOptions + usageOptions = UsageOptions #requiredOptions = ['dst'] def setUp(self, *a, **kw): @@ -62,11 +62,11 @@ class EchoTest(nettest.NetTestCase): log.debug("setting self.%s = %s" % (key, value)) setattr(self, key, value) - self.timeout *= 1000 ## convert to milliseconds + self.timeout *= 1000 ## convert to milliseconds if not self.interface: try: - iface = txscapy.getDefaultIface() + iface = net.getDefaultIface() except Exception, e: log.msg("No network interface specified!") log.err(e) @@ -111,22 +111,22 @@ class EchoTest(nettest.NetTestCase): def test_icmp(self): def process_response(echo_reply, dest): - ans, unans = echo_reply - if ans: - log.msg("Recieved echo reply from %s: %s" % (dest, ans)) - else: - log.msg("No reply was received from %s. Possible censorship event." % dest) - log.debug("Unanswered packets: %s" % unans) - self.report[dest] = echo_reply + ans, unans = echo_reply + if ans: + log.msg("Recieved echo reply from %s: %s" % (dest, ans)) + else: + log.msg("No reply was received from %s. Possible censorship event." % dest) + log.debug("Unanswered packets: %s" % unans) + self.report[dest] = echo_reply for label, data in self.destinations.items(): - reply = sr1(IP(dst=lebal)/ICMP()) + reply = sr1(IP(dst=lebal) / ICMP()) process = process_reponse(reply, label) - #(ans, unans) = ping - #self.destinations[self.dst].update({'ans': ans, - # 'unans': unans, - # 'response_packet': ping}) - #return ping + #(ans, unans) = ping + #self.destinations[self.dst].update({'ans': ans, + # 'unans': unans, + # 'response_packet': ping}) + #return ping - #return reply + #return reply diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 279d87c..6020501 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -14,7 +14,7 @@ from ooni.deck import Deck, nettest_to_path from ooni.nettest import NetTestLoader from ooni.utils import log -from ooni.utils.txscapy import hasRawSocketPermission +from ooni.utils.net import hasRawSocketPermission class Options(usage.Options): diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index 925a9d6..35dbf5b 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -1,9 +1,9 @@ from ooni.nettest import NetTestCase from ooni.utils import log from ooni.settings import config +from ooni.utils.net import hasRawSocketPermission from ooni.utils.txscapy import ScapySender, ScapyFactory -from ooni.utils.txscapy import hasRawSocketPermission class BaseScapyTest(NetTestCase): diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index 0bd3180..a01aade 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -9,7 +9,7 @@ from ooni.tests.bases import ConfigTestCase from ooni.settings import config from ooni.oonicli import runWithDirector from ooni.errors import InsufficientPrivileges -from ooni.utils.txscapy import hasRawSocketPermission +from ooni.utils.net import hasRawSocketPermission def verify_header(header): diff --git a/ooni/tests/test_txscapy.py b/ooni/tests/test_txscapy.py index 1dbb8cc..0332fcf 100644 --- a/ooni/tests/test_txscapy.py +++ b/ooni/tests/test_txscapy.py @@ -52,16 +52,3 @@ class TestTxScapy(unittest.TestCase): assert result[0][0][0] == packet_sent assert result[0][0][1] == packet_received - def test_get_addresses(self): - addresses = txscapy.getAddresses() - assert isinstance(addresses, list) - - # @defer.inlineCallbacks - # def test_multi_traceroute(self): - # traceroute = txscapy.MPTraceroute() - # traceroute.timeout = 3 - # self.scapy_factory.registerProtocol(traceroute) - # yield traceroute.ICMPTraceroute('8.8.8.8') - # yield traceroute.TCPTraceroute('8.8.8.8') - # yield traceroute.UDPTraceroute('8.8.8.8') - # self.scapy_factory.super_socket.send.assert_called() diff --git a/ooni/tests/test_utils.py b/ooni/tests/test_utils.py index be5d578..e2e448a 100644 --- a/ooni/tests/test_utils.py +++ b/ooni/tests/test_utils.py @@ -1,7 +1,7 @@ import os from twisted.trial import unittest -from ooni.utils import pushFilenameStack, log, generate_filename +from ooni.utils import pushFilenameStack, log, generate_filename, net class TestUtils(unittest.TestCase): @@ -71,3 +71,7 @@ class TestUtils(unittest.TestCase): def test_generate_filename_with_extension_and_basename(self): filename = generate_filename(self.test_details, extension=self.extension, filename=self.basename) self.assertEqual(filename, 'filename.ext') + + def test_get_addresses(self): + addresses = net.getAddresses() + assert isinstance(addresses, list) diff --git a/ooni/utils/net.py b/ooni/utils/net.py index 2f1a2c6..014020c 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -6,6 +6,9 @@ from zope.interface import implements from twisted.internet import protocol, defer from twisted.web.iweb import IBodyProducer +from scapy.config import conf + +from ooni.errors import IfaceError try: from twisted.internet.endpoints import connectProtocol @@ -136,3 +139,34 @@ def randomFreePort(addr="127.0.0.1"): pass s.close() return port + + +def getDefaultIface(): + """ Return the default interface or raise IfaceError """ + iface = conf.route.route('0.0.0.0', verbose=0)[0] + if len(iface) > 0: + return iface + raise IfaceError + + +def getAddresses(): + from scapy.all import get_if_addr, get_if_list + from ipaddr import IPAddress + + addresses = set() + for i in get_if_list(): + try: + addresses.add(get_if_addr(i)) + except: + pass + if '0.0.0.0' in addresses: + addresses.remove('0.0.0.0') + return [IPAddress(addr) for addr in addresses] + + +def hasRawSocketPermission(): + try: + socket.socket(socket.AF_INET, socket.SOCK_RAW, socket.IPPROTO_RAW) + return True + except socket.error: + return False \ No newline at end of file diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index d0f58ba..59ac5b1 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -1,21 +1,18 @@ -import socket import sys import time import random - from twisted.internet import fdesc from twisted.internet import reactor from twisted.internet import defer, abstract - from scapy.config import conf from scapy.all import RandShort, IP, IPerror, ICMP, ICMPerror, TCP, TCPerror, UDP, UDPerror -from ooni.utils import log -from ooni.settings import config +from ooni.errors import ProtocolNotRegistered, ProtocolAlreadyRegistered, LibraryNotInstalledError +from ooni.utils import log -class LibraryNotInstalledError(Exception): - pass +from ooni.utils.net import getDefaultIface, getAddresses +from ooni.settings import config def pcapdnet_installed(): @@ -83,68 +80,6 @@ else: from scapy.all import Gen, SetGen, MTU -def getNetworksFromRoutes(): - """ Return a list of networks from the routing table """ - from scapy.all import conf, ltoa, read_routes - from ipaddr import IPNetwork, IPAddress - - # # Hide the 'no routes' warnings - conf.verb = 0 - - networks = [] - for nw, nm, gw, iface, addr in read_routes(): - n = IPNetwork(ltoa(nw)) - (n.netmask, n.gateway, n.ipaddr) = [IPAddress(x) for x in [nm, gw, addr]] - n.iface = iface - if not n.compressed in networks: - networks.append(n) - - return networks - - -class IfaceError(Exception): - pass - - -def getAddresses(): - from scapy.all import get_if_addr, get_if_list - from ipaddr import IPAddress - - addresses = set() - for i in get_if_list(): - try: - addresses.add(get_if_addr(i)) - except: - pass - if '0.0.0.0' in addresses: - addresses.remove('0.0.0.0') - return [IPAddress(addr) for addr in addresses] - - -def getDefaultIface(): - """ Return the default interface or raise IfaceError """ - iface = conf.route.route('0.0.0.0', verbose=0)[0] - if len(iface) > 0: - return iface - raise IfaceError - - -def hasRawSocketPermission(): - try: - socket.socket(socket.AF_INET, socket.SOCK_RAW, socket.IPPROTO_RAW) - return True - except socket.error: - return False - - -class ProtocolNotRegistered(Exception): - pass - - -class ProtocolAlreadyRegistered(Exception): - pass - - class ScapyFactory(abstract.FileDescriptor): """ Inspired by muxTCP scapyLink:

1 0

[ooni-probe/master] Merge pull request #362 from TheTorProject/fix/unassigned_variable
by art＠torproject.org 03 Jan '15

03 Jan '15

commit 8af0c79d44b035d46a65e24abbad3a68969b2eec Merge: f3bfa7d 3c864e7 Author: Arturo Filastò <arturo(a)filasto.net> Date: Mon Nov 3 15:07:29 2014 +0100 Merge pull request #362 from TheTorProject/fix/unassigned_variable Fix unassigned variable use ooni/api/spec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0