April 2018 - tor-commits - lists.torproject.org

[onionoo/release] Bump version to 5.1-1.11.0-dev.
by karsten＠torproject.org 06 Apr '18

06 Apr '18

commit e7ac4ca99571d8aeb501559713184b5601982111 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Mar 15 14:58:16 2018 +0100 Bump version to 5.1-1.11.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c7b0b98..149dcde 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="5.1"/> <property name="release.version" - value="${onionoo.protocol.version}-1.11.0"/> + value="${onionoo.protocol.version}-1.11.0-dev"/> <property name="metricslibversion" value="2.1.1"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Make two fixes to recently added version_status field.
by karsten＠torproject.org 06 Apr '18

06 Apr '18

commit b1077620b1da3dd7a464ceb4e2957445b9e26415 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 5 22:20:19 2018 +0200 Make two fixes to recently added version_status field. - Fix NullPointerException in cases where a relay/bridge does not report to have a (valid) tor version. - Set version_status field in bridge details documents, too. --- .../org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java | 5 ++++- .../java/org/torproject/onionoo/writer/DetailsDocumentWriter.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index b8bd4f6..6f9bdea 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -919,7 +919,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setLastChangedOrAddressOrPort( nodeStatus.getLastChangedOrAddressOrPort()); detailsStatus.setVersion(nodeStatus.getVersion()); - detailsStatus.setVersionStatus(nodeStatus.getVersionStatus().toString()); + if (null != nodeStatus.getVersionStatus()) { + detailsStatus.setVersionStatus(nodeStatus.getVersionStatus() + .toString()); + } this.documentStore.store(detailsStatus, fingerprint); this.documentStore.store(nodeStatus, fingerprint); diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index eca7874..4aace51 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -194,6 +194,7 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setPlatform(detailsStatus.getPlatform()); detailsDocument.setTransports(detailsStatus.getTransports()); detailsDocument.setVersion(detailsStatus.getVersion()); + detailsDocument.setVersionStatus(detailsStatus.getVersionStatus()); this.documentStore.store(detailsDocument, fingerprint); }

1 0

[onionoo/release] Only unescape valid UTF.
by karsten＠torproject.org 06 Apr '18

06 Apr '18

