January 2020 - tor-commits - lists.torproject.org

[metrics-lib/release] Remove unused suppression.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit b3b12366411eaba769dfc95b4edd64c4e534487b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:10:40 2019 +0100 Remove unused suppression. --- src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 3df90cc..995909c 100644 --- a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -844,7 +844,6 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl } @Override - @SuppressWarnings("deprecation") public List<Integer> getHiddenServiceDirVersions() { return this.hiddenServiceDir ? null : Collections.singletonList(2); }

1 0

[metrics-lib/release] Make inner class static.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 26874eb8a9af953b907fbe90cd6a604626312f6d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:08:57 2019 +0100 Make inner class static. --- src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java index 5d661e4..657b90e 100644 --- a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java @@ -165,7 +165,7 @@ public class BandwidthFileImpl extends DescriptorImpl implements BandwidthFile { } } - private class RelayLineImpl implements RelayLine { + private static class RelayLineImpl implements RelayLine { private String nodeId;

1 0

[metrics-lib/release] Simplify method call.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 5af3f60993a5ccf68545ca83a485e966a66343a9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:07:49 2019 +0100 Simplify method call. --- src/main/java/org/torproject/descriptor/impl/KeyValueMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java b/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java index 08ad84e..6cb4680 100644 --- a/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java +++ b/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java @@ -20,7 +20,7 @@ public class KeyValueMap<T> extends TreeMap<String, T> { private void putPair(String key, T value, String line, String listElement, int keyLength) throws DescriptorParseException { - if (this.keySet().contains(key)) { + if (this.containsKey(key)) { throw new DescriptorParseException("Line '" + line + "' contains " + "duplicate key '" + key + "'."); }

1 0

[metrics-lib/release] Fix NPE when parsing invalid crypto blocks.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit d6e9a0d75eb70500aa05097e3d09f4c77d37ddbb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 17:19:44 2019 +0100 Fix NPE when parsing invalid crypto blocks. --- CHANGELOG.md | 4 ++++ .../descriptor/impl/DirectoryKeyCertificateImpl.java | 4 ++++ .../org/torproject/descriptor/impl/DirectorySignatureImpl.java | 4 ++++ .../torproject/descriptor/impl/ExtraInfoDescriptorImpl.java | 4 ++++ .../org/torproject/descriptor/impl/MicrodescriptorImpl.java | 4 ++++ .../org/torproject/descriptor/impl/RelayDirectoryImpl.java | 8 ++++++++ .../org/torproject/descriptor/impl/RelayNetworkStatusImpl.java | 8 ++++++++ .../torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java | 4 ++++ .../org/torproject/descriptor/impl/ServerDescriptorImpl.java | 4 ++++ .../descriptor/impl/ExtraInfoDescriptorImplTest.java | 10 ++++++++++ .../torproject/descriptor/impl/ServerDescriptorImplTest.java | 10 ++++++++++ 11 files changed, 64 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cf59e0..568f115 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 2.?.? - 2019-1?-?? + * Minor changes + - Fix a NullPointerException when parsing an invalid crypto block + starting with "-----END " rather than "-----BEGIN ". + # Changes in version 2.9.1 - 2019-11-09 diff --git a/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java b/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java index a9268ce..8ae1ed7 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirectoryKeyCertificateImpl.java @@ -80,6 +80,10 @@ public class DirectoryKeyCertificateImpl extends DescriptorImpl crypto.append(line).append(NL); break; case CRYPTO_END: + if (null == crypto) { + throw new DescriptorParseException(Key.CRYPTO_END + " before " + + Key.CRYPTO_BEGIN); + } crypto.append(line).append(NL); String cryptoString = crypto.toString(); crypto = null; diff --git a/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java b/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java index 6430e7f..248d546 100644 --- a/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DirectorySignatureImpl.java @@ -70,6 +70,10 @@ public class DirectorySignatureImpl implements DirectorySignature { crypto.append(line).append(NL); break; case CRYPTO_END: + if (null == crypto) { + throw new DescriptorParseException(Key.CRYPTO_END + " before " + + Key.CRYPTO_BEGIN); + } crypto.append(line).append(NL); String cryptoString = crypto.toString(); crypto = null; diff --git a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java index 7053ced..17ac6e5 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImpl.java @@ -242,6 +242,10 @@ public abstract class ExtraInfoDescriptorImpl extends DescriptorImpl cryptoLines.add(line); break; case CRYPTO_END: + if (null == cryptoLines) { + throw new DescriptorParseException(Key.CRYPTO_END + " before " + + Key.CRYPTO_BEGIN); + } cryptoLines.add(line); StringBuilder sb = new StringBuilder(); for (String cryptoLine : cryptoLines) { diff --git a/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java index dc9795c..47028bd 100644 --- a/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/MicrodescriptorImpl.java @@ -71,6 +71,10 @@ public class MicrodescriptorImpl extends DescriptorImpl crypto.append(line).append(NL); break; case CRYPTO_END: + if (null == crypto) { + throw new DescriptorParseException(Key.CRYPTO_END + " before " + + Key.CRYPTO_BEGIN); + } crypto.append(line).append(NL); String cryptoString = crypto.toString(); crypto = null; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 6370e87..55303d2 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -125,6 +125,10 @@ public class RelayDirectoryImpl extends DescriptorImpl crypto.append(line).append(NL); break; case CRYPTO_END: + if (null == crypto) { + throw new DescriptorParseException(Key.CRYPTO_END + " before " + + Key.CRYPTO_BEGIN); + } crypto.append(line).append(NL); String cryptoString = crypto.toString(); crypto = null; @@ -215,6 +219,10 @@ public class RelayDirectoryImpl extends DescriptorImpl crypto.append(line).append(NL); break; case CRYPTO_END: + if (null == crypto) { + throw new DescriptorParseException(Key.CRYPTO_END + " before " + + Key.CRYPTO_BEGIN); + } crypto.append(line).append(NL); String cryptoString = crypto.toString(); crypto = null; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 11cc631..1af9503 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -81,6 +81,10 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl crypto.append(line).append(NL); break; case CRYPTO_END: + if (null == crypto) { + throw new DescriptorParseException(Key.CRYPTO_END + " before " + + Key.CRYPTO_BEGIN); + } crypto.append(line).append(NL); String cryptoString = crypto.toString(); crypto = null; @@ -130,6 +134,10 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl crypto.append(line).append(NL); break; case CRYPTO_END: + if (null == crypto) { + throw new DescriptorParseException(Key.CRYPTO_END + " before " + + Key.CRYPTO_BEGIN); + } crypto.append(line).append(NL); String cryptoString = crypto.toString(); crypto = null; diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index bb71842..8e83b83 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -186,6 +186,10 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl crypto.append(line).append(NL); break; case CRYPTO_END: + if (null == crypto) { + throw new DescriptorParseException(Key.CRYPTO_END + " before " + + Key.CRYPTO_BEGIN); + } crypto.append(line).append(NL); String cryptoString = crypto.toString(); crypto = null; diff --git a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 995909c..7102335 100644 --- a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -181,6 +181,10 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl cryptoLines.add(line); break; case CRYPTO_END: + if (null == cryptoLines) { + throw new DescriptorParseException(Key.CRYPTO_END + " before " + + Key.CRYPTO_BEGIN); + } cryptoLines.add(line); StringBuilder sb = new StringBuilder(); for (String cryptoLine : cryptoLines) { diff --git a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java index c90207a..4aa2008 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExtraInfoDescriptorImplTest.java @@ -2244,6 +2244,16 @@ public class ExtraInfoDescriptorImplTest { } @Test + public void testEd25519IdentityInvalidCrypto() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage("CRYPTO_END before CRYPTO_BEGIN"); + DescriptorBuilder.createWithEd25519Lines("identity-ed25519\n" + + "-----END ED25519 CERT-----\n-----BEGIN ED25519 CERT-----", + MASTER_KEY_ED25519_LINE, ROUTER_SIG_ED25519_LINE); + } + + @Test public void testEd25519MasterKeyMissing() throws DescriptorParseException { ExtraInfoDescriptor descriptor = diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index cd0b5dd..bd1d1d2 100644 --- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -1826,6 +1826,16 @@ public class ServerDescriptorImplTest { } @Test + public void testEd25519IdentityInvalidCrypto() + throws DescriptorParseException { + this.thrown.expect(DescriptorParseException.class); + this.thrown.expectMessage("CRYPTO_END before CRYPTO_BEGIN"); + DescriptorBuilder.createWithEd25519Lines("identity-ed25519\n" + + "-----END ED25519 CERT-----\n-----BEGIN ED25519 CERT-----", + MASTER_KEY_ED25519_LINE, ROUTER_SIG_ED25519_LINE); + } + + @Test public void testEd25519MasterKeyMissing() throws DescriptorParseException { ServerDescriptor descriptor =

1 0

[metrics-lib/release] Remove final modifier from static methods.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 3554a91d813352bdefd5e5b10fc1c0891b4b753a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 16:43:07 2019 +0100 Remove final modifier from static methods. --- .../java/org/torproject/descriptor/DescriptorSourceFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java index 55fbcf3..80ea524 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java @@ -103,7 +103,7 @@ public final class DescriptorSourceFactory { * * @since 1.0.0 */ - public static final DescriptorParser createDescriptorParser() { + public static DescriptorParser createDescriptorParser() { return (DescriptorParser) retrieve(PARSER_PROPERTY); } @@ -113,7 +113,7 @@ public final class DescriptorSourceFactory { * * @since 1.0.0 */ - public static final DescriptorReader createDescriptorReader() { + public static DescriptorReader createDescriptorReader() { return (DescriptorReader) retrieve(READER_PROPERTY); } @@ -123,11 +123,11 @@ public final class DescriptorSourceFactory { * * @since 1.0.0 */ - public static final DescriptorCollector createDescriptorCollector() { + public static DescriptorCollector createDescriptorCollector() { return (DescriptorCollector) retrieve(COLLECTOR_PROPERTY); } - private static final <T> Object retrieve(String type) { + private static <T> Object retrieve(String type) { Object object; String clazzName = null; try {

1 0

[metrics-lib/release] Properly parse hostname in v2 network status.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit ca37fd616c1e6464829e4ef64d6252944ccb69f5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 17:53:54 2019 +0100 Properly parse hostname in v2 network status. --- CHANGELOG.md | 2 ++ .../java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java | 1 + .../java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java | 1 + 3 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 568f115..ad91d5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * Minor changes - Fix a NullPointerException when parsing an invalid crypto block starting with "-----END " rather than "-----BEGIN ". + - Properly parse an authority's hostname from the "dir-source" line + in a v2 network status. # Changes in version 2.9.1 - 2019-11-09 diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 1af9503..9860df0 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -181,6 +181,7 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl throw new DescriptorParseException("Illegal hostname in '" + line + "'."); } + this.hostname = parts[1]; this.address = ParseHelper.parseIpv4Address(line, parts[2]); this.dirPort = ParseHelper.parsePort(line, parts[3]); } diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java index 9ecf391..80d46da 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusImplTest.java @@ -60,6 +60,7 @@ public class RelayNetworkStatusImplTest { new int[] { 0, statusBytes.length }, null); assertEquals(rnsi.getContactLine(), "1024R/8D56913D Alex de Joode <adejoode(a)sabotage.org>"); + assertEquals("194.109.206.212", rnsi.getHostname()); } }

1 0

[metrics-lib/release] Fix possible NPE in tests.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit f5f6e5971c9f5d42fa9698526d8716a0f13deebc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 17:34:59 2019 +0100 Fix possible NPE in tests. --- .../java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index bd1d1d2..8e4424c 100644 --- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -453,6 +453,9 @@ public class ServerDescriptorImplTest { private ServerDescriptorImpl buildDescriptor() throws DescriptorParseException { byte[] descriptorBytes = this.buildDescriptorBytes(); + if (null == descriptorBytes) { + descriptorBytes = new byte[0]; + } return new RelayServerDescriptorImpl(descriptorBytes, new int[] { 0, descriptorBytes.length }, null); }

1 0

[metrics-lib/release] Properly mark deprecated method with annotation.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 9c7e1b9a54aa3f0df655864768254afd63acc0cb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 17:40:08 2019 +0100 Properly mark deprecated method with annotation. --- src/main/java/org/torproject/descriptor/ServerDescriptor.java | 1 + src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/org/torproject/descriptor/ServerDescriptor.java b/src/main/java/org/torproject/descriptor/ServerDescriptor.java index 1867a01..9ecd46b 100644 --- a/src/main/java/org/torproject/descriptor/ServerDescriptor.java +++ b/src/main/java/org/torproject/descriptor/ServerDescriptor.java @@ -323,6 +323,7 @@ public interface ServerDescriptor extends Descriptor { * * @since 1.0.0 */ + @Deprecated List<Integer> getHiddenServiceDirVersions(); /** diff --git a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 7102335..f33e2e8 100644 --- a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -848,6 +848,7 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl } @Override + @Deprecated public List<Integer> getHiddenServiceDirVersions() { return this.hiddenServiceDir ? null : Collections.singletonList(2); }

1 0

[metrics-lib/release] Prepare for 2.10.0 release.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit abcbd7c7a6b7a17d012cf1c8ac077fd73c9479e4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 22:09:27 2020 +0100 Prepare for 2.10.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d3ab12..5671a86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 2.10.0 - 2019-1?-?? +# Changes in version 2.10.0 - 2020-01-15 * Medium changes - Parse three newly added lines in snowflake statistics files. diff --git a/build.xml b/build.xml index 9c3869a..bf615f7 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.9.1-dev" /> + <property name="release.version" value="2.10.0" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/release] Parse three new lines in snowflake statistics.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 5fb36b70c884073963af8e9cb3a37fa907eb35b8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 9 10:16:29 2019 +0100 Parse three new lines in snowflake statistics. Implements #32665. --- CHANGELOG.md | 5 ++- .../org/torproject/descriptor/SnowflakeStats.java | 30 +++++++++++++ .../java/org/torproject/descriptor/impl/Key.java | 3 ++ .../descriptor/impl/SnowflakeStatsImpl.java | 51 +++++++++++++++++++++- .../descriptor/impl/SnowflakeStatsImplTest.java | 12 +++++ 5 files changed, 98 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad91d5d..8d3ab12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# Changes in version 2.?.? - 2019-1?-?? +# Changes in version 2.10.0 - 2019-1?-?? + + * Medium changes + - Parse three newly added lines in snowflake statistics files. * Minor changes - Fix a NullPointerException when parsing an invalid crypto block diff --git a/src/main/java/org/torproject/descriptor/SnowflakeStats.java b/src/main/java/org/torproject/descriptor/SnowflakeStats.java index 379a0f7..5c464df 100644 --- a/src/main/java/org/torproject/descriptor/SnowflakeStats.java +++ b/src/main/java/org/torproject/descriptor/SnowflakeStats.java @@ -52,6 +52,36 @@ public interface SnowflakeStats extends Descriptor { Optional<Long> snowflakeIpsTotal(); /** + * Return a count of the total number of unique IP addresses of snowflake + * proxies of type "standalone" that have polled. + * + * @return Count of the total number of unique IP addresses of snowflake + * proxies of type "standalone" that have polled. + * @since 2.10.0 + */ + Optional<Long> snowflakeIpsStandalone(); + + /** + * Return a count of the total number of unique IP addresses of snowflake + * proxies of type "badge" that have polled. + * + * @return Count of the total number of unique IP addresses of snowflake + * proxies of type "badge" that have polled. + * @since 2.10.0 + */ + Optional<Long> snowflakeIpsBadge(); + + /** + * Return a count of the total number of unique IP addresses of snowflake + * proxies of type "webext" that have polled. + * + * @return Count of the total number of unique IP addresses of snowflake + * proxies of type "webext" that have polled. + * @since 2.10.0 + */ + Optional<Long> snowflakeIpsWebext(); + + /** * Return a count of the number of times a proxy has polled but received no * client offer, rounded up to the nearest multiple of 8. * diff --git a/src/main/java/org/torproject/descriptor/impl/Key.java b/src/main/java/org/torproject/descriptor/impl/Key.java index ac12992..10839dd 100644 --- a/src/main/java/org/torproject/descriptor/impl/Key.java +++ b/src/main/java/org/torproject/descriptor/impl/Key.java @@ -139,7 +139,10 @@ public enum Key { SIGNING_KEY("signing-key"), SNOWFLAKE_IDLE_COUNT("snowflake-idle-count"), SNOWFLAKE_IPS("snowflake-ips"), + SNOWFLAKE_IPS_BADGE("snowflake-ips-badge"), + SNOWFLAKE_IPS_STANDALONE("snowflake-ips-standalone"), SNOWFLAKE_IPS_TOTAL("snowflake-ips-total"), + SNOWFLAKE_IPS_WEBEXT("snowflake-ips-webext"), SNOWFLAKE_STATS_END("snowflake-stats-end"), TRANSPORT("transport"), TUNNELLED_DIR_SERVER("tunnelled-dir-server"), diff --git a/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java b/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java index 9922756..daaa933 100644 --- a/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/SnowflakeStatsImpl.java @@ -20,8 +20,10 @@ public class SnowflakeStatsImpl extends DescriptorImpl implements SnowflakeStats { private static final Set<Key> atMostOnce = EnumSet.of( - Key.SNOWFLAKE_IPS, Key.SNOWFLAKE_IPS_TOTAL, Key.SNOWFLAKE_IDLE_COUNT, - Key.CLIENT_DENIED_COUNT, Key.CLIENT_SNOWFLAKE_MATCH_COUNT); + Key.SNOWFLAKE_IPS, Key.SNOWFLAKE_IPS_TOTAL, Key.SNOWFLAKE_IPS_STANDALONE, + Key.SNOWFLAKE_IPS_BADGE, Key.SNOWFLAKE_IPS_WEBEXT, + Key.SNOWFLAKE_IDLE_COUNT, Key.CLIENT_DENIED_COUNT, + Key.CLIENT_SNOWFLAKE_MATCH_COUNT); private static final Set<Key> exactlyOnce = EnumSet.of( Key.SNOWFLAKE_STATS_END); @@ -61,6 +63,15 @@ public class SnowflakeStatsImpl extends DescriptorImpl case SNOWFLAKE_IPS_TOTAL: this.parseSnowflakeIpsTotal(line, parts); break; + case SNOWFLAKE_IPS_STANDALONE: + this.parseSnowflakeIpsStandalone(line, parts); + break; + case SNOWFLAKE_IPS_BADGE: + this.parseSnowflakeIpsBadge(line, parts); + break; + case SNOWFLAKE_IPS_WEBEXT: + this.parseSnowflakeIpsWebext(line, parts); + break; case SNOWFLAKE_IDLE_COUNT: this.parseSnowflakeIdleCount(line, parts); break; @@ -104,6 +115,21 @@ public class SnowflakeStatsImpl extends DescriptorImpl this.snowflakeIpsTotal = ParseHelper.parseLong(line, parts, 1); } + private void parseSnowflakeIpsStandalone(String line, String[] parts) + throws DescriptorParseException { + this.snowflakeIpsStandalone = ParseHelper.parseLong(line, parts, 1); + } + + private void parseSnowflakeIpsBadge(String line, String[] parts) + throws DescriptorParseException { + this.snowflakeIpsBadge = ParseHelper.parseLong(line, parts, 1); + } + + private void parseSnowflakeIpsWebext(String line, String[] parts) + throws DescriptorParseException { + this.snowflakeIpsWebext = ParseHelper.parseLong(line, parts, 1); + } + private void parseSnowflakeIdleCount(String line, String[] parts) throws DescriptorParseException { this.snowflakeIdleCount = ParseHelper.parseLong(line, parts, 1); @@ -147,6 +173,27 @@ public class SnowflakeStatsImpl extends DescriptorImpl return Optional.ofNullable(this.snowflakeIpsTotal); } + private Long snowflakeIpsStandalone; + + @Override + public Optional<Long> snowflakeIpsStandalone() { + return Optional.ofNullable(this.snowflakeIpsStandalone); + } + + private Long snowflakeIpsBadge; + + @Override + public Optional<Long> snowflakeIpsBadge() { + return Optional.ofNullable(this.snowflakeIpsBadge); + } + + private Long snowflakeIpsWebext; + + @Override + public Optional<Long> snowflakeIpsWebext() { + return Optional.ofNullable(this.snowflakeIpsWebext); + } + private Long snowflakeIdleCount; @Override diff --git a/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java b/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java index 6d0e50b..0378fbc 100644 --- a/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/SnowflakeStatsImplTest.java @@ -35,6 +35,9 @@ public class SnowflakeStatsImplTest { + "PK=4,ID=9,IR=7,JO=2,CR=2,US=265,DE=92,LV=1,MY=8,AR=5,NZ=10,BG=2," + "UY=1,TW=5,SI=3,LU=2,GE=2,BN=1,JP=15,ES=9,SG=7,EC=1", "snowflake-ips-total 937", + "snowflake-ips-standalone 3", + "snowflake-ips-badge 0", + "snowflake-ips-webext 4118", "snowflake-idle-count 660976", "client-denied-count 0", "client-snowflake-match-count 864" }; @@ -51,6 +54,12 @@ public class SnowflakeStatsImplTest { assertEquals(68, snowflakeStats.snowflakeIps().get().size()); assertTrue(snowflakeStats.snowflakeIpsTotal().isPresent()); assertEquals((Long) 937L, snowflakeStats.snowflakeIpsTotal().get()); + assertTrue(snowflakeStats.snowflakeIpsStandalone().isPresent()); + assertEquals((Long) 3L, snowflakeStats.snowflakeIpsStandalone().get()); + assertTrue(snowflakeStats.snowflakeIpsBadge().isPresent()); + assertEquals((Long) 0L, snowflakeStats.snowflakeIpsBadge().get()); + assertTrue(snowflakeStats.snowflakeIpsWebext().isPresent()); + assertEquals((Long) 4118L, snowflakeStats.snowflakeIpsWebext().get()); assertTrue(snowflakeStats.snowflakeIdleCount().isPresent()); assertEquals((Long) 660976L, snowflakeStats.snowflakeIdleCount().get()); assertTrue(snowflakeStats.clientDeniedCount().isPresent()); @@ -69,6 +78,9 @@ public class SnowflakeStatsImplTest { snowflakeStats.snowflakeStatsIntervalLength()); assertFalse(snowflakeStats.snowflakeIps().isPresent()); assertFalse(snowflakeStats.snowflakeIpsTotal().isPresent()); + assertFalse(snowflakeStats.snowflakeIpsStandalone().isPresent()); + assertFalse(snowflakeStats.snowflakeIpsBadge().isPresent()); + assertFalse(snowflakeStats.snowflakeIpsWebext().isPresent()); assertFalse(snowflakeStats.snowflakeIdleCount().isPresent()); assertFalse(snowflakeStats.clientDeniedCount().isPresent()); assertFalse(snowflakeStats.clientSnowflakeMatchCount().isPresent());

1 0