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

[metrics-lib/release] Add support for six new key-value pairs added by OnionPerf.
by karsten＠torproject.org 17 May '17

17 May '17

commit ee696b09f02ae59e7dccf8a5eb68ca484051040e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 1 20:38:55 2017 +0200 Add support for six new key-value pairs added by OnionPerf. OnionPerf adds six new key-value pairs to the .tpf format that Torperf/CollecTor did not produce: ENDPOINTLOCAL, ENDPOINTPROXY, ENDPOINTREMOTE, HOSTNAMELOCAL, HOSTNAMEREMOTE, and SOURCEADDRESS. We should add support for these keys to metrics-lib, so that we can start using their values. Implements #22122. --- CHANGELOG.md | 1 + .../org/torproject/descriptor/TorperfResult.java | 62 ++++++++++++++++ .../descriptor/impl/TorperfResultImpl.java | 84 ++++++++++++++++++++++ .../descriptor/impl/TorperfResultImplTest.java | 42 +++++++++++ 4 files changed, 189 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cb2acd..da9cb37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ # Medium changes - Fix a bug where unrecognized lines in extra-info descriptors below crypto blocks were silently skipped. + - Add support for six new key-value pairs added by OnionPerf. # Changes in version 1.6.0 - 2017-02-17 diff --git a/src/main/java/org/torproject/descriptor/TorperfResult.java b/src/main/java/org/torproject/descriptor/TorperfResult.java index 1f4e50c..1958ed2 100644 --- a/src/main/java/org/torproject/descriptor/TorperfResult.java +++ b/src/main/java/org/torproject/descriptor/TorperfResult.java @@ -211,5 +211,67 @@ public interface TorperfResult extends Descriptor { * @since 1.0.0 */ public int getUsedBy(); + + /** + * Return the hostname, IP address, and port that the TGen client used to + * connect to the local tor SOCKS port, formatted as + * <code>hostname:ip:port</code>, which may be <code>"NULL:0.0.0.0:0"</code> + * if TGen was not able to find this information or <code>null</code> if the + * OnionPerf line didn't contain this information. + * + * @since 1.7.0 + */ + public String getEndpointLocal(); + + /** + * Return the hostname, IP address, and port that the TGen client used to + * connect to the SOCKS proxy server that tor runs, formatted as + * <code>hostname:ip:port</code>, which may be <code>"NULL:0.0.0.0:0"</code> + * if TGen was not able to find this information or <code>null</code> if the + * OnionPerf line didn't contain this information. + * + * @since 1.7.0 + */ + public String getEndpointProxy(); + + /** + * Return the hostname, IP address, and port that the TGen client used to + * connect to the remote server, formatted as <code>hostname:ip:port</code>, + * which may be <code>"NULL:0.0.0.0:0"</code> if TGen was not able to find + * this information or <code>null</code> if the OnionPerf line didn't contain + * this information. + * + * @since 1.7.0 + */ + public String getEndpointRemote(); + + /** + * Return the client machine hostname, which may be <code>"(NULL)"</code> if + * the TGen client was not able to find this information or <code>null</code> + * if the OnionPerf line didn't contain this information. + * + * @since 1.7.0 + */ + public String getHostnameLocal(); + + /** + * Return the server machine hostname, which may be <code>"(NULL)"</code> if + * the TGen server was not able to find this information or <code>null</code> + * if the OnionPerf line didn't contain this information. + * + * @since 1.7.0 + */ + public String getHostnameRemote(); + + /** + * Return the public IP address of the OnionPerf host obtained by connecting + * to well-known servers and finding the IP address in the result, which may + * be <code>"unknown"</code> if OnionPerf was not able to find this + * information or <code>null</code> if the OnionPerf line didn't contain this + * information. + * + * @since 1.7.0 + */ + public String getSourceAddress(); } diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index f5fe892..16274c7 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -147,6 +147,24 @@ public class TorperfResultImpl extends DescriptorImpl case "USED_BY": this.parseUsedBy(value, keyValue, line); break; + case "ENDPOINTLOCAL": + this.parseEndpointLocal(value, keyValue, line); + break; + case "ENDPOINTPROXY": + this.parseEndpointProxy(value, keyValue, line); + break; + case "ENDPOINTREMOTE": + this.parseEndpointRemote(value, keyValue, line); + break; + case "HOSTNAMELOCAL": + this.parseHostnameLocal(value, keyValue, line); + break; + case "HOSTNAMEREMOTE": + this.parseHostnameRemote(value, keyValue, line); + break; + case "SOURCEADDRESS": + this.parseSourceAddress(value, keyValue, line); + break; default: if (key.startsWith("DATAPERC")) { this.parseDataPercentile(value, keyValue, line); @@ -359,6 +377,30 @@ public class TorperfResultImpl extends DescriptorImpl this.usedBy = this.parseInt(value, keyValue, line); } + private void parseEndpointLocal(String value, String keyValue, String line) { + this.endpointLocal = value; + } + + private void parseEndpointProxy(String value, String keyValue, String line) { + this.endpointProxy = value; + } + + private void parseEndpointRemote(String value, String keyValue, String line) { + this.endpointRemote = value; + } + + private void parseHostnameLocal(String value, String keyValue, String line) { + this.hostnameLocal = value; + } + + private void parseHostnameRemote(String value, String keyValue, String line) { + this.hostnameRemote = value; + } + + private void parseSourceAddress(String value, String keyValue, String line) { + this.sourceAddress = value; + } + private long parseTimestamp(String value, String keyValue, String line) throws DescriptorParseException { long timestamp = -1L; @@ -570,5 +612,47 @@ public class TorperfResultImpl extends DescriptorImpl public int getUsedBy() { return this.usedBy; } + + private String endpointLocal; + + @Override + public String getEndpointLocal() { + return this.endpointLocal; + } + + private String endpointProxy; + + @Override + public String getEndpointProxy() { + return this.endpointProxy; + } + + private String endpointRemote; + + @Override + public String getEndpointRemote() { + return this.endpointRemote; + } + + private String hostnameLocal; + + @Override + public String getHostnameLocal() { + return this.hostnameLocal; + } + + private String hostnameRemote; + + @Override + public String getHostnameRemote() { + return this.hostnameRemote; + } + + private String sourceAddress; + + @Override + public String getSourceAddress() { + return this.sourceAddress; + } } diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java index 080d16d..640b8a3 100644 --- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java @@ -5,8 +5,10 @@ package org.torproject.descriptor.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorParseException; import org.junit.Test; @@ -95,5 +97,45 @@ public class TorperfResultImplTest { assertEquals("DATAPERMILLE", torperfResult.getUnrecognizedKeys().firstKey()); } + + private static final String input2 = + "BUILDTIMES=0.490000009537,0.610000133514,0.75 CIRC_ID=8522 " + + "CONNECT=1493397365.14 DATACOMPLETE=1493397368.13 " + + "DATAPERC0=1493397367.67 DATAPERC10=1493397367.81 " + + "DATAPERC100=1493397368.13 DATAPERC20=1493397367.87 " + + "DATAPERC30=1493397367.87 DATAPERC40=1493397367.90 " + + "DATAPERC50=1493397367.91 DATAPERC60=1493397367.97 " + + "DATAPERC70=1493397367.97 DATAPERC80=1493397367.99 " + + "DATAPERC90=1493397367.99 DATAREQUEST=1493397367.33 " + + "DATARESPONSE=1493397367.67 DIDTIMEOUT=0 " + + "ENDPOINTLOCAL=localhost:127.0.0.1:42436 " + + "ENDPOINTPROXY=localhost:127.0.0.1:52265 " + + "ENDPOINTREMOTE=4jocm7xwo4ltrvzp.onion:0.0.0.0:80 FILESIZE=51200 " + + "HOSTNAMELOCAL=op-us HOSTNAMEREMOTE=op-us LAUNCH=1493396168.1 " + + "NEGOTIATE=1493397365.14 " + + "PATH=$F69BED36177ED727706512BA6A97755025EEA0FB," + + "$91D23D8A539B83D2FB56AA67ECD4D75CC093AC55," + + "$4DD902046E7155BBE79C34EE6D53BF7408B98CE4 QUANTILE=0.8 " + + "READBYTES=51269 REQUEST=1493397365.14 RESPONSE=1493397367.32 " + + "SOCKET=1493397365.14 SOURCE=op-us SOURCEADDRESS=199.119.112.144 " + + "START=1493397365.14 TIMEOUT=1500 USED_AT=1493397368.14 " + + "USED_BY=17429 WRITEBYTES=54"; + + @Test() + public void testEndpointsHostnamesSourceAddress() + throws DescriptorParseException { + List<Descriptor> result = TorperfResultImpl.parseTorperfResults( + input2.getBytes(), true); + assertEquals(1, result.size()); + TorperfResultImpl torperfResult = (TorperfResultImpl) result.get(0); + assertNull(torperfResult.getUnrecognizedKeys()); + assertEquals("localhost:127.0.0.1:42436", torperfResult.getEndpointLocal()); + assertEquals("localhost:127.0.0.1:52265", torperfResult.getEndpointProxy()); + assertEquals("4jocm7xwo4ltrvzp.onion:0.0.0.0:80", + torperfResult.getEndpointRemote()); + assertEquals("op-us", torperfResult.getHostnameLocal()); + assertEquals("op-us", torperfResult.getHostnameRemote()); + assertEquals("199.119.112.144", torperfResult.getSourceAddress()); + } }

