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

[exonerator/release] Use configured base URL for permanent link.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit d165e4a1d5a29f82d932115e611011fc7ef97134 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jan 14 21:20:04 2020 +0100 Use configured base URL for permanent link. Turn absolute links into relative links. Fixes #27925. --- CHANGELOG.md | 6 +++ .../metrics/exonerator/ExoneraTorServlet.java | 53 ++++++++++++---------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c0cf51..a7cc1ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changes in version 4.?.? - 2019-1?-?? + * Medium changes + - Turn absolute links to nearby addresses and translations into + relative links to avoid falling back to http://. Use the base URL + from the deployment descriptor for the printed permanent link, + also to avoid falling back to http://. + # Changes in version 4.2.0 - 2019-11-09 diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index a74aa60..92cc8bb 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java @@ -140,8 +140,14 @@ public class ExoneraTorServlet extends HttpServlet { PrintWriter out = new PrintWriter(so); this.writeHeader(out, rb, langStr); - /* Obtain request URL without query string parameters for links. */ - String requestUrl = request.getRequestURL().toString(); + /* Obtain the current request URI for relative links and the configured + * base URL for absolute links like the printed permanent link. If no base + * URL has been configured, use the current request URL for the permanent + * link. */ + String requestUri = request.getRequestURI(); + String baseUrl = this.getServletContext().getInitParameter("baseUrl"); + String permanentLinkUrl = (null != baseUrl) + ? (baseUrl + requestUri) : request.getRequestURL().toString(); /* Write form. */ boolean timestampOutOfRange = requestedDate.valid @@ -157,43 +163,43 @@ public class ExoneraTorServlet extends HttpServlet { /* If both parameters are empty, don't print any summary and exit. * This is the start page. */ if ("".equals(relayIp) && requestedDate.empty) { - this.writeFooter(out, rb, requestUrl, null, null); + this.writeFooter(out, rb, requestUri, null, null); /* If only one parameter is empty and the other is not, print summary * with warning message and exit. */ } else if ("".equals(relayIp)) { this.writeSummaryNoIp(out, rb); - this.writeFooter(out, rb, requestUrl, null, null); + this.writeFooter(out, rb, requestUri, null, null); } else if (requestedDate.empty) { this.writeSummaryNoTimestamp(out, rb); - this.writeFooter(out, rb, requestUrl, null, null); + this.writeFooter(out, rb, requestUri, null, null); /* If there's an issue with parsing either of the parameters, print * summary with error message and exit. */ } else if (relayIpHasError) { this.writeSummaryInvalidIp(out, rb, ipParameter); - this.writeFooter(out, rb, requestUrl, null, null); + this.writeFooter(out, rb, requestUri, null, null); } else if (!requestedDate.valid) { this.writeSummaryInvalidTimestamp(out, rb, requestedDate.asRequested); - this.writeFooter(out, rb, requestUrl, null, null); + this.writeFooter(out, rb, requestUri, null, null); /* If the timestamp is too recent, print summary with error message and * exit. */ } else if (requestedDate.tooRecent) { this.writeSummaryTimestampTooRecent(out, rb); - this.writeFooter(out, rb, requestUrl, null, null); + this.writeFooter(out, rb, requestUri, null, null); /* If we were unable to connect to the database, * write an error message. */ } else if (!successfullyConnectedToBackend) { this.writeSummaryUnableToConnectToBackend(out, rb); - this.writeFooter(out, rb, requestUrl, null, null); + this.writeFooter(out, rb, requestUri, null, null); /* Similarly, if we found the database to be empty, * write an error message, too. */ } else if (firstDate.empty || lastDate.empty) { this.writeSummaryNoData(out, rb); - this.writeFooter(out, rb, requestUrl, null, null); + this.writeFooter(out, rb, requestUri, null, null); /* If the requested date is out of range, tell the user. */ } else if (timestampOutOfRange) { @@ -201,11 +207,11 @@ public class ExoneraTorServlet extends HttpServlet { this.writeSummaryTimestampOutsideRange(out, rb, requestedDate.asString, firstDate.asString, lastDate.date.isBefore(dayBeforeYesterday) ? lastDate.asString : dayBeforeYesterday.format(ISO_LOCAL_DATE)); - this.writeFooter(out, rb, requestUrl, relayIp, requestedDate.asString); + this.writeFooter(out, rb, requestUri, relayIp, requestedDate.asString); } else if (noRelevantConsensuses) { this.writeSummaryNoDataForThisInterval(out, rb); - this.writeFooter(out, rb, requestUrl, relayIp, requestedDate.asString); + this.writeFooter(out, rb, requestUri, relayIp, requestedDate.asString); /* Print out result. */ } else { @@ -215,14 +221,14 @@ public class ExoneraTorServlet extends HttpServlet { statusEntries); } else if (addressesInSameNetwork != null && !addressesInSameNetwork.isEmpty()) { - this.writeSummaryAddressesInSameNetwork(out, rb, requestUrl, relayIp, + this.writeSummaryAddressesInSameNetwork(out, rb, requestUri, relayIp, requestedDate.asString, langStr, addressesInSameNetwork); } else { this.writeSummaryNegative(out, rb, relayIp, requestedDate.asString); } - this.writePermanentLink(out, rb, requestUrl, relayIp, + this.writePermanentLink(out, rb, permanentLinkUrl, relayIp, requestedDate.asString, langStr); - this.writeFooter(out, rb, requestUrl, relayIp, requestedDate.asString); + this.writeFooter(out, rb, requestUri, relayIp, requestedDate.asString); } /* Forward to the JSP that adds header and footer. */ @@ -464,7 +470,7 @@ public class ExoneraTorServlet extends HttpServlet { } void writeSummaryAddressesInSameNetwork(PrintWriter out, - ResourceBundle rb, String requestUrl, String relayIp, String timestampStr, + ResourceBundle rb, String requestUri, String relayIp, String timestampStr, String langStr, List<String> addressesInSameNetwork) { Object[][] panelItems = new Object[addressesInSameNetwork.size()][]; for (int i = 0; i < addressesInSameNetwork.size(); i++) { @@ -474,11 +480,11 @@ public class ExoneraTorServlet extends HttpServlet { if (addressInSameNetwork.contains(":")) { address = addressInSameNetwork.replaceAll("[\\[\\]]", ""); link = String.format("%s?ip=[%s]&timestamp=%s&lang=%s", - requestUrl, address.replaceAll(":", "%3A"), timestampStr, langStr); + requestUri, address.replaceAll(":", "%3A"), timestampStr, langStr); address = "[" + address + "]"; } else { link = String.format("%s?ip=%s&timestamp=%s&lang=%s", - requestUrl, addressInSameNetwork, timestampStr, langStr); + requestUri, addressInSameNetwork, timestampStr, langStr); address = addressInSameNetwork; } panelItems[i] = new Object[] { link, address }; @@ -600,7 +606,8 @@ public class ExoneraTorServlet extends HttpServlet { } private void writePermanentLink(PrintWriter out, ResourceBundle rb, - String requestUrl, String relayIp, String timestampStr, String langStr) { + String permanentLinkUrl, String relayIp, String timestampStr, + String langStr) { String encodedAddress = relayIp.contains(":") ? "[" + relayIp.replaceAll(":", "%3A") + "]" : relayIp; out.printf(" <div class=\"row\">\n" @@ -610,12 +617,12 @@ public class ExoneraTorServlet extends HttpServlet { + "timestamp=%s&lang=%s</pre>\n" + " </div>\n" + " </div>\n", - rb.getString("permanentlink.heading"), requestUrl, + rb.getString("permanentlink.heading"), permanentLinkUrl, encodedAddress, timestampStr, langStr); } private void writeFooter(PrintWriter out, ResourceBundle rb, - String requestUrl, String relayIp, String timestampStr) { + String requestUri, String relayIp, String timestampStr) { out.printf(" </div>\n" + " <div class=\"container\">\n" + " <div class=\"row\">\n" @@ -644,11 +651,11 @@ public class ExoneraTorServlet extends HttpServlet { : this.availableLanguageNames.entrySet()) { if (null != relayIp && null != timestampStr) { out.printf(" <a href=\"%s?ip=%s&timestamp=%s&lang=%s\">%s</a>", - requestUrl, relayIp, timestampStr, entry.getKey(), + requestUri, relayIp, timestampStr, entry.getKey(), entry.getValue()); } else { out.printf(" <a href=\"%s?lang=%s\">%s</a>", - requestUrl, entry.getKey(), entry.getValue()); + requestUri, entry.getKey(), entry.getValue()); } } out.printf("</p>\n"

