Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Dnstamper to dnsconsistency #35

Merged
merged 2 commits into from
Feb 16, 2013
Merged

Rename Dnstamper to dnsconsistency #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dbe984
Rename DNS Tamper Test to DNS Consistency Test
hellais Feb 4, 2013
70ecad5
Merge branch 'master' into dnstamper-dnsconsistency
hellais Feb 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion decks/before_i_commit.testdeck
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
pcapfile: null
reportfile: dns_tamper_test.yamloo
subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt]
test: nettests/blocking/dnstamper.py
test: nettests/blocking/dnsconsistency.py
- options:
collector: null
help: 0
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ respectively.
Content Blocking Tests
......................

* `DNSTamper <tests/dnstamper.html>`_
* `DNSConsistency <tests/dnsconsistency.html>`_

* `HTTP Requests <tests/http_requests.html>`_

Expand Down
4 changes: 2 additions & 2 deletions docs/source/nettests/nettests.blocking.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
nettests blocking Package
=========================

:mod:`nettests.blocking.dnstamper` Module
:mod:`nettests.blocking.dnsconsistency` Module
-----------------------------------------

.. automodule:: nettests.blocking.dnstamper
.. automodule:: nettests.blocking.dnsconsistency
:members:
:undoc-members:
:show-inheritance:
Expand Down
10 changes: 5 additions & 5 deletions docs/source/tests/dnstamper.rst → docs/source/tests/dnsconsistency.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Details
=======

*Test Name*: DNS Tamper
*Test Name*: DNS Consistency (Ex DNS Tamper)

*Current version*: 0.4

*NetTest*: DNS Tamper Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/blocking/dnstamper.py)
*NetTest*: DNS Consistency Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/blocking/dnsconsistency.py)

*Test Helper*: DNS Test Helper (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/dns_helpers.py)

Expand All @@ -28,7 +28,7 @@ Youtube, etc.
How to run the test
===================

`./bin/ooniprobe nettests/core/dnstamper.py [-t <test resolvers>|-T <test resolver file>-f <input file> -b IP:PORT`
`./bin/ooniprobe nettests/core/dnsconsistency.py [-t <test resolvers>|-T <test resolver file>-f <input file> -b IP:PORT`

*test resolvers* is a single test resolver (IP address)

Expand All @@ -42,7 +42,7 @@ Sample report
=============

From running:
`./bin/ooniprobe nettests/core/dnstamper.py -T test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/http_host_file.txt`
`./bin/ooniprobe nettests/core/dnsconsistency.py -T test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/http_host_file.txt`

::

Expand All @@ -59,7 +59,7 @@ From running:
reportfile: null
resume: 0
subargs: [-t, 8.8.8.8, -f, test_inputs/dns_tamper_file.txt]
test: nettests/blocking/dnstamper.py
test: nettests/blocking/dnsconsistency.py
probe_asn: null
probe_cc: null
probe_ip: 127.0.0.1
Expand Down
2 changes: 1 addition & 1 deletion docs/source/writing_tests.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,4 +508,4 @@ Report format
test_started: 1354801371.980114
...

For a more complex example, see: :mod:`nettests.blocking.dnstamper`
For a more complex example, see: :mod:`nettests.blocking.dnsconsistency`
2 changes: 1 addition & 1 deletion inputs/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ the correct functionality of the various OONIProbe tests.

# DNS Tamper

./bin/ooniprobe -o dns_tamper_test.yamloo nettests/blocking/dnstamper.py -t
./bin/ooniprobe -o dns_tamper_test.yamloo nettests/blocking/dnsconsistency.py -t
example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt

less dns_tamper_test.yamloo
Expand Down
12 changes: 6 additions & 6 deletions nettests/blocking/dnstamper.py → nettests/blocking/dnsconsistency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
#
# dnstamper
# *********
# dnsconsistency
# **************
#
# The test reports censorship if the cardinality of the intersection of
# the query result set from the control server and the query result set
Expand Down Expand Up @@ -34,11 +34,11 @@ class UsageOptions(usage.Options):
'Specify a single test resolver to use for testing']
]

class DNSTamperTest(dnst.DNSTest):
class DNSConsistencyTest(dnst.DNSTest):

name = "DNS tamper"
name = "DNS Consistency"
description = "DNS censorship detection test"
version = "0.4"
version = "0.5"
authors = "Arturo Filastò, Isis Lovecruft"
requirements = None

Expand Down Expand Up @@ -163,7 +163,7 @@ def inputProcessor(self, filename=None):
"""
This inputProcessor extracts domain names from urls
"""
log.debug("Running dnstamper default processor")
log.debug("Running dnsconsistency default processor")
if filename:
fp = open(filename)
for x in fp.readlines():
Expand Down