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

[onionoo/master] Bump version to 7.0-1.24.0-dev.
by karsten＠torproject.org 14 Feb '20

14 Feb '20

commit b59ac6f1b1fb54bc6c2d89e65d9bd1a322881dc9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 14 11:25:08 2020 +0100 Bump version to 7.0-1.24.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03b86ef..8cda620 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 7.0-1.??.? - 2020-??-?? + + # Changes in version 7.0-1.24.0 - 2020-02-14 * Medium changes diff --git a/build.xml b/build.xml index 0c49b18..47f2228 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.24.0"/> + value="${onionoo.protocol.version}-1.24.0-dev"/> <property name="metricslibversion" value="2.10.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/master] Prepare for 7.0-1.24.0 release.
by karsten＠torproject.org 14 Feb '20

14 Feb '20

commit a22ba07cb7e94ee2d0c1cf1c7b3bae5e96ef3322 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 14 11:05:10 2020 +0100 Prepare for 7.0-1.24.0 release. --- CHANGELOG.md | 3 ++- build.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d1b084..03b86ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 7.0-1.2?.? - 20??-??-?? +# Changes in version 7.0-1.24.0 - 2020-02-14 * Medium changes - Process bridge pool assignments to include the BridgeDB @@ -6,6 +6,7 @@ * Minor changes - Make Jetty host and port configurable. + - Update to metrics-lib 2.10.0. # Changes in version 7.0-1.23.0 - 2019-12-06 diff --git a/build.xml b/build.xml index c8e336a..0c49b18 100644 --- a/build.xml +++ b/build.xml @@ -11,8 +11,8 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.23.0-dev"/> - <property name="metricslibversion" value="2.9.1"/> + value="${onionoo.protocol.version}-1.24.0"/> + <property name="metricslibversion" value="2.10.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="onionoo-${release.version}.war"/>

1 0

[onionoo/release] Add bridgedb_distributor field.
by karsten＠torproject.org 14 Feb '20

14 Feb '20

