tor-commits May 2019

tor-commits@lists.torproject.org

17 participants
2795 discussions

[collector/release] Fix synchronizing bandwidth files from other CollecTors.
by karsten＠torproject.org 30 May '19

30 May '19

commit c19be5b35490a1da33ecf57201e37409599fea48 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 16 15:55:57 2019 +0200 Fix synchronizing bandwidth files from other CollecTors. Fixes #30525. --- build.xml | 2 +- .../persist/BandwidthFilePersistence.java | 65 ++++++++++++++++++++++ .../metrics/collector/sync/SyncPersistence.java | 5 ++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 5be33ff..05cba36 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="release.version" value="1.9.0-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> - <property name="metricslibversion" value="2.6.1" /> + <property name="metricslibversion" value="2.6.2" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" > diff --git a/src/main/java/org/torproject/metrics/collector/persist/BandwidthFilePersistence.java b/src/main/java/org/torproject/metrics/collector/persist/BandwidthFilePersistence.java new file mode 100644 index 0000000..aeaf0ee --- /dev/null +++ b/src/main/java/org/torproject/metrics/collector/persist/BandwidthFilePersistence.java @@ -0,0 +1,65 @@ +/* Copyright 2016--2018 The Tor Project + * See LICENSE for licensing information */ + +package org.torproject.metrics.collector.persist; + +import org.torproject.descriptor.BandwidthFile; +import org.torproject.metrics.collector.conf.Annotation; + +import org.apache.commons.codec.digest.DigestUtils; + +import java.nio.file.Paths; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; + +public class BandwidthFilePersistence + extends DescriptorPersistence<BandwidthFile> { + + private static final String BANDWIDTH = "bandwidth"; + private static final String BANDWIDTHS = "bandwidths"; + + public BandwidthFilePersistence(BandwidthFile desc) { + super(desc, Annotation.BandwidthFile.bytes()); + calculatePaths(); + } + + private void calculatePaths() { + LocalDateTime fileCreatedOrTimestamp = this.desc.fileCreated() + .orElse(this.desc.timestamp()); + DateTimeFormatter directoriesFormatter = DateTimeFormatter + .ofPattern("uuuu/MM/dd").withZone(ZoneOffset.UTC); + String[] directories = fileCreatedOrTimestamp.format(directoriesFormatter) + .split("/"); + DateTimeFormatter fileFormatter = DateTimeFormatter + .ofPattern("uuuu-MM-dd-HH-mm-ss").withZone(ZoneOffset.UTC); + String bandwidthFileDigest = calcDigestFromBytes( + this.desc.getRawDescriptorBytes()); + String fileOut = fileCreatedOrTimestamp.format(fileFormatter) + + "-bandwidth-" + bandwidthFileDigest; + this.recentPath = Paths.get(RELAYDESCS, BANDWIDTHS, fileOut).toString(); + this.storagePath = Paths.get(RELAYDESCS, BANDWIDTH, directories[0], + directories[1], directories[2], fileOut).toString(); + } + + /** Calculate a digest for bandwidth files. */ + private static String calcDigestFromBytes(byte[] bytes) { + String digest = ""; + int start = 0; + while (start < bytes.length && bytes[start] == (byte) '@') { + do { + start++; + } while (start < bytes.length && bytes[start] != (byte) '\n'); + start++; + } + if (start < bytes.length) { + byte[] forDigest = new byte[bytes.length - start]; + System.arraycopy(bytes, start, forDigest, 0, forDigest.length); + digest = DigestUtils.sha256Hex(forDigest).toUpperCase(); + } else { + log.error("No digest calculation possible. Returning empty string."); + } + return digest; + } +} + diff --git a/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java index f2d3e55..0d344bf 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java +++ b/src/main/java/org/torproject/metrics/collector/sync/SyncPersistence.java @@ -3,6 +3,7 @@ package org.torproject.metrics.collector.sync; +import org.torproject.descriptor.BandwidthFile; import org.torproject.descriptor.BridgeExtraInfoDescriptor; import org.torproject.descriptor.BridgeNetworkStatus; import org.torproject.descriptor.BridgeServerDescriptor; @@ -17,6 +18,7 @@ import org.torproject.descriptor.WebServerAccessLog; import org.torproject.metrics.collector.conf.Configuration; import org.torproject.metrics.collector.conf.ConfigurationException; import org.torproject.metrics.collector.conf.Key; +import org.torproject.metrics.collector.persist.BandwidthFilePersistence; import org.torproject.metrics.collector.persist.BridgeExtraInfoPersistence; import org.torproject.metrics.collector.persist.BridgeServerDescriptorPersistence; import org.torproject.metrics.collector.persist.ConsensusPersistence; @@ -138,6 +140,9 @@ public class SyncPersistence { descPersist = new WebServerAccessLogPersistence( (WebServerAccessLog) desc); break; + case "BandwidthFile": + descPersist = new BandwidthFilePersistence((BandwidthFile) desc); + break; default: log.trace("Invalid descriptor type {} for sync-merge.", clazz.getName());

