May 2017 - tor-commits - lists.torproject.org

[metrics-lib/master] Parse "padding-counts" lines in extra-info descriptors.
by karsten＠torproject.org 16 May '17

16 May '17

commit 75844d046cf6df8162599ce4de4794cc2de09af0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 11 16:21:17 2017 +0200 Parse "padding-counts" lines in extra-info descriptors. Implements #22217. --- CHANGELOG.md | 1 + .../torproject/descriptor/ExtraInfoDescriptor.java | 24 +++++++ .../descriptor/impl/ExtraInfoDescriptorImpl.java | 36 +++++++++++ .../torproject/descriptor/impl/ParseHelper.java | 33 ++++++++++ .../impl/ExtraInfoDescriptorImplTest.java | 75 ++++++++++++++++++++++ 5 files changed, 169 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9322ecd..36aa082 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ DescriptorParser and DescriptorReader and refer to getUnrecognizedLines() in Descriptor if applications really need to fail descriptors containing unrecognized lines. + - Parse "padding-counts" lines in extra-info descriptors. * Minor changes - Accept extra arguments in statistics-related extra-info diff --git a/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java b/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java index bb1cbe6..04a46d4 100644 --- a/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java +++ b/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java @@ -650,6 +650,30 @@ public interface ExtraInfoDescriptor extends Descriptor { public Map<String, Double> getHidservDirOnionsSeenParameters(); /** + * Return the time in milliseconds since the epoch when the included + * padding-counts statistics ended, or -1 if no such statistics are included. + * + * @since 1.7.0 + */ + public long getPaddingCountsStatsEndMillis(); + + /** + * Return the interval length of the included padding-counts statistics in + * seconds, or -1 if no such statistics are included. + * + * @since 1.7.0 + */ + public long getPaddingCountsStatsIntervalLength(); + + /** + * Return padding-counts statistics, or <code>null</code> if no such + * statistics are included. + * + * @since 1.7.0 + */ + public Map<String, Long> getPaddingCounts(); + + /** * Return the RSA-1024 signature of the PKCS1-padded descriptor digest, * taken from the beginning of the router line through the newline after * the router-signature line, or null if the descriptor doesn't contain diff --git a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index e2b3827..dd1bc07 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -66,6 +66,7 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl atMostOnceKeywords.addAll(connBiDirectStatsKeywords); atMostOnceKeywords.addAll(exitStatsKeywords); atMostOnceKeywords.addAll(bridgeStatsKeywords); + atMostOnceKeywords.add("padding-counts"); this.checkAtMostOnceKeywords(atMostOnceKeywords); this.checkKeywordsDependOn(dirreqStatsKeywords, "dirreq-stats-end"); this.checkKeywordsDependOn(entryStatsKeywords, "entry-stats-end"); @@ -220,6 +221,9 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl case "hidserv-dir-onions-seen": this.parseHidservDirOnionsSeenLine(line, lineNoOpt, partsNoOpt); break; + case "padding-counts": + this.parsePaddingCountsLine(line, lineNoOpt, partsNoOpt); + break; case "identity-ed25519": this.parseIdentityEd25519Line(line, lineNoOpt, partsNoOpt); nextCrypto = "identity-ed25519"; @@ -756,6 +760,16 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl partsNoOpt, 2); } + private void parsePaddingCountsLine(String line, String lineNoOpt, + String[] partsNoOpt) throws DescriptorParseException { + long[] parsedStatsEndData = this.parseStatsEndLine(line, partsNoOpt, + 6); + this.paddingCountsStatsEndMillis = parsedStatsEndData[0]; + this.paddingCountsStatsIntervalLength = parsedStatsEndData[1]; + this.paddingCounts = ParseHelper.parseSpaceSeparatedStringKeyLongValueMap( + line, partsNoOpt, 5); + } + private void parseRouterSignatureLine(String line, String lineNoOpt, String[] partsNoOpt) throws DescriptorParseException { if (!lineNoOpt.equals("router-signature")) { @@ -1341,6 +1355,28 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl : new HashMap<>(this.hidservDirOnionsSeenParameters); } + private long paddingCountsStatsEndMillis = -1L; + + @Override + public long getPaddingCountsStatsEndMillis() { + return this.paddingCountsStatsEndMillis; + } + + private long paddingCountsStatsIntervalLength = -1L; + + @Override + public long getPaddingCountsStatsIntervalLength() { + return this.paddingCountsStatsIntervalLength; + } + + private Map<String, Long> paddingCounts; + + @Override + public Map<String, Long> getPaddingCounts() { + return this.paddingCounts == null ? null + : new HashMap<>(this.paddingCounts); + } + private String routerSignature; @Override diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index fa6ca75..0d4a27a 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -493,6 +493,39 @@ public class ParseHelper { return result; } + protected static Map<String, Long> + parseSpaceSeparatedStringKeyLongValueMap(String line, + String[] partsNoOpt, int startIndex) + throws DescriptorParseException { + Map<String, Long> result = new LinkedHashMap<>(); + if (partsNoOpt.length < startIndex) { + throw new DescriptorParseException("Line '" + line + "' does not " + + "contain a key-value list starting at index " + startIndex + + "."); + } + for (int i = startIndex; i < partsNoOpt.length; i++) { + String listElement = partsNoOpt[i]; + String[] keyAndValue = listElement.split("="); + String key = null; + Long value = null; + if (keyAndValue.length == 2) { + try { + value = Long.parseLong(keyAndValue[1]); + key = keyAndValue[0]; + } catch (NumberFormatException e) { + /* Handle below. */ + } + } + if (key == null) { + throw new DescriptorParseException("Line '" + line + "' contains " + + "an illegal key or value in list element '" + listElement + + "'."); + } + result.put(key, value); + } + return result; + } + protected static String parseMasterKeyEd25519FromIdentityEd25519CryptoBlock( String identityEd25519CryptoBlock) throws DescriptorParseException { diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 76a2148..0afc344 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -180,6 +180,15 @@ public class ExtraInfoDescriptorImplTest { return new RelayExtraInfoDescriptorImpl(db.buildDescriptor(), true); } + private String paddingCountsLine = null; + + private static ExtraInfoDescriptor createWithPaddingCountsLine( + String line) throws DescriptorParseException { + DescriptorBuilder db = new DescriptorBuilder(); + db.paddingCountsLine = line; + return new RelayExtraInfoDescriptorImpl(db.buildDescriptor(), true); + } + private String unrecognizedLine = null; private static ExtraInfoDescriptor createWithUnrecognizedLine( @@ -288,6 +297,9 @@ public class ExtraInfoDescriptorImplTest { if (this.hidservStatsLines != null) { sb.append(this.hidservStatsLines).append("\n"); } + if (this.paddingCountsLine != null) { + sb.append(this.paddingCountsLine).append("\n"); + } if (this.unrecognizedLine != null) { sb.append(this.unrecognizedLine).append("\n"); } @@ -1727,6 +1739,69 @@ public class ExtraInfoDescriptorImplTest { } @Test() + public void testPaddingCountsValid() + throws DescriptorParseException { + ExtraInfoDescriptor descriptor = DescriptorBuilder + .createWithPaddingCountsLine("padding-counts 2017-05-10 01:48:43 " + + "(86400 s) bin-size=10000 write-drop=10000 write-pad=10000 " + + "write-total=10000 read-drop=10000 read-pad=10000 read-total=70000 " + + "enabled-read-pad=0 enabled-read-total=0 enabled-write-pad=0 " + + "enabled-write-total=0 max-chanpad-timers=0"); + assertEquals(1494380923000L, + descriptor.getPaddingCountsStatsEndMillis()); + assertEquals(86400, descriptor.getPaddingCountsStatsIntervalLength()); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("bin-size")); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("write-drop")); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("write-pad")); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("write-total")); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("read-drop")); + assertEquals(10000L, + (long) descriptor.getPaddingCounts().get("read-pad")); + assertEquals(70000L, + (long) descriptor.getPaddingCounts().get("read-total")); + assertEquals(0L, + (long) descriptor.getPaddingCounts().get("enabled-read-pad")); + assertEquals(0L, + (long) descriptor.getPaddingCounts().get("enabled-read-total")); + assertEquals(0L, + (long) descriptor.getPaddingCounts().get("enabled-write-pad")); + assertEquals(0L, + (long) descriptor.getPaddingCounts().get("enabled-write-total")); + assertEquals(0L, + (long) descriptor.getPaddingCounts().get("max-chanpad-timers")); + } + + @Test(expected = DescriptorParseException.class) + public void testPaddingCountsNoTime() throws DescriptorParseException { + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "(86400 s) bin-size=10000 write-drop=10000"); + } + + @Test(expected = DescriptorParseException.class) + public void testPaddingCountsNoInterval() throws DescriptorParseException { + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "01:48:43 bin-size=10000 write-drop=10000"); + } + + @Test(expected = DescriptorParseException.class) + public void testPaddingCountsCommaSeparatedList() + throws DescriptorParseException { + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "(86400 s) bin-size=10000,write-drop=10000"); + } + + @Test(expected = DescriptorParseException.class) + public void testPaddingCountsNoList() throws DescriptorParseException { + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "(86400 s)"); + } + + @Test() public void testHidservStatsValid() throws DescriptorParseException { ExtraInfoDescriptor descriptor = HidservStatsBuilder .createWithDefaultLines();

