- tor-commits - lists.torproject.org

[onionoo/master] Further specify limit and offset parameters.
by karsten＠torproject.org 05 Dec '12

05 Dec '12

commit 3edf098d09aefc3655b74e39cdb4b3a0b7e4006c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 20:16:13 2012 +0100 Further specify limit and offset parameters. --- web/index.html | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/index.html b/web/index.html index 4df3d7a..e29c0b8 100755 --- a/web/index.html +++ b/web/index.html @@ -683,9 +683,11 @@ undefined. </td></tr> <tr><td><b>offset</b></td><td>Skip the given number of relays and/or bridges. +Relays are skipped first, then bridges. </td></tr> <tr><td><b>limit</b></td><td>Limit result to the given number of relays and/or bridges. +Relays are kept first, then bridges. When used together with <b>offset</b>, the offsetting step precedes the limiting step. </td></tr>

1 0

[onionoo/master] Specify how we handle multiple parameter values.
by karsten＠torproject.org 05 Dec '12

05 Dec '12

commit a999d69bad8a1a93e142f703d38f02a0853fa5ab Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 17:06:43 2012 +0100 Specify how we handle multiple parameter values. --- web/index.html | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/index.html b/web/index.html index 1af4904..4df3d7a 100755 --- a/web/index.html +++ b/web/index.html @@ -616,6 +616,8 @@ of relay and/or bridge documents to be included in the response. If multiple parameters are specified, they are combined using a logical AND operation, meaning that only the intersection of relays and bridges matching all parameters is returned. +If the same parameter is specified more than once, only the first +parameter value is considered. </p> <table border="0" cellpadding="4" cellspacing="0" summary=""> <colgroup> @@ -657,7 +659,9 @@ Filtering by country code is case-insensitive. </td></tr> </table> <p>Relay and/or bridge documents in the response can be ordered and -limited by providing further parameters.</p> +limited by providing further parameters. +If the same parameter is specified more than once, only the first +parameter value is considered.</p> <table border="0" cellpadding="4" cellspacing="0" summary=""> <colgroup> <col width="150">

1 0

[onionoo/master] Actually support searching for hashed full fingerprints.
by karsten＠torproject.org 05 Dec '12

05 Dec '12

