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

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 19 Jul '13

19 Jul '13

commit 71df60e98987d0a26a77b937ba58d4757f1a01ab Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 19 19:16:50 2013 +0000 Update translations for tails-greeter_completed --- da/da.po | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/da/da.po b/da/da.po new file mode 100644 index 0000000..1c66f4d --- /dev/null +++ b/da/da.po @@ -0,0 +1,140 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# mort3n <nalholm(a)yahoo.dk>, 2013 +# torebjornson <tore.bjornson(a)gmail.com>, 2013 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-05-12 19:29+0200\n" +"PO-Revision-Date: 2013-07-19 19:10+0000\n" +"Last-Translator: mort3n <nalholm(a)yahoo.dk>\n" +"Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: da\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../glade/persistencewindow.glade.h:1 +msgid "Forward" +msgstr "Frem" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 +msgid "Login" +msgstr "Log in" + +#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Velkommen til Tails" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Use persistence?" +msgstr "Brug vedholdenhed?" + +#: ../glade/persistencewindow.glade.h:5 +msgid "Yes" +msgstr "Ja" + +#: ../glade/persistencewindow.glade.h:6 +msgid "No" +msgstr "Nej" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Passphrase:" +msgstr "Kodeord:" + +#: ../glade/persistencewindow.glade.h:8 +msgid "Read-Only?" +msgstr "Skrivebeskyttet?" + +#: ../glade/persistencewindow.glade.h:9 +msgid "Wrong passphrase. Please try again." +msgstr "Forkert kodeord. Forsøg venligst igen." + +#: ../glade/persistencewindow.glade.h:10 +msgid "More options?" +msgstr "Flere muligheder?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Administrations kodeord" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Indtast et administrations kodeord, hvis De har behov for at udføre administrative opgaver.\nAlternativt vil det blive deaktiveret for at optimere sikkerheden." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Kodeord:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Bekræft kodeord:" + +#: ../glade/optionswindow.glade.h:8 +msgid "Passwords do not match" +msgstr "Kodeord passer ikke" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Windows Camouflage" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Denne indstilling lader Tails ligne Microsoft Windows XP. Dette kan være brugbart ved offentlige lokationer for at minimere mistanke." + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Aktivér Microsoft Windows XP Camouflage" + +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr " " + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Sprog" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Lokal" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Layout" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live persist fejlede med return code %(returncode)s:\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup fejlede med return code %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist fejlede med return code %(returncode)s:\n%(stdout)s\n%(stderr)s" + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Anden..."

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 19 Jul '13

19 Jul '13

commit d410464873c877abd40d1d59e74bee221cc02efb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 19 19:16:40 2013 +0000 Update translations for tails-greeter --- da/da.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/da/da.po b/da/da.po index edc2c95..1c66f4d 100644 --- a/da/da.po +++ b/da/da.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# mort3n <nalholm(a)yahoo.dk>, 2013 # torebjornson <tore.bjornson(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-05-12 19:29+0200\n" -"PO-Revision-Date: 2013-06-27 20:20+0000\n" -"Last-Translator: torebjornson <tore.bjornson(a)gmail.com>\n" +"PO-Revision-Date: 2013-07-19 19:10+0000\n" +"Last-Translator: mort3n <nalholm(a)yahoo.dk>\n" "Language-Team: Danish (http://www.transifex.com/projects/p/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,7 +97,7 @@ msgstr "Aktivér Microsoft Windows XP Camouflage" #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr " " #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 msgid "Language"

1 0