commit ff2db949e57f35df8cfffe691e2caeece8fdeccc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 26 12:01:50 2020 +0100 Add bridgedb_distributor field. Implements #33008. --- CHANGELOG.md | 4 +++ .../metrics/onionoo/docs/DetailsDocument.java | 10 ++++++ .../metrics/onionoo/docs/DetailsStatus.java | 21 +++++++++++++ .../metrics/onionoo/server/ResponseBuilder.java | 4 +++ .../metrics/onionoo/updater/DescriptorHistory.java | 1 + .../metrics/onionoo/updater/DescriptorSource.java | 6 ++++ .../metrics/onionoo/updater/DescriptorType.java | 3 +- .../onionoo/updater/NodeDetailsStatusUpdater.java | 36 ++++++++++++++++++++++ .../onionoo/writer/DetailsDocumentWriter.java | 2 ++ .../onionoo/updater/DummyDescriptorSource.java | 1 + 10 files changed, 87 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bf4466..4d1b084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 7.0-1.2?.? - 20??-??-?? + * Medium changes + - Process bridge pool assignments to include the BridgeDB + distributor in bridge details documents. + * Minor changes - Make Jetty host and port configurable. diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java index bb90089..81892fc 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java @@ -571,5 +571,15 @@ public class DetailsDocument extends Document { public List<String> getUnreachableOrAddresses() { return this.unreachableOrAddresses; } + + private String bridgedbDistributor; + + public void setBridgedbDistributor(String bridgedbDistributor) { + this.bridgedbDistributor = bridgedbDistributor; + } + + public String getBridgedbDistributor() { + return this.bridgedbDistributor; + } } diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java index 8f09b52..33fef6d 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java @@ -252,6 +252,27 @@ public class DetailsStatus extends Document { this.orAddressesAndPorts; } + private Long bridgePoolAssignmentPublished; + + public void setBridgePoolAssignmentPublished( + Long bridgePoolAssignmentPublished) { + this.bridgePoolAssignmentPublished = bridgePoolAssignmentPublished; + } + + public java.lang.Long getBridgePoolAssignmentPublished() { + return bridgePoolAssignmentPublished; + } + + private String bridgedbDistributor; + + public void setBridgedbDistributor(String bridgedbDistributor) { + this.bridgedbDistributor = bridgedbDistributor; + } + + public String getBridgedbDistributor() { + return bridgedbDistributor; + } + /** Returns all addresses used for the onion-routing protocol which * includes the primary address and all additionally configured * onion-routing addresses. */ diff --git a/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java index 04ba2cc..2358ddd 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java @@ -392,6 +392,10 @@ public class ResponseBuilder { case "version_status": dd.setVersionStatus(detailsDocument.getVersionStatus()); break; + case "bridgedb_distributor": + dd.setBridgedbDistributor( + detailsDocument.getBridgedbDistributor()); + break; default: /* Not a field that we know of. Ignore. */ break; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java index 481ed9d..91febc4 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java @@ -12,6 +12,7 @@ public enum DescriptorHistory { BRIDGE_STATUS_HISTORY("bridge-status-history"), BRIDGE_SERVER_HISTORY("bridge-server-history"), BRIDGE_EXTRAINFO_HISTORY("bridge-extrainfo-history"), + BRIDGE_POOL_ASSIGNMENTS_HISTORY("bridge-pool-assignments-history"), ARCHIVED_HISTORY("archived-history"); private String fileName; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java index d8cfb82..27be94d 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java @@ -133,6 +133,9 @@ public class DescriptorSource { log.debug("Reading recent {} ...", DescriptorType.BRIDGE_STATUSES); this.readDescriptors(DescriptorType.BRIDGE_STATUSES, DescriptorHistory.BRIDGE_STATUS_HISTORY, false); + log.debug("Reading recent {} ...", DescriptorType.BRIDGE_POOL_ASSIGNMENTS); + this.readDescriptors(DescriptorType.BRIDGE_POOL_ASSIGNMENTS, + DescriptorHistory.BRIDGE_POOL_ASSIGNMENTS_HISTORY, false); } private void readDescriptors(DescriptorType descriptorType, @@ -195,6 +198,9 @@ public class DescriptorSource { } else if (annotation.startsWith("@type bridge-extra-info 1.")) { descriptorType = DescriptorType.BRIDGE_EXTRA_INFOS; relay = false; + } else if (annotation.startsWith("@type bridge-pool-assignment 1.")) { + descriptorType = DescriptorType.BRIDGE_POOL_ASSIGNMENTS; + relay = false; } } if (descriptorType == null) { diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java index 1af3b57..61f61d1 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java @@ -10,7 +10,8 @@ public enum DescriptorType { EXIT_LISTS("exit-lists"), BRIDGE_STATUSES("bridge-descriptors/statuses"), BRIDGE_SERVER_DESCRIPTORS("bridge-descriptors/server-descriptors"), - BRIDGE_EXTRA_INFOS("bridge-descriptors/extra-infos"); + BRIDGE_EXTRA_INFOS("bridge-descriptors/extra-infos"), + BRIDGE_POOL_ASSIGNMENTS("bridge-pool-assignments"); private final String dir; DescriptorType(String dir) { diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java index 60dd915..ce809aa 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java @@ -4,6 +4,7 @@ package org.torproject.metrics.onionoo.updater; import org.torproject.descriptor.BridgeNetworkStatus; +import org.torproject.descriptor.BridgePoolAssignment; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.ExitList; import org.torproject.descriptor.ExtraInfoDescriptor; @@ -120,6 +121,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, DescriptorType.BRIDGE_EXTRA_INFOS); this.descriptorSource.registerDescriptorListener(this, DescriptorType.EXIT_LISTS); + this.descriptorSource.registerDescriptorListener(this, + DescriptorType.BRIDGE_POOL_ASSIGNMENTS); } /* Step 1: parse descriptors. */ @@ -140,6 +143,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, (ExtraInfoDescriptor) descriptor); } else if (descriptor instanceof BridgeNetworkStatus) { this.processBridgeNetworkStatus((BridgeNetworkStatus) descriptor); + } else if (descriptor instanceof BridgePoolAssignment) { + this.processBridgePoolAssignment((BridgePoolAssignment) descriptor); } } @@ -384,6 +389,17 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, this.bridgeStatusesProcessed++; } + private BridgePoolAssignment latestBridgePoolAssignments = null; + + private void processBridgePoolAssignment( + BridgePoolAssignment bridgePoolAssignment) { + if (null == this.latestBridgePoolAssignments + || this.latestBridgePoolAssignments.getPublishedMillis() + < bridgePoolAssignment.getPublishedMillis()) { + this.latestBridgePoolAssignments = bridgePoolAssignment; + } + } + @Override public void updateStatuses() { this.readNodeStatuses(); @@ -847,6 +863,26 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setExitAddresses(exitAddresses); nodeStatus.setExitAddresses(new TreeSet<>(exitAddresses.keySet())); + if (null != this.latestBridgePoolAssignments + && (null == detailsStatus.getBridgePoolAssignmentPublished() + || detailsStatus.getBridgePoolAssignmentPublished() + < this.latestBridgePoolAssignments.getPublishedMillis())) { + if (this.latestBridgePoolAssignments.getEntries() + .containsKey(fingerprint)) { + detailsStatus.setBridgePoolAssignmentPublished( + this.latestBridgePoolAssignments.getPublishedMillis()); + String assignment = this.latestBridgePoolAssignments.getEntries() + .get(fingerprint); + if (null != assignment && !assignment.isEmpty()) { + String bridgedbDistributor = assignment.split(" ")[0]; + detailsStatus.setBridgedbDistributor(bridgedbDistributor); + } + } else { + detailsStatus.setBridgePoolAssignmentPublished(0L); + detailsStatus.setBridgedbDistributor(null); + } + } + detailsStatus.setAllegedFamily(nodeStatus.getAllegedFamily()); detailsStatus.setEffectiveFamily(nodeStatus.getEffectiveFamily()); detailsStatus.setIndirectFamily(nodeStatus.getIndirectFamily()); diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java index 81fcb64..29d9244 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java @@ -186,6 +186,8 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setTransports(detailsStatus.getTransports()); detailsDocument.setVersion(detailsStatus.getVersion()); detailsDocument.setVersionStatus(detailsStatus.getVersionStatus()); + detailsDocument.setBridgedbDistributor( + detailsStatus.getBridgedbDistributor()); this.documentStore.store(detailsDocument, fingerprint); } diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java b/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java index 24d456b..22d834a 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java @@ -61,6 +61,7 @@ public class DummyDescriptorSource extends DescriptorSource { case BRIDGE_STATUSES: case BRIDGE_SERVER_DESCRIPTORS: case BRIDGE_EXTRA_INFOS: + case BRIDGE_POOL_ASSIGNMENTS: default: relay = false; break;

1 0

[onionoo/release] Bump version to 7.0-1.23.0-dev.
by karsten＠torproject.org 14 Feb '20

14 Feb '20

commit a1ee6e9cffafb30f43bf0e615ea316e4a8affc02 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 6 11:39:49 2019 +0100 Bump version to 7.0-1.23.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a635f4..d34453a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 7.0-1.2?.? - 20??-??-?? + + # Changes in version 7.0-1.23.0 - 2019-12-06 * Medium changes diff --git a/build.xml b/build.xml index 85212e5..c8e336a 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.23.0"/> + value="${onionoo.protocol.version}-1.23.0-dev"/> <property name="metricslibversion" value="2.9.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Make Jetty host and port configurable.
by karsten＠torproject.org 14 Feb '20

14 Feb '20

commit a1782ef04b7f05269d13cba1b2cde37aeec1d7a1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 13 09:50:47 2020 +0100 Make Jetty host and port configurable. Implements #24222. --- CHANGELOG.md | 3 +++ src/main/resources/jetty.xml | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d34453a..6bf4466 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changes in version 7.0-1.2?.? - 20??-??-?? + * Minor changes + - Make Jetty host and port configurable. + # Changes in version 7.0-1.23.0 - 2019-12-06 diff --git a/src/main/resources/jetty.xml b/src/main/resources/jetty.xml index 3e53131..7c0f954 100644 --- a/src/main/resources/jetty.xml +++ b/src/main/resources/jetty.xml @@ -26,8 +26,12 @@ <Arg> <Ref id="server"/> </Arg> - <Set name="port">8080</Set> - <Set name="host">127.0.0.1</Set> + <Set name="port"> + <SystemProperty name="onionoo.jetty.port" default="8080" /> + </Set> + <Set name="host"> + <SystemProperty name="onionoo.jetty.host" default="127.0.0.1" /> + </Set> </New> </Arg> </Call>

