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

[ooni-probe/master] Uniform transparent_http_proxy keys in report
by art＠torproject.org 30 Mar '13

30 Mar '13

commit 0c49af0fef382cef3dfa8da5b3288f526d5b40bb Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Feb 26 17:57:55 2013 +0100 Uniform transparent_http_proxy keys in report --- nettests/manipulation/http_host.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nettests/manipulation/http_host.py b/nettests/manipulation/http_host.py index 38b0fff..d95d836 100644 --- a/nettests/manipulation/http_host.py +++ b/nettests/manipulation/http_host.py @@ -121,7 +121,7 @@ class HTTPHost(httpt.HTTPTest): content = json.loads(body) except: log.msg("The json does not parse, this is not what we expected") - self.report['trans_http_proxy'] = True + self.report['transparent_http_proxy'] = True self.check_for_censorship(body) return @@ -132,10 +132,10 @@ class HTTPHost(httpt.HTTPTest): 'request_line' in content and \ 'headers_dict' in content: log.msg("Found the keys I expected in %s" % content) - self.report['trans_http_proxy'] = False + self.report['transparent_http_proxy'] = False self.report['censored'] = False else: log.msg("Did not find the keys I expected in %s" % content) - self.report['trans_http_proxy'] = True + self.report['transparent_http_proxy'] = True self.check_for_censorship(body)

1 0

[ooni-probe/master] Move geoip related classes into ooni.geoip
by art＠torproject.org 30 Mar '13

30 Mar '13