[tor/master] Whoops; check in test_circuitmux.c
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit 8f0755fa85b9c1fb38fd122719e483cc11d89069 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 19 12:05:38 2013 -0400 Whoops; check in test_circuitmux.c --- src/test/test_circuitmux.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/src/test/test_circuitmux.c b/src/test/test_circuitmux.c new file mode 100644 index 0000000..0f59200 --- /dev/null +++ b/src/test/test_circuitmux.c @@ -0,0 +1,84 @@ +/* Copyright (c) 2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define TOR_CHANNEL_INTERNAL_ +#define CIRCUITMUX_PRIVATE +#define RELAY_PRIVATE +#include "or.h" +#include "channel.h" +#include "circuitmux.h" +#include "relay.h" +#include "test.h" + +/* XXXX duplicated function from test_circuitlist.c */ +static channel_t * +new_fake_channel(void) +{ + channel_t *chan = tor_malloc_zero(sizeof(channel_t)); + channel_init(chan); + return chan; +} + +static int +has_queued_writes(channel_t *c) +{ + (void) c; + return 1; +} + +/** Test destroy cell queue with no interference from other queues. */ +static void +test_cmux_destroy_cell_queue(void *arg) +{ + circuitmux_t *cmux = NULL; + channel_t *ch = NULL; + circuit_t *circ = NULL; + cell_queue_t *cq = NULL; + packed_cell_t *pc = NULL; + + init_cell_pool(); + (void) arg; + + cmux = circuitmux_alloc(); + tt_assert(cmux); + ch = new_fake_channel(); + ch->has_queued_writes = has_queued_writes; + ch->wide_circ_ids = 1; + + circ = circuitmux_get_first_active_circuit(cmux, &cq); + tt_assert(!circ); + tt_assert(!cq); + + circuitmux_append_destroy_cell(ch, cmux, 100, 10); + circuitmux_append_destroy_cell(ch, cmux, 190, 6); + circuitmux_append_destroy_cell(ch, cmux, 30, 1); + + tt_int_op(circuitmux_num_cells(cmux), ==, 3); + + circ = circuitmux_get_first_active_circuit(cmux, &cq); + tt_assert(!circ); + tt_assert(cq); + + tt_int_op(cq->n, ==, 3); + + pc = cell_queue_pop(cq); + tt_assert(pc); + test_mem_op(pc->body, ==, "\x00\x00\x00\x64\x04\x0a\x00\x00\x00", 9); + packed_cell_free(pc); + pc = NULL; + + tt_int_op(circuitmux_num_cells(cmux), ==, 2); + + done: + circuitmux_free(cmux); + channel_free(ch); + packed_cell_free(pc); + + free_cell_pool(); +} + +struct testcase_t circuitmux_tests[] = { + { "destroy_cell_queue", test_cmux_destroy_cell_queue, TT_FORK, NULL, NULL }, + END_OF_TESTCASES +}; +

1 0

[tor/master] Regression test for destroy cell queue
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit 34ad7642c8da894e459be09a3f051cb8f09cba31 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 19 10:17:00 2013 -0400 Regression test for destroy cell queue This exercises the code that crashed and caused #9296. --- src/test/include.am | 1 + src/test/test.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index 6271909..fb704d7 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -20,6 +20,7 @@ src_test_test_SOURCES = \ src/test/test_addr.c \ src/test/test_cell_formats.c \ src/test/test_circuitlist.c \ + src/test/test_circuitmux.c \ src/test/test_containers.c \ src/test/test_crypto.c \ src/test/test_cell_queue.c \ diff --git a/src/test/test.c b/src/test/test.c index 9640169..60fbfb1 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -2133,6 +2133,7 @@ extern struct testcase_t introduce_tests[]; extern struct testcase_t replaycache_tests[]; extern struct testcase_t cell_format_tests[]; extern struct testcase_t circuitlist_tests[]; +extern struct testcase_t circuitmux_tests[]; extern struct testcase_t cell_queue_tests[]; extern struct testcase_t options_tests[]; @@ -2152,6 +2153,7 @@ static struct testgroup_t testgroups[] = { { "replaycache/", replaycache_tests }, { "introduce/", introduce_tests }, { "circuitlist/", circuitlist_tests }, + { "circuitmux/", circuitmux_tests }, { "options/", options_tests }, END_OF_GROUPS };

1 0

[tor/master] Initialize destroy_cell_queue.
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit 18845c550722d5fa7d68bdee6a5e2090acb89a6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 19 09:49:35 2013 -0400 Initialize destroy_cell_queue. Likely fix for the crash bug of #9296, which was introduced through a combination of #7912 and #8586. Bugfix not in any released Tor. --- src/or/circuitmux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 77cb2f9..47b4230 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -383,6 +383,7 @@ circuitmux_alloc(void) rv = tor_malloc_zero(sizeof(*rv)); rv->chanid_circid_map = tor_malloc_zero(sizeof(*( rv->chanid_circid_map))); HT_INIT(chanid_circid_muxinfo_map, rv->chanid_circid_map); + cell_queue_init(&rv->destroy_cell_queue); return rv; }

1 0

[tor/master] Merge branch 'bug9296'
by nickm＠torproject.org 19 Jul '13

19 Jul '13

commit d2cd0dfd14e834fe24bd223d083b5daa7d02d9bf Merge: e1d3b44 34ad764 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 19 11:58:20 2013 -0400 Merge branch 'bug9296' src/or/circuitmux.c | 1 + src/test/include.am | 1 + src/test/test.c | 2 ++ 3 files changed, 4 insertions(+)

