February 2015 - tor-commits - lists.torproject.org

[torspec/master] Add proposal 242-better-families.txt
by nickm＠torproject.org 27 Feb '15

27 Feb '15

commit 90b7e19c07f0c7a8fb27680062de5942def5cf91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 27 10:38:58 2015 -0500 Add proposal 242-better-families.txt --- proposals/000-index.txt | 2 + proposals/242-better-families.txt | 96 +++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index a1593a5..63317e1 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -162,6 +162,7 @@ Proposals by number: 239 Consensus Hash Chaining [DRAFT] 240 Early signing key revocation for directory authorities [DRAFT] 241 Resisting guard-turnover attacks [DRAFT] +242 Better performance and usability for the MyFamily option [OPEN] Proposals by status: @@ -219,6 +220,7 @@ Proposals by status: 234 Adding remittance field to directory specification 236 The move to a single guard node 237 All relays are directory servers [for 0.2.6.x] + 242 Better performance and usability for the MyFamily option ACCEPTED: 140 Provide diffs between consensuses 172 GETINFO controller option for circuit information diff --git a/proposals/242-better-families.txt b/proposals/242-better-families.txt new file mode 100644 index 0000000..f4ac620 --- /dev/null +++ b/proposals/242-better-families.txt @@ -0,0 +1,96 @@ +Filename: 242-better-families.txt +Title: Better performance and usability for the MyFamily option. +Author: Aaron Johnson, Nick Mathewson +Created: 2015-02-27 +Status: Open + +1. Problem statement. + + The current family interface allows well-behaved relays to + identify that they all belong to the same 'family', and should + not be used in the same circuits. + + Right now, this interface works by having every family member + list every other family member in its server descriptor. This + winds up using O(n^2) space in microdescriptors, server + descriptors, and RAM. Adding or removing a server from the + family requires all the other servers to change their torrc + settings. + + One proposal is to eliminate the use of the Family option + entirely; see ticket #6676. But if we don't, let's come up with + a way to make it better. (I'm writing this down mainly to get it + out of my head.) + +2. Design overview. + + In this design, every family has a master ed25519 key. A node is + in the family iff its server descriptor includes a certificate of + its ed25519 identity key with the master ed25519 key. The + certificate format is as in proposal 220 section 2.1. + + Note that because server descriptors are signed with the node's + ed25519 signing key, this creates a bidirectional relationship + where nodes can't be put in families without their consent. + +3. Changes to server descriptors + + We add a new entry to server descriptors: + "family-cert" + + This line contains a base64-encoded certificate as described + above. It may appear any number of times. + +4. Changes to microdescriptors + + We add a new entry to microdescriptors: + "family-keys" + + This line contains one or more space-separated strings describing + families to which the node belongs. These strings MUST be + between 1 and 64 characters long, and sorted in lexical order. + Clients MUST NOT depend on any particular property of these + strings. + +5. Changes to voting algorithm + + We allocate a new consensus method number for voting on these keys. + + When generating microdescriptors using a suitable consensus + method, the authorities include a "family-keys" line if the + underlying server descriptor contains any family-cert lines. + For reach family-cert in the server descriptor, they add a + base-64-encoded string of that family-cert's signing key. + +6. Client behavior + + Clients should treat node A and node B as belonging to the same + family if ANY of these is true: + + * The client has server descriptors or microdescriptors for A + and B, and A's descriptor lists B in its family line, and + B's descriptor lists A in its family line. + + * The client has a server descriptor for A and one for B, and + they both contain valid family-cert lines whose certs are + signed by the family key. + + * The client has microdescriptors for A and B, and they both + contain some string in common on their family-cert line. + +7. Deprecating the old family lines. + + Once all clients that support the old family line format are + deprecated, servers can stop including family lines in their + descriptors, and authorities can stop including them in their + microdescriptors. + +8. Open questions + + The rules in section 6 above leave open the possibility of old + clients and new clients reaching different decisions about who is + in a family. We should evaluate this for anonymity implications. + + It's possible that families are a bad idea entirely; see ticket + #6676. +