1 0

[metrics-lib/master] Let tests also verify error message (for all padding-count related tests).
by karsten＠torproject.org 16 May '17

16 May '17

commit cdab58758ab1e4d45a5db8ed8761fe210878f42f Author: iwakeh <iwakeh(a)torproject.org> Date: Sun May 14 17:31:25 2017 +0000 Let tests also verify error message (for all padding-count related tests). Added some tests of which two don't pass yet. --- .../impl/ExtraInfoDescriptorImplTest.java | 129 ++++++++++++++++----- 1 file changed, 101 insertions(+), 28 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 0afc344..5b3fe1f 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -13,7 +13,10 @@ import org.torproject.descriptor.DescriptorParseException; import org.torproject.descriptor.ExtraInfoDescriptor; import org.torproject.descriptor.RelayExtraInfoDescriptor; +import org.hamcrest.Matchers; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -25,6 +28,9 @@ import java.util.SortedMap; /* Test parsing of extra-info descriptors. */ public class ExtraInfoDescriptorImplTest { + @Rule + public ExpectedException thrown = ExpectedException.none(); + /* Helper class to build a descriptor based on default data and * modifications requested by test methods. */ private static class DescriptorBuilder { @@ -1747,33 +1753,57 @@ public class ExtraInfoDescriptorImplTest { + "write-total=10000 read-drop=10000 read-pad=10000 read-total=70000 " + "enabled-read-pad=0 enabled-read-total=0 enabled-write-pad=0 " + "enabled-write-total=0 max-chanpad-timers=0"); + checkPaddingCounts(descriptor, new String[] { "bin-size", "write-drop", + "write-pad", "write-total", "read-drop", "read-pad", "read-total", + "enabled-read-pad", "enabled-read-total", "enabled-write-pad", + "enabled-write-total", "max-chanpad-timers"}, + new long[] { 10000L, 10000L, 10000L, 10000L, 10000L, 10000L, 70000L, + 0L, 0L, 0L, 0L, 0L}); + } + + @Test() + public void testPaddingOtherCountsValid() + throws DescriptorParseException { + ExtraInfoDescriptor descriptor = DescriptorBuilder + .createWithPaddingCountsLine("padding-counts 2017-05-10 01:48:43 " + + "(86400 s) xbin-size=10000 xwrite-drop=10000 xwrite-pad=10000 " + + "write-total=10000 xread-drop=10000 xread-pad=10000 read-total=70000 " + + "enabled-read-pad=0 enabled-read-total=0 xenabled-write-pad=0 " + + "enabled-write-total=0"); + checkPaddingCounts(descriptor, new String[] { "xbin-size", "xwrite-drop", + "xwrite-pad", "write-total", "xread-drop", "xread-pad", "read-total", + "enabled-read-pad", "enabled-read-total", "xenabled-write-pad", + "enabled-write-total"}, + new long[] { 10000L, 10000L, 10000L, 10000L, 10000L, 10000L, 70000L, + 0L, 0L, 0L, 0L}); + } + + private void checkPaddingCounts(ExtraInfoDescriptor descriptor, + String[] keys, long[] vals) { assertEquals(1494380923000L, descriptor.getPaddingCountsStatsEndMillis()); assertEquals(86400, descriptor.getPaddingCountsStatsIntervalLength()); - assertEquals(10000L, - (long) descriptor.getPaddingCounts().get("bin-size")); - assertEquals(10000L, - (long) descriptor.getPaddingCounts().get("write-drop")); - assertEquals(10000L, - (long) descriptor.getPaddingCounts().get("write-pad")); - assertEquals(10000L, - (long) descriptor.getPaddingCounts().get("write-total")); - assertEquals(10000L, - (long) descriptor.getPaddingCounts().get("read-drop")); - assertEquals(10000L, - (long) descriptor.getPaddingCounts().get("read-pad")); - assertEquals(70000L, - (long) descriptor.getPaddingCounts().get("read-total")); - assertEquals(0L, - (long) descriptor.getPaddingCounts().get("enabled-read-pad")); - assertEquals(0L, - (long) descriptor.getPaddingCounts().get("enabled-read-total")); - assertEquals(0L, - (long) descriptor.getPaddingCounts().get("enabled-write-pad")); - assertEquals(0L, - (long) descriptor.getPaddingCounts().get("enabled-write-total")); - assertEquals(0L, - (long) descriptor.getPaddingCounts().get("max-chanpad-timers")); + for (int k = 0; k < keys.length; k++) { + assertEquals(vals[k], + (long) descriptor.getPaddingCounts().get(keys[k])); + } + } + + @Test() + public void testPaddingCountsValidFutureProof() + throws DescriptorParseException { + ExtraInfoDescriptor descriptor = DescriptorBuilder + .createWithPaddingCountsLine("padding-counts 2017-05-10 01:48:43 " + + "(86400 s) write-drop=10000 write-pad=10000 bin-size=10000 " + + "write-total=10000 read-drop=10000 read-pad=10000 read-total=70000 " + + "enabled-read-pad=0 enabled-read-total=0 enabled-write-pad=0 " + + "enabled-write-total=0 max-chanpad-timers=0 some-new-value=42"); + checkPaddingCounts(descriptor, new String[] { "bin-size", "write-drop", + "write-pad", "write-total", "read-drop", "read-pad", "read-total", + "enabled-read-pad", "enabled-read-total", "enabled-write-pad", + "enabled-write-total", "max-chanpad-timers", "some-new-value"}, + new long[] { 10000L, 10000L, 10000L, 10000L, 10000L, 10000L, 70000L, + 0L, 0L, 0L, 0L, 0L, 42L}); } @Test(expected = DescriptorParseException.class) @@ -1782,21 +1812,64 @@ public class ExtraInfoDescriptorImplTest { + "(86400 s) bin-size=10000 write-drop=10000"); } - @Test(expected = DescriptorParseException.class) + @Test() public void testPaddingCountsNoInterval() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers + .allOf(Matchers.containsString("Illegal line"), Matchers + .containsString("'padding-counts 2017-05-10 01:48:43 " + + "bin-size=10000 write-drop=10000'"))); DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + "01:48:43 bin-size=10000 write-drop=10000"); } - @Test(expected = DescriptorParseException.class) + @Test() + public void testPaddingCountsNoKey() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers + .allOf(Matchers.containsString("illegal key or value in list element"), + Matchers.containsString("=7"))); + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "01:48:43 (86400 s) write-total=9 write-drop=10000 =7 x=8"); + } + + @Test() + public void testPaddingCountsNoValue() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers + .allOf(Matchers.containsString("illegal key or value in list element"), + Matchers.containsString("'write-drop='"))); + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "01:48:43 (86400 s) write-total=7 write-drop= bin-size=10000 "); + } + + @Test() + public void testPaddingCountsKeyRepeated() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers + .allOf(Matchers.containsString("contains an already defined key"), + Matchers.containsString("'a'"))); + DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + + "01:48:43 (86400 s) a=1 b=2 a=3 b=4"); + } + + @Test() public void testPaddingCountsCommaSeparatedList() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers + .allOf(Matchers.containsString("Line 'padding-counts 2017-05-10 "), + Matchers.containsString("'bin-size=10000,write-drop=10000'"))); DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " - + "(86400 s) bin-size=10000,write-drop=10000"); + + "01:48:43 (86400 s) bin-size=10000,write-drop=10000"); } - @Test(expected = DescriptorParseException.class) + @Test() public void testPaddingCountsNoList() throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage(Matchers + .allOf(Matchers.containsString("Illegal line"), + Matchers.containsString("'padding-counts 2017-05-10 (86400 s)'"))); DescriptorBuilder.createWithPaddingCountsLine("padding-counts 2017-05-10 " + "(86400 s)"); }

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 16 May '17