commit 532ef3479a576733934edb45f588f2a074061f62 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Mar 15 13:58:17 2018 +0000 Only unescape valid UTF. Add a utility method for only un-escaping valid utf and supply a test as well as test data for this issue. Fixes task-22594. --- CHANGELOG.md | 8 ++++ .../org/torproject/onionoo/docs/DocumentStore.java | 4 +- .../torproject/onionoo/server/ResponseBuilder.java | 5 +-- .../torproject/onionoo/util/FormattingUtils.java | 34 +++++++++++++++++ .../onionoo/util/FormattingUtilsTest.java | 43 ++++++++++++++++++++++ src/test/resources/lines-for-escape-tests.txt | 16 ++++++++ 6 files changed, 104 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fe389b..3a3c468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Changes in version 5.1-1.12.0 - 2018-??-?? + + * Minor changes + - Don't attempt to un-escape character sequences in contact lines + (like "\uk") that only happen to start like escaped utf-8 characters + (like "\u0055"). + + # Changes in version 5.1-1.11.0 - 2018-03-14 * Medium changes diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index 4622a34..f1f3803 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -9,7 +9,6 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParseException; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -318,8 +317,7 @@ public class DocumentStore { * objects are escaped JSON, e.g., \u00F2. When Gson serlializes * this string, it escapes the \ to \\, hence writes \\u00F2. We * need to undo this and change \\u00F2 back to \u00F2. */ - documentString = StringUtils.replace(gson.toJson(document), - "\\\\u", "\\u"); + documentString = FormattingUtils.replaceValidUtf(gson.toJson(document)); /* Existing details statuses don't contain opening and closing curly * brackets, so we should remove them from new details statuses, * too. */ diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index bb36a2c..e2bdf82 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -12,12 +12,11 @@ import org.torproject.onionoo.docs.DocumentStoreFactory; import org.torproject.onionoo.docs.SummaryDocument; import org.torproject.onionoo.docs.UptimeDocument; import org.torproject.onionoo.docs.WeightsDocument; +import org.torproject.onionoo.util.FormattingUtils; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.apache.commons.lang3.StringUtils; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -348,7 +347,7 @@ public class ResponseBuilder { /* Whenever we provide Gson with a string containing an escaped * non-ASCII character like \u00F2, it escapes the \ to \\, which * we need to undo before including the string in a response. */ - return StringUtils.replace(gson.toJson(dd), "\\\\u", "\\u"); + return FormattingUtils.replaceValidUtf(gson.toJson(dd)); } else { // TODO We should probably log that we didn't find a details // document that we expected to exist. diff --git a/src/main/java/org/torproject/onionoo/util/FormattingUtils.java b/src/main/java/org/torproject/onionoo/util/FormattingUtils.java index 7ed1377..3d16f5a 100644 --- a/src/main/java/org/torproject/onionoo/util/FormattingUtils.java +++ b/src/main/java/org/torproject/onionoo/util/FormattingUtils.java @@ -3,8 +3,18 @@ package org.torproject.onionoo.util; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** Static helper methods for string processing etc. */ public class FormattingUtils { + private static Logger log = LoggerFactory.getLogger( + FormattingUtils.class); + private FormattingUtils() { } @@ -35,5 +45,29 @@ public class FormattingUtils { public static String formatDecimalNumber(long decimalNumber) { return String.format("%,d", decimalNumber); } + + private static Pattern escapePattern = Pattern.compile( + "(\\\\{4}u[0-9a-fA-F]{4})"); + + /** De-escape only valid UTF and leave anything else escaped. */ + public static String replaceValidUtf(String text) { + if (null == text || text.isEmpty()) { + return text; + } + try { + StringBuffer sb = new StringBuffer(); + Matcher mat = escapePattern.matcher(text); + while (mat.find()) { + String unescaped = mat.group(1); + mat.appendReplacement(sb, unescaped); + } + mat.appendTail(sb); + return sb.toString(); + } catch (Throwable ex) { + log.debug("Couldn't process input '{}'.", text, ex); + return text; + } + } + } diff --git a/src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java b/src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java new file mode 100644 index 0000000..8744696 --- /dev/null +++ b/src/test/java/org/torproject/onionoo/util/FormattingUtilsTest.java @@ -0,0 +1,43 @@ +package org.torproject.onionoo.util; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; +import org.junit.runners.Parameterized.Parameters; + +import java.io.File; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +(a)RunWith(Parameterized.class) +public class FormattingUtilsTest { + + /** Provide test data. */ + @Parameters + public static Collection<String[]> data() throws Exception { + List<String> lines = Files.readAllLines((new File(ClassLoader + .getSystemResource("lines-for-escape-tests.txt").toURI())) + .toPath()); + List<String[]> testData = new ArrayList<>(); + for (int i = 0; i < lines.size(); i += 2) { + testData.add(new String[]{lines.get(i), lines.get(i + 1)}); + } + return testData; + } + + @Parameter(0) + public String in; + + @Parameter(1) + public String out; + + @Test + public void testReplaceUtf() { + assertEquals(out, new String(FormattingUtils.replaceValidUtf(in))); + } +} diff --git a/src/test/resources/lines-for-escape-tests.txt b/src/test/resources/lines-for-escape-tests.txt new file mode 100644 index 0000000..4fb5895 --- /dev/null +++ b/src/test/resources/lines-for-escape-tests.txt @@ -0,0 +1,16 @@ + + +abc +abc +\\\\u +\\\\u +Haha/\\\\(a)/\\\\live/\\\\./\\\\co/\\\\./\\\uk +Haha/\\\\(a)/\\\\live/\\\\./\\\\co/\\\\./\\\uk +\\\\u20ac +\\u20ac +\\\\u0024 +\\u0024 +some \\\\u20ac other string \\\\u0024 to unescape +some \\u20ac other string \\u0024 to unescape +abcd efg\\\\u0024xyz\\\\uxxxx +abcd efg\\u0024xyz\\\\uxxxx

1 0

[onionoo/release] Prepare for 5.2-1.12.0 release.
by karsten＠torproject.org 06 Apr '18

06 Apr '18

commit a225c094ada1afe3865c0874e0429f9ff63121ad Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 5 22:21:55 2018 +0200 Prepare for 5.2-1.12.0 release. --- CERT | 20 ++++++++++---------- CHANGELOG.md | 2 +- build.xml | 6 +++--- .../torproject/onionoo/server/ResponseBuilder.java | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CERT b/CERT index ca92db0..43be56e 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIEPrK+4DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIEIk6NnzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU -b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcx -MTE3MTA0MDQ5WhcNMTgwMjE1MTA0MDQ5WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTgw +MjI2MTQwMzUzWhcNMTgwNTI3MTQwMzUzWjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAIqRy -T4uMqw1WwZ8CtJx5kSs/or+5025bGK6V2dY/jYapZcbyG7sq3KVFAqLik8Yn7a0D -dfbmtR7r2jbkWhYppa7MGSQ6SMG6nxas05l8yf9ShDnNLtJoay8JyGPeucaFyEwV -VxwN9/I4M4chrrvBzpMB/1U3oJxlKR+nssh4w55DoUijk3vHn01+20EPU9uNJrsr -mXhcrJLU/4R952ZMLxtiBfNP7vaxLpQctNqZxEfa9/rm0pLlfd2t62BWf8kkGqEy -Ke4WdNpQwk3WKjFlKWcvsF6ztJJlwA+qHk4IB9PynVRNggWimBrxWigbeBL8qpML -A5xMtX/MHDXreWGaKA== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAlUkU +qqf+4yfXwAWFr2q6iijr54NDDEQwybCblIzVnsuGHPUDuie3ZWSHirtblBs/uJ9x +RxmwkBrJr9IGMmGhN2GKXIPeUH0EZBYo7bsgo5d+E61OCnd/O+1JZzdG9dK+0kfq +MLfo6ltFZZouHIIXfvOm8sLLRrdkXPrLQ/E8fTHB7dL6T8Hqg6pHRrRZDtuSM9CO +zSYropxqlFzzlzciOdTU05D8Cnx2j/RtaycxHxFS7QtriDB0uOfqvyiVeqpr72wG +qetlu3h46fXj3ALGVSXy+YZpYxcRNZsQyiBXdlXbgY0OfOVPFOH3HiZuv3zhfRJW +2DiJiA8BLxZToe2XDA== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index ac15a8f..b903acc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 5.1-1.12.0 - 2018-??-?? +# Changes in version 5.2-1.12.0 - 2018-04-06 * Medium changes - Add version_status field to details documents. diff --git a/build.xml b/build.xml index 149dcde..15e85ac 100644 --- a/build.xml +++ b/build.xml @@ -8,10 +8,10 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="5.1"/> + <property name="onionoo.protocol.version" value="5.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.11.0-dev"/> - <property name="metricslibversion" value="2.1.1"/> + value="${onionoo.protocol.version}-1.12.0"/> + <property name="metricslibversion" value="2.2.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="onionoo-${release.version}.war"/> diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index fcf3c8f..6930d92 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -122,7 +122,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "5.1"; + private static final String PROTOCOL_VERSION = "5.2"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2018-04-14";

1 0

[onionoo/release] Fetch descriptors from both CollecTor instances.
by karsten＠torproject.org 06 Apr '18

06 Apr '18

commit 520c1577c119f46f5de8db83ee9d4eb498a30e7a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 3 15:19:36 2018 +0200 Fetch descriptors from both CollecTor instances. Fixes #25700. --- CHANGELOG.md | 1 + .../onionoo/updater/DescriptorSource.java | 85 +++++++++++++++------- 2 files changed, 60 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36d6471..ac15a8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * Medium changes - Add version_status field to details documents. + - Fetch descriptors from both CollecTor instances. * Minor changes - Don't attempt to un-escape character sequences in contact lines diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java index 6bddd02..20e249d 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java @@ -25,32 +25,54 @@ public class DescriptorSource { private final File inDir = new File("in"); - private final File inRecentDir = new File(inDir, "recent"); + private final String[] collecTorHosts = new String[] { + "collector.torproject.org", "collector2.torproject.org" }; + + private File[] inCollecTorHostDirs; + + private File[] inCollecTorHostRecentDirs; + + private List<DescriptorQueue> recentDescriptorQueues; private final File inArchiveDir = new File(inDir, "archive"); private final File statusDir = new File("status"); - private List<DescriptorQueue> descriptorQueues; - private DescriptorQueue archiveDescriptorQueue; /** Instantiates a new descriptor source. */ public DescriptorSource() { - this.descriptorQueues = new ArrayList<>(); + this.inCollecTorHostDirs = new File[this.collecTorHosts.length]; + this.inCollecTorHostRecentDirs = new File[this.collecTorHosts.length]; + for (int collecTorHostIndex = 0; + collecTorHostIndex < this.collecTorHosts.length; + collecTorHostIndex++) { + this.inCollecTorHostDirs[collecTorHostIndex] + = new File(this.statusDir, this.collecTorHosts[collecTorHostIndex]); + this.inCollecTorHostRecentDirs[collecTorHostIndex] + = new File(this.inCollecTorHostDirs[collecTorHostIndex], "recent"); + } + this.recentDescriptorQueues = new ArrayList<>(); this.descriptorListeners = new HashMap<>(); } - private DescriptorQueue getDescriptorQueue( + private List<DescriptorQueue> getDescriptorQueues( DescriptorType descriptorType, DescriptorHistory descriptorHistory) { - DescriptorQueue descriptorQueue = new DescriptorQueue( - this.inRecentDir, descriptorType, this.statusDir); - if (descriptorHistory != null) { - descriptorQueue.readHistoryFile(descriptorHistory); + List<DescriptorQueue> descriptorQueues = new ArrayList<>(); + for (int collecTorHostIndex = 0; + collecTorHostIndex < this.collecTorHosts.length; + collecTorHostIndex++) { + DescriptorQueue descriptorQueue = new DescriptorQueue( + this.inCollecTorHostRecentDirs[collecTorHostIndex], descriptorType, + this.inCollecTorHostDirs[collecTorHostIndex]); + if (descriptorHistory != null) { + descriptorQueue.readHistoryFile(descriptorHistory); + } + descriptorQueues.add(descriptorQueue); } - this.descriptorQueues.add(descriptorQueue); - return descriptorQueue; + this.recentDescriptorQueues.addAll(descriptorQueues); + return descriptorQueues; } private Map<DescriptorType, Set<DescriptorListener>> @@ -68,14 +90,24 @@ public class DescriptorSource { /** Downloads descriptors from CollecTor. */ public void downloadDescriptors() { - List<String> remoteDirectories = new ArrayList<>(); + List<String> remoteDirectoriesList = new ArrayList<>(); for (DescriptorType descriptorType : DescriptorType.values()) { - remoteDirectories.add("/recent/" + descriptorType.getDir()); + remoteDirectoriesList.add("/recent/" + descriptorType.getDir()); + } + for (int collecTorHostIndex = 0; + collecTorHostIndex < this.collecTorHosts.length; + collecTorHostIndex++) { + String collecTorBaseUrl = "https://" + + this.collecTorHosts[collecTorHostIndex]; + String[] remoteDirectories = remoteDirectoriesList.toArray(new String[0]); + long minLastModified = 0L; + File localDirectory = this.inCollecTorHostDirs[collecTorHostIndex]; + boolean deleteExtraneousLocalFiles = true; + DescriptorCollector dc = org.torproject.descriptor.DescriptorSourceFactory + .createDescriptorCollector(); + dc.collectDescriptors(collecTorBaseUrl, remoteDirectories, + minLastModified, localDirectory, deleteExtraneousLocalFiles); } - DescriptorCollector dc = org.torproject.descriptor.DescriptorSourceFactory - .createDescriptorCollector(); - dc.collectDescriptors("https://collector.torproject.org", - remoteDirectories.toArray(new String[0]), 0L, inDir, true); } /** Reads archived and recent descriptors from disk and feeds them into @@ -113,12 +145,13 @@ public class DescriptorSource { } Set<DescriptorListener> descriptorListeners = this.descriptorListeners.get(descriptorType); - DescriptorQueue descriptorQueue = this.getDescriptorQueue( - descriptorType, descriptorHistory); - Descriptor descriptor; - while ((descriptor = descriptorQueue.nextDescriptor()) != null) { - for (DescriptorListener descriptorListener : descriptorListeners) { - descriptorListener.processDescriptor(descriptor, relay); + for (DescriptorQueue descriptorQueue + : this.getDescriptorQueues(descriptorType, descriptorHistory)) { + Descriptor descriptor; + while ((descriptor = descriptorQueue.nextDescriptor()) != null) { + for (DescriptorListener descriptorListener : descriptorListeners) { + descriptorListener.processDescriptor(descriptor, relay); + } } } log.info("Read recent/{}.", descriptorType.getDir()); @@ -185,7 +218,7 @@ public class DescriptorSource { /** Writes parse histories for recent descriptors to disk. */ public void writeHistoryFiles() { log.debug("Writing parse histories for recent descriptors..."); - for (DescriptorQueue descriptorQueue : this.descriptorQueues) { + for (DescriptorQueue descriptorQueue : this.recentDescriptorQueues) { descriptorQueue.writeHistoryFile(); } } @@ -194,13 +227,13 @@ public class DescriptorSource { * descriptors during the current execution. */ public String getStatsString() { StringBuilder sb = new StringBuilder(); - sb.append(" ").append(this.descriptorQueues.size()) + sb.append(" ").append(this.recentDescriptorQueues.size()) .append(" descriptor ").append("queues created for recent descriptors\n"); int historySizeBefore = 0; int historySizeAfter = 0; long descriptors = 0L; long bytes = 0L; - for (DescriptorQueue descriptorQueue : this.descriptorQueues) { + for (DescriptorQueue descriptorQueue : this.recentDescriptorQueues) { historySizeBefore += descriptorQueue.getHistorySizeBefore(); historySizeAfter += descriptorQueue.getHistorySizeAfter(); descriptors += descriptorQueue.getReturnedDescriptors();

1 0

[onionoo/master] Make two fixes to recently added version_status field.
by karsten＠torproject.org 06 Apr '18

06 Apr '18

commit b1077620b1da3dd7a464ceb4e2957445b9e26415 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 5 22:20:19 2018 +0200 Make two fixes to recently added version_status field. - Fix NullPointerException in cases where a relay/bridge does not report to have a (valid) tor version. - Set version_status field in bridge details documents, too. --- .../org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java | 5 ++++- .../java/org/torproject/onionoo/writer/DetailsDocumentWriter.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index b8bd4f6..6f9bdea 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -919,7 +919,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setLastChangedOrAddressOrPort( nodeStatus.getLastChangedOrAddressOrPort()); detailsStatus.setVersion(nodeStatus.getVersion()); - detailsStatus.setVersionStatus(nodeStatus.getVersionStatus().toString()); + if (null != nodeStatus.getVersionStatus()) { + detailsStatus.setVersionStatus(nodeStatus.getVersionStatus() + .toString()); + } this.documentStore.store(detailsStatus, fingerprint); this.documentStore.store(nodeStatus, fingerprint); diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index eca7874..4aace51 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -194,6 +194,7 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setPlatform(detailsStatus.getPlatform()); detailsDocument.setTransports(detailsStatus.getTransports()); detailsDocument.setVersion(detailsStatus.getVersion()); + detailsDocument.setVersionStatus(detailsStatus.getVersionStatus()); this.documentStore.store(detailsDocument, fingerprint); }