1 0

[collector/master] Prepare for 1.9.1 release.
by karsten＠torproject.org 30 May '19

30 May '19

commit df98ac79a3d0cb0e0a4e37387420a2edf60cf093 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 29 17:48:07 2019 +0200 Prepare for 1.9.1 release. --- CHANGELOG.md | 7 +++++++ build.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc1216a..4682fef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 1.9.1 - 2019-05-29 + + * Medium changes + - Fix synchronizing bandwidth files from other CollecTors. + - Update to metrics-lib 2.6.2. + + # Changes in version 1.9.0 - 2019-05-13 * Medium changes diff --git a/build.xml b/build.xml index 05cba36..d2d1f73 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.9.0-dev" /> + <property name="release.version" value="1.9.1" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.6.2" />

1 0

[collector/master] Fix synchronizing bandwidth files from other CollecTors.
by karsten＠torproject.org 30 May '19

30 May '19

1 0

[metrics-lib/release] Recognize bandwidth files with @type annotation.
by karsten＠torproject.org 30 May '19

30 May '19

commit f8afa3930d800e139b4e1ca540961ac4a097c11b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 16 15:54:13 2019 +0200 Recognize bandwidth files with @type annotation. Fixes part of #30525. --- CHANGELOG.md | 6 ++++++ .../java/org/torproject/descriptor/impl/DescriptorParserImpl.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e70572..d1aa923 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 2.6.2 - 2019-05-?? + + * Medium changes + - Recognize bandwidth files with @type annotation. + + # Changes in version 2.6.1 - 2019-05-03 * Medium changes diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index 08ac909..ef9da56 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -132,7 +132,8 @@ public class DescriptorParserImpl implements DescriptorParser { sourceFile); } else if (fileName.contains(LogDescriptorImpl.MARKER)) { return LogDescriptorImpl.parse(rawDescriptorBytes, sourceFile, fileName); - } else if (firstLines.matches("(?s)[0-9]{10}\\n.*")) { + } else if (firstLines.startsWith("@type bandwidth-file 1.") + || firstLines.matches("(?s)[0-9]{10}\\n.*")) { /* Identifying bandwidth files by a 10-digit timestamp in the first line * breaks with files generated before 2002 or after 2286 and when the next * descriptor identifier starts with just a timestamp in the first line

1 0

[metrics-lib/release] Bump version to 2.6.1-dev.
by karsten＠torproject.org 30 May '19

30 May '19

commit 3693e107a3aff7473200ece3ba3889dc9462c7b3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon May 13 11:45:17 2019 +0200 Bump version to 2.6.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 9b76d46..9ae5215 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.6.1" /> + <property name="release.version" value="2.6.1-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/release] Prepare for 2.6.2 release.
by karsten＠torproject.org 30 May '19

30 May '19

commit 3fe5dd322a823f50003bf66596cb73d990d2d70f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 29 17:22:12 2019 +0200 Prepare for 2.6.2 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1aa923..18d250e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 2.6.2 - 2019-05-?? +# Changes in version 2.6.2 - 2019-05-29 * Medium changes - Recognize bandwidth files with @type annotation. diff --git a/build.xml b/build.xml index 9ae5215..e6a1dbe 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.6.1-dev" /> + <property name="release.version" value="2.6.2" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Bump version to 2.6.2-dev.
by karsten＠torproject.org 30 May '19

30 May '19

commit e723c065b764ecfbb3bb96d4c491e67398b7f21b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 30 15:21:41 2019 +0200 Bump version to 2.6.2-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index e6a1dbe..3066e90 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.6.2" /> + <property name="release.version" value="2.6.2-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Prepare for 2.6.2 release.
by karsten＠torproject.org 30 May '19

30 May '19

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 30 May '19

30 May '19

