tor-commits January 2014

tor-commits@lists.torproject.org

23 participants
2271 discussions

[ooni-probe/master] Set country code to be ZZ if no country code is detected.
by art＠torproject.org 03 Jan '14

03 Jan '14

commit c05e5ac9b20107152d9853e6f9f6947172e8745e Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Dec 27 23:08:01 2013 +0100 Set country code to be ZZ if no country code is detected. --- ooni/geoip.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ooni/geoip.py b/ooni/geoip.py index 33766f3..6c539e9 100644 --- a/ooni/geoip.py +++ b/ooni/geoip.py @@ -40,6 +40,8 @@ def IPToLocation(ipaddr): country_dat = GeoIP(country_file) location['countrycode'] = country_dat.country_code_by_addr(ipaddr) + if not location['countrycode']: + location['countrycode'] = 'ZZ' asn_dat = GeoIP(asn_file) try:

1 0

[ooni-probe/master] Explicitly specify the scapy version so that pip does not fail
by art＠torproject.org 03 Jan '14

03 Jan '14

commit c427b766910c7edaff54604118117e953d40b436 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Dec 28 15:17:12 2013 +0100 Explicitly specify the scapy version so that pip does not fail --- .travis.yml | 1 - requirements.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50e0e2c..0a7ae5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ python: install: - pip install pyrex - pip install coveralls - - pip install scapy-real - pip install -r requirements.txt --use-mirrors - python setup.py install # command to run tests, e.g. python setup.py test diff --git a/requirements.txt b/requirements.txt index 815bb89..793c68e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,4 +20,4 @@ zope.interface>=3.6 # Get scapy 2.2 from pypi # https://pypi.python.org/pypi/scapy-real/2.2.0-dev -scapy-real +scapy-real==2.2.0-dev

1 0

[ooni-probe/master] Fix travis building?
by art＠torproject.org 03 Jan '14

03 Jan '14

commit 355568dc8c45eb1fad4ec05494a06a47b43b6e6e Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Dec 28 00:55:55 2013 +0100 Fix travis building? --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 0a7ae5b..50e0e2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ python: install: - pip install pyrex - pip install coveralls + - pip install scapy-real - pip install -r requirements.txt --use-mirrors - python setup.py install # command to run tests, e.g. python setup.py test

1 0

[ooni-probe/master] Disable DNS test
by art＠torproject.org 03 Jan '14

03 Jan '14

commit cba5b0c1c8bd16d66a09f325a1509f3dc0faf3be Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Dec 28 15:40:34 2013 +0100 Disable DNS test --- ooni/tests/disable_test_dns.py | 24 ++++++++++++++++++++++++ ooni/tests/test_dns.py | 24 ------------------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ooni/tests/disable_test_dns.py b/ooni/tests/disable_test_dns.py new file mode 100644 index 0000000..e9bb524 --- /dev/null +++ b/ooni/tests/disable_test_dns.py @@ -0,0 +1,24 @@ +# +# 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 + +class DNSTest(unittest.TestCase): + def test_a_lookup_ooni_query(self): + def done_query(message, *arg): + answer = message.answers[0] + self.assertEqual(answer.type, 1) + + dns_query = [dns.Query('ooni.nu', type=dns.A)] + resolver = Resolver(servers=[('8.8.8.8', 53)]) + d = resolver.queryUDP(dns_query) + d.addCallback(done_query) + return d + diff --git a/ooni/tests/test_dns.py b/ooni/tests/test_dns.py deleted file mode 100644 index e9bb524..0000000 --- a/ooni/tests/test_dns.py +++ /dev/null @@ -1,24 +0,0 @@ -# -# 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 - -class DNSTest(unittest.TestCase): - def test_a_lookup_ooni_query(self): - def done_query(message, *arg): - answer = message.answers[0] - self.assertEqual(answer.type, 1) - - dns_query = [dns.Query('ooni.nu', type=dns.A)] - resolver = Resolver(servers=[('8.8.8.8', 53)]) - d = resolver.queryUDP(dns_query) - d.addCallback(done_query) - return d -

1 0

[ooni-probe/master] Fix bug inside of oonid
by art＠torproject.org 03 Jan '14

03 Jan '14