1 0

[onionoo/master] Prepare for 5.2-1.12.0 release.
by karsten＠torproject.org 06 Apr '18

06 Apr '18

commit a225c094ada1afe3865c0874e0429f9ff63121ad Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 5 22:21:55 2018 +0200 Prepare for 5.2-1.12.0 release. --- CERT | 20 ++++++++++---------- CHANGELOG.md | 2 +- build.xml | 6 +++--- .../torproject/onionoo/server/ResponseBuilder.java | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CERT b/CERT index ca92db0..43be56e 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIEPrK+4DANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIEIk6NnzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU -b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTcx -MTE3MTA0MDQ5WhcNMTgwMjE1MTA0MDQ5WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTgw +MjI2MTQwMzUzWhcNMTgwNTI3MTQwMzUzWjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAIqRy -T4uMqw1WwZ8CtJx5kSs/or+5025bGK6V2dY/jYapZcbyG7sq3KVFAqLik8Yn7a0D -dfbmtR7r2jbkWhYppa7MGSQ6SMG6nxas05l8yf9ShDnNLtJoay8JyGPeucaFyEwV -VxwN9/I4M4chrrvBzpMB/1U3oJxlKR+nssh4w55DoUijk3vHn01+20EPU9uNJrsr -mXhcrJLU/4R952ZMLxtiBfNP7vaxLpQctNqZxEfa9/rm0pLlfd2t62BWf8kkGqEy -Ke4WdNpQwk3WKjFlKWcvsF6ztJJlwA+qHk4IB9PynVRNggWimBrxWigbeBL8qpML -A5xMtX/MHDXreWGaKA== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAlUkU +qqf+4yfXwAWFr2q6iijr54NDDEQwybCblIzVnsuGHPUDuie3ZWSHirtblBs/uJ9x +RxmwkBrJr9IGMmGhN2GKXIPeUH0EZBYo7bsgo5d+E61OCnd/O+1JZzdG9dK+0kfq +MLfo6ltFZZouHIIXfvOm8sLLRrdkXPrLQ/E8fTHB7dL6T8Hqg6pHRrRZDtuSM9CO +zSYropxqlFzzlzciOdTU05D8Cnx2j/RtaycxHxFS7QtriDB0uOfqvyiVeqpr72wG +qetlu3h46fXj3ALGVSXy+YZpYxcRNZsQyiBXdlXbgY0OfOVPFOH3HiZuv3zhfRJW +2DiJiA8BLxZToe2XDA== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index ac15a8f..b903acc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 5.1-1.12.0 - 2018-??-?? +# Changes in version 5.2-1.12.0 - 2018-04-06 * Medium changes - Add version_status field to details documents. diff --git a/build.xml b/build.xml index 149dcde..15e85ac 100644 --- a/build.xml +++ b/build.xml @@ -8,10 +8,10 @@ <property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="5.1"/> + <property name="onionoo.protocol.version" value="5.2"/> <property name="release.version" - value="${onionoo.protocol.version}-1.11.0-dev"/> - <property name="metricslibversion" value="2.1.1"/> + value="${onionoo.protocol.version}-1.12.0"/> + <property name="metricslibversion" value="2.2.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="onionoo-${release.version}.war"/> diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index fcf3c8f..6930d92 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -122,7 +122,7 @@ public class ResponseBuilder { return this.charsWritten; } - private static final String PROTOCOL_VERSION = "5.1"; + private static final String PROTOCOL_VERSION = "5.2"; private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2018-04-14";