commit 51fe88e01de3d559522dc2cf3ea518f65993635b Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 15 09:22:13 2013 +0100 Move geoip related classes into ooni.geoip --- HACKING | 2 +- ooni/director.py | 133 +-------------------------------------- ooni/geoip.py | 168 +++++++++++++++++++++++++++++++++++++++++++++++++ ooni/nettest.py | 5 +- ooni/reporter.py | 2 +- ooni/utils/geodata.py | 40 ------------ tests/test_nettest.py | 2 +- 7 files changed, 176 insertions(+), 176 deletions(-) diff --git a/HACKING b/HACKING index b92ddbe..aad7ebb 100644 --- a/HACKING +++ b/HACKING @@ -87,7 +87,7 @@ Code Structure - ooni/utils/ In here go internal utilities that are useful to ooniprobe -- ooni/utils/geodata.py +- ooni/geoip.py In here go functions related to the understanding of geographical information of the probe diff --git a/ooni/director.py b/ooni/director.py index 07510eb..d2f5a7c 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -5,6 +5,7 @@ import os import re 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 @@ -16,136 +17,6 @@ from txtorcon import TorConfig from txtorcon import TorState, launch_tor from twisted.internet import defer, reactor -from twisted.web import client, http_headers -from ooni.utils.net import userAgents, BodyReceiver - -class HTTPGeoIPLookupper(object): - url = None - - def _response(self, response): - content_length = response.headers.getRawHeaders('content-length') - - finished = defer.Deferred() - response.deliverBody(BodyReceiver(finished, content_length)) - finished.addCallback(self.parseResponse) - return finished - - def parseResponse(self, response_body): - """ - Override this with the logic for parsing the response. - - Should return the IP address of the probe. - """ - pass - - def failed(self, failure): - log.err("Failed to lookup via %s" % url) - log.exception(failure) - return failure - - def lookup(self): - agent = client.Agent(reactor) - headers = {} - headers['User-Agent'] = [random.choice(userAgents)] - - d = agent.request("GET", self.url, http_headers.Headers(headers)) - d.addCallback(self._response) - d.addErrback(self.failed) - return d - -class UbuntuGeoIP(HTTPGeoIPLookupper): - url = "http://geoip.ubuntu.com/lookup" - - def parseResponse(self, response_body): - response = ET.fromstring(response_body) - probe_ip = response.find('Ip').text - return probe_ip - -class TorProjectGeoIP(HTTPGeoIPLookupper): - url = "https://check.torproject.org/" - - def parseResponse(self, response_body): - regexp = "Your IP address appears to be: ((\d+\.)+(\d+))" - probe_ip = re.search(regexp, response_body).group(1) - return probe_ip - -class MaxMindGeoIP(HTTPGeoIPLookupper): - url = "https://www.maxmind.com/en/locate_my_ip" - - def parseResponse(self, response_body): - regexp = '((\d+\.)+(\d+))' - probe_ip = re.search(regexp, response_body).group(1) - return probe_ip - -class ProbeIP(object): - strategy = None - geoIPServices = {'ubuntu': UbuntuGeoIP, - 'torproject': TorProjectGeoIP, - 'maximind': MaxMindGeoIP - } - address = None - - @defer.inlineCallbacks - def lookup(self): - try: - yield self.askTor() - defer.returnValue(self.address) - except errors.TorStateNotFound: - log.debug("Tor is not running. Skipping IP lookup via Tor.") - except: - log.msg("Unable to lookup the probe IP via Tor.") - - try: - yield self.askTraceroute() - defer.returnValue(self.address) - except errors.InsufficientPrivileges: - log.debug("Cannot determine the probe IP address with a traceroute, becase of insufficient priviledges") - except: - log.msg("Unable to lookup the probe IP via traceroute") - - try: - yield self.askGeoIPService() - defer.returnValue(self.address) - except Exception, e: - print e - log.msg("Unable to lookup the probe IP via GeoIPService") - - @defer.inlineCallbacks - def askGeoIPService(self): - for service_name, service in self.geoIPServices.items(): - s = TorProjectGeoIP() - log.msg("Looking up your IP address via %s" % service_name) - try: - self.address = yield s.lookup() - self.strategy = 'geo_ip_service-' + service_name - break - except: - log.msg("Failed to lookup your IP via %s" % service_name) - - def askTraceroute(self): - """ - Perform a UDP traceroute to determine the probes IP address. - """ - checkForRoot() - raise NotImplemented - - def askTor(self): - """ - Obtain the probes IP address by asking the Tor Control port via GET INFO - address. - - XXX this lookup method is currently broken when there are cached descriptors or consensus documents - see: https://trac.torproject.org/projects/tor/ticket/8214 - """ - if config.tor_state: - d = config.tor_state.protocol.get_info("address") - @d.addCallback - def cb(result): - self.strategy = 'tor_get_info_address' - self.address = result.values()[0] - return d - else: - raise errors.TorStateNotFound class Director(object): """ @@ -225,7 +96,7 @@ class Director(object): log.msg("Starting Tor...") yield self.startTor() - config.probe_ip = ProbeIP() + config.probe_ip = geoip.ProbeIP() yield config.probe_ip.lookup() @property diff --git a/ooni/geoip.py b/ooni/geoip.py new file mode 100644 index 0000000..0fe8a6b --- /dev/null +++ b/ooni/geoip.py @@ -0,0 +1,168 @@ +import re +import os + +from twisted.web import client, http_headers +from ooni.utils.net import userAgents, BodyReceiver +from twisted.internet import reactor, defer, protocol + +from ooni.utils import log, net +from ooni import config + +try: + import pygeoip +except ImportError: + log.err("Unable to import pygeoip. We will not be able to run geo IP related measurements") + +class GeoIPDataFilesNotFound(Exception): + pass + +def IPToLocation(ipaddr): + 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') + + location = {'city': None, 'countrycode': None, 'asn': None} + try: + city_dat = pygeoip.GeoIP(city_file) + location['city'] = city_dat.record_by_addr(ipaddr)['city'] + + country_dat = pygeoip.GeoIP(country_file) + location['countrycode'] = country_dat.country_code_by_addr(ipaddr) + + asn_dat = pygeoip.GeoIP(asn_file) + location['asn'] = asn_dat.org_by_addr(ipaddr) + + except IOError: + log.err("Could not find GeoIP data files. Go into data/ " + "and run make geoip") + raise GeoIPDataFilesNotFound + + return location + +class HTTPGeoIPLookupper(object): + url = None + + def _response(self, response): + content_length = response.headers.getRawHeaders('content-length') + + finished = defer.Deferred() + response.deliverBody(BodyReceiver(finished, content_length)) + finished.addCallback(self.parseResponse) + return finished + + def parseResponse(self, response_body): + """ + Override this with the logic for parsing the response. + + Should return the IP address of the probe. + """ + pass + + def failed(self, failure): + log.err("Failed to lookup via %s" % url) + log.exception(failure) + return failure + + def lookup(self): + agent = client.Agent(reactor) + headers = {} + headers['User-Agent'] = [random.choice(userAgents)] + + d = agent.request("GET", self.url, http_headers.Headers(headers)) + d.addCallback(self._response) + d.addErrback(self.failed) + return d + +class UbuntuGeoIP(HTTPGeoIPLookupper): + url = "http://geoip.ubuntu.com/lookup" + + def parseResponse(self, response_body): + response = ET.fromstring(response_body) + probe_ip = response.find('Ip').text + return probe_ip + +class TorProjectGeoIP(HTTPGeoIPLookupper): + url = "https://check.torproject.org/" + + def parseResponse(self, response_body): + regexp = "Your IP address appears to be: ((\d+\.)+(\d+))" + probe_ip = re.search(regexp, response_body).group(1) + return probe_ip + +class MaxMindGeoIP(HTTPGeoIPLookupper): + url = "https://www.maxmind.com/en/locate_my_ip" + + def parseResponse(self, response_body): + regexp = '((\d+\.)+(\d+))' + probe_ip = re.search(regexp, response_body).group(1) + return probe_ip + +class ProbeIP(object): + strategy = None + geoIPServices = {'ubuntu': UbuntuGeoIP, + 'torproject': TorProjectGeoIP, + 'maximind': MaxMindGeoIP + } + address = None + + @defer.inlineCallbacks + def lookup(self): + try: + yield self.askTor() + defer.returnValue(self.address) + except errors.TorStateNotFound: + log.debug("Tor is not running. Skipping IP lookup via Tor.") + except: + log.msg("Unable to lookup the probe IP via Tor.") + + try: + yield self.askTraceroute() + defer.returnValue(self.address) + except errors.InsufficientPrivileges: + log.debug("Cannot determine the probe IP address with a traceroute, becase of insufficient priviledges") + except: + log.msg("Unable to lookup the probe IP via traceroute") + + try: + yield self.askGeoIPService() + defer.returnValue(self.address) + except Exception, e: + print e + log.msg("Unable to lookup the probe IP via GeoIPService") + + @defer.inlineCallbacks + def askGeoIPService(self): + for service_name, service in self.geoIPServices.items(): + s = TorProjectGeoIP() + log.msg("Looking up your IP address via %s" % service_name) + try: + self.address = yield s.lookup() + self.strategy = 'geo_ip_service-' + service_name + break + except: + log.msg("Failed to lookup your IP via %s" % service_name) + + def askTraceroute(self): + """ + Perform a UDP traceroute to determine the probes IP address. + """ + checkForRoot() + raise NotImplemented + + def askTor(self): + """ + Obtain the probes IP address by asking the Tor Control port via GET INFO + address. + + XXX this lookup method is currently broken when there are cached descriptors or consensus documents + see: https://trac.torproject.org/projects/tor/ticket/8214 + """ + if config.tor_state: + d = config.tor_state.protocol.get_info("address") + @d.addCallback + def cb(result): + self.strategy = 'tor_get_info_address' + self.address = result.values()[0] + return d + else: + raise errors.TorStateNotFound diff --git a/ooni/nettest.py b/ooni/nettest.py index 67dee9d..bd6bd41 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -5,8 +5,9 @@ from twisted.internet import defer, reactor from twisted.trial.runner import filenameToModule from twisted.python import usage, reflect +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 config from ooni import otime @@ -35,7 +36,7 @@ class NetTestLoader(object): config.privacy.includecountry or \ config.privacy.includecity): log.msg("We will include some geo data in the report") - client_geodata = geodata.IPToLocation(config.probe_ip.address) + client_geodata = geoip.IPToLocation(config.probe_ip.address) if config.privacy.includeip: client_geodata['ip'] = config.probe_ip.address diff --git a/ooni/reporter.py b/ooni/reporter.py index 20193c9..fc73b67 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -30,7 +30,7 @@ from ooni.errors import InvalidOONIBCollectorAddress from ooni.errors import ReportNotCreated, ReportAlreadyClosed from ooni import otime -from ooni.utils import geodata, pushFilenameStack +from ooni.utils import pushFilenameStack from ooni.utils.net import BodyReceiver, StringProducer, userAgents from ooni import config diff --git a/ooni/utils/geodata.py b/ooni/utils/geodata.py deleted file mode 100644 index d9883ba..0000000 --- a/ooni/utils/geodata.py +++ /dev/null @@ -1,40 +0,0 @@ -import re -import os - -from twisted.web.client import Agent -from twisted.internet import reactor, defer, protocol - -from ooni.utils import log, net -from ooni import config - -try: - import pygeoip -except ImportError: - log.err("Unable to import pygeoip. We will not be able to run geo IP related measurements") - -class GeoIPDataFilesNotFound(Exception): - pass - -def IPToLocation(ipaddr): - 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') - - location = {'city': None, 'countrycode': None, 'asn': None} - try: - city_dat = pygeoip.GeoIP(city_file) - location['city'] = city_dat.record_by_addr(ipaddr)['city'] - - country_dat = pygeoip.GeoIP(country_file) - location['countrycode'] = country_dat.country_code_by_addr(ipaddr) - - asn_dat = pygeoip.GeoIP(asn_file) - location['asn'] = asn_dat.org_by_addr(ipaddr) - - except IOError: - log.err("Could not find GeoIP data files. Go into data/ " - "and run make geoip") - raise GeoIPDataFilesNotFound - - return location - diff --git a/tests/test_nettest.py b/tests/test_nettest.py index 976757f..2d070c3 100644 --- a/tests/test_nettest.py +++ b/tests/test_nettest.py @@ -241,7 +241,7 @@ class TestNetTest(unittest.TestCase): # try: # net_test = NetTestLoader(StringIO(net_test_root_required), # dummyArgs) - # except NotRootError: + # except errors.InsufficientPrivileges: # pass #def test_create_report_succeed(self):