16 May '17

commit de7157fa586dfa851a27dd4f5f957250285ddd24 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 16 13:47:43 2017 +0000 Update translations for tor-messenger-otrproperties --- es_AR/otr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es_AR/otr.properties b/es_AR/otr.properties index 08df80a..25e8b40 100644 --- a/es_AR/otr.properties +++ b/es_AR/otr.properties @@ -11,10 +11,10 @@ msgevent.rcvdmsg_malformed=We received a malformed data message from %S. msgevent.log_heartbeat_rcvd=Heartbeat received from %S. msgevent.log_heartbeat_sent=Heartbeat sent to %S. msgevent.rcvdmsg_general_err=An OTR error occured. -msgevent.rcvdmsg_unecrypted=The following message received from %S was not encrypted: %S +msgevent.rcvdmsg_unecrypted=El siguiente mensaje recibido de %S no fue cifrado: %S msgevent.rcvdmsg_unrecognized=Recibimos un mensaje OTR no reconocido de %S. msgevent.rcvdmsg_for_other_instance=%S has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message. -context.gone_secure_private=Private conversation with %S started. +context.gone_secure_private=Se inició una conversación privada con %S. context.gone_secure_unverified=Private conversation with %S started. However, their identity has not been verified. context.still_secure=Successfully refreshed the private conversation with %S. error.enc=Error occurred encrypting message.