commit feca21854365e2ccd0441000ab10cd69c4ef1a84 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 30 12:47:18 2019 +0000 Update translations for tails-greeter-2_completed --- es/es.po | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/es/es.po b/es/es.po index c0426fbe4..9a96fbac4 100644 --- a/es/es.po +++ b/es/es.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-25 19:21+0200\n" +"POT-Creation-Date: 2019-05-11 00:25+0200\n" "PO-Revision-Date: 2016-11-18 21:29+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" @@ -163,43 +163,45 @@ msgstr "Mostrar contraseña" msgid "Configure Persistent Storage" msgstr "Configurar Almacenamiento Persistente" -#: ../data/greeter.ui.h:32 +#. The label for this placeholder text is not very big, so keep this string +#. short. +#: ../data/greeter.ui.h:33 msgid "Enter your passphrase to unlock the persistent storage" msgstr "" "Introduce tu frase contraseña para desbloquear el almacenamiento persistente" -#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 +#: ../data/greeter.ui.h:34 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" msgstr "Desbloquear " -#: ../data/greeter.ui.h:34 +#: ../data/greeter.ui.h:35 msgid "Relock Persistent Storage" msgstr "Bloquear de nuevo el almacenamiento persistente" -#: ../data/greeter.ui.h:35 +#: ../data/greeter.ui.h:36 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" "Tu almacenamiento persistente está desbloqueado. Reinicia Tails para volver " "a bloquearlo." -#: ../data/greeter.ui.h:36 +#: ../data/greeter.ui.h:37 msgid "_Additional Settings" msgstr "_Configuración adicional" -#: ../data/greeter.ui.h:37 +#: ../data/greeter.ui.h:38 msgid "Save Additional Settings" msgstr "Guardar configuraciones adicionales " -#: ../data/greeter.ui.h:38 +#: ../data/greeter.ui.h:39 msgid "Add an additional setting" msgstr "Añadir un ajuste adicional" -#: ../data/greeter.ui.h:39 +#: ../data/greeter.ui.h:40 msgid "Network Configuration" msgstr "Configuración de red" -#: ../data/greeter.ui.h:40 +#: ../data/greeter.ui.h:41 msgid "" "If your Internet connection is censored, filtered, or proxied you can " "configure a Tor bridge or a local proxy. To work completely offline, you can" @@ -209,19 +211,19 @@ msgstr "" "puedes configurar un puente de red Tor o un proxy local. Para trabajar " "completamente desconectado, puedes deshabilitar todas las conexiones de red." -#: ../data/greeter.ui.h:41 +#: ../data/greeter.ui.h:42 msgid "Connect directly to the Tor network (default)" msgstr "Conectar directamente a la red Tor (predeterminado) " -#: ../data/greeter.ui.h:42 +#: ../data/greeter.ui.h:43 msgid "Configure a Tor bridge or local proxy" msgstr "Configura un puente Tor o un proxy local" -#: ../data/greeter.ui.h:43 +#: ../data/greeter.ui.h:44 msgid "Disable all networking" msgstr "Deshabilitar todas las conexiones de red " -#: ../data/greeter.ui.h:44 +#: ../data/greeter.ui.h:45 msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." @@ -229,31 +231,31 @@ msgstr "" "La configuración predeterminada es casi siempre la más segura. Para añadir " "una configuración personalizada, pulsa el botón \"+\"." -#: ../data/greeter.ui.h:45 +#: ../data/greeter.ui.h:46 msgid "_Administration Password" msgstr "_Contraseña de administrador" -#: ../data/greeter.ui.h:46 ../tailsgreeter/utils.py:45 +#: ../data/greeter.ui.h:47 ../tailsgreeter/utils.py:45 msgid "Off (default)" msgstr "Desactivada (predeterminado) " -#: ../data/greeter.ui.h:47 +#: ../data/greeter.ui.h:48 msgid "_MAC Address Spoofing" msgstr "_Falseamiento de dirección MAC" -#: ../data/greeter.ui.h:48 ../tailsgreeter/utils.py:43 +#: ../data/greeter.ui.h:49 ../tailsgreeter/utils.py:43 msgid "On (default)" msgstr "Activada (predeterminado) " -#: ../data/greeter.ui.h:49 +#: ../data/greeter.ui.h:50 msgid "_Network Connection" msgstr "Conexiones de _red" -#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385 +#: ../data/greeter.ui.h:51 ../tailsgreeter/gui.py:385 msgid "Direct (default)" msgstr "Directa (predeterminado) " -#: ../data/greeter.ui.h:51 +#: ../data/greeter.ui.h:52 msgid "_Windows Camouflage" msgstr "Camuflar como _Windows"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 30 May '19

30 May '19