1 0

[ooni-probe/master] Add an example test that inherits from the HTTP and DNS test template
by art＠torproject.org 30 Mar '13

30 Mar '13

commit 0c99be6979ace45d9d46758aa9c1e1741fbb69b9 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Feb 26 23:34:01 2013 +0100 Add an example test that inherits from the HTTP and DNS test template --- nettests/examples/example_dns_http.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/nettests/examples/example_dns_http.py b/nettests/examples/example_dns_http.py new file mode 100644 index 0000000..9b76775 --- /dev/null +++ b/nettests/examples/example_dns_http.py @@ -0,0 +1,11 @@ +from twisted.internet import defer +from ooni.templates import httpt, dnst + +class TestDNSandHTTP(httpt.HTTPTest, dnst.DNSTest): + + @defer.inlineCallbacks + def test_http_and_dns(self): + yield self.doRequest('http://torproject.org') + yield self.performALookup('torproject.org', ('8.8.8.8', 53)) + +

1 0

[ooni-probe/master] Implement modular probe IP address lookup function.
by art＠torproject.org 30 Mar '13

30 Mar '13

commit f544c3ef06808c441ed6e7db3cd4dfd187b04aa3 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Mar 13 20:57:19 2013 +0100 Implement modular probe IP address lookup function. --- ooni/director.py | 153 ++++++++++++++++++++++++++++++++++++++++++++---- ooni/errors.py | 5 ++ ooni/nettest.py | 8 +- ooni/utils/__init__.py | 5 +- tests/test_nettest.py | 1 - 5 files changed, 152 insertions(+), 20 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index 8365ebd..07510eb 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -1,18 +1,151 @@ +import xml.etree.ElementTree as ET +import random import sys import os +import re from ooni import config from ooni.managers import ReportEntryManager, MeasurementManager from ooni.reporter import Report -from ooni.utils import log, checkForRoot, NotRootError +from ooni.utils import log, checkForRoot from ooni.utils.net import randomFreePort from ooni.nettest import NetTest -from ooni.errors import UnableToStartTor +from ooni import errors from txtorcon import TorConfig from txtorcon import TorState, launch_tor from twisted.internet import defer, reactor +from twisted.web import client, http_headers +from ooni.utils.net import userAgents, BodyReceiver + +class HTTPGeoIPLookupper(object): + url = None + + def _response(self, response): + content_length = response.headers.getRawHeaders('content-length') + + finished = defer.Deferred() + response.deliverBody(BodyReceiver(finished, content_length)) + finished.addCallback(self.parseResponse) + return finished + + def parseResponse(self, response_body): + """ + Override this with the logic for parsing the response. + + Should return the IP address of the probe. + """ + pass + + def failed(self, failure): + log.err("Failed to lookup via %s" % url) + log.exception(failure) + return failure + + def lookup(self): + agent = client.Agent(reactor) + headers = {} + headers['User-Agent'] = [random.choice(userAgents)] + + d = agent.request("GET", self.url, http_headers.Headers(headers)) + d.addCallback(self._response) + d.addErrback(self.failed) + return d + +class UbuntuGeoIP(HTTPGeoIPLookupper): + url = "http://geoip.ubuntu.com/lookup" + + def parseResponse(self, response_body): + response = ET.fromstring(response_body) + probe_ip = response.find('Ip').text + return probe_ip + +class TorProjectGeoIP(HTTPGeoIPLookupper): + url = "https://check.torproject.org/" + + def parseResponse(self, response_body): + regexp = "Your IP address appears to be: ((\d+\.)+(\d+))" + probe_ip = re.search(regexp, response_body).group(1) + return probe_ip + +class MaxMindGeoIP(HTTPGeoIPLookupper): + url = "https://www.maxmind.com/en/locate_my_ip" + + def parseResponse(self, response_body): + regexp = '((\d+\.)+(\d+))' + probe_ip = re.search(regexp, response_body).group(1) + return probe_ip + +class ProbeIP(object): + strategy = None + geoIPServices = {'ubuntu': UbuntuGeoIP, + 'torproject': TorProjectGeoIP, + 'maximind': MaxMindGeoIP + } + address = None + + @defer.inlineCallbacks + def lookup(self): + try: + yield self.askTor() + defer.returnValue(self.address) + except errors.TorStateNotFound: + log.debug("Tor is not running. Skipping IP lookup via Tor.") + except: + log.msg("Unable to lookup the probe IP via Tor.") + + try: + yield self.askTraceroute() + defer.returnValue(self.address) + except errors.InsufficientPrivileges: + log.debug("Cannot determine the probe IP address with a traceroute, becase of insufficient priviledges") + except: + log.msg("Unable to lookup the probe IP via traceroute") + + try: + yield self.askGeoIPService() + defer.returnValue(self.address) + except Exception, e: + print e + log.msg("Unable to lookup the probe IP via GeoIPService") + + @defer.inlineCallbacks + def askGeoIPService(self): + for service_name, service in self.geoIPServices.items(): + s = TorProjectGeoIP() + log.msg("Looking up your IP address via %s" % service_name) + try: + self.address = yield s.lookup() + self.strategy = 'geo_ip_service-' + service_name + break + except: + log.msg("Failed to lookup your IP via %s" % service_name) + + def askTraceroute(self): + """ + Perform a UDP traceroute to determine the probes IP address. + """ + checkForRoot() + raise NotImplemented + + def askTor(self): + """ + Obtain the probes IP address by asking the Tor Control port via GET INFO + address. + + XXX this lookup method is currently broken when there are cached descriptors or consensus documents + see: https://trac.torproject.org/projects/tor/ticket/8214 + """ + if config.tor_state: + d = config.tor_state.protocol.get_info("address") + @d.addCallback + def cb(result): + self.strategy = 'tor_get_info_address' + self.address = result.values()[0] + return d + else: + raise errors.TorStateNotFound class Director(object): """ @@ -80,6 +213,7 @@ class Director(object): self.torControlProtocol = None + @defer.inlineCallbacks def start(self): if config.privacy.includepcap: log.msg("Starting") @@ -89,10 +223,10 @@ class Director(object): if config.advanced.start_tor: log.msg("Starting Tor...") - d = self.startTor() - else: - d = defer.succeed(None) - return d + yield self.startTor() + + config.probe_ip = ProbeIP() + yield config.probe_ip.lookup() @property def measurementSuccessRatio(self): @@ -200,7 +334,7 @@ class Director(object): from ooni.utils.txscapy import ScapyFactory, ScapySniffer try: checkForRoot() - except NotRootError: + 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" sys.exit(1) @@ -232,18 +366,15 @@ class Director(object): socks_port = yield state.protocol.get_conf("SocksPort") control_port = yield state.protocol.get_conf("ControlPort") - client_ip = yield state.protocol.get_info("address") config.tor.socks_port = int(socks_port.values()[0]) config.tor.control_port = int(control_port.values()[0]) - config.probe_ip = client_ip.values()[0] - log.debug("Obtained our IP address from a Tor Relay %s" % config.probe_ip) def setup_failed(failure): log.exception(failure) - raise UnableToStartTor + raise errors.UnableToStartTor def setup_complete(proto): """ diff --git a/ooni/errors.py b/ooni/errors.py index 36a042f..6b23727 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -132,3 +132,8 @@ class ReportNotCreated(Exception): class ReportAlreadyClosed(Exception): pass +class TorStateNotFound(Exception): + pass + +class InsufficientPrivileges(Exception): + pass diff --git a/ooni/nettest.py b/ooni/nettest.py index 6273d34..67dee9d 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -6,7 +6,7 @@ from twisted.trial.runner import filenameToModule from twisted.python import usage, reflect from ooni.tasks import Measurement -from ooni.utils import log, checkForRoot, NotRootError, geodata +from ooni.utils import log, checkForRoot, geodata from ooni import config from ooni import otime @@ -30,15 +30,15 @@ class NetTestLoader(object): from ooni import __version__ as software_version client_geodata = {} - if config.probe_ip and (config.privacy.includeip or \ + if config.probe_ip.address and (config.privacy.includeip or \ config.privacy.includeasn or \ config.privacy.includecountry or \ config.privacy.includecity): log.msg("We will include some geo data in the report") - client_geodata = geodata.IPToLocation(config.probe_ip) + client_geodata = geodata.IPToLocation(config.probe_ip.address) if config.privacy.includeip: - client_geodata['ip'] = config.probe_ip + client_geodata['ip'] = config.probe_ip.address else: client_geodata['ip'] = "127.0.0.1" diff --git a/ooni/utils/__init__.py b/ooni/utils/__init__.py index 8510a3b..340693b 100644 --- a/ooni/utils/__init__.py +++ b/ooni/utils/__init__.py @@ -48,12 +48,9 @@ class Storage(dict): for (k, v) in value.items(): self[k] = v -class NotRootError(Exception): - pass - def checkForRoot(): if os.getuid() != 0: - raise NotRootError("This test requires root") + raise errors.InsufficientPrivileges def randomSTR(length, num=True): """ diff --git a/tests/test_nettest.py b/tests/test_nettest.py index a0ccb32..976757f 100644 --- a/tests/test_nettest.py +++ b/tests/test_nettest.py @@ -9,7 +9,6 @@ from twisted.python.usage import UsageError from ooni.nettest import NetTest, InvalidOption, MissingRequiredOption from ooni.nettest import NetTestLoader, FailureToLoadNetTest from ooni.tasks import BaseTask -from ooni.utils import NotRootError from ooni.director import Director

1 0

[ooni-probe/master] Fix bug #7999 allowing tests to inherit from multiple test templates
by art＠torproject.org 30 Mar '13

30 Mar '13

commit 1e351c9bc86f89ad022fb1e580182acbb4778dee Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Feb 26 23:33:37 2013 +0100 Fix bug #7999 allowing tests to inherit from multiple test templates --- ooni/templates/dnst.py | 10 ++++++---- ooni/templates/httpt.py | 8 +++++--- ooni/templates/scapyt.py | 2 ++ ooni/templates/tcpt.py | 2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ooni/templates/dnst.py b/ooni/templates/dnst.py index 08d660a..caf4d04 100644 --- a/ooni/templates/dnst.py +++ b/ooni/templates/dnst.py @@ -28,6 +28,8 @@ class DNSTest(NetTestCase): queryTimeout = [1] def _setUp(self): + super(DNSTest, self)._setUp() + self.report['queries'] = [] def performPTRLookup(self, address, dns_server): @@ -51,7 +53,7 @@ class DNSTest(NetTestCase): name = str(answer.payload.name) answers.append(representAnswer(answer)) - self.addToReport(query, resolver=dns_server, + DNSTest.addToReport(self, query, resolver=dns_server, query_type = 'PTR', answers=answers, name=name) return name @@ -59,7 +61,7 @@ class DNSTest(NetTestCase): log.err("Failed to perform lookup") log.exception(failure) failure.trap(gaierror, TimeoutError) - self.addToReport(query, resolver=dns_server, + DNSTest.addToReport(self, query, resolver=dns_server, query_type = 'PTR', failure=failure) return None @@ -89,13 +91,13 @@ class DNSTest(NetTestCase): addrs.append(addr) answers.append(representAnswer(answer)) - self.addToReport(query, resolver=dns_server, query_type='A', + DNSTest.addToReport(self, query, resolver=dns_server, query_type='A', answers=answers, addrs=addrs) return addrs def gotError(failure): failure.trap(gaierror, TimeoutError) - self.addToReport(query, resolver=dns_server, query_type='A', + DNSTest.addToReport(self, query, resolver=dns_server, query_type='A', failure=failure) return failure diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index a265f4c..5e6bc5d 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -54,6 +54,8 @@ class HTTPTest(NetTestCase): responses = [] def _setUp(self): + super(HTTPTest, self)._setUp() + try: import OpenSSL except: @@ -134,7 +136,7 @@ class HTTPTest(NetTestCase): def _processResponseBody(self, response_body, request, response, body_processor): log.debug("Processing response body") - self.addToReport(request, response, response_body) + HTTPTest.addToReport(self, request, response, response_body) if body_processor: body_processor(response_body) else: @@ -205,7 +207,7 @@ class HTTPTest(NetTestCase): """ if not response: log.err("Got no response for request %s" % request) - self.addToReport(request, response) + HTTPTest.addToReport(self, request, response) return else: log.debug("Got response %s" % response) @@ -304,7 +306,7 @@ class HTTPTest(NetTestCase): def errback(failure, request): failure_string = handleAllFailures(failure) log.err("Error performing %s" % request) - self.addToReport(request, failure_string=failure_string) + HTTPTest.addToReport(self, request, failure_string=failure_string) return failure d = agent.request(request['method'], request['url'], headers, diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index 5f6c7c8..cadc793 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -37,6 +37,8 @@ class BaseScapyTest(NetTestCase): ] def _setUp(self): + super(BaseScapyTest, self)._setUp() + if not config.scapyFactory: log.debug("Scapy factoring not set, registering it.") config.scapyFactory = ScapyFactory(config.advanced.interface) diff --git a/ooni/templates/tcpt.py b/ooni/templates/tcpt.py index 323ead8..1acd6bb 100644 --- a/ooni/templates/tcpt.py +++ b/ooni/templates/tcpt.py @@ -57,6 +57,8 @@ class TCPTest(NetTestCase): port = None def _setUp(self): + super(TCPTest, self)._setUp() + self.report['sent'] = [] self.report['received'] = []

1 0

[ooni-probe/master] Make reporter creation more robust
by art＠torproject.org 30 Mar '13

30 Mar '13

commit e620ea035144550e3ca4162a25237367919045cb Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Mar 13 20:57:44 2013 +0100 Make reporter creation more robust We want to raise errors by yielding, because we are inside of a inlineCallbacks decorated function. --- ooni/reporter.py | 12 +++++++----- ooni/runner.py | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ooni/reporter.py b/ooni/reporter.py index 594c6b8..20193c9 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -226,6 +226,7 @@ class YAMLReporter(OReporter): self.writeReportEntry(self.testDetails) self.created.callback(self) + return defer.succeed(None) def finish(self): self._stream.close() @@ -305,7 +306,7 @@ class OONIBReporter(OReporter): self.agent = Agent(reactor, sockshost="127.0.0.1", socksport=int(config.tor.socks_port)) except Exception, e: - log.exception(e) + yield defer.fail(e) url = self.collectorAddress + '/report' @@ -338,11 +339,11 @@ class OONIBReporter(OReporter): bodyProducer=bodyProducer) except ConnectionRefusedError: log.err("Connection to reporting backend failed (ConnectionRefusedError)") - raise OONIBReportCreationError + self.created.errback(defer.fail(OONIBReportCreationError)) except Exception, e: log.exception(e) - raise OONIBReportCreationError + yield defer.fail(OONIBReportCreationError) # This is a little trix to allow us to unspool the response. We create # a deferred and call yield on it. @@ -355,7 +356,7 @@ class OONIBReporter(OReporter): parsed_response = json.loads(backend_response) except Exception, e: log.exception(e) - raise OONIBReportCreationError + yield defer.fail(e) self.reportID = parsed_response['report_id'] self.backendVersion = parsed_response['backend_version'] @@ -392,7 +393,8 @@ class Report(object): """ l = [] for reporter in self.reporters[:]: - reporter.createReport() + d = reporter.createReport() + d.addErrback(self.failedOpeningReport, reporter) reporter.created.addErrback(self.failedOpeningReport, reporter) l.append(reporter.created) log.debug("Reporters created: %s" % l) diff --git a/ooni/runner.py b/ooni/runner.py index 080db18..abdc256 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -15,7 +15,7 @@ from ooni.reporter import OONIBReporter, YAMLReporter, OONIBReportError from ooni.inputunit import InputUnitFactory from ooni.nettest import NetTestCase, NoPostProcessor from ooni.utils import log, checkForRoot, pushFilenameStack -from ooni.utils import NotRootError, Storage +from ooni.utils import Storage from ooni.utils.net import randomFreePort class InvalidResumeFile(Exception):

