December 2012 - tor-commits - lists.torproject.org

[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

[ooni-probe/master] Fix bug in DNSTamper test
by art＠torproject.org 05 Dec '12

05 Dec '12

commit 18c2dbd0b0491b25e997214fef672a8ebe1b2312 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Dec 5 16:07:30 2012 +0100 Fix bug in DNSTamper test --- nettests/blocking/dnstamper.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/nettests/blocking/dnstamper.py b/nettests/blocking/dnstamper.py index b9dfc1b..7a60a65 100644 --- a/nettests/blocking/dnstamper.py +++ b/nettests/blocking/dnstamper.py @@ -65,7 +65,7 @@ class DNSTamperTest(dnst.DNSTest): self.report['test_resolvers'] = self.test_resolvers f.close() - except IOError: + except IOError, e: log.exception(e) raise usage.UsageError("Invalid test resolvers file")

1 0

[onionoo/master] Add "[last|first]_seen" fields to details docs.
by karsten＠torproject.org 05 Dec '12

05 Dec '12

commit 40a2faee73ee002c90582e16008b2211c2d1bb8f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Dec 5 13:49:31 2012 +0100 Add "[last|first]_seen" fields to details docs. Implements step 1 of 3 as suggested in #6509. --- src/org/torproject/onionoo/CurrentNodes.java | 40 ++++++++++++++++----- src/org/torproject/onionoo/DetailDataWriter.java | 13 ++++++- src/org/torproject/onionoo/Node.java | 7 +++- web/index.html | 28 +++++++++++++++ 4 files changed, 75 insertions(+), 13 deletions(-) diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index 82ba592..9e5d0db 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java +++ b/src/org/torproject/onionoo/CurrentNodes.java @@ -113,18 +113,23 @@ public class CurrentNodes { portList = parts[14]; } } + long firstSeenMillis = publishedOrValidAfterMillis; + if (parts.length > 16) { + firstSeenMillis = dateTimeFormat.parse(parts[15] + " " + + parts[16]).getTime(); + } if (isRelay) { this.addRelay(nickname, fingerprint, address, orAddressesAndPorts, exitAddresses, publishedOrValidAfterMillis, orPort, dirPort, relayFlags, consensusWeight, countryCode, hostName, lastRdnsLookup, - defaultPolicy, portList); + defaultPolicy, portList, firstSeenMillis); } else { this.addBridge(nickname, fingerprint, address, orAddressesAndPorts, exitAddresses, publishedOrValidAfterMillis, orPort, dirPort, relayFlags, consensusWeight, countryCode, hostName, lastRdnsLookup, - defaultPolicy, portList); + defaultPolicy, portList, firstSeenMillis); } } br.close(); @@ -190,12 +195,14 @@ public class CurrentNodes { ? entry.getDefaultPolicy() : "null"; String portList = entry.getPortList() != null ? entry.getPortList() : "null"; + String firstSeen = dateTimeFormat.format( + entry.getFirstSeenMillis()); bw.write("r " + nickname + " " + fingerprint + " " + addressesBuilder.toString() + " " + validAfter + " " + orPort + " " + dirPort + " " + flagsBuilder.toString() + " " + consensusWeight + " " + countryCode + " " + hostName + " " + String.valueOf(lastRdnsLookup) + " " + defaultPolicy + " " - + portList + "\n"); + + portList + " " + firstSeen + "\n"); } for (Node entry : this.currentBridges.values()) { String nickname = entry.getNickname(); @@ -218,10 +225,12 @@ public class CurrentNodes { for (String relayFlag : entry.getRelayFlags()) { flagsBuilder.append((written++ > 0 ? "," : "") + relayFlag); } + String firstSeen = dateTimeFormat.format( + entry.getFirstSeenMillis()); bw.write("b " + nickname + " " + fingerprint + " " + addressesBuilder.toString() + " " + published + " " + orPort + " " + dirPort + " " + flagsBuilder.toString() - + " -1 ?? null -1 null null\n"); + + " -1 ?? null -1 null null " + firstSeen + "\n"); } bw.close(); } catch (IOException e) { @@ -294,7 +303,8 @@ public class CurrentNodes { String portList = entry.getPortList(); this.addRelay(nickname, fingerprint, address, orAddressesAndPorts, null, validAfterMillis, orPort, dirPort, relayFlags, - consensusWeight, null, null, -1L, defaultPolicy, portList); + consensusWeight, null, null, -1L, defaultPolicy, portList, + validAfterMillis); } if (this.lastValidAfterMillis == validAfterMillis) { this.lastBandwidthWeights = consensus.getBandwidthWeights(); @@ -306,7 +316,7 @@ public class CurrentNodes { SortedSet<String> exitAddresses, long validAfterMillis, int orPort, int dirPort, SortedSet<String> relayFlags, long consensusWeight, String countryCode, String hostName, long lastRdnsLookup, - String defaultPolicy, String portList) { + String defaultPolicy, String portList, long firstSeenMillis) { if (validAfterMillis >= cutoff && (!this.currentRelays.containsKey(fingerprint) || this.currentRelays.get(fingerprint).getLastSeenMillis() < @@ -318,10 +328,14 @@ public class CurrentNodes { hostName = previousRelay.getHostName(); lastRdnsLookup = previousRelay.getLastRdnsLookup(); } + if (previousRelay != null) { + firstSeenMillis = Math.min(firstSeenMillis, + previousRelay.getFirstSeenMillis()); + } Node entry = new Node(nickname, fingerprint, address, orAddressesAndPorts, exitAddresses, validAfterMillis, orPort, dirPort, relayFlags, consensusWeight, countryCode, hostName, - lastRdnsLookup, defaultPolicy, portList); + lastRdnsLookup, defaultPolicy, portList, firstSeenMillis); this.currentRelays.put(fingerprint, entry); if (validAfterMillis > this.lastValidAfterMillis) { this.lastValidAfterMillis = validAfterMillis; @@ -424,7 +438,7 @@ public class CurrentNodes { SortedSet<String> relayFlags = entry.getFlags(); this.addBridge(nickname, fingerprint, address, orAddressesAndPorts, null, publishedMillis, orPort, dirPort, relayFlags, -1, "??", - null, -1L, null, null); + null, -1L, null, null, publishedMillis); } } @@ -433,15 +447,21 @@ public class CurrentNodes { SortedSet<String> exitAddresses, long publishedMillis, int orPort, int dirPort, SortedSet<String> relayFlags, long consensusWeight, String countryCode, String hostname, long lastRdnsLookup, - String defaultPolicy, String portList) { + String defaultPolicy, String portList, long firstSeenMillis) { if (publishedMillis >= cutoff && (!this.currentBridges.containsKey(fingerprint) || this.currentBridges.get(fingerprint).getLastSeenMillis() < publishedMillis)) { + Node previousBridge = this.currentBridges.containsKey(fingerprint) + ? this.currentBridges.get(fingerprint) : null; + if (previousBridge != null) { + firstSeenMillis = Math.min(firstSeenMillis, + previousBridge.getFirstSeenMillis()); + } Node entry = new Node(nickname, fingerprint, address, orAddressesAndPorts, exitAddresses, publishedMillis, orPort, dirPort, relayFlags, consensusWeight, countryCode, hostname, - lastRdnsLookup, defaultPolicy, portList); + lastRdnsLookup, defaultPolicy, portList, firstSeenMillis); this.currentBridges.put(fingerprint, entry); if (publishedMillis > this.lastPublishedMillis) { this.lastPublishedMillis = publishedMillis; diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index bdc36e9..af0a0b9 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -572,6 +572,9 @@ public class DetailDataWriter { (addressesWritten++ > 0 ? "," : "") + "\"" + orAddress + "\""); } + String lastSeen = dateTimeFormat.format(entry.getLastSeenMillis()); + String firstSeen = dateTimeFormat.format( + entry.getFirstSeenMillis()); String running = entry.getRunning() ? "true" : "false"; int dirPort = entry.getDirPort(); String countryCode = entry.getCountryCode(); @@ -602,6 +605,8 @@ public class DetailDataWriter { sb.append(",\n\"dir_address\":\"" + address + ":" + dirPort + "\""); } + sb.append(",\n\"last_seen\":\"" + lastSeen + "\""); + sb.append(",\n\"first_seen\":\"" + firstSeen + "\""); sb.append(",\n\"running\":" + running + ",\n"); SortedSet<String> relayFlags = entry.getRelayFlags(); if (!relayFlags.isEmpty()) { @@ -821,6 +826,9 @@ public class DetailDataWriter { /* Generate network-status-specific part. */ Node entry = bridge.getValue(); String nickname = entry.getNickname(); + String lastSeen = dateTimeFormat.format(entry.getLastSeenMillis()); + String firstSeen = dateTimeFormat.format( + entry.getFirstSeenMillis()); String running = entry.getRunning() ? "true" : "false"; String address = entry.getAddress(); SortedSet<String> orAddresses = new TreeSet<String>( @@ -838,8 +846,9 @@ public class DetailDataWriter { + "\"nickname\":\"" + nickname + "\",\n" + "\"hashed_fingerprint\":\"" + fingerprint + "\",\n" + "\"or_addresses\":[" + orAddressesAndPortsBuilder.toString() - + "],\n" - + "\"running\":" + running + ","); + + "],\n\"last_seen\":\"" + lastSeen + "\",\n\"first_seen\":\"" + + firstSeen + "\",\n\"running\":" + running + ","); + SortedSet<String> relayFlags = entry.getRelayFlags(); if (!relayFlags.isEmpty()) { sb.append("\n\"flags\":["); diff --git a/src/org/torproject/onionoo/Node.java b/src/org/torproject/onionoo/Node.java index 1bf984d..0857b4c 100644 --- a/src/org/torproject/onionoo/Node.java +++ b/src/org/torproject/onionoo/Node.java @@ -27,6 +27,7 @@ public class Node { private String cityName; private String aSName; private String aSNumber; + private long firstSeenMillis; private long lastSeenMillis; private int orPort; private int dirPort; @@ -47,7 +48,7 @@ public class Node { SortedSet<String> exitAddresses, long lastSeenMillis, int orPort, int dirPort, SortedSet<String> relayFlags, long consensusWeight, String countryCode, String hostName, long lastRdnsLookup, - String defaultPolicy, String portList) { + String defaultPolicy, String portList, long firstSeenMillis) { this.nickname = nickname; this.fingerprint = fingerprint; try { @@ -80,6 +81,7 @@ public class Node { this.lastRdnsLookup = lastRdnsLookup; this.defaultPolicy = defaultPolicy; this.portList = portList; + this.firstSeenMillis = firstSeenMillis; } public String getFingerprint() { return this.fingerprint; @@ -171,6 +173,9 @@ public class Node { public String getASName() { return this.aSName; } + public long getFirstSeenMillis() { + return this.firstSeenMillis; + } public long getLastSeenMillis() { return this.lastSeenMillis; } diff --git a/web/index.html b/web/index.html index 95b3866..ae084f1 100755 --- a/web/index.html +++ b/web/index.html @@ -124,6 +124,20 @@ Omitted if array is empty.</li> accepts directory connections. Optional field. Omitted if the relay does not accept directory connections.</li> +<li><b><font color="blue">"last_seen":</font></b> UTC timestamp +(YYYY-MM-DD hh:mm:ss) when this relay was last seen in a network status +consensus. +Required field. +Added field on December 5, 2012.</li> +<li><b><font color="blue">"first_seen":</font></b> UTC timestamp +(YYYY-MM-DD hh:mm:ss) when this relay was first seen in a network status +consensus. +Note that this timestamp is reset when a relay drops out of the consensus +for more than 7 days, so that whenever that relay rejoins, it would seem +as if it joined for the first time; this is a known limitation of the +current Onionoo design. +Required field. +Added field on December 5, 2012.</li> <li><b>"running":</b> Boolean field saying whether this relay was listed as running in the last relay network status consensus. Required field.</li> @@ -310,6 +324,20 @@ Sanitized IP addresses always change on the 1st of every month at 00:00:00 UTC, regardless of the bridge actually changing its IP address. TCP ports are not sanitized. Required field.</li> +<li><b><font color="blue">"last_seen":</font></b> UTC timestamp +(YYYY-MM-DD hh:mm:ss) when this bridge was last seen in a bridge network +status. +Required field. +Added field on December 5, 2012.</li> +<li><b><font color="blue">"first_seen":</font></b> UTC timestamp +(YYYY-MM-DD hh:mm:ss) when this bridge was first seen in a bridge network +status. +Note that this timestamp is reset when a bridge drops out of the network +status for more than 7 days, so that whenever that bridge rejoins, it +would seem as if it joined for the first time; this is a known limitation +of the current Onionoo design. +Required field. +Added field on December 5, 2012.</li> <li><b>"running":</b> Boolean field saying whether this bridge was listed as running in the last bridge network status. Required field.</li>

1 0

[tor/master] Return connection_exit_connect() if payload creation failed.
by nickm＠torproject.org 05 Dec '12

05 Dec '12

commit c01dfd5d7b5662c9bc70ae9a97ecd268b307495c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Dec 5 04:32:11 2012 +0200 Return connection_exit_connect() if payload creation failed. Fixes bug #7592; bugfix on 882b389668067a29bb539d0f5bd5cb2f83b93012. The bug is not present in any released versions of Tor. --- src/or/connection_edge.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 41c75a2..6587a30 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2614,6 +2614,7 @@ connection_exit_connect(edge_connection_t *edge_conn) connection_edge_end(edge_conn, END_STREAM_REASON_INTERNAL); circuit_detach_stream(circuit_get_by_edge_conn(edge_conn), edge_conn); connection_free(conn); + return; } connection_edge_send_command(edge_conn,

1 0

[tor/master] Merge remote-tracking branch 'asn/bug7592_take2'
by nickm＠torproject.org 05 Dec '12

05 Dec '12

commit bd93ff8dd76b06ca3afe1f362b086d4f12639f71 Merge: e899d49 c01dfd5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 4 21:47:45 2012 -0500 Merge remote-tracking branch 'asn/bug7592_take2' src/or/connection_edge.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[flashproxy/master] Check the message length limit in accumulated frames, not only per-frame.
by dcf＠torproject.org 05 Dec '12

05 Dec '12

commit e881395d512261b30505043bd5b33404ff0ccd2a Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 26 22:15:50 2012 -0800 Check the message length limit in accumulated frames, not only per-frame. --- flashproxy-client | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/flashproxy-client b/flashproxy-client index b6d80ce..0aa51d4 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -361,6 +361,8 @@ class WebSocketDecoder(object): else: if frame.opcode != 0: raise ValueError("Non-first frame has nonzero opcode %d" % frame.opcode) + if len(self.message_buf) + len(frame.payload) > self.MAX_MESSAGE_LENGTH: + raise ValueError("Refusing to buffer payload of %d bytes" % (len(self.message_buf) + len(frame.payload))) self.message_buf += frame.payload if frame.fin:

1 0