1 0

[onionoo/release] Update copyright to 2020.
by karsten＠torproject.org 14 Feb '20

14 Feb '20

commit f271a2a72a6c3515dd9d2b5255c8a725b75c5656 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 21:41:03 2020 +0100 Update copyright to 2020. --- LICENSE | 2 +- src/main/java/org/torproject/metrics/onionoo/cron/Main.java | 2 +- src/main/java/org/torproject/metrics/onionoo/cron/package-info.java | 4 ++-- .../java/org/torproject/metrics/onionoo/docs/BandwidthDocument.java | 2 +- .../java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java | 2 +- .../java/org/torproject/metrics/onionoo/docs/ClientsDocument.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/ClientsHistory.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/ClientsStatus.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/DateTimeHelper.java | 2 +- .../java/org/torproject/metrics/onionoo/docs/DetailsDocument.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/Document.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java | 2 +- .../org/torproject/metrics/onionoo/docs/DocumentStoreFactory.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/GraphHistory.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java | 2 +- .../java/org/torproject/metrics/onionoo/docs/SummaryDocument.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/UpdateStatus.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/UptimeDocument.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/UptimeHistory.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/UptimeStatus.java | 2 +- .../java/org/torproject/metrics/onionoo/docs/WeightsDocument.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java | 2 +- src/main/java/org/torproject/metrics/onionoo/docs/package-info.java | 4 ++-- src/main/java/org/torproject/metrics/onionoo/package-info.java | 4 ++-- src/main/java/org/torproject/metrics/onionoo/server/Counter.java | 2 +- .../torproject/metrics/onionoo/server/HttpServletRequestWrapper.java | 2 +- .../torproject/metrics/onionoo/server/HttpServletResponseWrapper.java | 2 +- .../org/torproject/metrics/onionoo/server/IntegerDistribution.java | 2 +- .../org/torproject/metrics/onionoo/server/MostFrequentString.java | 2 +- src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java | 2 +- src/main/java/org/torproject/metrics/onionoo/server/NodeIndexer.java | 2 +- .../org/torproject/metrics/onionoo/server/NodeIndexerFactory.java | 2 +- .../org/torproject/metrics/onionoo/server/OrderParameterValues.java | 2 +- .../org/torproject/metrics/onionoo/server/PerformanceMetrics.java | 2 +- .../java/org/torproject/metrics/onionoo/server/RequestHandler.java | 2 +- .../java/org/torproject/metrics/onionoo/server/ResourceServlet.java | 2 +- .../java/org/torproject/metrics/onionoo/server/ResponseBuilder.java | 2 +- src/main/java/org/torproject/metrics/onionoo/server/ServerMain.java | 2 +- .../torproject/metrics/onionoo/server/SummaryDocumentComparator.java | 2 +- src/main/java/org/torproject/metrics/onionoo/server/package-info.java | 4 ++-- .../torproject/metrics/onionoo/updater/BandwidthStatusUpdater.java | 2 +- .../org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java | 2 +- .../org/torproject/metrics/onionoo/updater/DescriptorHistory.java | 2 +- .../org/torproject/metrics/onionoo/updater/DescriptorListener.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/DescriptorSource.java | 2 +- .../torproject/metrics/onionoo/updater/DescriptorSourceFactory.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/DescriptorType.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/LookupResult.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/LookupService.java | 2 +- .../torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java | 2 +- .../org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java | 2 +- .../torproject/metrics/onionoo/updater/ReverseDomainNameResolver.java | 2 +- .../org/torproject/metrics/onionoo/updater/StatusUpdateRunner.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/StatusUpdater.java | 2 +- src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/TorVersionStatus.java | 2 +- .../org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java | 2 +- .../org/torproject/metrics/onionoo/updater/WeightsStatusUpdater.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/package-info.java | 4 ++-- .../java/org/torproject/metrics/onionoo/util/FormattingUtils.java | 2 +- src/main/java/org/torproject/metrics/onionoo/util/package-info.java | 4 ++-- .../torproject/metrics/onionoo/writer/BandwidthDocumentWriter.java | 2 +- .../org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java | 2 +- .../org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java | 2 +- .../java/org/torproject/metrics/onionoo/writer/DocumentWriter.java | 2 +- .../org/torproject/metrics/onionoo/writer/DocumentWriterRunner.java | 2 +- .../org/torproject/metrics/onionoo/writer/GraphHistoryCompiler.java | 2 +- .../org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java | 2 +- .../org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java | 2 +- .../org/torproject/metrics/onionoo/writer/WeightsDocumentWriter.java | 2 +- src/main/java/org/torproject/metrics/onionoo/writer/package-info.java | 4 ++-- src/main/resources/bootstrap-development.sh | 2 +- .../java/org/torproject/metrics/onionoo/docs/BandwidthStatusTest.java | 2 +- .../java/org/torproject/metrics/onionoo/docs/DummyDocumentStore.java | 2 +- src/test/java/org/torproject/metrics/onionoo/docs/NodeStatusTest.java | 2 +- .../java/org/torproject/metrics/onionoo/docs/SummaryDocumentTest.java | 2 +- .../java/org/torproject/metrics/onionoo/docs/UptimeStatusTest.java | 2 +- .../java/org/torproject/metrics/onionoo/docs/WeightsStatusTest.java | 2 +- .../org/torproject/metrics/onionoo/server/PerformanceMetricsTest.java | 2 +- .../org/torproject/metrics/onionoo/server/ResourceServletTest.java | 2 +- .../metrics/onionoo/server/SummaryDocumentComparatorTest.java | 2 +- .../org/torproject/metrics/onionoo/updater/DummyBridgeStatus.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/DummyConsensus.java | 2 +- .../org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/DummyStatusEntry.java | 2 +- .../org/torproject/metrics/onionoo/updater/LookupServiceTest.java | 2 +- .../metrics/onionoo/updater/NodeDetailsStatusUpdaterTest.java | 2 +- .../java/org/torproject/metrics/onionoo/updater/TorVersionTest.java | 2 +- .../torproject/metrics/onionoo/updater/UptimeStatusUpdaterTest.java | 2 +- .../metrics/onionoo/writer/BandwidthDocumentWriterTest.java | 2 +- .../torproject/metrics/onionoo/writer/GraphHistoryCompilerTest.java | 2 +- .../torproject/metrics/onionoo/writer/UptimeDocumentWriterTest.java | 2 +- 95 files changed, 102 insertions(+), 102 deletions(-) diff --git a/LICENSE b/LICENSE index a874782..9109d85 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2011, 2016 The Tor Project +Copyright 2011, 2016--2020 The Tor Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/src/main/java/org/torproject/metrics/onionoo/cron/Main.java b/src/main/java/org/torproject/metrics/onionoo/cron/Main.java index 47666c0..e79edf5 100644 --- a/src/main/java/org/torproject/metrics/onionoo/cron/Main.java +++ b/src/main/java/org/torproject/metrics/onionoo/cron/Main.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.cron; diff --git a/src/main/java/org/torproject/metrics/onionoo/cron/package-info.java b/src/main/java/org/torproject/metrics/onionoo/cron/package-info.java index 7e63cc1..568c4c9 100644 --- a/src/main/java/org/torproject/metrics/onionoo/cron/package-info.java +++ b/src/main/java/org/torproject/metrics/onionoo/cron/package-info.java @@ -1,7 +1,7 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ /** * Classes related to the background updater process. */ -package org.torproject.metrics.onionoo.cron; \ No newline at end of file +package org.torproject.metrics.onionoo.cron; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthDocument.java b/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthDocument.java index fb627eb..2868ad0 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthDocument.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthDocument.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java index c9eddf1..a3ceb69 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/ClientsDocument.java b/src/main/java/org/torproject/metrics/onionoo/docs/ClientsDocument.java index fffa6ec..a21df84 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/ClientsDocument.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/ClientsDocument.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/ClientsHistory.java b/src/main/java/org/torproject/metrics/onionoo/docs/ClientsHistory.java index 7142417..bab618e 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/ClientsHistory.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/ClientsHistory.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/ClientsStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/ClientsStatus.java index d9e6afa..09899b6 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/ClientsStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/ClientsStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DateTimeHelper.java b/src/main/java/org/torproject/metrics/onionoo/docs/DateTimeHelper.java index aec03ff..e49b48a 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DateTimeHelper.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DateTimeHelper.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java index 3e2b8a6..bb90089 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java index b6dd8be..8f09b52 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/Document.java b/src/main/java/org/torproject/metrics/onionoo/docs/Document.java index f160175..994da10 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/Document.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/Document.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index ea7786e..4ad6709 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStoreFactory.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStoreFactory.java index 78a6b08..d77a137 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStoreFactory.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStoreFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/GraphHistory.java b/src/main/java/org/torproject/metrics/onionoo/docs/GraphHistory.java index 7955e7a..497f867 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/GraphHistory.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/GraphHistory.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java index 1294bd5..53cd9ec 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java b/src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java index dc7230b..58edc1c 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/SummaryDocument.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/UpdateStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/UpdateStatus.java index ca6c55a..10b6123 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/UpdateStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/UpdateStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/UptimeDocument.java b/src/main/java/org/torproject/metrics/onionoo/docs/UptimeDocument.java index a305d68..e481f25 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/UptimeDocument.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/UptimeDocument.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/UptimeHistory.java b/src/main/java/org/torproject/metrics/onionoo/docs/UptimeHistory.java index 16b957a..07145e4 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/UptimeHistory.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/UptimeHistory.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/UptimeStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/UptimeStatus.java index 70e6e8b..912dd66 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/UptimeStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/UptimeStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/WeightsDocument.java b/src/main/java/org/torproject/metrics/onionoo/docs/WeightsDocument.java index 19807d6..afa8e96 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/WeightsDocument.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/WeightsDocument.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java index 121ec87..d3783fc 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/package-info.java b/src/main/java/org/torproject/metrics/onionoo/docs/package-info.java index 75ca580..895c451 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/package-info.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/package-info.java @@ -1,8 +1,8 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ /** * Documents managed by this service, including internal status files and * pre-written response objects. */ -package org.torproject.metrics.onionoo.docs; \ No newline at end of file +package org.torproject.metrics.onionoo.docs; diff --git a/src/main/java/org/torproject/metrics/onionoo/package-info.java b/src/main/java/org/torproject/metrics/onionoo/package-info.java index b13453e..7c30194 100644 --- a/src/main/java/org/torproject/metrics/onionoo/package-info.java +++ b/src/main/java/org/torproject/metrics/onionoo/package-info.java @@ -1,7 +1,7 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ /** * Root package for this service. */ -package org.torproject.metrics.onionoo; \ No newline at end of file +package org.torproject.metrics.onionoo; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/Counter.java b/src/main/java/org/torproject/metrics/onionoo/server/Counter.java index c3b6ffd..0646cd1 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/Counter.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/Counter.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/HttpServletRequestWrapper.java b/src/main/java/org/torproject/metrics/onionoo/server/HttpServletRequestWrapper.java index 91b5ea9..8c9b1ef 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/HttpServletRequestWrapper.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/HttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/HttpServletResponseWrapper.java b/src/main/java/org/torproject/metrics/onionoo/server/HttpServletResponseWrapper.java index 87dc451..fc1c043 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/HttpServletResponseWrapper.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/HttpServletResponseWrapper.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/IntegerDistribution.java b/src/main/java/org/torproject/metrics/onionoo/server/IntegerDistribution.java index ab38bf9..85e221a 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/IntegerDistribution.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/IntegerDistribution.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/MostFrequentString.java b/src/main/java/org/torproject/metrics/onionoo/server/MostFrequentString.java index 1ee8c45..306c96d 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/MostFrequentString.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/MostFrequentString.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java b/src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java index f461c25..dc101a1 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/NodeIndex.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexer.java index 33cabb6..b32b1bc 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexer.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexerFactory.java b/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexerFactory.java index e0ba666..bd8bc49 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexerFactory.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/NodeIndexerFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/OrderParameterValues.java b/src/main/java/org/torproject/metrics/onionoo/server/OrderParameterValues.java index b42a052..bc7a40a 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/OrderParameterValues.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/OrderParameterValues.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/PerformanceMetrics.java b/src/main/java/org/torproject/metrics/onionoo/server/PerformanceMetrics.java index 654b27c..2ffd460 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/PerformanceMetrics.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/PerformanceMetrics.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/RequestHandler.java b/src/main/java/org/torproject/metrics/onionoo/server/RequestHandler.java index ba4b293..83415d5 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/RequestHandler.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/RequestHandler.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java index b46c465..4983a31 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/ResourceServlet.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java index 7d4dcde..04ba2cc 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/ServerMain.java b/src/main/java/org/torproject/metrics/onionoo/server/ServerMain.java index 115d64a..8bc2fa4 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/ServerMain.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/ServerMain.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/SummaryDocumentComparator.java b/src/main/java/org/torproject/metrics/onionoo/server/SummaryDocumentComparator.java index 9512a29..e9a34af 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/SummaryDocumentComparator.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/SummaryDocumentComparator.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/server/package-info.java b/src/main/java/org/torproject/metrics/onionoo/server/package-info.java index 9287320..99e4c95 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/package-info.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/package-info.java @@ -1,8 +1,8 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ /** * Server classes that process client requests. The web-facing part of this * service. */ -package org.torproject.metrics.onionoo.server; \ No newline at end of file +package org.torproject.metrics.onionoo.server; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/BandwidthStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/BandwidthStatusUpdater.java index 0977f0f..9613907 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/BandwidthStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/BandwidthStatusUpdater.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java index 07dfb85..e2bd061 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java index 1974083..481ed9d 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorListener.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorListener.java index 53dac57..c785acd 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorListener.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorListener.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java index c609b2a..8ebae37 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java index 6891667..d8cfb82 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSourceFactory.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSourceFactory.java index 4bf60ec..1a3d70c 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSourceFactory.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSourceFactory.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java index 58857eb..1af3b57 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/LookupResult.java b/src/main/java/org/torproject/metrics/onionoo/updater/LookupResult.java index d789cbe..5b694bc 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/LookupResult.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/LookupResult.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java index 9e97487..9a9dad5 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java index 9718202..60dd915 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java index 53e3fa9..8830e5b 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupRequest.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java index 6353daa..8c3f56f 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/RdnsLookupWorker.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/ReverseDomainNameResolver.java b/src/main/java/org/torproject/metrics/onionoo/updater/ReverseDomainNameResolver.java index 74fbeae..6403475 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/ReverseDomainNameResolver.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/ReverseDomainNameResolver.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/StatusUpdateRunner.java b/src/main/java/org/torproject/metrics/onionoo/updater/StatusUpdateRunner.java index 7193a7a..65ff859 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/StatusUpdateRunner.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/StatusUpdateRunner.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/StatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/StatusUpdater.java index 7adb59e..cce4649 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/StatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/StatusUpdater.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java b/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java index bba490c..4a236ee 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/TorVersionStatus.java b/src/main/java/org/torproject/metrics/onionoo/updater/TorVersionStatus.java index da2187d..31736b4 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/TorVersionStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/TorVersionStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java index 1f9f960..639ad45 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/WeightsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/WeightsStatusUpdater.java index 9253ba6..ab1c6ff 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/WeightsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/WeightsStatusUpdater.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/package-info.java b/src/main/java/org/torproject/metrics/onionoo/updater/package-info.java index f630fa1..e06ed73 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/package-info.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/package-info.java @@ -1,8 +1,8 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ /** * Classes related to the updater feature, which periodically updates internal * files related to status and metrics. */ -package org.torproject.metrics.onionoo.updater; \ No newline at end of file +package org.torproject.metrics.onionoo.updater; diff --git a/src/main/java/org/torproject/metrics/onionoo/util/FormattingUtils.java b/src/main/java/org/torproject/metrics/onionoo/util/FormattingUtils.java index 7cc721c..b1bae46 100644 --- a/src/main/java/org/torproject/metrics/onionoo/util/FormattingUtils.java +++ b/src/main/java/org/torproject/metrics/onionoo/util/FormattingUtils.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.util; diff --git a/src/main/java/org/torproject/metrics/onionoo/util/package-info.java b/src/main/java/org/torproject/metrics/onionoo/util/package-info.java index 5deaab2..e739e77 100644 --- a/src/main/java/org/torproject/metrics/onionoo/util/package-info.java +++ b/src/main/java/org/torproject/metrics/onionoo/util/package-info.java @@ -1,8 +1,8 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ /** * Generic utilities for aiding other classes. Feature-specific utility classes * should be placed in feature-specific packages. */ -package org.torproject.metrics.onionoo.util; \ No newline at end of file +package org.torproject.metrics.onionoo.util; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriter.java index d82a55b..53cb95b 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2011--2018 The Tor Project +/* Copyright 2011--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java index e253d22..9727403 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java index a497cfd..81fcb64 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/DocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/DocumentWriter.java index 2c288f1..b3d9f6a 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/DocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/DocumentWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/DocumentWriterRunner.java b/src/main/java/org/torproject/metrics/onionoo/writer/DocumentWriterRunner.java index 96f8bdf..99b627e 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/DocumentWriterRunner.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/DocumentWriterRunner.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/GraphHistoryCompiler.java b/src/main/java/org/torproject/metrics/onionoo/writer/GraphHistoryCompiler.java index 3fbf46c..ae5231f 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/GraphHistoryCompiler.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/GraphHistoryCompiler.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java index 1c79c20..bcdb370 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java index e2a0f63..45d9242 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/WeightsDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/WeightsDocumentWriter.java index d5bf95d..361528a 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/WeightsDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/WeightsDocumentWriter.java @@ -1,4 +1,4 @@ -/* Copyright 2012--2018 The Tor Project +/* Copyright 2012--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/package-info.java b/src/main/java/org/torproject/metrics/onionoo/writer/package-info.java index ed5ec44..43a6f42 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/package-info.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/package-info.java @@ -1,8 +1,8 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ /** * Classes responsible for pre-building documents that can later be sent in * response to client requests. */ -package org.torproject.metrics.onionoo.writer; \ No newline at end of file +package org.torproject.metrics.onionoo.writer; diff --git a/src/main/resources/bootstrap-development.sh b/src/main/resources/bootstrap-development.sh index d301e25..ebdc1de 100755 --- a/src/main/resources/bootstrap-development.sh +++ b/src/main/resources/bootstrap-development.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2016--2018 The Tor Project +# Copyright 2016--2020 The Tor Project # See LICENSE for licensing information # # Use for submodule initialization and checkout. diff --git a/src/test/java/org/torproject/metrics/onionoo/docs/BandwidthStatusTest.java b/src/test/java/org/torproject/metrics/onionoo/docs/BandwidthStatusTest.java index 635fc8b..471a072 100644 --- a/src/test/java/org/torproject/metrics/onionoo/docs/BandwidthStatusTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/docs/BandwidthStatusTest.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/test/java/org/torproject/metrics/onionoo/docs/DummyDocumentStore.java b/src/test/java/org/torproject/metrics/onionoo/docs/DummyDocumentStore.java index 42ef483..c1ccb0f 100644 --- a/src/test/java/org/torproject/metrics/onionoo/docs/DummyDocumentStore.java +++ b/src/test/java/org/torproject/metrics/onionoo/docs/DummyDocumentStore.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/test/java/org/torproject/metrics/onionoo/docs/NodeStatusTest.java b/src/test/java/org/torproject/metrics/onionoo/docs/NodeStatusTest.java index 4e98a53..ceac2fc 100644 --- a/src/test/java/org/torproject/metrics/onionoo/docs/NodeStatusTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/docs/NodeStatusTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/test/java/org/torproject/metrics/onionoo/docs/SummaryDocumentTest.java b/src/test/java/org/torproject/metrics/onionoo/docs/SummaryDocumentTest.java index ee2d4e7..ffda99b 100644 --- a/src/test/java/org/torproject/metrics/onionoo/docs/SummaryDocumentTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/docs/SummaryDocumentTest.java @@ -1,4 +1,4 @@ -/* Copyright 2015--2018 The Tor Project +/* Copyright 2015--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/test/java/org/torproject/metrics/onionoo/docs/UptimeStatusTest.java b/src/test/java/org/torproject/metrics/onionoo/docs/UptimeStatusTest.java index e55b295..780412b 100644 --- a/src/test/java/org/torproject/metrics/onionoo/docs/UptimeStatusTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/docs/UptimeStatusTest.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/test/java/org/torproject/metrics/onionoo/docs/WeightsStatusTest.java b/src/test/java/org/torproject/metrics/onionoo/docs/WeightsStatusTest.java index 8f2155c..7219b48 100644 --- a/src/test/java/org/torproject/metrics/onionoo/docs/WeightsStatusTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/docs/WeightsStatusTest.java @@ -1,4 +1,4 @@ -/* Copyright 2016--2018 The Tor Project +/* Copyright 2016--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.docs; diff --git a/src/test/java/org/torproject/metrics/onionoo/server/PerformanceMetricsTest.java b/src/test/java/org/torproject/metrics/onionoo/server/PerformanceMetricsTest.java index b1593df..bb3c963 100644 --- a/src/test/java/org/torproject/metrics/onionoo/server/PerformanceMetricsTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/server/PerformanceMetricsTest.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java index ac3f107..4cbb370 100644 --- a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/test/java/org/torproject/metrics/onionoo/server/SummaryDocumentComparatorTest.java b/src/test/java/org/torproject/metrics/onionoo/server/SummaryDocumentComparatorTest.java index 26aec68..e62ef19 100644 --- a/src/test/java/org/torproject/metrics/onionoo/server/SummaryDocumentComparatorTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/server/SummaryDocumentComparatorTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.server; diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/DummyBridgeStatus.java b/src/test/java/org/torproject/metrics/onionoo/updater/DummyBridgeStatus.java index 20ec86b..6a5a4cf 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/DummyBridgeStatus.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/DummyBridgeStatus.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/DummyConsensus.java b/src/test/java/org/torproject/metrics/onionoo/updater/DummyConsensus.java index 0ce0825..bca6e3d 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/DummyConsensus.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/DummyConsensus.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java b/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java index 5cd075c..24d456b 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/DummyStatusEntry.java b/src/test/java/org/torproject/metrics/onionoo/updater/DummyStatusEntry.java index 376cff1..5aa99ce 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/DummyStatusEntry.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/DummyStatusEntry.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java b/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java index 515280e..a6f387a 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/LookupServiceTest.java @@ -1,4 +1,4 @@ -/* Copyright 2013--2018 The Tor Project +/* Copyright 2013--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdaterTest.java b/src/test/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdaterTest.java index 9b4a2dd..b3077a3 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdaterTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdaterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/TorVersionTest.java b/src/test/java/org/torproject/metrics/onionoo/updater/TorVersionTest.java index b70925b..73e44c6 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/TorVersionTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/TorVersionTest.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdaterTest.java b/src/test/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdaterTest.java index bd6bb61..db7ef73 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdaterTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdaterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.updater; diff --git a/src/test/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriterTest.java b/src/test/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriterTest.java index ab2a108..7c22e62 100644 --- a/src/test/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriterTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/writer/BandwidthDocumentWriterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2017--2018 The Tor Project +/* Copyright 2017--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/test/java/org/torproject/metrics/onionoo/writer/GraphHistoryCompilerTest.java b/src/test/java/org/torproject/metrics/onionoo/writer/GraphHistoryCompilerTest.java index f82231f..4dbca75 100644 --- a/src/test/java/org/torproject/metrics/onionoo/writer/GraphHistoryCompilerTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/writer/GraphHistoryCompilerTest.java @@ -1,4 +1,4 @@ -/* Copyright 2018 The Tor Project +/* Copyright 2018--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer; diff --git a/src/test/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriterTest.java b/src/test/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriterTest.java index 2516b14..6c18906 100644 --- a/src/test/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriterTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriterTest.java @@ -1,4 +1,4 @@ -/* Copyright 2014--2018 The Tor Project +/* Copyright 2014--2020 The Tor Project * See LICENSE for licensing information */ package org.torproject.metrics.onionoo.writer;