1 0

[ooni-probe/master] Add test for checking the failure of the traceroute method
by art＠torproject.org 30 Mar '13

30 Mar '13

commit e63048bbe3e45ce597b80b8f7f7ac5de24557a54 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 15 16:01:27 2013 +0100 Add test for checking the failure of the traceroute method Should raise an error when run as non root. --- ooni/errors.py | 3 ++- ooni/geoip.py | 4 ++-- ooni/utils/__init__.py | 2 ++ tests/test_geoip.py | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ooni/errors.py b/ooni/errors.py index 6b23727..62fcf93 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -14,7 +14,6 @@ from txsocksx.errors import HostUnreachable, ConnectionRefused from txsocksx.errors import TTLExpired, CommandNotSupported from socket import gaierror -from ooni.utils import log def handleAllFailures(failure): """ Here we make sure to trap all the failures that are supported by the @@ -44,6 +43,8 @@ def failureToString(failure): A string representing the HTTP response error message. """ + from ooni.utils import log + string = None if isinstance(failure.value, ConnectionRefusedError): log.err("Connection refused. The backend may be down") diff --git a/ooni/geoip.py b/ooni/geoip.py index 55c4fa4..e6a221b 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -7,8 +7,8 @@ from twisted.web import client, http_headers from ooni.utils.net import userAgents, BodyReceiver from twisted.internet import reactor, defer, protocol -from ooni.utils import log, net -from ooni import config +from ooni.utils import log, net, checkForRoot +from ooni import config, errors try: import pygeoip diff --git a/ooni/utils/__init__.py b/ooni/utils/__init__.py index 340693b..b039c8a 100644 --- a/ooni/utils/__init__.py +++ b/ooni/utils/__init__.py @@ -6,6 +6,8 @@ import yaml import imp import os +from ooni import errors + class Storage(dict): """ A Storage object is like a dictionary except `obj.foo` can be used diff --git a/tests/test_geoip.py b/tests/test_geoip.py index a4ad767..443d262 100644 --- a/tests/test_geoip.py +++ b/tests/test_geoip.py @@ -4,6 +4,7 @@ from twisted.trial import unittest from twisted.python.filepath import FilePath from twisted.protocols.policies import WrappingFactory +from ooni import errors from ooni.geoip import ProbeIP, MaxMindGeoIP, TorProjectGeoIP from ooni.geoip import UbuntuGeoIP, HTTPGeoIPLookupper, IPToLocation @@ -24,7 +25,6 @@ class MaxMindGeoIPResource(resource.Resource): class TorProjectGeoIPResource(resource.Resource): def render(self, request): - return """ Your IP address appears to be: 127.0.0.1 """ @@ -98,8 +98,8 @@ class TestProbeIP(GeoIPBaseTest): self.assertEqual(self.probe_ip.address, '127.0.0.1') return d - def test_ask_traceroute_service(self): - pass + def test_fail_traceroute_service(self): + self.assertRaises(errors.InsufficientPrivileges, self.probe_ip.askTraceroute) def test_ask_tor(self): pass

1 0

[ooni-probe/master] Write unittests for geoip web services.
by art＠torproject.org 30 Mar '13

30 Mar '13

commit e851611afd663f4c58d482d39960b2dae6ac7de6 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 15 15:02:04 2013 +0100 Write unittests for geoip web services. Fix some bugs found in unittesting. --- ooni/geoip.py | 26 ++++++++---- tests/test_geoip.py | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 9 deletions(-) diff --git a/ooni/geoip.py b/ooni/geoip.py index 0fe8a6b..55c4fa4 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -1,5 +1,7 @@ +import xml.etree.ElementTree as ET import re import os +import random from twisted.web import client, http_headers from ooni.utils.net import userAgents, BodyReceiver @@ -42,6 +44,11 @@ def IPToLocation(ipaddr): class HTTPGeoIPLookupper(object): url = None + _agent = client.Agent + + def __init__(self): + self.agent = self._agent(reactor) + def _response(self, response): content_length = response.headers.getRawHeaders('content-length') @@ -59,16 +66,15 @@ class HTTPGeoIPLookupper(object): pass def failed(self, failure): - log.err("Failed to lookup via %s" % url) + log.err("Failed to lookup via %s" % self.url) log.exception(failure) return failure def lookup(self): - agent = client.Agent(reactor) headers = {} headers['User-Agent'] = [random.choice(userAgents)] - d = agent.request("GET", self.url, http_headers.Headers(headers)) + d = self.agent.request("GET", self.url, http_headers.Headers(headers)) d.addCallback(self._response) d.addErrback(self.failed) return d @@ -101,7 +107,7 @@ class ProbeIP(object): strategy = None geoIPServices = {'ubuntu': UbuntuGeoIP, 'torproject': TorProjectGeoIP, - 'maximind': MaxMindGeoIP + 'maxmind': MaxMindGeoIP } address = None @@ -126,20 +132,22 @@ class ProbeIP(object): try: yield self.askGeoIPService() defer.returnValue(self.address) - except Exception, e: - print e + except: log.msg("Unable to lookup the probe IP via GeoIPService") @defer.inlineCallbacks def askGeoIPService(self): - for service_name, service in self.geoIPServices.items(): - s = TorProjectGeoIP() + # Shuffle the order in which we test the geoip services. + services = self.geoIPServices.items() + random.shuffle(services) + for service_name, service in services: + s = service() log.msg("Looking up your IP address via %s" % service_name) try: self.address = yield s.lookup() self.strategy = 'geo_ip_service-' + service_name break - except: + except Exception, e: log.msg("Failed to lookup your IP via %s" % service_name) def askTraceroute(self): diff --git a/tests/test_geoip.py b/tests/test_geoip.py new file mode 100644 index 0000000..a4ad767 --- /dev/null +++ b/tests/test_geoip.py @@ -0,0 +1,109 @@ +from twisted.web import server, static, resource +from twisted.internet import reactor +from twisted.trial import unittest +from twisted.python.filepath import FilePath +from twisted.protocols.policies import WrappingFactory + +from ooni.geoip import ProbeIP, MaxMindGeoIP, TorProjectGeoIP +from ooni.geoip import UbuntuGeoIP, HTTPGeoIPLookupper, IPToLocation + +class UbuntuGeoIPResource(resource.Resource): + def render(self, request): + return """ + <Response> + <Ip>127.0.0.1</Ip> + <Spam>Ham</Spam> + </Response> + """ + +class MaxMindGeoIPResource(resource.Resource): + def render(self, request): + return """ + 127.0.0.1 + """ + +class TorProjectGeoIPResource(resource.Resource): + def render(self, request): + + return """ + Your IP address appears to be: 127.0.0.1 + """ + +class GeoIPBaseTest(unittest.TestCase): + services = {'ubuntu': UbuntuGeoIPResource, + 'maxmind': MaxMindGeoIPResource, + 'torproject': TorProjectGeoIPResource + } + def _listen(self, site): + return reactor.listenTCP(0, site, interface="127.0.0.1") + + def setUp(self): + r = resource.Resource() + for name, service in self.services.items(): + r.putChild(name, service()) + self.site = server.Site(r, timeout=None) + + self.wrapper = WrappingFactory(self.site) + self.port = self._listen(self.wrapper) + self.portno = self.port.getHost().port + + def getUrl(self, service_name): + return "http://%s:%s/%s" % ('127.0.0.1', self.portno, service_name) + + def tearDown(self): + return self.port.stopListening() + +class TestGeoIPServices(GeoIPBaseTest): + def test_torproject_geoip(self): + gip = TorProjectGeoIP() + gip.url = self.getUrl('torproject') + d = gip.lookup() + @d.addCallback + def cb(res): + self.assertEqual(res, '127.0.0.1') + return d + + def test_ubuntu_geoip(self): + gip = UbuntuGeoIP() + gip.url = self.getUrl('ubuntu') + d = gip.lookup() + @d.addCallback + def cb(res): + self.assertEqual(res, '127.0.0.1') + return d + + def test_maxmind_geoip(self): + gip = MaxMindGeoIP() + gip.url = self.getUrl('maxmind') + d = gip.lookup() + @d.addCallback + def cb(res): + self.assertEqual(res, '127.0.0.1') + return d + +class TestProbeIP(GeoIPBaseTest): + def setUp(self): + GeoIPBaseTest.setUp(self) + + # Override the service addresses with those of the fake localhost + # resource. + self.probe_ip = ProbeIP() + for name in self.probe_ip.geoIPServices.keys(): + self.probe_ip.geoIPServices[name].url = self.getUrl(name) + + def test_ask_geoip_service(self): + d = self.probe_ip.askGeoIPService() + @d.addCallback + def cb(res): + self.assertEqual(self.probe_ip.address, '127.0.0.1') + return d + + def test_ask_traceroute_service(self): + pass + + def test_ask_tor(self): + pass + +class TestIPToLocation(unittest.TestCase): + pass +

1 0

[ooni-probe/master] Use regexp instead of parsing XML.
by art＠torproject.org 30 Mar '13

30 Mar '13

commit 5f55b1822b1dd34b50b4f4f1a8dc0e9f0f64a6e4 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Mar 19 13:52:31 2013 -0400 Use regexp instead of parsing XML. Fix unittest of the ubuntu check --- ooni/director.py | 1 - ooni/geoip.py | 5 ++--- tests/test_geoip.py | 7 +------ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ooni/director.py b/ooni/director.py index d2f5a7c..7c8c75b 100644 --- a/ooni/director.py +++ b/ooni/director.py @@ -1,4 +1,3 @@ -import xml.etree.ElementTree as ET import random import sys import os diff --git a/ooni/geoip.py b/ooni/geoip.py index ae06608..efac5e9 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -1,4 +1,3 @@ -import xml.etree.ElementTree as ET import re import os import random @@ -83,8 +82,8 @@ class UbuntuGeoIP(HTTPGeoIPLookupper): url = "http://geoip.ubuntu.com/lookup" def parseResponse(self, response_body): - response = ET.fromstring(response_body) - probe_ip = response.find('Ip').text + m = re.match(".*<Ip>(.*)</Ip>.*", response_body) + probe_ip = m.group(1) return probe_ip class TorProjectGeoIP(HTTPGeoIPLookupper): diff --git a/tests/test_geoip.py b/tests/test_geoip.py index 0d7165f..88f3dcb 100644 --- a/tests/test_geoip.py +++ b/tests/test_geoip.py @@ -12,12 +12,7 @@ from ooni.geoip import UbuntuGeoIP, HTTPGeoIPLookupper, IPToLocation class UbuntuGeoIPResource(resource.Resource): def render(self, request): - return """ - <Response> - <Ip>127.0.0.1</Ip> - <Spam>Ham</Spam> - </Response> - """ + return """<?xml version="1.0" encoding="UTF-8"?><Response><Ip>127.0.0.1</Ip><Status>OK</Status></Response>""" class MaxMindGeoIPResource(resource.Resource): def render(self, request):

1 0

[ooni-probe/master] Write unittests also for Tor geoip stuff
by art＠torproject.org 30 Mar '13

30 Mar '13

commit d73c5fa22a72413fd1c5d24eeb1e9118f0a4662a Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Mar 15 16:31:14 2013 +0100 Write unittests also for Tor geoip stuff --- ooni/errors.py | 3 +++ ooni/geoip.py | 16 ++++++++++++---- tests/test_geoip.py | 45 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 54 insertions(+), 10 deletions(-) diff --git a/ooni/errors.py b/ooni/errors.py index 62fcf93..69af726 100644 --- a/ooni/errors.py +++ b/ooni/errors.py @@ -138,3 +138,6 @@ class TorStateNotFound(Exception): class InsufficientPrivileges(Exception): pass + +class ProbeIPUnknown(Exception): + pass diff --git a/ooni/geoip.py b/ooni/geoip.py index e6a221b..ae06608 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -110,19 +110,22 @@ class ProbeIP(object): 'maxmind': MaxMindGeoIP } address = None + tor_state = config.tor_state @defer.inlineCallbacks def lookup(self): try: yield self.askTor() + log.msg("Found your IP via Tor %s" % self.address) defer.returnValue(self.address) except errors.TorStateNotFound: log.debug("Tor is not running. Skipping IP lookup via Tor.") - except: + except Exception: log.msg("Unable to lookup the probe IP via Tor.") try: yield self.askTraceroute() + log.msg("Found your IP via Traceroute %s" % self.address) defer.returnValue(self.address) except errors.InsufficientPrivileges: log.debug("Cannot determine the probe IP address with a traceroute, becase of insufficient priviledges") @@ -131,9 +134,11 @@ class ProbeIP(object): try: yield self.askGeoIPService() + log.msg("Found your IP via a GeoIP service: %s" % self.address) defer.returnValue(self.address) - except: + except Exception, e: log.msg("Unable to lookup the probe IP via GeoIPService") + raise e @defer.inlineCallbacks def askGeoIPService(self): @@ -150,6 +155,9 @@ class ProbeIP(object): except Exception, e: log.msg("Failed to lookup your IP via %s" % service_name) + if not self.address: + raise errors.ProbeIPUnknown + def askTraceroute(self): """ Perform a UDP traceroute to determine the probes IP address. @@ -165,8 +173,8 @@ class ProbeIP(object): XXX this lookup method is currently broken when there are cached descriptors or consensus documents see: https://trac.torproject.org/projects/tor/ticket/8214 """ - if config.tor_state: - d = config.tor_state.protocol.get_info("address") + if self.tor_state: + d = self.tor_state.protocol.get_info("address") @d.addCallback def cb(result): self.strategy = 'tor_get_info_address' diff --git a/tests/test_geoip.py b/tests/test_geoip.py index 443d262..0d7165f 100644 --- a/tests/test_geoip.py +++ b/tests/test_geoip.py @@ -1,5 +1,7 @@ +from collections import namedtuple + from twisted.web import server, static, resource -from twisted.internet import reactor +from twisted.internet import reactor, defer from twisted.trial import unittest from twisted.python.filepath import FilePath from twisted.protocols.policies import WrappingFactory @@ -58,7 +60,7 @@ class TestGeoIPServices(GeoIPBaseTest): gip = TorProjectGeoIP() gip.url = self.getUrl('torproject') d = gip.lookup() - @d.addCallback + @d.addBoth def cb(res): self.assertEqual(res, '127.0.0.1') return d @@ -67,7 +69,7 @@ class TestGeoIPServices(GeoIPBaseTest): gip = UbuntuGeoIP() gip.url = self.getUrl('ubuntu') d = gip.lookup() - @d.addCallback + @d.addBoth def cb(res): self.assertEqual(res, '127.0.0.1') return d @@ -76,7 +78,7 @@ class TestGeoIPServices(GeoIPBaseTest): gip = MaxMindGeoIP() gip.url = self.getUrl('maxmind') d = gip.lookup() - @d.addCallback + @d.addBoth def cb(res): self.assertEqual(res, '127.0.0.1') return d @@ -93,7 +95,7 @@ class TestProbeIP(GeoIPBaseTest): def test_ask_geoip_service(self): d = self.probe_ip.askGeoIPService() - @d.addCallback + @d.addBoth def cb(res): self.assertEqual(self.probe_ip.address, '127.0.0.1') return d @@ -102,7 +104,38 @@ class TestProbeIP(GeoIPBaseTest): self.assertRaises(errors.InsufficientPrivileges, self.probe_ip.askTraceroute) def test_ask_tor(self): - pass + class MockTorState(object): + """ + This is a Mock Tor state object. It will just pretend to answer to + the get_info("address") method call. + """ + protocol = namedtuple('Protocol', 'get_info') + def __init__(self): + def get_info(key): + return defer.succeed({'XXX': '127.0.0.2'}) + self.protocol = self.protocol(get_info=get_info) + + self.probe_ip.tor_state = MockTorState() + d = self.probe_ip.lookup() + @d.addBoth + def cb(res): + self.assertEqual(self.probe_ip.address, '127.0.0.2') + return d + + def test_probe_ip(self): + d = self.probe_ip.lookup() + @d.addBoth + def cb(res): + self.assertEqual(self.probe_ip.address, '127.0.0.1') + self.assertTrue(self.probe_ip.strategy.startswith('geo_ip_service-')) + return d + + def test_failing_probe_ip(self): + self.probe_ip.geoIPServices = {} + + d = self.probe_ip.lookup() + self.assertFailure(d, errors.ProbeIPUnknown) + return d class TestIPToLocation(unittest.TestCase): pass

1 0