1 0

[exonerator/release] Update copyright to 2020.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 20501a55241d90a015ea7efcef3f18371c6c80c8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 21:45:54 2020 +0100 Update copyright to 2020. --- LICENSE | 2 +- .../org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java | 2 +- src/main/java/org/torproject/metrics/exonerator/ExoneraTorDate.java | 2 +- .../org/torproject/metrics/exonerator/ExoneraTorRedirectServlet.java | 2 +- src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java | 2 +- src/main/java/org/torproject/metrics/exonerator/QueryResponse.java | 2 +- src/main/java/org/torproject/metrics/exonerator/QueryServlet.java | 2 +- src/main/java/org/torproject/metrics/exonerator/ServerMain.java | 2 +- src/main/resources/bootstrap-development.sh | 2 +- src/main/sql/exonerator.sql | 2 +- src/main/sql/exonerator2.sql | 2 +- src/test/java/org/torproject/metrics/exonerator/ExoneraTorDateTest.java | 2 +- .../java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java | 2 +- src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/LICENSE b/LICENSE index 49d61f8..d7b0663 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2010--2017 The Tor Project +Copyright 2010--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/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java index 47261fc..c9cc6b9 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.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.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDate.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDate.java index 92d6b31..8e084d6 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDate.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDate.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.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorRedirectServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorRedirectServlet.java index fbe4e49..ebcbaca 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorRedirectServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorRedirectServlet.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.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java index 92cc8bb..3ba42da 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.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.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java index 6a8976a..aee8dbf 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryResponse.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryResponse.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.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java index 760e385..85dec57 100644 --- a/src/main/java/org/torproject/metrics/exonerator/QueryServlet.java +++ b/src/main/java/org/torproject/metrics/exonerator/QueryServlet.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.exonerator; diff --git a/src/main/java/org/torproject/metrics/exonerator/ServerMain.java b/src/main/java/org/torproject/metrics/exonerator/ServerMain.java index 3554915..0663e0f 100644 --- a/src/main/java/org/torproject/metrics/exonerator/ServerMain.java +++ b/src/main/java/org/torproject/metrics/exonerator/ServerMain.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.exonerator; 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/main/sql/exonerator.sql b/src/main/sql/exonerator.sql index 7e5ad7e..e6245ce 100755 --- a/src/main/sql/exonerator.sql +++ b/src/main/sql/exonerator.sql @@ -1,4 +1,4 @@ --- Copyright 2011--2018 The Tor Project +-- Copyright 2011--2020 The Tor Project -- See LICENSE for licensing information -------------------------------------------------------------------------------- diff --git a/src/main/sql/exonerator2.sql b/src/main/sql/exonerator2.sql index 397d2bf..5ec1765 100755 --- a/src/main/sql/exonerator2.sql +++ b/src/main/sql/exonerator2.sql @@ -1,4 +1,4 @@ --- Copyright 2011--2018 The Tor Project +-- Copyright 2011--2020 The Tor Project -- See LICENSE for licensing information -------------------------------------------------------------------------------- diff --git a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorDateTest.java b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorDateTest.java index 0276e1f..3c0ca83 100644 --- a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorDateTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorDateTest.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.exonerator; diff --git a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java index 1ede590..1814644 100644 --- a/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/ExoneraTorServletTest.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.exonerator; diff --git a/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java b/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java index 97ae88d..eb01a1f 100644 --- a/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.java +++ b/src/test/java/org/torproject/metrics/exonerator/QueryResponseTest.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.exonerator;