1 0

[webwml/master] Fix no script version of debian install docs
by hiro＠torproject.org 06 Apr '18

06 Apr '18

commit 0f3c0995f91e2de1e9146355a62845d7bc2e6f8f Author: hiro <hiro(a)torproject.org> Date: Fri Apr 6 10:46:29 2018 +0200 Fix no script version of debian install docs --- docs/en/debian.wml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index d71712c8..6440ba5c 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -136,7 +136,7 @@ Then add this line to your <tt>/etc/apt/sources.list</tt> file:<br /> <pre style="margin: 1.5em 0 1.5em 2em"> -deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main +deb https://deb.torproject.org/torproject.org <DISTRIBUTION> main </pre> where you put the codename of your distribution (i.e. stretch, buster, sid or whatever it is) @@ -209,8 +209,8 @@ download/download-unix>#packagediff">development branch</a> of Tor instead (more features and more bugs), you need to add a different set of lines to your <tt>/etc/apt/sources.list</tt> file:<br /> <pre style="margin: 1.5em 0 1.5em 2em"> -deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main -deb http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main +deb https://deb.torproject.org/torproject.org <DISTRIBUTION> main +deb https://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main </pre> where you again substitute the name of your distro (stretch, buster, sid, xenial, ...) in place of @@ -244,11 +244,11 @@ If you want to build your own debs from source you must first add an appropriate <tt>deb-src</tt> line to <tt>sources.list</tt>. <pre style="margin: 1.5em 0 1.5em 2em"> # For the stable version. -deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main +deb-src https://deb.torproject.org/torproject.org <DISTRIBUTION> main # For the unstable version. -deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main -deb-src http://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main +deb-src https://deb.torproject.org/torproject.org <DISTRIBUTION> main +deb-src https://deb.torproject.org/torproject.org tor-experimental-0.3.3.x-<DISTRIBUTION> main </pre> Substitute the name of your distro (stretch, buster, sid, xenial, ...) in place of <DISTRIBUTION>. Now refresh your sources by running (as root): <pre style="margin: 1.5em 0 1.5em 2em">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 06 Apr '18