1 0

[torspec/master] Whoops, aaron didn't write this one
by nickm＠torproject.org 27 Feb '15

27 Feb '15

commit 712fab6f800400a41058e6f096861f3bfc46052e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 27 10:39:36 2015 -0500 Whoops, aaron didn't write this one --- proposals/242-better-families.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/242-better-families.txt b/proposals/242-better-families.txt index f4ac620..b3a6399 100644 --- a/proposals/242-better-families.txt +++ b/proposals/242-better-families.txt @@ -1,6 +1,6 @@ Filename: 242-better-families.txt Title: Better performance and usability for the MyFamily option. -Author: Aaron Johnson, Nick Mathewson +Author: Nick Mathewson Created: 2015-02-27 Status: Open

1 0

[onionoo/master] Don't escape `/` before feeding strings into Gson.
by karsten＠torproject.org 27 Feb '15

27 Feb '15

commit 1b3a455719e333764b76aa012e51674b6f7e1c56 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 25 12:03:26 2015 +0100 Don't escape `/` before feeding strings into Gson. We escape a few characters in strings before feeding them into Gson, including backslashes, double quotes, \b, \n, \t, \f, \r, and non-ASCII characters. But we also escape `/` to `\/` which we did not change back after receiving Gson's output. We should simply stop escaping forward slashes, because Gson leaves them untouched. The easiest way to change this is to switch from escapeEcmaScript to escapeJava which also saves us the effort of undoing the escaping of `'`. Fixes #13267. --- src/main/java/org/torproject/onionoo/docs/DetailsDocument.java | 7 ++----- src/main/java/org/torproject/onionoo/docs/DetailsStatus.java | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index 99a98cb..d4efdc0 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.SortedSet; import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.commons.lang3.StringUtils; public class DetailsDocument extends Document { @@ -21,12 +20,10 @@ public class DetailsDocument extends Document { * we'll have to do is to change back the '\\' that Gson writes for the * '\'. */ private static String escapeJSON(String s) { - return StringUtils.replaceEach(StringEscapeUtils.escapeEcmaScript(s), - new String[] { "\\'" }, new String[] { "'" }); + return StringEscapeUtils.escapeJava(s); } private static String unescapeJSON(String s) { - return StringEscapeUtils.unescapeEcmaScript(StringUtils.replaceEach(s, - new String[] { "'" }, new String[] { "\\'" })); + return StringEscapeUtils.unescapeJava(s); } private String nickname; diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index ff951ce..fe46416 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -8,7 +8,6 @@ import java.util.SortedSet; import java.util.TreeSet; import org.apache.commons.lang3.StringEscapeUtils; -import org.apache.commons.lang3.StringUtils; public class DetailsStatus extends Document { @@ -21,12 +20,10 @@ public class DetailsStatus extends Document { * we'll have to do is to change back the '\\' that Gson writes for the * '\'. */ private static String escapeJSON(String s) { - return StringUtils.replaceEach(StringEscapeUtils.escapeEcmaScript(s), - new String[] { "\\'" }, new String[] { "'" }); + return StringEscapeUtils.escapeJava(s); } private static String unescapeJSON(String s) { - return StringEscapeUtils.unescapeEcmaScript(StringUtils.replaceEach(s, - new String[] { "'" }, new String[] { "\\'" })); + return StringEscapeUtils.unescapeJava(s); } /* From most recently published server descriptor: */

1 0

[onionoo/master] Use Apache Common Lang's StringUtils.replace correctly.
by karsten＠torproject.org 27 Feb '15

27 Feb '15