1 0

[exonerator/release] Prepare for 4.3.0 release.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 4390e931b5e3f10f6dfe72779c4edca07b570fdf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 23:40:54 2020 +0100 Prepare for 4.3.0 release. --- CHANGELOG.md | 3 ++- build.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7cc1ec..0db446b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ -# Changes in version 4.?.? - 2019-1?-?? +# Changes in version 4.3.0 - 2020-01-15 * Medium changes - Turn absolute links to nearby addresses and translations into relative links to avoid falling back to http://. Use the base URL from the deployment descriptor for the printed permanent link, also to avoid falling back to http://. + - Update to metrics-lib 2.10.0. # Changes in version 4.2.0 - 2019-11-09 diff --git a/build.xml b/build.xml index 312f249..c209699 100644 --- a/build.xml +++ b/build.xml @@ -9,8 +9,8 @@ <property name="javadoc-title" value="ExoneraTor API Documentation"/> <property name="implementation-title" value="ExoneraTor" /> - <property name="release.version" value="4.2.0-dev" /> - <property name="metricslibversion" value="2.9.1" /> + <property name="release.version" value="4.3.0" /> + <property name="metricslibversion" value="2.10.0" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="exonerator-${release.version}.war"/>

1 0

[exonerator/master] Prepare for 4.3.0 release.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 4390e931b5e3f10f6dfe72779c4edca07b570fdf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 23:40:54 2020 +0100 Prepare for 4.3.0 release. --- CHANGELOG.md | 3 ++- build.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7cc1ec..0db446b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ -# Changes in version 4.?.? - 2019-1?-?? +# Changes in version 4.3.0 - 2020-01-15 * Medium changes - Turn absolute links to nearby addresses and translations into relative links to avoid falling back to http://. Use the base URL from the deployment descriptor for the printed permanent link, also to avoid falling back to http://. + - Update to metrics-lib 2.10.0. # Changes in version 4.2.0 - 2019-11-09 diff --git a/build.xml b/build.xml index 312f249..c209699 100644 --- a/build.xml +++ b/build.xml @@ -9,8 +9,8 @@ <property name="javadoc-title" value="ExoneraTor API Documentation"/> <property name="implementation-title" value="ExoneraTor" /> - <property name="release.version" value="4.2.0-dev" /> - <property name="metricslibversion" value="2.9.1" /> + <property name="release.version" value="4.3.0" /> + <property name="metricslibversion" value="2.10.0" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="exonerator-${release.version}.war"/>