commit d043dbe3dad4c414f50f9502a0816d36a7d61c3c Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 30 12:47:12 2019 +0000 Update translations for tails-greeter-2 --- es/es.po | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/es/es.po b/es/es.po index c0426fbe4..9a96fbac4 100644 --- a/es/es.po +++ b/es/es.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-25 19:21+0200\n" +"POT-Creation-Date: 2019-05-11 00:25+0200\n" "PO-Revision-Date: 2016-11-18 21:29+0000\n" "Last-Translator: erinm, 2019\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" @@ -163,43 +163,45 @@ msgstr "Mostrar contraseña" msgid "Configure Persistent Storage" msgstr "Configurar Almacenamiento Persistente" -#: ../data/greeter.ui.h:32 +#. The label for this placeholder text is not very big, so keep this string +#. short. +#: ../data/greeter.ui.h:33 msgid "Enter your passphrase to unlock the persistent storage" msgstr "" "Introduce tu frase contraseña para desbloquear el almacenamiento persistente" -#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:478 +#: ../data/greeter.ui.h:34 ../tailsgreeter/gui.py:478 #: ../tailsgreeter/gui.py:528 msgid "Unlock" msgstr "Desbloquear " -#: ../data/greeter.ui.h:34 +#: ../data/greeter.ui.h:35 msgid "Relock Persistent Storage" msgstr "Bloquear de nuevo el almacenamiento persistente" -#: ../data/greeter.ui.h:35 +#: ../data/greeter.ui.h:36 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" "Tu almacenamiento persistente está desbloqueado. Reinicia Tails para volver " "a bloquearlo." -#: ../data/greeter.ui.h:36 +#: ../data/greeter.ui.h:37 msgid "_Additional Settings" msgstr "_Configuración adicional" -#: ../data/greeter.ui.h:37 +#: ../data/greeter.ui.h:38 msgid "Save Additional Settings" msgstr "Guardar configuraciones adicionales " -#: ../data/greeter.ui.h:38 +#: ../data/greeter.ui.h:39 msgid "Add an additional setting" msgstr "Añadir un ajuste adicional" -#: ../data/greeter.ui.h:39 +#: ../data/greeter.ui.h:40 msgid "Network Configuration" msgstr "Configuración de red" -#: ../data/greeter.ui.h:40 +#: ../data/greeter.ui.h:41 msgid "" "If your Internet connection is censored, filtered, or proxied you can " "configure a Tor bridge or a local proxy. To work completely offline, you can" @@ -209,19 +211,19 @@ msgstr "" "puedes configurar un puente de red Tor o un proxy local. Para trabajar " "completamente desconectado, puedes deshabilitar todas las conexiones de red." -#: ../data/greeter.ui.h:41 +#: ../data/greeter.ui.h:42 msgid "Connect directly to the Tor network (default)" msgstr "Conectar directamente a la red Tor (predeterminado) " -#: ../data/greeter.ui.h:42 +#: ../data/greeter.ui.h:43 msgid "Configure a Tor bridge or local proxy" msgstr "Configura un puente Tor o un proxy local" -#: ../data/greeter.ui.h:43 +#: ../data/greeter.ui.h:44 msgid "Disable all networking" msgstr "Deshabilitar todas las conexiones de red " -#: ../data/greeter.ui.h:44 +#: ../data/greeter.ui.h:45 msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." @@ -229,31 +231,31 @@ msgstr "" "La configuración predeterminada es casi siempre la más segura. Para añadir " "una configuración personalizada, pulsa el botón \"+\"." -#: ../data/greeter.ui.h:45 +#: ../data/greeter.ui.h:46 msgid "_Administration Password" msgstr "_Contraseña de administrador" -#: ../data/greeter.ui.h:46 ../tailsgreeter/utils.py:45 +#: ../data/greeter.ui.h:47 ../tailsgreeter/utils.py:45 msgid "Off (default)" msgstr "Desactivada (predeterminado) " -#: ../data/greeter.ui.h:47 +#: ../data/greeter.ui.h:48 msgid "_MAC Address Spoofing" msgstr "_Falseamiento de dirección MAC" -#: ../data/greeter.ui.h:48 ../tailsgreeter/utils.py:43 +#: ../data/greeter.ui.h:49 ../tailsgreeter/utils.py:43 msgid "On (default)" msgstr "Activada (predeterminado) " -#: ../data/greeter.ui.h:49 +#: ../data/greeter.ui.h:50 msgid "_Network Connection" msgstr "Conexiones de _red" -#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:385 +#: ../data/greeter.ui.h:51 ../tailsgreeter/gui.py:385 msgid "Direct (default)" msgstr "Directa (predeterminado) " -#: ../data/greeter.ui.h:51 +#: ../data/greeter.ui.h:52 msgid "_Windows Camouflage" msgstr "Camuflar como _Windows"

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
280
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2019