1 0

[metrics-lib/release] Provided failing test for issue in task-22190.
by karsten＠torproject.org 17 May '17

17 May '17

commit f483211795662c9fbb8dd81661312b1e01126706 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue May 9 15:17:08 2017 +0000 Provided failing test for issue in task-22190. --- .../index/DescriptorIndexCollectorTest.java | 44 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java index e2a31b5..142d883 100644 --- a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java +++ b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java @@ -158,7 +158,49 @@ public class DescriptorIndexCollectorTest { new DescriptorIndexCollector() .collectDescriptors(indexFile.toURL().toString(), - new String[]{"a/b", "a/b/c"}, 1451606400_000L, localFolder, true); + new String[]{"a/b/", "a/b/c"}, 1451606400_000L, localFolder, true); + + // verify file addition, including that the non-synced dir is not touched. + checkContains(true, + DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), + "a/b/y2", "a/b/x2", "a/b/c/u2", "d/p1"); + + // verify that invalid files weren't fetched. + checkContains(false, + DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), + "a/b/c/w2", "a/b/c/z2"); + + // verify file deletion. + checkContains(false, + DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), + "a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/u1"); + } + + @Test() + public void testSlashesInCollectionWithDeletion() throws Exception { + File localFolder = tmpf.newFolder(); + makeStructure(localFolder, "1"); + File nonSyncedDir = makeDirs(localFolder.toString(), "d"); + makeFiles(nonSyncedDir, "p1"); + + File remoteDirectory = tmpf.newFolder(); + makeStructure(remoteDirectory, "2"); + + File indexFile = newIndexFile("testindexDelete.json", + remoteDirectory.toURL().toString()); + + // verify precondition for test. + checkContains(true, + DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), + "a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/u1"); + checkContains(false, + DescriptorIndexCollector.statLocalDirectory(localFolder).toString(), + "a/b/y2","a/b/x2"); + + new DescriptorIndexCollector() + .collectDescriptors(indexFile.toURL().toString(), + new String[]{"/a/b", "/a/b/c/"}, 1451606400_000L, + localFolder, true); // verify file addition, including that the non-synced dir is not touched. checkContains(true,