commit 24d9e5128c8d823a86d1ccc011f6d058e414c709 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 25 11:58:09 2015 +0100 Use Apache Common Lang's StringUtils.replace correctly. When we switched from String.replaceAll to StringUtils.replaceEach for performance reasons, we forgot to change the passed regular expression into a simple string. That's why some of our replacements didn't work out as expected. Bug introduced in f660e24be80b2efed1423b9ebf912377ccea49d5. --- src/main/java/org/torproject/onionoo/docs/DetailsDocument.java | 2 +- src/main/java/org/torproject/onionoo/docs/DetailsStatus.java | 2 +- src/main/java/org/torproject/onionoo/docs/DocumentStore.java | 2 +- src/main/java/org/torproject/onionoo/server/ResponseBuilder.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index 06b74cf..99a98cb 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -22,7 +22,7 @@ public class DetailsDocument extends Document { * '\'. */ private static String escapeJSON(String s) { return StringUtils.replaceEach(StringEscapeUtils.escapeEcmaScript(s), - new String[] { "\\\\'" }, new String[] { "'" }); + new String[] { "\\'" }, new String[] { "'" }); } private static String unescapeJSON(String s) { return StringEscapeUtils.unescapeEcmaScript(StringUtils.replaceEach(s, diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index f38d7e8..ff951ce 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -22,7 +22,7 @@ public class DetailsStatus extends Document { * '\'. */ private static String escapeJSON(String s) { return StringUtils.replaceEach(StringEscapeUtils.escapeEcmaScript(s), - new String[] { "\\\\'" }, new String[] { "'" }); + new String[] { "\\'" }, new String[] { "'" }); } private static String unescapeJSON(String s) { return StringEscapeUtils.unescapeEcmaScript(StringUtils.replaceEach(s, diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index 974f4c1..69646f1 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -316,7 +316,7 @@ public class DocumentStore { * this string, it escapes the \ to \\, hence writes \\u00F2. We * need to undo this and change \\u00F2 back to \u00F2. */ documentString = StringUtils.replace(gson.toJson(document), - "\\\\\\\\u", "\\\\u"); + "\\\\u", "\\u"); /* Existing details statuses don't contain opening and closing curly * brackets, so we should remove them from new details statuses, * too. */ diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 371b79f..d1e7f23 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -6,6 +6,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; import org.torproject.onionoo.docs.BandwidthDocument; import org.torproject.onionoo.docs.ClientsDocument; import org.torproject.onionoo.docs.DetailsDocument; @@ -274,7 +275,7 @@ public class ResponseBuilder { /* Whenever we provide Gson with a string containing an escaped * non-ASCII character like \u00F2, it escapes the \ to \\, which * we need to undo before including the string in a response. */ - return gson.toJson(dd).replaceAll("\\\\\\\\u", "\\\\u"); + return StringUtils.replace(gson.toJson(dd), "\\\\u", "\\u"); } else { // TODO We should probably log that we didn't find a details // document that we expected to exist.

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 27 Feb '15

27 Feb '15

commit 2d967db106cdb4438a1eb55a97fc22a0ccf09002 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 27 12:18:02 2015 +0000 Update translations for tails-misc --- fa.po | 2 +- ru.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fa.po b/fa.po index a14c2ed..4c2f46b 100644 --- a/fa.po +++ b/fa.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-27 06:46+0000\n" +"PO-Revision-Date: 2015-02-27 12:11+0000\n" "Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" diff --git a/ru.po b/ru.po index 4089e71..0a38e13 100644 --- a/ru.po +++ b/ru.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-27 08:48+0000\n" +"PO-Revision-Date: 2015-02-27 12:11+0000\n" "Last-Translator: Sergey Briskin <sergey.briskin(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 27 Feb '15

27 Feb '15

commit 02dd9f610c0a6ac8c9642c5951bc3449f274e786 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 27 12:17:43 2015 +0000 Update translations for tails-persistence-setup_completed --- fa/fa.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/fa.po b/fa/fa.po index d623445..29752b0 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-27 06:45+0000\n" +"PO-Revision-Date: 2015-02-27 12:10+0000\n" "Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 27 Feb '15

27 Feb '15

commit e213141f89a067233c6456b9297bc38ea727c9bd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 27 12:17:37 2015 +0000 Update translations for tails-persistence-setup --- fa/fa.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/fa.po b/fa/fa.po index d623445..29752b0 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-27 06:45+0000\n" +"PO-Revision-Date: 2015-02-27 12:10+0000\n" "Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 27 Feb '15

27 Feb '15

commit 33310c34f25f44039401f61cca3fe833c0687d5f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 27 09:17:58 2015 +0000 Update translations for tails-misc --- ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru.po b/ru.po index 8b58b49..4089e71 100644 --- a/ru.po +++ b/ru.po @@ -10,6 +10,7 @@ # jujjer <jujjer(a)gmail.com>, 2013 # mendov <mr.mendov(a)gmail.com>, 2013 # Oul Gocke <beandonlybe(a)yandex.ru>, 2013-2014 +# Sergey Briskin <sergey.briskin(a)gmail.com>, 2015 # Valid Olov, 2013 # Руслан <nasretdinov.r.r(a)ya.ru>, 2014 msgid "" @@ -17,8 +18,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-02-23 16:25+0100\n" -"PO-Revision-Date: 2015-02-25 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-02-27 08:48+0000\n" +"Last-Translator: Sergey Briskin <sergey.briskin(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,7 +65,7 @@ msgstr "Когда Вы перезагрузите Tails, все данные El #: config/chroot_local-includes/usr/local/bin/electrum:18 msgid "Do you want to start Electrum anyway?" -msgstr "" +msgstr "Вы хотите запустить Electrum в любом случае?" #: config/chroot_local-includes/usr/local/bin/electrum:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 27 Feb '15

27 Feb '15

commit 3490672f18e5ddfcd48e6f813d6258dffb470e49 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 27 09:17:50 2015 +0000 Update translations for tor-launcher-properties_completed --- fi/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/torlauncher.properties b/fi/torlauncher.properties index b5bb23c..0a8e1b3 100644 --- a/fi/torlauncher.properties +++ b/fi/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Valmis torlauncher.forAssistance=Tukea saat ottamalla yhteyttä %S -torlauncher.copiedNLogMessages=Kopionti suoritettu. %S Tor loki viesti on valmis kopiotavaksi textieditoriin tai sähköposti viestiin. +torlauncher.copiedNLogMessages=Kopionti suoritettu. %S Tor-lokiviestit ovat valmiita kopiotavaksi tekstimuokkaimeen tai sähköpostiviestiin. torlauncher.bootstrapStatus.conn_dir=Yhdistetään reititinhakemistoon torlauncher.bootstrapStatus.handshake_dir=Muodostetaan suojattu yhteys hakemistoon

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 27 Feb '15

27 Feb '15

commit ce8d48dd21c07326c3bf1791430549982452e08f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 27 09:17:46 2015 +0000 Update translations for tor-launcher-properties --- fi/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/torlauncher.properties b/fi/torlauncher.properties index b5bb23c..0a8e1b3 100644 --- a/fi/torlauncher.properties +++ b/fi/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.done=Valmis torlauncher.forAssistance=Tukea saat ottamalla yhteyttä %S -torlauncher.copiedNLogMessages=Kopionti suoritettu. %S Tor loki viesti on valmis kopiotavaksi textieditoriin tai sähköposti viestiin. +torlauncher.copiedNLogMessages=Kopionti suoritettu. %S Tor-lokiviestit ovat valmiita kopiotavaksi tekstimuokkaimeen tai sähköpostiviestiin. torlauncher.bootstrapStatus.conn_dir=Yhdistetään reititinhakemistoon torlauncher.bootstrapStatus.handshake_dir=Muodostetaan suojattu yhteys hakemistoon

1 0