1 0

[onionoo/master] Add new contact parameter to the servlet.
by karsten＠torproject.org 19 Jul '13

19 Jul '13

commit fd810e6c6b5ee46977142901105e35290806dcf0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 17 09:55:49 2013 +0200 Add new contact parameter to the servlet. Implements #5255. --- src/org/torproject/onionoo/DetailsDataWriter.java | 23 ++++- src/org/torproject/onionoo/NodeDataWriter.java | 4 +- src/org/torproject/onionoo/NodeStatus.java | 72 +++++++++---- src/org/torproject/onionoo/ResourceServlet.java | 53 +++++++++- .../torproject/onionoo/ResourceServletTest.java | 107 ++++++++++++++------ web/index.html | 11 ++ 6 files changed, 212 insertions(+), 58 deletions(-) diff --git a/src/org/torproject/onionoo/DetailsDataWriter.java b/src/org/torproject/onionoo/DetailsDataWriter.java index aa511c2..51ca2e9 100644 --- a/src/org/torproject/onionoo/DetailsDataWriter.java +++ b/src/org/torproject/onionoo/DetailsDataWriter.java @@ -426,6 +426,10 @@ public class DetailsDataWriter implements DescriptorListener { return StringEscapeUtils.escapeJavaScript(s).replaceAll("\\\\'", "'"); } + private static String unescapeJSON(String s) { + return StringEscapeUtils.unescapeJavaScript(s.replaceAll("'", "\\'")); + } + private void updateRelayDetailsFiles( SortedSet<String> remainingDetailsFiles) { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( @@ -588,12 +592,29 @@ public class DetailsDataWriter implements DescriptorListener { sb.append("]"); } - /* Append descriptor-specific part from details status file. */ + /* Append descriptor-specific part from details status file, and + * update contact in node status. */ DetailsStatus detailsStatus = this.documentStore.retrieve( DetailsStatus.class, false, fingerprint); if (detailsStatus != null && detailsStatus.documentString.length() > 0) { sb.append(",\n" + detailsStatus.documentString); + String contact = null; + Scanner s = new Scanner(detailsStatus.documentString); + while (s.hasNextLine()) { + String line = s.nextLine(); + if (!line.startsWith("\"contact\":")) { + continue; + } + int start = "\"contact\":\"".length(), end = line.length() - 1; + if (line.endsWith(",")) { + end--; + } + contact = unescapeJSON(line.substring(start, end)); + break; + } + s.close(); + entry.setContact(contact); } /* Finish details string. */ diff --git a/src/org/torproject/onionoo/NodeDataWriter.java b/src/org/torproject/onionoo/NodeDataWriter.java index 723dd16..b1e9b5c 100644 --- a/src/org/torproject/onionoo/NodeDataWriter.java +++ b/src/org/torproject/onionoo/NodeDataWriter.java @@ -82,7 +82,7 @@ public class NodeDataWriter implements DescriptorListener { fingerprint, address, orAddressesAndPorts, null, validAfterMillis, orPort, dirPort, relayFlags, consensusWeight, null, null, -1L, defaultPolicy, portList, validAfterMillis, - validAfterMillis, null); + validAfterMillis, null, null); if (this.knownNodes.containsKey(fingerprint)) { this.knownNodes.get(fingerprint).update(newNodeStatus); } else { @@ -112,7 +112,7 @@ public class NodeDataWriter implements DescriptorListener { NodeStatus newNodeStatus = new NodeStatus(false, nickname, fingerprint, address, orAddressesAndPorts, null, publishedMillis, orPort, dirPort, relayFlags, -1L, "??", null, - -1L, null, null, publishedMillis, -1L, null); + -1L, null, null, publishedMillis, -1L, null, null); if (this.knownNodes.containsKey(fingerprint)) { this.knownNodes.get(fingerprint).update(newNodeStatus); } else { diff --git a/src/org/torproject/onionoo/NodeStatus.java b/src/org/torproject/onionoo/NodeStatus.java index 4f207a0..e549336 100644 --- a/src/org/torproject/onionoo/NodeStatus.java +++ b/src/org/torproject/onionoo/NodeStatus.java @@ -55,13 +55,14 @@ public class NodeStatus extends Document { private String defaultPolicy; private String portList; private SortedMap<Long, Set<String>> lastAddresses; + private String contact; public NodeStatus(boolean isRelay, String nickname, String fingerprint, String address, SortedSet<String> orAddressesAndPorts, SortedSet<String> exitAddresses, long lastSeenMillis, int orPort, int dirPort, SortedSet<String> relayFlags, long consensusWeight, String countryCode, String hostName, long lastRdnsLookup, String defaultPolicy, String portList, long firstSeenMillis, - long lastChangedAddresses, String aSNumber) { + long lastChangedAddresses, String aSNumber, String contact) { this.isRelay = isRelay; this.nickname = nickname; this.fingerprint = fingerprint; @@ -106,13 +107,14 @@ public class NodeStatus extends Document { addresses.addAll(orAddressesAndPorts); this.lastAddresses.put(lastChangedAddresses, addresses); this.aSNumber = aSNumber; + this.contact = contact; } public static NodeStatus fromString(String documentString) { boolean isRelay = false; String nickname = null, fingerprint = null, address = null, countryCode = null, hostName = null, defaultPolicy = null, - portList = null, aSNumber = null; + portList = null, aSNumber = null, contact = null; SortedSet<String> orAddressesAndPorts = null, exitAddresses = null, relayFlags = null; long lastSeenMillis = -1L, consensusWeight = -1L, @@ -123,7 +125,8 @@ public class NodeStatus extends Document { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss"); dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - String[] parts = documentString.trim().split(" "); + String separator = documentString.contains("\t") ? "\t" : " "; + String[] parts = documentString.trim().split(separator); isRelay = parts[0].equals("r"); if (parts.length < 9) { System.err.println("Too few space-separated values in line '" @@ -193,6 +196,9 @@ public class NodeStatus extends Document { if (parts.length > 19) { aSNumber = parts[19]; } + if (parts.length > 20) { + contact = parts[20]; + } } catch (NumberFormatException e) { System.err.println("Number format exception while parsing node " + "status line '" + documentString + "': " + e.getMessage() @@ -215,7 +221,7 @@ public class NodeStatus extends Document { fingerprint, address, orAddressesAndPorts, exitAddresses, lastSeenMillis, orPort, dirPort, relayFlags, consensusWeight, countryCode, hostName, lastRdnsLookup, defaultPolicy, portList, - firstSeenMillis, lastChangedAddresses, aSNumber); + firstSeenMillis, lastChangedAddresses, aSNumber, contact); return newNodeStatus; } @@ -234,6 +240,7 @@ public class NodeStatus extends Document { this.defaultPolicy = newNodeStatus.defaultPolicy; this.portList = newNodeStatus.portList; this.aSNumber = newNodeStatus.aSNumber; + this.contact = newNodeStatus.contact; } if (this.isRelay && newNodeStatus.isRelay) { this.lastAddresses.putAll(newNodeStatus.lastAddresses); @@ -244,13 +251,13 @@ public class NodeStatus extends Document { public String toString() { SimpleDateFormat dateTimeFormat = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); + "yyyy-MM-dd\tHH:mm:ss"); dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); StringBuilder sb = new StringBuilder(); sb.append(this.isRelay ? "r" : "b"); - sb.append(" " + this.nickname); - sb.append(" " + this.fingerprint); - sb.append(" " + this.address + ";"); + sb.append("\t" + this.nickname); + sb.append("\t" + this.fingerprint); + sb.append("\t" + this.address + ";"); int written = 0; for (String orAddressAndPort : this.orAddressesAndPorts) { sb.append((written++ > 0 ? "+" : "") + orAddressAndPort); @@ -263,32 +270,34 @@ public class NodeStatus extends Document { + exitAddress); } } - sb.append(" " + dateTimeFormat.format(this.lastSeenMillis)); - sb.append(" " + this.orPort); - sb.append(" " + this.dirPort + " "); + sb.append("\t" + dateTimeFormat.format(this.lastSeenMillis)); + sb.append("\t" + this.orPort); + sb.append("\t" + this.dirPort + "\t"); written = 0; for (String relayFlag : this.relayFlags) { sb.append((written++ > 0 ? "," : "") + relayFlag); } if (this.isRelay) { - sb.append(" " + String.valueOf(this.consensusWeight)); - sb.append(" " + (this.countryCode != null ? this.countryCode : "??")); - sb.append(" " + (this.hostName != null ? this.hostName : "null")); - sb.append(" " + String.valueOf(this.lastRdnsLookup)); - sb.append(" " + (this.defaultPolicy != null ? this.defaultPolicy + sb.append("\t" + String.valueOf(this.consensusWeight)); + sb.append("\t" + + (this.countryCode != null ? this.countryCode : "??")); + sb.append("\t" + (this.hostName != null ? this.hostName : "null")); + sb.append("\t" + String.valueOf(this.lastRdnsLookup)); + sb.append("\t" + (this.defaultPolicy != null ? this.defaultPolicy : "null")); - sb.append(" " + (this.portList != null ? this.portList : "null")); + sb.append("\t" + (this.portList != null ? this.portList : "null")); } else { - sb.append(" -1 ?? null -1 null null"); + sb.append("\t-1\t??\tnull\t-1\tnull\tnull"); } - sb.append(" " + dateTimeFormat.format(this.firstSeenMillis)); + sb.append("\t" + dateTimeFormat.format(this.firstSeenMillis)); if (this.isRelay) { - sb.append(" " + dateTimeFormat.format( + sb.append("\t" + dateTimeFormat.format( this.getLastChangedOrAddress())); - sb.append(" " + (this.aSNumber != null ? this.aSNumber : "null")); + sb.append("\t" + (this.aSNumber != null ? this.aSNumber : "null")); } else { - sb.append(" null null null"); + sb.append("\tnull\tnull\tnull"); } + sb.append("\t" + (this.contact != null ? this.contact : "")); return sb.toString(); } @@ -480,5 +489,24 @@ public class NodeStatus extends Document { } return lastChangedAddressesMillis; } + public void setContact(String contact) { + if (contact == null) { + this.contact = null; + } else { + contact = contact.toLowerCase(); + StringBuilder sb = new StringBuilder(); + for (char c : contact.toCharArray()) { + if (c >= 32 && c < 127) { + sb.append(c); + } else { + sb.append(" "); + } + } + this.contact = sb.toString(); + } + } + public String getContact() { + return this.contact; + } } diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 110b123..47d4a93 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -59,7 +59,8 @@ public class ResourceServlet extends HttpServlet { private Map<String, String> relayFingerprintSummaryLines = null, bridgeFingerprintSummaryLines = null; private Map<String, Set<String>> relaysByCountryCode = null, - relaysByASNumber = null, relaysByFlag = null; + relaysByASNumber = null, relaysByFlag = null, + relaysByContact = null; private SortedMap<Integer, Set<String>> relaysByFirstSeenDays = null, bridgesByFirstSeenDays = null, relaysByLastSeenDays = null, bridgesByLastSeenDays = null; @@ -90,7 +91,8 @@ public class ResourceServlet extends HttpServlet { Map<String, Set<String>> relaysByCountryCode = new HashMap<String, Set<String>>(), relaysByASNumber = new HashMap<String, Set<String>>(), - relaysByFlag = new HashMap<String, Set<String>>(); + relaysByFlag = new HashMap<String, Set<String>>(), + relaysByContact = new HashMap<String, Set<String>>(); SortedMap<Integer, Set<String>> relaysByFirstSeenDays = new TreeMap<Integer, Set<String>>(), bridgesByFirstSeenDays = new TreeMap<Integer, Set<String>>(), @@ -182,6 +184,12 @@ public class ResourceServlet extends HttpServlet { relaysByLastSeenDays.get(daysSinceLastSeen).add(fingerprint); relaysByLastSeenDays.get(daysSinceLastSeen).add( hashedFingerprint); + String contact = entry.getContact(); + if (!relaysByContact.containsKey(contact)) { + relaysByContact.put(contact, new HashSet<String>()); + } + relaysByContact.get(contact).add(fingerprint); + relaysByContact.get(contact).add(hashedFingerprint); } Collections.sort(orderRelaysByConsensusWeight); relaysByConsensusWeight = new ArrayList<String>(); @@ -224,6 +232,7 @@ public class ResourceServlet extends HttpServlet { this.relaysByCountryCode = relaysByCountryCode; this.relaysByASNumber = relaysByASNumber; this.relaysByFlag = relaysByFlag; + this.relaysByContact = relaysByContact; this.relaysByFirstSeenDays = relaysByFirstSeenDays; this.relaysByLastSeenDays = relaysByLastSeenDays; this.bridgesByFirstSeenDays = bridgesByFirstSeenDays; @@ -374,7 +383,7 @@ public class ResourceServlet extends HttpServlet { * parameters. */ Set<String> knownParameters = new HashSet<String>(Arrays.asList(( "type,running,search,lookup,country,as,flag,first_seen_days," - + "last_seen_days,order,limit,offset").split(","))); + + "last_seen_days,contact,order,limit,offset").split(","))); for (String parameterKey : parameterMap.keySet()) { if (!knownParameters.contains(parameterKey)) { response.sendError(HttpServletResponse.SC_BAD_REQUEST); @@ -485,6 +494,15 @@ public class ResourceServlet extends HttpServlet { this.filterNodesByDays(filteredBridges, this.bridgesByLastSeenDays, days); } + if (parameterMap.containsKey("contact")) { + String[] contactParts = this.parseContactParameter( + parameterMap.get("contact")); + if (contactParts == null) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + this.filterByContact(filteredRelays, filteredBridges, contactParts); + } /* Re-order and limit results. */ List<String> orderedRelays = new ArrayList<String>(); @@ -667,6 +685,15 @@ public class ResourceServlet extends HttpServlet { return new int[] { x, y }; } + private String[] parseContactParameter(String parameter) { + for (char c : parameter.toCharArray()) { + if (c < 32 || c >= 127) { + return null; + } + } + return parameter.split(" "); + } + private void filterByType(Map<String, String> filteredRelays, Map<String, String> filteredBridges, boolean relaysRequested) { if (relaysRequested) { @@ -874,6 +901,26 @@ public class ResourceServlet extends HttpServlet { } } + private void filterByContact(Map<String, String> filteredRelays, + Map<String, String> filteredBridges, String[] contactParts) { + Set<String> removeRelays = new HashSet<String>(); + for (Map.Entry<String, Set<String>> e : + this.relaysByContact.entrySet()) { + String contact = e.getKey(); + for (String contactPart : contactParts) { + if (contact == null || + !contact.contains(contactPart.toLowerCase())) { + removeRelays.addAll(e.getValue()); + break; + } + } + } + for (String fingerprint : removeRelays) { + filteredRelays.remove(fingerprint); + } + filteredBridges.clear(); + } + private void writeRelays(List<String> relays, PrintWriter pw, String resourceType) { pw.write("{\"relays_published\":\"" + this.relaysPublishedString diff --git a/test/org/torproject/onionoo/ResourceServletTest.java b/test/org/torproject/onionoo/ResourceServletTest.java index 5be2fba..2d131b4 100644 --- a/test/org/torproject/onionoo/ResourceServletTest.java +++ b/test/org/torproject/onionoo/ResourceServletTest.java @@ -110,36 +110,41 @@ public class ResourceServletTest { Map<String, String[]> parameterMap) { this.tempOutDir = tempOutDir; this.relays = new TreeMap<String, String>(); - this.relays.put("000C5F55", "r TorkaZ " - + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A " - + "62.216.201.221;;62.216.201.222+62.216.201.223 " - + "2013-04-19 05:00:00 9001 0 Running,Valid 20 de null -1 " - + "reject 1-65535 2013-04-18 05:00:00 2013-04-19 05:00:00 " - + "AS8767"); - this.relays.put("001C13B3", "r Ferrari458 " - + "001C13B3A55A71B977CA65EC85539D79C653A3FC " - + "68.38.171.200;[2001:4f8:3:2e::51]:9001; " - + "2013-04-24 12:00:00 9001 9030 " - + "Fast,Named,Running,V2Dir,Valid 1140 us " - + "c-68-38-171-200.hsd1.pa.comcast.net 1366805763009 reject " - + "1-65535 2013-02-12 16:00:00 2013-02-26 18:00:00 AS7922"); - this.relays.put("0025C136", "r TimMayTribute " - + "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B 89.69.68.246;; " - + "2013-04-22 20:00:00 9001 9030 " - + "Fast,Running,Unnamed,V2Dir,Valid 63 a1 null -1 reject " - + "1-65535 2013-04-16 18:00:00 2013-04-16 18:00:00 AS6830"); - this.bridges.put("0000831B", "b ec2bridgercc7f31fe " - + "0000831B236DFF73D409AD17B40E2A728A53994F 10.199.7.176;; " - + "2013-04-21 18:07:03 443 0 Valid -1 ?? null -1 null null " - + "2013-04-20 15:37:04 null null null"); - this.bridges.put("0002D9BD", "b Unnamed " - + "0002D9BDBBC230BD9C78FF502A16E0033EF87E0C 10.0.52.84;; " - + "2013-04-20 17:37:04 443 0 Valid -1 ?? null -1 null " - + "null 2013-04-14 07:07:05 null null null"); - this.bridges.put("0010D49C", "b gummy " - + "1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756 10.63.169.98;; " - + "2013-04-24 01:07:04 9001 0 Running,Valid -1 ?? null -1 null " - + "null 2013-01-16 21:07:04 null null null"); + this.relays.put("000C5F55", "r\tTorkaZ\t" + + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A\t" + + "62.216.201.221;;62.216.201.222+62.216.201.223\t" + + "2013-04-19\t05:00:00\t9001\t0\tRunning,Valid\t20\tde\tnull\t" + + "-1\treject\t1-65535\t2013-04-18\t05:00:00\t" + + "2013-04-19\t05:00:00\tAS8767\ttorkaz <klaus dot zufall at " + + "gmx dot de> <fb-token:np5_g_83jmf=>"); + this.relays.put("001C13B3", "r\tFerrari458\t" + + "001C13B3A55A71B977CA65EC85539D79C653A3FC\t" + + "68.38.171.200;[2001:4f8:3:2e::51]:9001;\t" + + "2013-04-24\t12:00:00\t9001\t9030\t" + + "Fast,Named,Running,V2Dir,Valid\t1140\tus\t" + + "c-68-38-171-200.hsd1.pa.comcast.net\t1366805763009\treject\t" + + "1-65535\t2013-02-12\t16:00:00\t2013-02-26\t18:00:00\t" + + "AS7922\t"); + this.relays.put("0025C136", "r\tTimMayTribute\t" + + "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B\t89.69.68.246;;\t" + + "2013-04-22\t20:00:00\t9001\t9030\t" + + "Fast,Running,Unnamed,V2Dir,Valid\t63\ta1\tnull\t-1\treject\t" + + "1-65535\t2013-04-16\t18:00:00\t2013-04-16\t18:00:00\t" + + "AS6830\t1024D/51E2A1C7 steven j. murdoch " + + "<tor+steven.murdoch(a)cl.cam.ac.uk> <fb-token:5sr_k_zs2wm=>"); + this.bridges.put("0000831B", "b\tec2bridgercc7f31fe\t" + + "0000831B236DFF73D409AD17B40E2A728A53994F\t10.199.7.176;;\t" + + "2013-04-21\t18:07:03\t443\t0\tValid\t-1\t??\tnull\t-1\t" + + "null\tnull\t2013-04-20\t15:37:04\tnull\tnull\tnull\tnull"); + this.bridges.put("0002D9BD", "b\tUnnamed\t" + + "0002D9BDBBC230BD9C78FF502A16E0033EF87E0C\t10.0.52.84;;\t" + + "2013-04-20\t17:37:04\t443\t0\tValid\t-1\t??\tnull\t-1\t" + + "null\tnull\t2013-04-14\t07:07:05\tnull\tnull\tnull\tnull"); + this.bridges.put("0010D49C", "b\tgummy\t" + + "1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756\t10.63.169.98;;\t" + + "2013-04-24\t01:07:04\t9001\t0\tRunning,Valid\t-1\t??\tnull\t" + + "-1\tnull\tnull\t2013-01-16\t21:07:04\tnull\tnull\tnull\t" + + "null"); this.request = new TestingHttpServletRequestWrapper(requestURI, parameterMap); this.response = new TestingHttpServletResponseWrapper(); @@ -987,6 +992,48 @@ public class ResourceServletTest { } @Test() + public void testContactSteven() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary?contact=Steven", 1, null, 0, null); + } + + @Test() + public void testContactStevenMurdoch() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary?contact=Steven Murdoch", 1, null, 0, null); + } + + @Test() + public void testContactMurdochSteven() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary?contact=Murdoch Steven", 1, null, 0, null); + } + + @Test() + public void testContactStevenDotMurdoch() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary?contact=Steven.Murdoch", 1, null, 0, null); + } + + @Test() + public void testContactFbTokenFive() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary?contact=<fb-token:5sR_K_zs2wM=>", 1, null, 0, null); + } + + @Test() + public void testContactFbToken() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary?contact=<fb-token:", 2, null, 0, null); + } + + @Test() + public void testContactDash() { + ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, + "/summary?contact=-", 2, null, 0, null); + } + + @Test() public void testOrderConsensusWeightAscending() { ResourceServletTestHelper.assertSummaryDocument(this.tempOutDir, "/summary?order=consensus_weight", 3, diff --git a/web/index.html b/web/index.html index a3bcae8..2655975 100755 --- a/web/index.html +++ b/web/index.html @@ -687,6 +687,17 @@ Note that relays and bridges that haven't been running in the past week are never included in results, so that setting x to 8 or higher will always lead to an empty result set. </td></tr> +<tr><td>contact</td><td>Return only +relays with the parameter value +matching (part of) the contact line. +If the parameter value contains spaces, only relays are returned which +contain all space-separated parts in their contact line. +Only printable ASCII characters are permitted in the parameter value, +some of which need to be percent-encoded (# as %23, % as %25, & as +%26, + as %2B, and / as %2F). +Comparisons are case-insensitive. +Added on July 19, 2013. +</td></tr> </table> Relay and/or bridge documents in the response can be ordered and limited by providing further parameters.