06 Apr '18

commit 1f2a9505a9ba3eeb6a2e10e8654286054e3fa58e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 6 07:15:05 2018 +0000 Update translations for bridgedb --- ti/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ti/LC_MESSAGES/bridgedb.po b/ti/LC_MESSAGES/bridgedb.po index cec80a09a..910aea664 100644 --- a/ti/LC_MESSAGES/bridgedb.po +++ b/ti/LC_MESSAGES/bridgedb.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2018-02-20 18:46+0000\n" -"Last-Translator: Tewelde Tesfagabir <ttesfag(a)voanews.com>\n" +"PO-Revision-Date: 2018-04-06 06:55+0000\n" +"Last-Translator: Thewodros Aregay <teddywa8(a)yahoo.com>\n" "Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 05 Apr '18

05 Apr '18

commit 273233dba9d7bcf6024d4ca7e1e832c5891bf097 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 5 23:45:49 2018 +0000 Update translations for tails-persistence-setup --- ti/ti.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ti/ti.po b/ti/ti.po index 93929869e..d193b1ec5 100644 --- a/ti/ti.po +++ b/ti/ti.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2018-02-20 18:51+0000\n" -"Last-Translator: mulugetta tsegay <mulugettaat(a)gmail.com>\n" +"PO-Revision-Date: 2018-04-05 23:31+0000\n" +"Last-Translator: Thewodros Aregay <teddywa8(a)yahoo.com>\n" "Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0