1 0

[metrics-lib/release] Make tests pass again and solve task-22190.
by karsten＠torproject.org 17 May '17

17 May '17

commit e927475c12db02e492075e8a6a580e2626c94037 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue May 9 15:17:09 2017 +0000 Make tests pass again and solve task-22190. --- .../org/torproject/descriptor/index/DescriptorIndexCollector.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java index 68b6591..4796263 100644 --- a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java +++ b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java @@ -144,7 +144,9 @@ public class DescriptorIndexCollector implements DescriptorCollector { File localDir, SortedMap<String, Long> locals) { for (String localPath : locals.keySet()) { for (String remoteDirectory : remoteDirectories) { - if (localPath.startsWith(remoteDirectory)) { + String remDir = remoteDirectory.charAt(0) == '/' + ? remoteDirectory.substring(1) : remoteDirectory; + if (localPath.startsWith(remDir)) { if (!remoteFiles.containsKey(localPath)) { File extraneousLocalFile = new File(localDir, localPath); log.debug("Deleting extraneous local file {}.",

1 0

[metrics-lib/release] Tweak change log.
by karsten＠torproject.org 17 May '17

17 May '17

commit f6252f909f0685bba0f6307dfb05a4c72e39952c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 12 12:14:57 2017 +0200 Tweak change log. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c3f09e..9322ecd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - Fix a bug where DescriptorIndexCollector would not delete extraneous local files if remote paths start with /. - Add previously missing method to obtain the digest of a vote. - - Deprecated setFailUnrecognizedDescriptorLines() in + - Deprecate setFailUnrecognizedDescriptorLines() in DescriptorParser and DescriptorReader and refer to getUnrecognizedLines() in Descriptor if applications really need to fail descriptors containing unrecognized lines.

1 0

[metrics-lib/release] Prepare for 1.7.0 release.
by karsten＠torproject.org 17 May '17

17 May '17

commit 6941084f258130d53301769a332b7a501321b3ae Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 16 16:53:49 2017 +0200 Prepare for 1.7.0 release. --- CERT | 18 +++++++++--------- CHANGELOG.md | 2 +- build.xml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CERT b/CERT index 6cc5a93..0f90f7a 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIEYQnM/zANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIEM/uNRzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcw -MTAyMTYzNTQ2WhcNMTcwNDAyMTYzNTQ2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +NTE2MTQ0NDAwWhcNMTcwODE0MTQ0NDAwWjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAi2K5 -o3UnRBLdk9zkBEDbqPWxq8eiiIacbSoorspVlv4vqNO2UsTLc2sA4zZpY1L7Mkc6 -y7pcd1jFc6e9Wzt0agoIU9i3pyqkUx11ktE8a8CiVjDOns05GHe1DsLYcSLG8aJR -2pNEFjZEndHTXGRKwxtTmHimsIIWiy8tYFkC7SkBQj+BnXBqzCbJPhRDpMdhyJmQ -CLUhTTgU30G32x3vOhddWHAH8UDsXNlBASQOFs+A/1Mx5DI5AXLtwjp/rweTWoBk -11SfkVS/mfMZNRGOA9DEfoRYHPT0Rn4URAQrBr73CKQaVVYyeuDOoEs69KRH2JSO -IRcgAfpjtg8cry/eiw== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEACxUk +6eZkayjJGZjw02bWjrkwwe/N5iOnOz9XcpGQY5lUEk12uIYCYHDB66SsZngsbwNQ +qZ8T6Avm9XSrKAKMxBcPsjTUy0Fb7yG3jLRypPlbgoe61YoliYYaWiaV1OQY1nsZ +ujt6f7T5bwsLeh7La7+kB1SGDu+hKH7Bi3RtVN09iL7x+BJVuJOKHKYoK+UO2fB3 +ltFenkGpiDzGQQxJRzA1WbCQsSPrE6Qi3NmWXsTAc+24Y9gTO8qlmfi6zp1W7TGO ++cUmHIO0u3+ewkb8oIj8jjzGTmEbuJrwgBOohQr6CXCicQHhIrBF6Opi7mF/UHSO +J8d+DLvT41EL9JrgCg== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index 36aa082..c76bbc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.7.0 - ??? +# Changes in version 1.7.0 - 2017-05-17 * Medium changes - Fix a bug where unrecognized lines in extra-info descriptors diff --git a/build.xml b/build.xml index fb926c2..950b5c7 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="descriptor" basedir="."> - <property name="release.version" value="1.6.0-dev" /> + <property name="release.version" value="1.7.0" /> <property name="javadoc-title" value="DescripTor API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/**" /> <property name="implementation-title" value="DescripTor" />

1 0

[metrics-lib/release] Reverse equality test in if-statements.
by karsten＠torproject.org 17 May '17

17 May '17

commit 08ccbf83f7e232ced97ab1a47ab7b7d56b48f8c8 Author: iwakeh <iwakeh(a)torproject.org> Date: Sun May 14 17:31:29 2017 +0000 Reverse equality test in if-statements. (This should be in checkstyle.) --- src/main/java/org/torproject/descriptor/impl/ParseHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index 4b70731..e77bded 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -401,7 +401,7 @@ public class ParseHelper { /* Handle below. */ } } - if (key == null) { + if (null == key) { throw new DescriptorParseException("Line '" + line + "' " + "contains an illegal key or value in list element '" + listElement + "'."); @@ -483,7 +483,7 @@ public class ParseHelper { /* Handle below. */ } } - if (key == null) { + if (null == key) { throw new DescriptorParseException("Line '" + line + "' contains " + "an illegal key or value in list element '" + listElement + "'."); @@ -516,7 +516,7 @@ public class ParseHelper { /* Handle below. */ } } - if (key == null || key.isEmpty()) { + if (null == key || key.isEmpty()) { throw new DescriptorParseException("Line '" + line + "' contains " + "an illegal key or value in list element '" + listElement + "'.");

1 0

[metrics-lib/release] Deprecate setFailUnrecognizedDescriptorLines().
by karsten＠torproject.org 17 May '17

17 May '17

commit 091fc90e17bf9474ee47ea8179b439d76972e57d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 11 10:48:36 2017 +0200 Deprecate setFailUnrecognizedDescriptorLines(). Implements #22228. --- CHANGELOG.md | 4 ++++ src/main/java/org/torproject/descriptor/DescriptorParser.java | 4 ++++ src/main/java/org/torproject/descriptor/DescriptorReader.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e636780..8c3f09e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ - Fix a bug where DescriptorIndexCollector would not delete extraneous local files if remote paths start with /. - Add previously missing method to obtain the digest of a vote. + - Deprecated setFailUnrecognizedDescriptorLines() in + DescriptorParser and DescriptorReader and refer to + getUnrecognizedLines() in Descriptor if applications really need + to fail descriptors containing unrecognized lines. * Minor changes - Accept extra arguments in statistics-related extra-info diff --git a/src/main/java/org/torproject/descriptor/DescriptorParser.java b/src/main/java/org/torproject/descriptor/DescriptorParser.java index b2d5af1..537a259 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorParser.java +++ b/src/main/java/org/torproject/descriptor/DescriptorParser.java @@ -30,6 +30,10 @@ public interface DescriptorParser { * versions. But some applications may want to handle unrecognized * descriptor lines explicitly.</p> * + * @deprecated Removed in an attempt to simplify the interface. Applications + * that must fail descriptors with unrecognized lines can instead check + * whether {@link Descriptor#getUnrecognizedLines()} returns any lines. + * * @since 1.0.0 */ public void setFailUnrecognizedDescriptorLines( diff --git a/src/main/java/org/torproject/descriptor/DescriptorReader.java b/src/main/java/org/torproject/descriptor/DescriptorReader.java index 32c26d1..85f8cdd 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorReader.java +++ b/src/main/java/org/torproject/descriptor/DescriptorReader.java @@ -142,6 +142,10 @@ public interface DescriptorReader { * versions. But some applications may want to handle unrecognized * descriptor lines explicitly.</p> * + * @deprecated Removed in an attempt to simplify the interface. Applications + * that must fail descriptors with unrecognized lines can instead check + * whether {@link Descriptor#getUnrecognizedLines()} returns any lines. + * * @since 1.0.0 */ public void setFailUnrecognizedDescriptorLines();

1 0

[metrics-lib/release] Fix a few checkstyle complaints about whitespace.
by karsten＠torproject.org 17 May '17

17 May '17

commit b82c054dbf6902462daf0cd18b0d41e9d8eaf38f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 16 16:52:54 2017 +0200 Fix a few checkstyle complaints about whitespace. --- .../org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index 8b96c88..b6e1343 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -1777,7 +1777,7 @@ public class ExtraInfoDescriptorImplTest { "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}); + 0L, 0L, 0L, 0L, 0L}); } @Test() @@ -1794,7 +1794,7 @@ public class ExtraInfoDescriptorImplTest { "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}); + 0L, 0L, 0L, 0L}); } private void checkPaddingCounts(ExtraInfoDescriptor descriptor, @@ -1822,7 +1822,7 @@ public class ExtraInfoDescriptorImplTest { "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}); + 0L, 0L, 0L, 0L, 0L, 42L}); } @Test(expected = DescriptorParseException.class)

1 0

[metrics-lib/release] Make all tests pass. Implements task-22217.
by karsten＠torproject.org 17 May '17

17 May '17

commit 8456cb154a91f3669507b99b988f9584c895bbc0 Author: iwakeh <iwakeh(a)torproject.org> Date: Sun May 14 17:31:28 2017 +0000 Make all tests pass. Implements task-22217. --- src/main/java/org/torproject/descriptor/impl/ParseHelper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index 0d4a27a..4b70731 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -516,11 +516,15 @@ public class ParseHelper { /* Handle below. */ } } - if (key == null) { + if (key == null || key.isEmpty()) { throw new DescriptorParseException("Line '" + line + "' contains " + "an illegal key or value in list element '" + listElement + "'."); } + if (result.keySet().contains(key)) { + throw new DescriptorParseException("Line '" + line + "' contains " + + "an already defined key '" + key + "'."); + } result.put(key, value); } return result;

1 0

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

17 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