1 0

[tor/release-0.2.4] fold in recent changes stanzas
by arma＠torproject.org 19 Jul '13

19 Jul '13

commit 2b9fb51ac61c75d582008e892773fc1571145d65 Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jul 19 00:15:54 2013 -0400 fold in recent changes stanzas --- ChangeLog | 16 ++++++++++++++++ changes/bug9200 | 5 ----- changes/bug9254 | 4 ---- changes/bug9295 | 4 ---- changes/geoip-july2013 | 3 --- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 344bd17..e28e2ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Changes in version 0.2.4.16-rc - 2013-07-2? + o Major bugfixes: + - Fix a bug in the voting algorithm that could yield incorrect results + when a non-naming authority declared too many flags. Fixes bug 9200; + bugfix on 0.2.0.3-alpha. + - Avoid a crash when using --hash-password. Fixes bug 9295; bugfix on + 0.2.4.15-rc. Found by stem integration tests. + + o Minor bugfixes: + - Fix a spurious compilation warning with some older versions of + GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha. + + o Minor features: + - Update to the July 3 2013 Maxmind GeoLite Country database. + + Changes in version 0.2.4.15-rc - 2013-07-01 Tor 0.2.4.15-rc is the first release candidate for the Tor 0.2.4.x series. It fixes a few smaller bugs, but generally appears stable. diff --git a/changes/bug9200 b/changes/bug9200 deleted file mode 100644 index 7b64dd1..0000000 --- a/changes/bug9200 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Fix a bug in the voting algorithm that could yield incorrect results - when a non-naming authority declared too many flags. Fixes bug 9200; - bugfix on 0.2.0.3-alpha. - diff --git a/changes/bug9254 b/changes/bug9254 deleted file mode 100644 index 5179bdc..0000000 --- a/changes/bug9254 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Fix a spurious compilation warning with some older versions of - GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha. - diff --git a/changes/bug9295 b/changes/bug9295 deleted file mode 100644 index 2c11361..0000000 --- a/changes/bug9295 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Avoid a crash when using --hash-password. Fixes bug 9295; bugfix on - 0.2.4.15-rc. Found by stem integration tests. - diff --git a/changes/geoip-july2013 b/changes/geoip-july2013 deleted file mode 100644 index 097819d..0000000 --- a/changes/geoip-july2013 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the July 3 2013 Maxmind GeoLite Country database. -