1 0

[onionoo/release] Update to latest metrics-base.
by karsten＠torproject.org 14 Feb '20

14 Feb '20

commit 79626a16ccd6d4e61ee37b10422cb3af9aec4dbe Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 22:19:55 2020 +0100 Update to latest metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index eb16cb3..264e498 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit eb16cb359db41722e6089bafb1e26808df4338df +Subproject commit 264e498f54a20f7d299daaf2533d043f880e6a8b

1 0

[onionoo/release] Prepare for 7.0-1.24.0 release.
by karsten＠torproject.org 14 Feb '20

14 Feb '20

commit a22ba07cb7e94ee2d0c1cf1c7b3bae5e96ef3322 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 14 11:05:10 2020 +0100 Prepare for 7.0-1.24.0 release. --- CHANGELOG.md | 3 ++- build.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d1b084..03b86ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 7.0-1.2?.? - 20??-??-?? +# Changes in version 7.0-1.24.0 - 2020-02-14 * Medium changes - Process bridge pool assignments to include the BridgeDB @@ -6,6 +6,7 @@ * Minor changes - Make Jetty host and port configurable. + - Update to metrics-lib 2.10.0. # Changes in version 7.0-1.23.0 - 2019-12-06 diff --git a/build.xml b/build.xml index c8e336a..0c49b18 100644 --- a/build.xml +++ b/build.xml @@ -11,8 +11,8 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.23.0-dev"/> - <property name="metricslibversion" value="2.9.1"/> + value="${onionoo.protocol.version}-1.24.0"/> + <property name="metricslibversion" value="2.10.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="onionoo-${release.version}.war"/>

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 14 Feb '20

