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

[torbirdy/master] Reference the preference change
by sukhbir＠torproject.org 23 Nov '13

23 Nov '13

commit 0ebda760d3d052a4fcc452771f3af572f6de1ec4 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Nov 23 18:52:41 2013 -0500 Reference the preference change --- components/torbirdy.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 3c44372..c9cdb78 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -156,8 +156,9 @@ const TorBirdyPrefs = { // https://lists.torproject.org/pipermail/tor-talk/2012-May/024395.html "mailnews.reply_header_type": 1, "mailnews.reply_header_authorwrote": "%s", - // Show Sender header in message pane. + // Show Sender header in message pane (#10226). // http://heise.de/-2044405 + // https://bugzilla.mozilla.org/show_bug.cgi?id=332639 "mailnews.headers.showSender": true, /*

1 0

[torbirdy/master] Show Sender header in message pane (thanks to Carsten N.)
by sukhbir＠torproject.org 23 Nov '13

23 Nov '13

commit 29df13fec2e08a5968926806abd827f78c693bae Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Nov 23 18:22:57 2013 -0500 Show Sender header in message pane (thanks to Carsten N.) --- components/torbirdy.js | 3 +++ import-translations.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 7a0acfb..3c44372 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -156,6 +156,9 @@ const TorBirdyPrefs = { // https://lists.torproject.org/pipermail/tor-talk/2012-May/024395.html "mailnews.reply_header_type": 1, "mailnews.reply_header_authorwrote": "%s", + // Show Sender header in message pane. + // http://heise.de/-2044405 + "mailnews.headers.showSender": true, /* Mail diff --git a/import-translations.sh b/import-translations.sh index 53a9531..39ee9dc 100755 --- a/import-translations.sh +++ b/import-translations.sh @@ -2,7 +2,7 @@ # Script to fetch and update translations. Modified from tor-launcher. -BUNDLE_LOCALES="ar da eu he lv pa pt_BR tr cs de es fr it nl pl sv zh-CN ms-MY ja" +BUNDLE_LOCALES="ar da eu he lv pa pt-BR tr cs de es fr it nl pl sv zh-CN ms-MY ja" if [ -d translation ]; then

1 0

[torbirdy/master] Update the ChangeLog
by sukhbir＠torproject.org 23 Nov '13

23 Nov '13

commit 24d3cef0777c36f4fe25701454f34cd82ee20a3a Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Nov 23 18:51:17 2013 -0500 Update the ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 38b748f..f68a26e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ hkp://qdigse2yzvuglcix.onion New translations: Japanese, Malay + Show the Sender header in message pane (closes #10226) 0.1.2, 04 Nov 2013 New options:

1 0

r26437: {website} Updating the volunteer page entry for Check Arlo has been do (website/trunk/getinvolved/en)
by Damian Johnson 23 Nov '13

23 Nov '13

Author: atagar Date: 2013-11-23 23:09:58 +0000 (Sat, 23 Nov 2013) New Revision: 26437 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Updating the volunteer page entry for Check Arlo has been doing a fantastic job rewriting Check. Now that the Go counterpart is live swapping our volunteer page over to reference it. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-11-23 22:51:53 UTC (rev 26436) +++ website/trunk/getinvolved/en/volunteer.wml 2013-11-23 23:09:58 UTC (rev 26437) @@ -332,9 +332,9 @@ <tr> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> - <td>Python, Perl</td> - <td>None</td> - <td>ioerror</td> + <td>Go</td> + <td>Moderate</td> + <td>Arlo</td> </tr> <tr> @@ -765,13 +765,12 @@ <a id="project-torcheck"></a> <h3><a href="https://trac.torproject.org/projects/tor/wiki/org/roadmaps/TorCheck">TorCheck</a> (<a - href="https://svn.torproject.org/svn/check/trunk/">code</a>, <a + href="https://gitweb.torproject.org/check.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> - Provides a simple site for determining if the visitor is using Tor or not. - This has been relatively unchanged for quite a while. + Site for determining if the visitor is using Tor or not. </p> <a id="project-bridgedb"></a>

1 0

r26436: {website} Switching arm's project links to https Oops, had this change (website/trunk/projects/en)
by Damian Johnson 23 Nov '13

23 Nov '13

Author: atagar Date: 2013-11-23 22:51:53 +0000 (Sat, 23 Nov 2013) New Revision: 26436 Modified: website/trunk/projects/en/arm.wml Log: Switching arm's project links to https Oops, had this change laying around but forgot to push it. Changing arm's project page links to include ssl. Modified: website/trunk/projects/en/arm.wml =================================================================== --- website/trunk/projects/en/arm.wml 2013-11-23 22:49:45 UTC (rev 26435) +++ website/trunk/projects/en/arm.wml 2013-11-23 22:51:53 UTC (rev 26436) @@ -12,12 +12,12 @@ <div id="maincol">  - <h2>Arm (<a href="http://www.atagar.com/arm/">Project Page</a>)</h2> + <h2>Arm (<a href="https://www.atagar.com/arm/">Project Page</a>)</h2> <div class="underline"></div>  <div class="sidebar-left"> - <a href="http://www.atagar.com/arm/screenshots.php"><img src="$(IMGROOT)/screenshot_arm_page1_cropped.png" alt="Arm bandwidth graph and log"></a> + <a href="https://www.atagar.com/arm/screenshots.php"><img src="$(IMGROOT)/screenshot_arm_page1_cropped.png" alt="Arm bandwidth graph and log"></a> </div>  @@ -39,11 +39,10 @@ Most of arm's attributes are configurable through an optional armrc configuration file. It runs on any platform supported by curses including Linux, Mac OS X, and other Unix-like variants. For screenshots, change - logs, and repositories please see its <a - href="http://www.atagar.com/arm/">project page</a>. + logs, and repositories please see its <a href="https://www.atagar.com/arm/">project page</a>. </p> - <h1><a href="http://www.atagar.com/arm/download.php">Download</a></h1> + <h1><a href="https://www.atagar.com/arm/download.php">Download</a></h1> <br /> <a id="Support"></a>

1 0

r26435: {website} The 64-bit version of TBB was mislabeled with the 32-bit ver (website/trunk/download/en)
by Damian Johnson 23 Nov '13

23 Nov '13

Author: atagar Date: 2013-11-23 22:49:45 +0000 (Sat, 23 Nov 2013) New Revision: 26435 Modified: website/trunk/download/en/download-easy.wml Log: The 64-bit version of TBB was mislabeled with the 32-bit version Issue pointed out by aegirs. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2013-11-20 20:22:03 UTC (rev 26434) +++ website/trunk/download/en/download-easy.wml 2013-11-23 22:49:45 UTC (rev 26435) @@ -131,7 +131,7 @@ </form> <div class="desc"> <h2>Tor Browser Bundle for 64-Bit GNU/Linux</h2> - <em>Version <version-torbrowserbundlelinux32> - Linux, Unix, BSD (64-Bit)</em> + <em>Version <version-torbrowserbundlelinux64> - Linux, Unix, BSD (64-Bit)</em> <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></p> </div> <p class="alt-dl">Not Using GNU/Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>

1 0

[check/master] Don't ignore relays based on exit policy summary.
by arlo＠torproject.org 23 Nov '13

23 Nov '13

commit 829b00618db03cbbbe61d7420c5c4230fbc8c4e5 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Nov 23 14:02:44 2013 -0800 Don't ignore relays based on exit policy summary. Some exit policies summarize as reject all when, in fact, they do allow exiting. See the discussion in #21. --- scripts/exitips.py | 53 ++++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/scripts/exitips.py b/scripts/exitips.py index 7a27b5d..3c5bf45 100755 --- a/scripts/exitips.py +++ b/scripts/exitips.py @@ -20,6 +20,7 @@ class Router(): self.Fingerprint = router.fingerprint self.Address = router.address self.IsAllowedDefault = router.exit_policy._is_allowed_default + self.IsAllowed = router.exit_policy.is_exiting_allowed() self.Rules = [] self.Tminus = tminus @@ -51,8 +52,8 @@ def main(consensuses, exit_lists): "network-status-consensus-3 1.0"): if router.fingerprint in exits: continue - if router.exit_policy.is_exiting_allowed(): - r = Router(router, t) + r = Router(router, t) + if r.IsAllowed: for x in router.exit_policy._get_rules(): r.Rules.append({ "IsAddressWildcard": True, @@ -62,7 +63,7 @@ def main(consensuses, exit_lists): "MinPort": x.min_port, "MaxPort": x.max_port }) - exits[router.fingerprint] = r + exits[router.fingerprint] = r # get a corresponding exit list m = [x for x in exit_lists if x.startswith(d[:-5])] @@ -82,31 +83,35 @@ def main(consensuses, exit_lists): for descriptor in parse_file("data/cached-descriptors", "server-descriptor 1.0"): if descriptor.fingerprint in exits: - rules = [] - for x in descriptor.exit_policy._get_rules(): - is_address_wildcard = x.is_address_wildcard() - mask = "" - if not is_address_wildcard: - address_type = x.get_address_type() - if (address_type == AddressType.IPv4 and - x._masked_bits != 32) or \ - (address_type == AddressType.IPv6 and - x._masked_bits != 128): - mask = x.get_mask() - rules.append({ - "IsAddressWildcard": is_address_wildcard, - "Address": "" if x.address is None else x.address, - "Mask": "" if mask is None else mask, - "IsAccept": x.is_accept, - "MinPort": x.min_port, - "MaxPort": x.max_port - }) - exits[descriptor.fingerprint].Rules = rules + r = exits[descriptor.fingerprint] + r.IsAllowed = descriptor.exit_policy.is_exiting_allowed() + if r.IsAllowed: + rules = [] + for x in descriptor.exit_policy._get_rules(): + is_address_wildcard = x.is_address_wildcard() + mask = "" + if not is_address_wildcard: + address_type = x.get_address_type() + if (address_type == AddressType.IPv4 and + x._masked_bits != 32) or \ + (address_type == AddressType.IPv6 and + x._masked_bits != 128): + mask = x.get_mask() + rules.append({ + "IsAddressWildcard": is_address_wildcard, + "Address": "" if x.address is None else x.address, + "Mask": "" if mask is None else mask, + "IsAccept": x.is_accept, + "MinPort": x.min_port, + "MaxPort": x.max_port + }) + r.Rules = rules # output exits to file with open("data/exit-policies", "w") as exit_file: for e in exits: - exit_file.write(json.dumps(exits[e].__dict__) + "\n") + if exits[e].IsAllowed: + exit_file.write(json.dumps(exits[e].__dict__) + "\n") def print_help(c):

1 0

[check/master] Update default target.
by arlo＠torproject.org 23 Nov '13

23 Nov '13

commit bbacc525541645fcf0d9f40490ab9c74419f30c5 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat Nov 23 12:54:52 2013 -0800 Update default target. Should coincide with sergii, https://db.torproject.org/machines.cgi?host=sergii --- datastore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datastore.go b/datastore.go index c23109b..17aab92 100644 --- a/datastore.go +++ b/datastore.go @@ -134,7 +134,7 @@ func (e *Exits) GetAllExits(ap AddressPort, tminus int, fn func(string, string, } } -var DefaultTarget = AddressPort{"38.229.70.31", 443} +var DefaultTarget = AddressPort{"38.229.72.22", 443} func (e *Exits) PreComputeTorList() { newmap := make(map[string]string)

1 0

[atlas/master] Dynamically update year in footer.
by phw＠torproject.org 23 Nov '13

23 Nov '13

commit b802e8cb567d990c471d421dee4a573913974030 Author: Philipp Winter <phw(a)torproject.org> Date: Sat Nov 23 16:42:29 2013 +0100 Dynamically update year in footer. Fixes <https://bugs.torproject.org/9015>. --- index.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 0f9ffca..fce43d4 100644 --- a/index.html +++ b/index.html @@ -51,7 +51,7 @@ </div> <hr/> <footer> - The Tor Project - 2012<br/> + The Tor Project - <div style="display: inline" id="year"></div><br/> <a href="#about">About</a> - <a href="https://gitweb.torproject.org/atlas.git">Source code</a> - <a href="https://trac.torproject.org/projects/tor/newticket?component=Atlas">Report a bug</a> @@ -60,6 +60,9 @@ </div>  <script data-main="js/main" src="js/libs/require/require.js"></script> + <script type="text/javascript"> + document.getElementById("year").innerHTML = (new Date()).getUTCFullYear(); + </script> </body>

1 0

[ooni-probe/master] Move decks and inouts to data directory.
by art＠torproject.org 23 Nov '13

23 Nov '13

commit c3602305e65e48f014817687b58dd1efc55ad5f0 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Nov 13 10:07:21 2013 +0100 Move decks and inouts to data directory. --- data/decks/basic.deck | 24 ++++++++++++++ data/decks/before_i_commit.testdeck | 36 +++++++++++++++++++++ data/decks/short_no_root.deck | 60 +++++++++++++++++++++++++++++++++++ data/inputs/Makefile | 13 ++++++++ data/inputs/README | 47 +++++++++++++++++++++++++++ decks/basic.deck | 24 -------------- decks/before_i_commit.testdeck | 36 --------------------- decks/short_no_root.deck | 60 ----------------------------------- inputs/Makefile | 13 -------- inputs/README | 47 --------------------------- 10 files changed, 180 insertions(+), 180 deletions(-) diff --git a/data/decks/basic.deck b/data/decks/basic.deck new file mode 100644 index 0000000..b2ede99 --- /dev/null +++ b/data/decks/basic.deck @@ -0,0 +1,24 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, 'httpo://amcq5ldf3vwg22ze.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] + test_file: blocking/http_requests + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-b, 'http://93.95.227.200'] + test_file: manipulation/http_header_field_manipulation + testdeck: null diff --git a/data/decks/before_i_commit.testdeck b/data/decks/before_i_commit.testdeck new file mode 100644 index 0000000..9a3bca7 --- /dev/null +++ b/data/decks/before_i_commit.testdeck @@ -0,0 +1,36 @@ +- options: + collector: null + no-collector: true + help: 0 + logfile: reports/before_i_commit.log + pcapfile: null + reportfile: reports/captive_portal_test.yamloo + subargs: [] + test_file: manipulation/captiveportal +- options: + collector: null + no-collector: true + help: 0 + logfile: reports/before_i_commit.log + pcapfile: null + reportfile: reports/dns_tamper_test.yamloo + subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] + test_file: blocking/dnsconsistency +- options: + collector: null + no-collector: true + help: 0 + logfile: reports/before_i_commit.log + pcapfile: null + reportfile: reports/http_host.yamloo + subargs: [-b, 'http://93.95.227.200', -f, example_inputs/http_host_file.txt] + test_file: manipulation/http_host +- options: + no-collector: true + collector: null + help: 0 + logfile: reports/before_i_commit.log + pcapfile: null + reportfile: reports/header_field_manipulation.yamloo + subargs: [-b, 'http://93.95.227.200'] + test_file: manipulation/http_header_field_manipulation diff --git a/data/decks/short_no_root.deck b/data/decks/short_no_root.deck new file mode 100644 index 0000000..ddd157a --- /dev/null +++ b/data/decks/short_no_root.deck @@ -0,0 +1,60 @@ +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: manipulation/captiveportal + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, example_inputs/url_lists_file.txt] + test_file: blocking/http_requests + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, example_inputs/tcpconnect_host_file.txt] + test_file: blocking/tcpconnect + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, example_inputs/http_host_file.txt, -T, example_inputs/dns_tamper_test_resolvers.txt] + test_file: blocking/dnsconsistency + testdeck: null +- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: '10' + pcapfile: null + reportfile: null + resume: 0 + subargs: [-b, 'http://93.95.227.200'] + test_file: manipulation/http_header_field_manipulation + testdeck: null diff --git a/data/inputs/Makefile b/data/inputs/Makefile new file mode 100644 index 0000000..ff74cf6 --- /dev/null +++ b/data/inputs/Makefile @@ -0,0 +1,13 @@ +# This file will fetch a set of inputs that are of use to ooni-probe +all: whatheaders lists + +lists: + curl -O https://ooni.torproject.org/inputs/input-pack.tar.gz + tar xzf input-pack.tar.gz + rm input-pack.tar.gz + +whatheaders: + wget http://s3.amazonaws.com/data.whatheaders.com/whatheaders-latest.xml.zip + unzip whatheaders-latest.xml.zip + mv whatheaders*.xml whatheaders.xml + rm whatheaders-latest.xml.zip diff --git a/data/inputs/README b/data/inputs/README new file mode 100644 index 0000000..fb3599d --- /dev/null +++ b/data/inputs/README @@ -0,0 +1,47 @@ +In here you will find some very simple input lists that are useful for testing +the correct functionality of the various OONIProbe tests. + +# DNS Tamper + +./bin/ooniprobe -o dns_tamper_test.yamloo data/nettests/blocking/dnsconsistency.py -t +example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt + +less dns_tamper_test.yamloo + +# Captive Portal + +./bin/ooniprobe -o captive_portal_test.yamloo data/nettests/core/captiveportal.py + +less captive_portal_test.yamloo + +# HTTP Host + +./bin/ooniprobe -o http_host.yamloo data/nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt + +less http_host.yamloo + +# Keyword filtering + +./bin/ooniprobe -o keyword_filtering.yamloo data/nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt + +less keyword_filtering.yamloo + +# URL List + +./bin/ooniprobe -o url_lists.yamloo data/nettests/core/url_list.py -f test_inputs/url_lists_file.txt + +less url_lists.yamloo + +# Squid transparent proxy + +./bin/ooniprobe -o squid.yamloo data/nettests/core/squid.py + +less squid.yamloo + +# HTTP Requests + +Not Implemented + +# Traceroute + +Not Implemented diff --git a/decks/basic.deck b/decks/basic.deck deleted file mode 100644 index b2ede99..0000000 --- a/decks/basic.deck +++ /dev/null @@ -1,24 +0,0 @@ -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, 'httpo://amcq5ldf3vwg22ze.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1'] - test_file: blocking/http_requests - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-b, 'http://93.95.227.200'] - test_file: manipulation/http_header_field_manipulation - testdeck: null diff --git a/decks/before_i_commit.testdeck b/decks/before_i_commit.testdeck deleted file mode 100644 index 9a3bca7..0000000 --- a/decks/before_i_commit.testdeck +++ /dev/null @@ -1,36 +0,0 @@ -- options: - collector: null - no-collector: true - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/captive_portal_test.yamloo - subargs: [] - test_file: manipulation/captiveportal -- options: - collector: null - no-collector: true - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/dns_tamper_test.yamloo - subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] - test_file: blocking/dnsconsistency -- options: - collector: null - no-collector: true - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/http_host.yamloo - subargs: [-b, 'http://93.95.227.200', -f, example_inputs/http_host_file.txt] - test_file: manipulation/http_host -- options: - no-collector: true - collector: null - help: 0 - logfile: reports/before_i_commit.log - pcapfile: null - reportfile: reports/header_field_manipulation.yamloo - subargs: [-b, 'http://93.95.227.200'] - test_file: manipulation/http_header_field_manipulation diff --git a/decks/short_no_root.deck b/decks/short_no_root.deck deleted file mode 100644 index ddd157a..0000000 --- a/decks/short_no_root.deck +++ /dev/null @@ -1,60 +0,0 @@ -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [] - test_file: manipulation/captiveportal - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, example_inputs/url_lists_file.txt] - test_file: blocking/http_requests - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, example_inputs/tcpconnect_host_file.txt] - test_file: blocking/tcpconnect - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-f, example_inputs/http_host_file.txt, -T, example_inputs/dns_tamper_test_resolvers.txt] - test_file: blocking/dnsconsistency - testdeck: null -- options: - collector: null - help: 0 - logfile: null - no-default-reporter: 0 - parallelism: '10' - pcapfile: null - reportfile: null - resume: 0 - subargs: [-b, 'http://93.95.227.200'] - test_file: manipulation/http_header_field_manipulation - testdeck: null diff --git a/inputs/Makefile b/inputs/Makefile deleted file mode 100644 index ff74cf6..0000000 --- a/inputs/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# This file will fetch a set of inputs that are of use to ooni-probe -all: whatheaders lists - -lists: - curl -O https://ooni.torproject.org/inputs/input-pack.tar.gz - tar xzf input-pack.tar.gz - rm input-pack.tar.gz - -whatheaders: - wget http://s3.amazonaws.com/data.whatheaders.com/whatheaders-latest.xml.zip - unzip whatheaders-latest.xml.zip - mv whatheaders*.xml whatheaders.xml - rm whatheaders-latest.xml.zip diff --git a/inputs/README b/inputs/README deleted file mode 100644 index fb3599d..0000000 --- a/inputs/README +++ /dev/null @@ -1,47 +0,0 @@ -In here you will find some very simple input lists that are useful for testing -the correct functionality of the various OONIProbe tests. - -# DNS Tamper - -./bin/ooniprobe -o dns_tamper_test.yamloo data/nettests/blocking/dnsconsistency.py -t -example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt - -less dns_tamper_test.yamloo - -# Captive Portal - -./bin/ooniprobe -o captive_portal_test.yamloo data/nettests/core/captiveportal.py - -less captive_portal_test.yamloo - -# HTTP Host - -./bin/ooniprobe -o http_host.yamloo data/nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt - -less http_host.yamloo - -# Keyword filtering - -./bin/ooniprobe -o keyword_filtering.yamloo data/nettests/core/keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt - -less keyword_filtering.yamloo - -# URL List - -./bin/ooniprobe -o url_lists.yamloo data/nettests/core/url_list.py -f test_inputs/url_lists_file.txt - -less url_lists.yamloo - -# Squid transparent proxy - -./bin/ooniprobe -o squid.yamloo data/nettests/core/squid.py - -less squid.yamloo - -# HTTP Requests - -Not Implemented - -# Traceroute - -Not Implemented

1 0