1 0

[torspec/master] Add more correct "implemented-in" versions.
by nickm＠torproject.org 16 May '17

16 May '17

commit f59e8f5b2819842fe6cb5b162a9226a4f1891b4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 16 09:37:57 2017 -0400 Add more correct "implemented-in" versions. --- proposals/000-index.txt | 4 ++-- proposals/196-transport-control-ports.txt | 2 +- proposals/220-ecc-id-keys.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 57392e4..405b4ff 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -274,9 +274,9 @@ Proposals by status: 160 Authorities vote for bandwidth offsets in consensus [for 0.2.1.x] 161 Computing Bandwidth Adjustments [for 0.2.1.x] 162 Publish the consensus in multiple flavors [in 0.2.3.1-alpha] - 196 Extended ORPort and TransportControlPort [for 0.2.4.x] + 196 Extended ORPort and TransportControlPort [in 0.2.5.2-alpha] 217 Tor Extended ORPort Authentication [for 0.2.5.x] - 220 Migrate server identity keys to Ed25519 [for 0.2.x.x] + 220 Migrate server identity keys to Ed25519 [in 0.3.0.1-alpha] 232 Pluggable Transport through SOCKS proxy [in 0.2.6] 244 Use RFC5705 Key Exporting in our AUTHENTICATE calls [in 0.3.0.1-alpha] 260 Rendezvous Single Onion Services [in 0.2.9.3-alpha] diff --git a/proposals/196-transport-control-ports.txt b/proposals/196-transport-control-ports.txt index c90ad8c..154e581 100644 --- a/proposals/196-transport-control-ports.txt +++ b/proposals/196-transport-control-ports.txt @@ -3,7 +3,7 @@ Title: Extended ORPort and TransportControlPort Author: George Kadianakis, Nick Mathewson Created: 14 Mar 2012 Status: Finished -Target: 0.2.4.x +Implemented-In: 0.2.5.2-alpha 1. Overview diff --git a/proposals/220-ecc-id-keys.txt b/proposals/220-ecc-id-keys.txt index ca862ba..b7acdd2 100644 --- a/proposals/220-ecc-id-keys.txt +++ b/proposals/220-ecc-id-keys.txt @@ -2,7 +2,7 @@ Filename: 220-ecc-id-keys.txt Title: Migrate server identity keys to Ed25519 Authors: Nick Mathewson Created: 12 August 2013 -Target: 0.2.x.x +Implemented-In: 0.3.0.1-alpha Status: Finished [Note: This is a draft proposal; I've probably made some important

1 0

[torspec/master] Merge prop274; mark it closed.
by nickm＠torproject.org 16 May '17

16 May '17

commit 78636a3911b2db96ff80194d1309f72acf66fd59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 16 09:33:21 2017 -0400 Merge prop274; mark it closed. --- dir-spec.txt | 11 +++++++++++ proposals/000-index.txt | 4 ++-- proposals/274-rotate-onion-keys-less.txt | 2 +- tor-spec.txt | 10 ++++++---- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index d6ad9d8..4c842e8 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1911,6 +1911,17 @@ client should no longer try to find a diff for it. (min 0, max 8192, default 72) + onion key lifetime parameters: + "onion-key-rotation-days" -- (min 1, max 90, default 28) + "onion-key-grace-period-days" -- (min 1, max + onion-key-rotation-days, default 7) + Every relay should list each onion key it generates for + onion-key-rotation-days days after generating it, and then + replace it. Relays should continue to accept their most recent + previous onion key for an additional onion-key-grace-period-days + days after it is replaced. (Introduced in 0.3.1.1-alpha; + prior versions of tor hardcoded both of these values to 7 days.) + "shared-rand-previous-value" SP NumReveals SP Value NL [At most once] diff --git a/proposals/000-index.txt b/proposals/000-index.txt index bba6534..57392e4 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -194,7 +194,7 @@ Proposals by number: 271 Another algorithm for guard selection [CLOSED] 272 Listed routers should be Valid, Running, and treated as such [CLOSED] 273 Exit relay pinning for web services [DRAFT] -274 Rotate onion keys less frequently [FINISHED] +274 Rotate onion keys less frequently [CLOSED] 275 Stop including meaningful "published" time in microdescriptor consensus [OPEN] 276 Report bandwidth with lower granularity in consensus documents [OPEN] 277 Detect multiple relay instances running with same ID [OPEN] @@ -280,7 +280,6 @@ Proposals by status: 232 Pluggable Transport through SOCKS proxy [in 0.2.6] 244 Use RFC5705 Key Exporting in our AUTHENTICATE calls [in 0.3.0.1-alpha] 260 Rendezvous Single Onion Services [in 0.2.9.3-alpha] - 274 Rotate onion keys less frequently [in 0.3.1.1-alpha] 278 Directory Compression Scheme Negotiation [in 0.3.1.1-alpha] CLOSED: 101 Voting on the Tor Directory System [in 0.2.0.x] @@ -351,6 +350,7 @@ Proposals by status: 264 Putting version numbers on the Tor subprotocols [in 0.2.9.4-alpha] 271 Another algorithm for guard selection [in 0.3.0.1-alpha] 272 Listed routers should be Valid, Running, and treated as such [in 0.2.9.3-alpha, 0.2.9.4-alpha] + 274 Rotate onion keys less frequently [in 0.3.1.1-alpha] SUPERSEDED: 112 Bring Back Pathlen Coin Weight 113 Simplifying directory authority administration diff --git a/proposals/274-rotate-onion-keys-less.txt b/proposals/274-rotate-onion-keys-less.txt index 7c17873..d3a962a 100644 --- a/proposals/274-rotate-onion-keys-less.txt +++ b/proposals/274-rotate-onion-keys-less.txt @@ -2,7 +2,7 @@ Filename: 274-rotate-onion-keys-less.txt Title: Rotate onion keys less frequently. Author: Nick Mathewson Created: 20-Feb-2017 -Status: Finished +Status: Closed Implemented-In: 0.3.1.1-alpha 1. Overview diff --git a/tor-spec.txt b/tor-spec.txt index fdb8535..f61e98f 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -147,9 +147,10 @@ see tor-design.pdf. - A long-term signing-only "Identity key" used to sign documents and certificates, and used to establish relay identity. - A medium-term TAP "Onion key" used to decrypt onion skins when accepting - circuit extend attempts. (See 5.1.) Old keys MUST be accepted for at - least one week after they are no longer advertised. Because of this, - relays MUST retain old keys for a while after they're rotated. + circuit extend attempts. (See 5.1.) Old keys MUST be accepted for a + while after they are no longer advertised. Because of this, + relays MUST retain old keys for a while after they're rotated. (See + "onion key lifetime parameters" in dir-spec.txt.) - A short-term "Connection key" used to negotiate TLS connections. Tor implementations MAY rotate this key as often as they like, and SHOULD rotate this key at least once a day. @@ -160,7 +161,8 @@ see tor-design.pdf. accepting incoming circuit extend requests. As with TAP onion keys, old ntor keys MUST be accepted for at least one week after they are no longer advertised. Because of this, relays MUST retain old keys for a - while after they're rotated. + while after they're rotated. (See "onion key lifetime parameters" in + dir-spec.txt.) These are Ed25519 keys:

1 0

[torspec/master] Note the part of prop#275 that got implemented.
by nickm＠torproject.org 16 May '17

16 May '17

commit cbe17dfc88f753fa0a98acb6851fe5783e39bfc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 16 09:20:26 2017 -0400 Note the part of prop#275 that got implemented. --- dir-spec.txt | 13 ++++++++----- proposals/275-md-published-time-is-silly.txt | 6 ++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 60efdc0..d6ad9d8 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2070,11 +2070,14 @@ identity key, encoded in base64, with trailing equals sign(s) removed. "Digest" is a hash of its most recent descriptor as signed (that is, not including the signature), encoded in base64. - "Publication" is the - publication time of its most recent descriptor, in the form - YYYY-MM-DD HH:MM:SS, in UTC. "IP" is its current IP address; - ORPort is its current OR port, "DirPort" is its current directory - port, or "0" for "none". + + "Publication" is the publication time of its most recent descriptor, + in the form YYYY-MM-DD HH:MM:SS, in UTC. Implementations MAY base + decisions on publication times in the past, but MUST NOT reject + publication times in the future. + + "IP" is its current IP address; ORPort is its current OR port, + "DirPort" is its current directory port, or "0" for "none". "a" SP address ":" port NL diff --git a/proposals/275-md-published-time-is-silly.txt b/proposals/275-md-published-time-is-silly.txt index 0a01fe5..b38ee97 100644 --- a/proposals/275-md-published-time-is-silly.txt +++ b/proposals/275-md-published-time-is-silly.txt @@ -5,6 +5,12 @@ Created: 20-Feb-2017 Status: Open Target: 0.3.1.x-alpha +0. Status: + + As of 0.2.9.11 / 0.3.0.7 / 0.3.1.1-alpha, Tor no longer takes any + special action on "future" published times, as proposed in section 4. + + 1. Overview This document proposes that, in order to limit the bandwidth needed

1 0

[torspec/master] Fill in "implemented-in" fields.
by nickm＠torproject.org 16 May '17

16 May '17

commit 4b879cb63c88c8285adeb988accbe4a996295898 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 16 09:24:15 2017 -0400 Fill in "implemented-in" fields. --- proposals/000-index.txt | 4 ++-- proposals/151-path-selection-improvements.txt | 1 + proposals/260-rend-single-onion.txt | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 7ec3a2d..bba6534 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -268,7 +268,7 @@ Proposals by status: 257 Refactoring authorities and making them more isolated from the net FINISHED: 121 Hidden Service Authentication [in 0.2.1.x] - 151 Improving Tor Path Selection + 151 Improving Tor Path Selection [in 0.2.2.2-alpha] 155 Four Improvements of Hidden Service Performance [in 0.2.1.x] 158 Clients download consensus + microdescriptors [in 0.2.3.1-alpha] 160 Authorities vote for bandwidth offsets in consensus [for 0.2.1.x] @@ -279,7 +279,7 @@ Proposals by status: 220 Migrate server identity keys to Ed25519 [for 0.2.x.x] 232 Pluggable Transport through SOCKS proxy [in 0.2.6] 244 Use RFC5705 Key Exporting in our AUTHENTICATE calls [in 0.3.0.1-alpha] - 260 Rendezvous Single Onion Services + 260 Rendezvous Single Onion Services [in 0.2.9.3-alpha] 274 Rotate onion keys less frequently [in 0.3.1.1-alpha] 278 Directory Compression Scheme Negotiation [in 0.3.1.1-alpha] CLOSED: diff --git a/proposals/151-path-selection-improvements.txt b/proposals/151-path-selection-improvements.txt index af89f21..7e2d113 100644 --- a/proposals/151-path-selection-improvements.txt +++ b/proposals/151-path-selection-improvements.txt @@ -4,6 +4,7 @@ Author: Fallon Chen, Mike Perry Created: 5-Jul-2008 Status: Finished In-Spec: path-spec.txt +Implemented-In: 0.2.2.2-alpha Overview diff --git a/proposals/260-rend-single-onion.txt b/proposals/260-rend-single-onion.txt index 9777e0a..c4f2617 100644 --- a/proposals/260-rend-single-onion.txt +++ b/proposals/260-rend-single-onion.txt @@ -3,6 +3,7 @@ Title: Rendezvous Single Onion Services Author: Tim Wilson-Brown, John Brooks, Aaron Johnson, Rob Jansen, George Kadianakis, Paul Syverson, Roger Dingledine Created: 2015-10-17 Status: Finished +Implemented-In: 0.2.9.3-alpha 1. Overview

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 16 May '17

16 May '17

commit 6943d3c262bb65b671ef263fa41561e6a65b20b1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 16 13:17:45 2017 +0000 Update translations for tor-messenger-otrproperties --- es_AR/otr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es_AR/otr.properties b/es_AR/otr.properties index b37cce6..08df80a 100644 --- a/es_AR/otr.properties +++ b/es_AR/otr.properties @@ -4,8 +4,8 @@ msgevent.encryption_error=Se produjo un error al cifrar el mensaje. El mensaje n msgevent.connection_ended=%S ya ha cerrado su conexión privada con usted. Su mensaje no fue enviado. Termine su conversación privada o reiníciela. msgevent.setup_error=Se ha producido un error al configurar una conversación privada con %S. msgevent.msg_reflected=Está recibiendo sus propios mensajes OTR. Usted está tratando de hablar con usted mismo, o alguien está reflejando sus mensajes de nuevo a usted. -msgevent.msg_resent=The last message to %S was resent. -msgevent.rcvdmsg_not_private=The encrypted message received from %S is unreadable, as you are not currently communicating privately. +msgevent.msg_resent=El último mensaje a %S fue reenviado. +msgevent.rcvdmsg_not_private=El mensaje cifrado recibido desde %S es ilegible, ya que actualmente no se está comunicando en privado. msgevent.rcvdmsg_unreadable=We received an unreadable encrypted message from %S. msgevent.rcvdmsg_malformed=We received a malformed data message from %S. msgevent.log_heartbeat_rcvd=Heartbeat received from %S.

1 0

[torspec/master] Update proposal index
by nickm＠torproject.org 16 May '17

16 May '17

commit 607dabf60772d152f9b9edcae3993fdc6c90a5ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 16 09:15:16 2017 -0400 Update proposal index --- proposals/000-index.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index eca98ce..7ec3a2d 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -198,7 +198,7 @@ Proposals by number: 275 Stop including meaningful "published" time in microdescriptor consensus [OPEN] 276 Report bandwidth with lower granularity in consensus documents [OPEN] 277 Detect multiple relay instances running with same ID [OPEN] -278 Directory Compression Scheme Negotiation [DRAFT] +278 Directory Compression Scheme Negotiation [FINISHED] 279 A Name System API for Tor Onion Services [DRAFT] @@ -222,7 +222,6 @@ Proposals by status: 269 Transitionally secure hybrid handshakes 270 RebelAlliance: A Post-Quantum Secure Hybrid Handshake Based on NewHope 273 Exit relay pinning for web services [for n/a] - 278 Directory Compression Scheme Negotiation [for N/A] 279 A Name System API for Tor Onion Services NEEDS-REVISION: 190 Bridge Client Authorization Based on a Shared Secret @@ -282,6 +281,7 @@ Proposals by status: 244 Use RFC5705 Key Exporting in our AUTHENTICATE calls [in 0.3.0.1-alpha] 260 Rendezvous Single Onion Services 274 Rotate onion keys less frequently [in 0.3.1.1-alpha] + 278 Directory Compression Scheme Negotiation [in 0.3.1.1-alpha] CLOSED: 101 Voting on the Tor Directory System [in 0.2.0.x] 102 Dropping "opt" from the directory format [in 0.2.0.x]

1 0

[torspec/master] Mark prop278 as "finished".
by nickm＠torproject.org 16 May '17

16 May '17

commit 05bb7cd068cef58556ae8d81f6d4d749f98e577c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 16 09:14:51 2017 -0400 Mark prop278 as "finished". --- proposals/278-directory-compression-scheme-negotiation.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proposals/278-directory-compression-scheme-negotiation.txt b/proposals/278-directory-compression-scheme-negotiation.txt index 64b1839..ced710f 100644 --- a/proposals/278-directory-compression-scheme-negotiation.txt +++ b/proposals/278-directory-compression-scheme-negotiation.txt @@ -2,8 +2,8 @@ Filename: 278-directory-compression-scheme-negotiation.txt Title: Directory Compression Scheme Negotiation Author: Alexander Færøy Created: 2017-03-06 -Status: Draft -Target: N/A +Status: Finished +Implemented-In: 0.3.1.1-alpha 0. Overview

1 0