1 0

[exonerator/master] Bump version to 4.3.0-dev.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 06ec2db71aceb8ba0ca346f30742d46039bb7979 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 15 23:45:45 2020 +0100 Bump version to 4.3.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0db446b..9c87922 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 4.?.? - 2020-0?-?? + + # Changes in version 4.3.0 - 2020-01-15 * Medium changes diff --git a/build.xml b/build.xml index c209699..cdc919c 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="ExoneraTor API Documentation"/> <property name="implementation-title" value="ExoneraTor" /> - <property name="release.version" value="4.3.0" /> + <property name="release.version" value="4.3.0-dev" /> <property name="metricslibversion" value="2.10.0" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[collector/release] Fix minor JavaDoc issue.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 38234a37884b091ac3b06e027bc2a92c019f6f11 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 11:47:48 2019 +0100 Fix minor JavaDoc issue. --- src/main/java/org/torproject/metrics/collector/conf/Key.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/collector/conf/Key.java b/src/main/java/org/torproject/metrics/collector/conf/Key.java index d59438b..d0b8a5a 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Key.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java @@ -89,7 +89,7 @@ public enum Key { private static Set<String> keys; /** - * @param Class of key value. + * @param clazz Class of key value. */ Key(Class clazz) { this.clazz = clazz;

1 0

[collector/release] Bump version to 1.13.1-dev.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit d3d63bb1d8eaaf2c33486d68181fbb199041c9a5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 11 10:19:39 2019 +0100 Bump version to 1.13.1-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 174f2e1..5293207 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 1.1?.? - 2019-1?-?? + + # Changes in version 1.13.1 - 2019-11-11 * Minor changes diff --git a/build.xml b/build.xml index e91dae3..c75b69e 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.13.1" /> + <property name="release.version" value="1.13.1-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.9.1" />

1 0