commit 77d60dc442839264215f55714c18f4b8c55aea4d Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Dec 28 16:08:57 2013 +0100 Fix bug inside of oonid --- ooni/api/spec.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/api/spec.py b/ooni/api/spec.py index ecd514c..ed5cd44 100644 --- a/ooni/api/spec.py +++ b/ooni/api/spec.py @@ -11,7 +11,7 @@ from cyclone import web, escape from ooni.reporter import YAMLReporter, OONIBReporter, collector_supported from ooni import errors -from ooni.nettest import NetTestLoader, MissingRequiredOption +from ooni.nettest import NetTestLoader from ooni.settings import config class InvalidInputFilename(Exception): @@ -182,7 +182,7 @@ class StartTest(ORequestHandler): os.close(fd) os.remove(path) - except MissingRequiredOption, option_name: + except errors.MissingRequiredOption, option_name: self.write({'error': 'Missing required option: "%s"' % option_name}) except usage.UsageError, e:

1 0

[ooni-probe/master] Use the non raw scapy super socket when using Mac OS X
by art＠torproject.org 03 Jan '14

03 Jan '14

commit ce36a45700898c4b601b7c11bff5162896b78615 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Dec 30 16:30:16 2013 +0100 Use the non raw scapy super socket when using Mac OS X --- ooni/utils/txscapy.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index bcb0ca2..ae33365 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -129,7 +129,9 @@ class ScapyFactory(abstract.FileDescriptor): abstract.FileDescriptor.__init__(self, reactor) if interface == 'auto': interface = getDefaultIface() - if not super_socket: + if not super_socket and sys.platform == 'darwin': + super_socket = conf.L3socket(iface=interface, promisc=True, filter='') + elif not super_socket: super_socket = L3RawSocket(iface=interface, promisc=True) self.protocols = []

1 0

[ooni-probe/master] Merge branch 'master' into fix/misc
by art＠torproject.org 03 Jan '14

03 Jan '14

commit 211532c862e0672e993665dc01ba443a5548f6a2 Merge: 77d60dc 41e4683 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Dec 30 16:26:49 2013 +0100 Merge branch 'master' into fix/misc * master: Use the latest version of pygeoip from the github repo Remove package python-pypcap Issues with GPG homedir Make the setup-dependencies script work also on rasberry-pi requirements.txt | 4 +++- setup-dependencies.sh | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-)

1 0

[ooni-probe/master] Merge pull request #256 from TheTorProject/fix/misc
by art＠torproject.org 03 Jan '14

03 Jan '14

commit dbdff9b8ef7afba81d2868348c97c939f9ad6ce1 Merge: e7dcee3 1e704b4 Author: Arturo Filastò <hellais(a)users.noreply.github.com> Date: Thu Jan 2 06:19:33 2014 -0800 Merge pull request #256 from TheTorProject/fix/misc Fix/misc Vagrantfile | 2 +- data/decks/basic.deck | 2 +- data/ooniprobe.conf.sample | 2 +- ooni/__init__.py | 2 +- ooni/api/spec.py | 4 ++-- ooni/director.py | 9 +++++---- ooni/geoip.py | 23 +++++++++++++++++------ ooni/managers.py | 1 - ooni/nettest.py | 2 +- ooni/nettests/manipulation/traceroute.py | 12 ++++++------ ooni/oonicli.py | 14 +++++++------- ooni/reporter.py | 2 +- ooni/templates/scapyt.py | 4 ++-- ooni/tests/disable_test_dns.py | 24 ++++++++++++++++++++++++ ooni/tests/test_dns.py | 24 ------------------------ ooni/tests/test_nettest.py | 4 ++-- requirements.txt | 2 +- 17 files changed, 72 insertions(+), 61 deletions(-)

1 0

[ooni-probe/master] Merge branch 'fix/use_generic_L3socket'
by art＠torproject.org 03 Jan '14

03 Jan '14

commit e7dcee39a6e8d18310b7dae2ff6ace77c84d16d7 Merge: 41e4683 ce36a45 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Dec 30 16:32:22 2013 +0100 Merge branch 'fix/use_generic_L3socket' * fix/use_generic_L3socket: Use the non raw scapy super socket when using Mac OS X Use generic L3RawSocket rather than OS specific L3PacketSocket ooni/utils/txscapy.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[ooni-probe/master] Merge branch 'master' into fix/misc
by art＠torproject.org 03 Jan '14

03 Jan '14

commit b6a2a01629d5a22fe04fcdbc791fc5f89ad1784b Merge: 211532c e7dcee3 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Dec 30 17:34:37 2013 +0100 Merge branch 'master' into fix/misc * master: Use the non raw scapy super socket when using Mac OS X Use generic L3RawSocket rather than OS specific L3PacketSocket Conflicts: ooni/utils/txscapy.py ooni/utils/txscapy.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2014