1 0

[tor/release-0.2.4] Re-do a cast in order to make old buggy freebsd gcc happy
by arma＠torproject.org 18 Jul '13

18 Jul '13

commit c36bdbd53521a9b7d2213cde1f9f0f8fe8ac7441 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 16 14:48:12 2013 -0400 Re-do a cast in order to make old buggy freebsd gcc happy Fix for #9254. Bugfix on 0.2.4.14-alpha. This is not actually a bug in the Tor code. --- changes/bug9254 | 4 ++++ src/or/circuitlist.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug9254 b/changes/bug9254 new file mode 100644 index 0000000..5179bdc --- /dev/null +++ b/changes/bug9254 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a spurious compilation warning with some older versions of + GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 3dc362f..daeaa37 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1518,8 +1518,10 @@ static size_t n_cells_in_circ_queues(const circuit_t *c) { size_t n = c->n_chan_cells.n; - if (! CIRCUIT_IS_ORIGIN(c)) - n += TO_OR_CIRCUIT((circuit_t*)c)->p_chan_cells.n; + if (! CIRCUIT_IS_ORIGIN(c)) { + circuit_t *cc = (circuit_t *) c; + n += TO_OR_CIRCUIT(cc)->p_chan_cells.n; + } return n; }

1 0

[tor/release-0.2.4] tmp
by arma＠torproject.org 18 Jul '13

18 Jul '13

commit 5977435629d6f075e63fdc6ea8f1587be69b6b76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 18 23:08:36 2013 -0400 tmp --- src/or/config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/config.c b/src/or/config.c index d5c5689..e4901f2 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4691,6 +4691,7 @@ options_init_from_torrc(int argc, char **argv) } if (command == CMD_HASH_PASSWORD) { + cf_defaults = tor_strdup(""); cf = tor_strdup(""); } else { cf_defaults = load_torrc_from_disk(argc, argv, 1);

1 0