14 Feb '20

commit 0120d5756faac74826b491b1babf027276abfe86 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 14 10:17:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- es/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd index 05e0926ace..820ad61f41 100644 --- a/es/https-everywhere.dtd +++ b/es/https-everywhere.dtd @@ -29,8 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed "Reglas del Usuario para HTTPS Everywhere"> <!ENTITY https-everywhere.options.disabledUrlsListed "Sitios deshabilitados por HTTPS Everywhere"> <!ENTITY https-everywhere.options.updateChannelsWarning "Cuidado: Agregar canales de actualización puede originar que los atacantes secuestren tu navegador. ¡Edita esta sección sólo si sabes lo que estás haciendo!"> -<!ENTITY https-everywhere.options.addDisabledSite ""> -<!ENTITY https-everywhere.options.enterDisabledSite ""> +<!ENTITY https-everywhere.options.addDisabledSite "Añadir lugares inhabilitados"> +<!ENTITY https-everywhere.options.enterDisabledSite "Introducir el sitio inhabilitado"> <!ENTITY https-everywhere.options.addUpdateChannel "Añadir Actualizar Canales"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Introduce el nombre del canal de actualización"> <!ENTITY https-everywhere.options.delete "Borrar">

1 0

[onionoo/master] Add bridgedb_distributor field.
by karsten＠torproject.org 14 Feb '20