[collector/release] Fix logging bug.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit e25b39757cc464e0450f88e3779b9c987d003d58 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 11:54:46 2019 +0100 Fix logging bug. --- src/main/java/org/torproject/metrics/collector/cron/Scheduler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java index db10205..054f03f 100644 --- a/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java @@ -58,7 +58,7 @@ public final class Scheduler implements ThreadFactory { try { gracePeriodMinutes = conf.getLong(Key.ShutdownGraceWaitMinutes); } catch (ConfigurationException ce) { - logger.warn("Cannot read grace period: {}", ce); + logger.warn("Cannot read grace period.", ce); gracePeriodMinutes = 10L; } List<Callable<Object>> runOnceMains = new ArrayList<>();

1 0

[collector/release] Use StandardCharsets.US_ASCII instead of "US-ASCII".
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 7338d79d1abcfd04857a10818d076d6a7917649b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 11:49:54 2019 +0100 Use StandardCharsets.US_ASCII instead of "US-ASCII". --- .../collector/bridgedescs/BridgeDescriptorParser.java | 3 ++- .../collector/bridgedescs/BridgeSnapshotReader.java | 3 ++- .../collector/bridgedescs/SanitizedBridgesWriter.java | 6 +++--- .../metrics/collector/relaydescs/ArchiveReader.java | 2 +- .../relaydescs/CachedRelayDescriptorReader.java | 7 ++++--- .../collector/relaydescs/RelayDescriptorParser.java | 9 +++++---- .../collector/relaydescs/ReferenceCheckerTest.java | 16 ++++++++-------- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java index 04460c8..778d187 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; +import java.nio.charset.StandardCharsets; public class BridgeDescriptorParser { @@ -33,7 +34,7 @@ public class BridgeDescriptorParser { String authorityFingerprint) { try { BufferedReader br = new BufferedReader(new StringReader( - new String(allData, "US-ASCII"))); + new String(allData, StandardCharsets.US_ASCII))); String line = br.readLine(); if (line == null) { return; diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java index 68ee28b..041807e 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java @@ -20,6 +20,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -139,7 +140,7 @@ public class BridgeSnapshotReader { } String fileDigest = Hex.encodeHexString(DigestUtils.sha1( allData)); - String ascii = new String(allData, "US-ASCII"); + String ascii = new String(allData, StandardCharsets.US_ASCII); BufferedReader br3 = new BufferedReader(new StringReader( ascii)); String firstLine; diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java index 921396c..45f2a1a 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java @@ -470,7 +470,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { try { DescriptorBuilder scrubbed = new DescriptorBuilder(); BufferedReader br = new BufferedReader(new StringReader(new String( - data, "US-ASCII"))); + data, StandardCharsets.US_ASCII))); String line; String mostRecentDescPublished = null; byte[] fingerprintBytes = null; @@ -682,7 +682,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { String masterKeyEd25519FromIdentityEd25519 = null; DescriptorBuilder scrubbed = new DescriptorBuilder(); try (BufferedReader br = new BufferedReader(new StringReader( - new String(data, "US-ASCII")))) { + new String(data, StandardCharsets.US_ASCII)))) { scrubbed.append(Annotation.BridgeServer.toString()); String line; String masterKeyEd25519 = null; @@ -1112,7 +1112,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { String masterKeyEd25519FromIdentityEd25519 = null; try { BufferedReader br = new BufferedReader(new StringReader(new String( - data, "US-ASCII"))); + data, StandardCharsets.US_ASCII))); String line; DescriptorBuilder scrubbed = null; String hashedBridgeIdentity; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java index fee46c9..3326833 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java @@ -184,7 +184,7 @@ public class ArchiveReader { bis.close(); byte[] allData = baos.toByteArray(); BufferedReader br = new BufferedReader(new StringReader( - new String(allData, "US-ASCII"))); + new String(allData, StandardCharsets.US_ASCII))); String line; do { line = br.readLine(); diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java index 0308f05..0a8012a 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java @@ -18,6 +18,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -130,7 +131,7 @@ public class CachedRelayDescriptorReader { if (f.getName().equals("cached-consensus")) { /* Check if directory information is stale. */ BufferedReader br = new BufferedReader(new StringReader( - new String(allData, "US-ASCII"))); + new String(allData, StandardCharsets.US_ASCII))); String line; while ((line = br.readLine()) != null) { if (line.startsWith("valid-after ")) { @@ -166,7 +167,7 @@ public class CachedRelayDescriptorReader { } else if (f.getName().equals("v3-status-votes")) { int parsedNum = 0; int skippedNum = 0; - String ascii = new String(allData, "US-ASCII"); + String ascii = new String(allData, StandardCharsets.US_ASCII); String startToken = "network-status-version "; int end = ascii.length(); int start = ascii.indexOf(startToken); @@ -197,7 +198,7 @@ public class CachedRelayDescriptorReader { .append(" votes"); } else if (f.getName().startsWith("cached-descriptors") || f.getName().startsWith("cached-extrainfo")) { - String ascii = new String(allData, "US-ASCII"); + String ascii = new String(allData, StandardCharsets.US_ASCII); int start; int sig; int end = -1; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java index a610ed9..abbd777 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java @@ -13,6 +13,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.Instant; @@ -83,7 +84,7 @@ public class RelayDescriptorParser { * the non-ASCII chars, but we don't care about them for parsing * anyway. */ BufferedReader br = new BufferedReader(new StringReader(new String( - data, "US-ASCII"))); + data, StandardCharsets.US_ASCII))); String line; do { line = br.readLine(); @@ -209,7 +210,7 @@ public class RelayDescriptorParser { break; default: if (this.aw != null || this.rdd != null) { - String ascii = new String(data, "US-ASCII"); + String ascii = new String(data, StandardCharsets.US_ASCII); String startToken = "network-status-version "; String sigToken = "directory-signature "; int start = ascii.indexOf(startToken); @@ -260,7 +261,7 @@ public class RelayDescriptorParser { : line.split(" ")[1].toLowerCase(); } } - String ascii = new String(data, "US-ASCII"); + String ascii = new String(data, StandardCharsets.US_ASCII); String startToken = "router "; String sigToken = "\nrouter-signature\n"; int start = ascii.indexOf(startToken); @@ -290,7 +291,7 @@ public class RelayDescriptorParser { published = parseFormat.parse(publishedTime).getTime(); } } - String ascii = new String(data, "US-ASCII"); + String ascii = new String(data, StandardCharsets.US_ASCII); String startToken = "extra-info "; String sigToken = "\nrouter-signature\n"; String digest = null; diff --git a/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java b/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java index 19672fc..9489315 100644 --- a/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java +++ b/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java @@ -12,7 +12,7 @@ import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import java.io.File; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; public class ReferenceCheckerTest { @@ -36,12 +36,12 @@ public class ReferenceCheckerTest { File histFile = tmpf.newFile(); Files.write(refsFile.toPath(), validReferenceJson.getBytes()); assertEquals(validReferenceJson, Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); ReferenceChecker rc = new ReferenceChecker(descDir, refsFile, histFile); rc.check(); assertTrue(refsFile.exists()); assertEquals(validReferenceJson, Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); } @Test() @@ -52,12 +52,12 @@ public class ReferenceCheckerTest { String badJson = "[{\"xx\":7]}"; Files.write(refsFile.toPath(), badJson.getBytes()); assertEquals(badJson, Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); ReferenceChecker rc = new ReferenceChecker(descDir, refsFile, histFile); rc.check(); assertTrue(refsFile.exists()); assertEquals("[]", Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); } @Test() @@ -70,7 +70,7 @@ public class ReferenceCheckerTest { rc.check(); assertTrue(refsFile.exists()); assertEquals("The file's contents shouldn't have changed, but did.", "[]", - Files.readAllLines(refsFile.toPath(), Charset.forName("US-ASCII")) + Files.readAllLines(refsFile.toPath(), StandardCharsets.US_ASCII) .get(0)); } @@ -87,13 +87,13 @@ public class ReferenceCheckerTest { Files.write(refsFile.toPath(), validEmptyReferencedString.getBytes()); assertEquals(validEmptyReferencedString, Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); ReferenceChecker rc = new ReferenceChecker(descDir, refsFile, histFile); rc.check(); assertTrue(refsFile.exists()); assertEquals(validEmptyReferencedString, Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); } }

1 0

[collector/release] Fix two JavaDocs issues with package-info.java.
by karsten＠torproject.org 15 Jan '20

15 Jan '20

commit 3bbc4db433979867cfcbac08eb7a698d4259a009 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 11:53:11 2019 +0100 Fix two JavaDocs issues with package-info.java. --- .../java/org/torproject/metrics/collector/persist/package-info.java | 6 +++--- .../java/org/torproject/metrics/collector/sync/package-info.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/persist/package-info.java b/src/main/java/org/torproject/metrics/collector/persist/package-info.java index 11d3939..75ec95e 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/package-info.java +++ b/src/main/java/org/torproject/metrics/collector/persist/package-info.java @@ -1,11 +1,11 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.collector.persist; - -/** This package containes decorating classes for descriptors that +/** This package contains decorating classes for descriptors that * simply determine the two storage paths based on the descriptor * and further parameters like acquisition time. * <p>All special persistence classes extend * {@code DescriptorPersistence}.</p> */ +package org.torproject.metrics.collector.persist; + diff --git a/src/main/java/org/torproject/metrics/collector/sync/package-info.java b/src/main/java/org/torproject/metrics/collector/sync/package-info.java index 08a6cdd..53e64b7 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/package-info.java +++ b/src/main/java/org/torproject/metrics/collector/sync/package-info.java @@ -1,8 +1,6 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.collector.sync; - /** This package coordinates syncing and merging the fetched data. * <p>The central class for this process is {@code SyncManager}, which * coordinates download from other instances and merging the new data @@ -10,4 +8,5 @@ package org.torproject.metrics.collector.sync; * <p>Storing data to the file system is facilitated by * {@code SyncPersistence}.</p> */ +package org.torproject.metrics.collector.sync;

1 0