commit a80dc1252344b83271d0a03d31ad24e0ee67268f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 19:36:42 2012 +0100 Actually support searching for hashed full fingerprints. The spec says that we support looking up and searching for hashed full fingerprints, but only the former was implemented. Implement the latter, too. --- src/org/torproject/onionoo/ResourceServlet.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 149f169..9a2e353 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -428,7 +428,15 @@ public class ResourceServlet extends HttpServlet { private void filterBySearchTerms(Map<String, String> filteredRelays, Map<String, String> filteredBridges, String[] searchTerms) { for (String searchTerm : searchTerms) { - filterBySearchTerm(filteredRelays, filteredBridges, searchTerm); + if (searchTerm.startsWith("$") && searchTerm.length() == 41) { + this.filterByFingerprint(filteredRelays, filteredBridges, + searchTerm.substring(1).toUpperCase()); + } else if (!searchTerm.startsWith("$") && searchTerm.length() == 40) { + this.filterByFingerprint(filteredRelays, filteredBridges, + searchTerm.toUpperCase()); + } else { + filterBySearchTerm(filteredRelays, filteredBridges, searchTerm); + } } }

1 0

[onionoo/master] Ensure that IPv6 hex characters are always lower-case.
by karsten＠torproject.org 05 Dec '12

05 Dec '12

commit 2324448000154571c60e768f28d910a98e45d973 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 16:38:41 2012 +0100 Ensure that IPv6 hex characters are always lower-case. --- src/org/torproject/onionoo/DetailDataWriter.java | 12 ++++++------ src/org/torproject/onionoo/ResourceServlet.java | 4 ++-- web/index.html | 4 ++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index af0a0b9..7d0ab15 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -569,8 +569,8 @@ public class DetailDataWriter { int addressesWritten = 0; for (String orAddress : orAddresses) { orAddressesAndPortsBuilder.append( - (addressesWritten++ > 0 ? "," : "") + "\"" + orAddress - + "\""); + (addressesWritten++ > 0 ? "," : "") + "\"" + + orAddress.toLowerCase() + "\""); } String lastSeen = dateTimeFormat.format(entry.getLastSeenMillis()); String firstSeen = dateTimeFormat.format( @@ -699,8 +699,8 @@ public class DetailDataWriter { sb.append(",\n\"exit_addresses\":["); int written = 0; for (String exitAddress : entry.getExitAddresses()) { - sb.append((written++ > 0 ? "," : "") + "\"" + exitAddress - + "\""); + sb.append((written++ > 0 ? "," : "") + "\"" + + exitAddress.toLowerCase() + "\""); } sb.append("]"); } @@ -838,8 +838,8 @@ public class DetailDataWriter { int addressesWritten = 0; for (String orAddress : orAddresses) { orAddressesAndPortsBuilder.append( - (addressesWritten++ > 0 ? "," : "") + "\"" + orAddress - + "\""); + (addressesWritten++ > 0 ? "," : "") + "\"" + + orAddress.toLowerCase() + "\""); } StringBuilder sb = new StringBuilder(); sb.append("{\"version\":1,\n" diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 512b7ca..149f169 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -123,8 +123,8 @@ public class ResourceServlet extends HttpServlet { StringBuilder addressesBuilder = new StringBuilder(); int written = 0; for (String address : addresses) { - addressesBuilder.append((written++ > 0 ? "," : "") + "\"" + address - + "\""); + addressesBuilder.append((written++ > 0 ? "," : "") + "\"" + + address.toLowerCase() + "\""); } return String.format("{%s\"f\":\"%s\",\"a\":[%s],\"r\":%s}", (nickname == null ? "" : "\"n\":\"" + nickname + "\","), diff --git a/web/index.html b/web/index.html index ae084f1..1af4904 100755 --- a/web/index.html +++ b/web/index.html @@ -61,6 +61,7 @@ Required field.</li> <li><b>"a":</b> Array of IPv4 or IPv6 addresses where the relay accepts onion-routing connections or which the relay used to exit to the Internet in the past 24 hours. +IPv6 hex characters are all lower-case. Required field.</li> <li><b>"r":</b> Boolean field saying whether this relay was listed as running in the last relay network status consensus. @@ -113,9 +114,11 @@ hexadecimal characters. Required field.</li> <li><b>"or_addresses":</b> Array of IPv4 or IPv6 addresses and TCP ports or port lists where the relay accepts onion-routing connections. +IPv6 hex characters are all lower-case. Required field.</li> <li><b>"exit_addresses":</b> Array of IPv4 or IPv6 addresses that the relay used to exit to the Internet in the past 24 hours. +IPv6 hex characters are all lower-case. Only those addresses are listed that are different from onion-routing addresses. Optional field. @@ -316,6 +319,7 @@ Required field.</li> <li><b>"or_addresses":</b> Array of sanitized IPv4 or IPv6 addresses and TCP ports or port lists where the bridge accepts onion-routing connections. +IPv6 hex characters are all lower-case. Sanitized IP addresses are always in <i>10/8</i> or <i>[fd9f:2e19:3bcf/48]</i> IP networks and are only useful to learn which IP version the bridge uses and to detect whether the bridge changed its

1 0

r25934: {website} Don't claim there are two Onionoo clients when really there (website/trunk/projects/en)
by Karsten Loesing 05 Dec '12

05 Dec '12

Author: kloesing Date: 2012-12-05 18:15:33 +0000 (Wed, 05 Dec 2012) New Revision: 25934 Modified: website/trunk/projects/en/onionoo.wml Log: Don't claim there are two Onionoo clients when really there are four. Modified: website/trunk/projects/en/onionoo.wml =================================================================== --- website/trunk/projects/en/onionoo.wml 2012-12-05 17:10:05 UTC (rev 25933) +++ website/trunk/projects/en/onionoo.wml 2012-12-05 18:15:33 UTC (rev 25934) @@ -16,8 +16,8 @@ Tor relays and bridges. Onionoo itself was not designed as a service for human beings—at least not directly. Onionoo provides the data for other applications and websites which in turn present Tor - network status information to humans. There are currently two - Onionoo clients available:</p> + network status information to humans. The following Onionoo clients + are currently available:</p> <ul> <li><a href="https://atlas.torproject.org/">Atlas</a> is a web application to discover Tor relays and bridges. It provides useful

1 0

[ooni-probe/master] fixup Netalyzr third party plugin
by ioerror＠torproject.org 05 Dec '12

05 Dec '12

commit 89e1de82f18e8a1b47347a4c5be5ba5db5134ac1 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Dec 5 23:50:38 2012 +0630 fixup Netalyzr third party plugin --- nettests/third_party/netalyzr.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nettests/third_party/netalyzr.py b/nettests/third_party/netalyzr.py index 1d878ff..6ce5a9f 100644 --- a/nettests/third_party/netalyzr.py +++ b/nettests/third_party/netalyzr.py @@ -25,10 +25,10 @@ class NetalyzrWrapperTest(nettest.NetTestCase): test_token = time.asctime(time.gmtime()).replace(" ", "_").strip() - output_file = os.path.join(outputdir, + self.output_file = os.path.join(outputdir, "NetalyzrCLI_" + test_token + ".out") - output_file.strip() - self.run_me = program + " 2>&1 >> " + output_file + self.output_file.strip() + self.run_me = program + " 2>&1 >> " + self.output_file def test_run_netalyzr(self): """

1 0

[ooni-probe/master] Retain local Netalyzr debugging information using hidden argument
by ioerror＠torproject.org 05 Dec '12

05 Dec '12

commit 1bb2eb68adf67da7376892865169f9244f42f84d Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Dec 5 23:38:36 2012 +0630 Retain local Netalyzr debugging information using hidden argument --- nettests/third_party/netalyzr.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nettests/third_party/netalyzr.py b/nettests/third_party/netalyzr.py index 20830ba..1d878ff 100644 --- a/nettests/third_party/netalyzr.py +++ b/nettests/third_party/netalyzr.py @@ -21,7 +21,7 @@ class NetalyzrWrapperTest(nettest.NetTestCase): outputdir = os.path.join(cwd, '..', '..') program_path = os.path.join(cwd, 'NetalyzrCLI.jar') - program = "java -jar %s " % program_path + program = "java -jar %s -d" % program_path test_token = time.asctime(time.gmtime()).replace(" ", "_").strip()

1 0

[ooni-probe/master] Update the input README to be correct
by ioerror＠torproject.org 05 Dec '12

05 Dec '12

commit 331c23570ccdaef145cb176abbbc01925c52897b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Wed Dec 5 23:37:59 2012 +0630 Update the input README to be correct --- inputs/README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/inputs/README b/inputs/README index 14c2c81..9a4f9b7 100644 --- a/inputs/README +++ b/inputs/README @@ -3,7 +3,8 @@ the correct functionality of the various OONIProbe tests. # DNS Tamper -./bin/ooniprobe -o dns_tamper_test.yamloo nettests/core/dnstamper.py -t test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/dns_tamper_file.txt +./bin/ooniprobe -o dns_tamper_test.yamloo nettests/blocking/dnstamper.py -t +example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt less dns_tamper_test.yamloo @@ -15,7 +16,7 @@ less captive_portal_test.yamloo # HTTP Host -./bin/ooniprobe -o http_host.yamloo nettests/core/http_host.py -b http://ooni.nu/test -f test_inputs/http_host_file.txt +./bin/ooniprobe -o http_host.yamloo nettests/manipulation/http_host.py -b http://ooni.nu/test -f example_inputs/http_host_file.txt less http_host.yamloo

1 0

r25933: {website} state a position on using the tor mark in research paper tit (website/trunk/docs/en)
by Roger Dingledine 05 Dec '12

05 Dec '12

Author: arma Date: 2012-12-05 17:10:05 +0000 (Wed, 05 Dec 2012) New Revision: 25933 Modified: website/trunk/docs/en/trademark-faq.wml Log: state a position on using the tor mark in research paper titles Modified: website/trunk/docs/en/trademark-faq.wml =================================================================== --- website/trunk/docs/en/trademark-faq.wml 2012-12-05 16:54:24 UTC (rev 25932) +++ website/trunk/docs/en/trademark-faq.wml 2012-12-05 17:10:05 UTC (rev 25933) @@ -44,7 +44,33 @@ is to make sure that people aren't confused about whether your product or project is made or endorsed by The Tor Project. Creating a new brand that incorporates the Tor brand is likely to lead to confusion.</p> - + + <a id="researchpapers"></a> + <h2>What about cute Tor-derived names in research paper titles?</h2> + + <p>Tor enjoys a vibrant <a + href="https://research.torproject.org/">research community</a> + that examines anonymity attacks and defenses, design improvements, + impact on society, and so on. We think it's great that professors + and other researchers continue to contribute to our community, + and we've even gotten funding from the National Science Foundation + to help keep the Tor design and code researcher-friendly. The <a + href="http://freehaven.net/anonbib/">anonymity bibliography</a> lists + many research papers that use Tor-derived names in their titles: + Torsk, DefenestraTor, Tortoise, LASTor, Torchestra, StegoTorus, + and more.</p> + + <p>Since the authors of these research papers aren't trying to make + a profit from them, and (because they're just papers, not products) + the papers aren't confusing Tor users into running potentially unsafe + software, we believe that the use of the Tor mark in these research + paper titles is acceptable non-trademark or fair use.</p> + + <p>That said, if the research paper comes with software, and that + software could potentially confuse people (users or other researchers) + about whether it's written or endorsed by The Tor Project, then we're + back to the <a href="#combining">above scenario</a>.</p> + <a id="enforcing"></a> <h2>Does this mean you're enforcing trademark rights?</h2> <p>The Tor Project is a non-profit corporation organized to research and

1 0

r25932: {website} Add the missing Apple OS X accordionContent closing div. It (website/trunk/download/en)
by George Kadianakis 05 Dec '12

05 Dec '12

Author: asn Date: 2012-12-05 16:54:24 +0000 (Wed, 05 Dec 2012) New Revision: 25932 Modified: website/trunk/download/en/download.wml Log: Add the missing Apple OS X accordionContent closing div. It was removed in trunk@25931. Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2012-12-04 20:48:12 UTC (rev 25931) +++ website/trunk/download/en/download.wml 2012-12-05 16:54:24 UTC (rev 25932) @@ -148,6 +148,7 @@ <em>Version <version-torbrowserbundleosx32> - OS X Intel</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> + </div>   <div id="linux" class="accordionButton on">

1 0