14 Feb '20

commit ff2db949e57f35df8cfffe691e2caeece8fdeccc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 26 12:01:50 2020 +0100 Add bridgedb_distributor field. Implements #33008. --- CHANGELOG.md | 4 +++ .../metrics/onionoo/docs/DetailsDocument.java | 10 ++++++ .../metrics/onionoo/docs/DetailsStatus.java | 21 +++++++++++++ .../metrics/onionoo/server/ResponseBuilder.java | 4 +++ .../metrics/onionoo/updater/DescriptorHistory.java | 1 + .../metrics/onionoo/updater/DescriptorSource.java | 6 ++++ .../metrics/onionoo/updater/DescriptorType.java | 3 +- .../onionoo/updater/NodeDetailsStatusUpdater.java | 36 ++++++++++++++++++++++ .../onionoo/writer/DetailsDocumentWriter.java | 2 ++ .../onionoo/updater/DummyDescriptorSource.java | 1 + 10 files changed, 87 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bf4466..4d1b084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changes in version 7.0-1.2?.? - 20??-??-?? + * Medium changes + - Process bridge pool assignments to include the BridgeDB + distributor in bridge details documents. + * Minor changes - Make Jetty host and port configurable. diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java index bb90089..81892fc 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsDocument.java @@ -571,5 +571,15 @@ public class DetailsDocument extends Document { public List<String> getUnreachableOrAddresses() { return this.unreachableOrAddresses; } + + private String bridgedbDistributor; + + public void setBridgedbDistributor(String bridgedbDistributor) { + this.bridgedbDistributor = bridgedbDistributor; + } + + public String getBridgedbDistributor() { + return this.bridgedbDistributor; + } } diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java index 8f09b52..33fef6d 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DetailsStatus.java @@ -252,6 +252,27 @@ public class DetailsStatus extends Document { this.orAddressesAndPorts; } + private Long bridgePoolAssignmentPublished; + + public void setBridgePoolAssignmentPublished( + Long bridgePoolAssignmentPublished) { + this.bridgePoolAssignmentPublished = bridgePoolAssignmentPublished; + } + + public java.lang.Long getBridgePoolAssignmentPublished() { + return bridgePoolAssignmentPublished; + } + + private String bridgedbDistributor; + + public void setBridgedbDistributor(String bridgedbDistributor) { + this.bridgedbDistributor = bridgedbDistributor; + } + + public String getBridgedbDistributor() { + return bridgedbDistributor; + } + /** Returns all addresses used for the onion-routing protocol which * includes the primary address and all additionally configured * onion-routing addresses. */ diff --git a/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java index 04ba2cc..2358ddd 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java @@ -392,6 +392,10 @@ public class ResponseBuilder { case "version_status": dd.setVersionStatus(detailsDocument.getVersionStatus()); break; + case "bridgedb_distributor": + dd.setBridgedbDistributor( + detailsDocument.getBridgedbDistributor()); + break; default: /* Not a field that we know of. Ignore. */ break; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java index 481ed9d..91febc4 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorHistory.java @@ -12,6 +12,7 @@ public enum DescriptorHistory { BRIDGE_STATUS_HISTORY("bridge-status-history"), BRIDGE_SERVER_HISTORY("bridge-server-history"), BRIDGE_EXTRAINFO_HISTORY("bridge-extrainfo-history"), + BRIDGE_POOL_ASSIGNMENTS_HISTORY("bridge-pool-assignments-history"), ARCHIVED_HISTORY("archived-history"); private String fileName; diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java index d8cfb82..27be94d 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorSource.java @@ -133,6 +133,9 @@ public class DescriptorSource { log.debug("Reading recent {} ...", DescriptorType.BRIDGE_STATUSES); this.readDescriptors(DescriptorType.BRIDGE_STATUSES, DescriptorHistory.BRIDGE_STATUS_HISTORY, false); + log.debug("Reading recent {} ...", DescriptorType.BRIDGE_POOL_ASSIGNMENTS); + this.readDescriptors(DescriptorType.BRIDGE_POOL_ASSIGNMENTS, + DescriptorHistory.BRIDGE_POOL_ASSIGNMENTS_HISTORY, false); } private void readDescriptors(DescriptorType descriptorType, @@ -195,6 +198,9 @@ public class DescriptorSource { } else if (annotation.startsWith("@type bridge-extra-info 1.")) { descriptorType = DescriptorType.BRIDGE_EXTRA_INFOS; relay = false; + } else if (annotation.startsWith("@type bridge-pool-assignment 1.")) { + descriptorType = DescriptorType.BRIDGE_POOL_ASSIGNMENTS; + relay = false; } } if (descriptorType == null) { diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java index 1af3b57..61f61d1 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorType.java @@ -10,7 +10,8 @@ public enum DescriptorType { EXIT_LISTS("exit-lists"), BRIDGE_STATUSES("bridge-descriptors/statuses"), BRIDGE_SERVER_DESCRIPTORS("bridge-descriptors/server-descriptors"), - BRIDGE_EXTRA_INFOS("bridge-descriptors/extra-infos"); + BRIDGE_EXTRA_INFOS("bridge-descriptors/extra-infos"), + BRIDGE_POOL_ASSIGNMENTS("bridge-pool-assignments"); private final String dir; DescriptorType(String dir) { diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java index 60dd915..ce809aa 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java @@ -4,6 +4,7 @@ package org.torproject.metrics.onionoo.updater; import org.torproject.descriptor.BridgeNetworkStatus; +import org.torproject.descriptor.BridgePoolAssignment; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.ExitList; import org.torproject.descriptor.ExtraInfoDescriptor; @@ -120,6 +121,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, DescriptorType.BRIDGE_EXTRA_INFOS); this.descriptorSource.registerDescriptorListener(this, DescriptorType.EXIT_LISTS); + this.descriptorSource.registerDescriptorListener(this, + DescriptorType.BRIDGE_POOL_ASSIGNMENTS); } /* Step 1: parse descriptors. */ @@ -140,6 +143,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, (ExtraInfoDescriptor) descriptor); } else if (descriptor instanceof BridgeNetworkStatus) { this.processBridgeNetworkStatus((BridgeNetworkStatus) descriptor); + } else if (descriptor instanceof BridgePoolAssignment) { + this.processBridgePoolAssignment((BridgePoolAssignment) descriptor); } } @@ -384,6 +389,17 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, this.bridgeStatusesProcessed++; } + private BridgePoolAssignment latestBridgePoolAssignments = null; + + private void processBridgePoolAssignment( + BridgePoolAssignment bridgePoolAssignment) { + if (null == this.latestBridgePoolAssignments + || this.latestBridgePoolAssignments.getPublishedMillis() + < bridgePoolAssignment.getPublishedMillis()) { + this.latestBridgePoolAssignments = bridgePoolAssignment; + } + } + @Override public void updateStatuses() { this.readNodeStatuses(); @@ -847,6 +863,26 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setExitAddresses(exitAddresses); nodeStatus.setExitAddresses(new TreeSet<>(exitAddresses.keySet())); + if (null != this.latestBridgePoolAssignments + && (null == detailsStatus.getBridgePoolAssignmentPublished() + || detailsStatus.getBridgePoolAssignmentPublished() + < this.latestBridgePoolAssignments.getPublishedMillis())) { + if (this.latestBridgePoolAssignments.getEntries() + .containsKey(fingerprint)) { + detailsStatus.setBridgePoolAssignmentPublished( + this.latestBridgePoolAssignments.getPublishedMillis()); + String assignment = this.latestBridgePoolAssignments.getEntries() + .get(fingerprint); + if (null != assignment && !assignment.isEmpty()) { + String bridgedbDistributor = assignment.split(" ")[0]; + detailsStatus.setBridgedbDistributor(bridgedbDistributor); + } + } else { + detailsStatus.setBridgePoolAssignmentPublished(0L); + detailsStatus.setBridgedbDistributor(null); + } + } + detailsStatus.setAllegedFamily(nodeStatus.getAllegedFamily()); detailsStatus.setEffectiveFamily(nodeStatus.getEffectiveFamily()); detailsStatus.setIndirectFamily(nodeStatus.getIndirectFamily()); diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java index 81fcb64..29d9244 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/DetailsDocumentWriter.java @@ -186,6 +186,8 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setTransports(detailsStatus.getTransports()); detailsDocument.setVersion(detailsStatus.getVersion()); detailsDocument.setVersionStatus(detailsStatus.getVersionStatus()); + detailsDocument.setBridgedbDistributor( + detailsStatus.getBridgedbDistributor()); this.documentStore.store(detailsDocument, fingerprint); } diff --git a/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java b/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java index 24d456b..22d834a 100644 --- a/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java +++ b/src/test/java/org/torproject/metrics/onionoo/updater/DummyDescriptorSource.java @@ -61,6 +61,7 @@ public class DummyDescriptorSource extends DescriptorSource { case BRIDGE_STATUSES: case BRIDGE_SERVER_DESCRIPTORS: case BRIDGE_EXTRA_INFOS: + case BRIDGE_POOL_ASSIGNMENTS: default: relay = false; break;

1 0