May 2017 - tor-commits - lists.torproject.org

[tor-browser-build/master] Release preparations for 7.0a4
by boklm＠torproject.org 17 May '17

17 May '17

commit 18416a106aa9ba82320758a29436dd1d3b20d6f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed May 17 18:01:11 2017 +0200 Release preparations for 7.0a4 tor-browser-bundle.git author: 999a7afe0f50c6d6503d99ff3fab3879cd069a85 tor-browser-bundle.git commit: Georg Koppen <gk(a)torproject.org> --- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 43 ++++++++++++++++++++++ projects/tor-browser/config | 4 +- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 2 +- 6 files changed, 49 insertions(+), 6 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index f149cac..23c4e1e 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.2.14 +version: 5.2.16 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 11c178c..9f00100 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,46 @@ +Tor Browser 7.0a4 -- May 15 2017 + * All Platforms + * Update Firefox to 52.1.1esr + * Update Tor to 0.3.0.6 + * Update Tor Launcher to 0.2.12.1 + * Bug 20761: Don't ignore additional SocksPorts + * Translation update + * Update HTTPS-Everywhere to 5.2.16 + * Update NoScript to 5.0.4 + * Bug 21962: Fix crash on about:addons page + * Bug 21778: Canvas prompt is not shown in Tor Browser based on ESR52 + * Bug 21569: Add first-party domain to Permissions key + * Bug 22165: Don't allow collection of local IP addresses + * Bug 13017: Work around audio fingerprinting by disabling the Web Audio API + * Bug 10286: Disable Touch API and add fingerprinting resistance as fallback + * Bug 13612: Disable Social API + * Bug 10283: Disable SpeechSynthesis API + * Bug 21675: Spoof window.navigator.hardwareConcurrency + * Bug 21792: Suppress MediaError.message + * Bug 16337: Round times exposed by Animation API to nearest 100ms + * Bug 21726: Keep Graphite support disabled + * Bug 21685: Disable remote new tab pages + * Bug 21790: Disable captive portal detection + * Bug 21686: Disable Microsoft Family Safety support + * Bug 22073: Make sure Mozilla's experiments are disabled + * Bug 21683: Disable newly added Safebrowsing capabilities + * Bug 22071: Disable Kinto-based blocklist update mechanism + * Bug 22072: Hide TLS error reporting checkbox + * Bug 20761: Don't ignore additional SocksPorts + * Bug 21340: Identify and backport new patches from Firefox + * Bug 22153: Fix broken feeds on higher security levels + * Bug 22025: Fix broken certificate error pages on higher security levels + * Bug 21710: Upgrade Go to 1.8.1 + * Mac + * Bug 21940: Don't allow privilege escalation during update + * Bug 22044: Fix broken default search engine on macOS + * Bug 21879: Use our default bookmarks on OSX + * Bug 21779: Non-admin users can't access Tor Browser on macOS + * Linux + * Bug 22041: Fix update error during update to 7.0a3 + * Bug 22238: Fix use of hardened wrapper for Firefox build + * Bug 20683: Selfrando support for 64-bit Linux systems + Tor Browser 7.0a3 -- April 20 2017 * All Platforms * Update Firefox to 52.1.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 805d7b6..a2c21ed 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -54,9 +54,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 31ba7743699deefb606bcc49197d26d926f6b4e3d3526cd2f8a339f857a04fb1 + sha256sum: cd8e5561bdd7331d9fdd510fb1bd1cb6460d64f351076b523d31361ff9853c76 - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 9211844..a164ef3 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.12 +version: 0.2.12.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index c2d359c..b92fb4f 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.0.5-rc +version: 0.3.0.6 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/rbm.conf b/rbm.conf index ce70215..6a1cc43 100644 --- a/rbm.conf +++ b/rbm.conf @@ -7,7 +7,7 @@ build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %] pkg_type: build var: - torbrowser_version: '7.0a3' + torbrowser_version: '7.0a4' project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 17 May '17

17 May '17

commit f229770cf755b7df6e1ec4003e5899d35b026f5b Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 17 15:48:21 2017 +0000 Update translations for tor-browser-manual --- es_AR/es_AR.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index e9e8b55..fdc284b 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.po @@ -5,12 +5,13 @@ # Joaquín Serna <bubuanabelas(a)cryptolab.net>, 2017 # Rodolfo Fernando Juarez <rfjuarez(a)gmail.com>, 2017 # orienta cionscj <orientacionscj-survey(a)yahoo.com.ar>, 2017 +# dario tomatis <dftomatis(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: orienta cionscj <orientacionscj-survey(a)yahoo.com.ar>, 2017\n" +"Last-Translator: dario tomatis <dftomatis(a)gmail.com>, 2017\n" "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/1519/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -126,7 +127,7 @@ msgstr "Aprenda qué son los puentes y cómo obtenerlos" #: bridges.page:10 msgid "Bridges" -msgstr "" +msgstr "Bridges" #: bridges.page:12 msgid ""

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 17 May '17

17 May '17

commit 050041e1e140c2aa336e099627e432eb8ad6df88 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 17 15:45:28 2017 +0000 Update translations for https_everywhere_completed --- es_AR/ssl-observatory.dtd | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/es_AR/ssl-observatory.dtd b/es_AR/ssl-observatory.dtd new file mode 100644 index 0000000..6551a4d --- /dev/null +++ b/es_AR/ssl-observatory.dtd @@ -0,0 +1,99 @@ + +<!ENTITY ssl-observatory.popup.details "Detalles e información privada"> +<!ENTITY ssl-observatory.popup.later "Preguntarme después"> +<!ENTITY ssl-observatory.popup.no "No"> + +<!ENTITY ssl-observatory.popup.text "En todos lados HTTPS puede detectar ataques +contra su navegador enviando los certificados que recibe al +observatorio. ¿Desea Activarlo?"> + + + +<!ENTITY ssl-observatory.popup.title +"¿Deberia HTTPS Everywhere usar el Observatorio SSL?"> + +<!ENTITY ssl-observatory.popup.yes "Si"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +"Es seguro habilitar esta opción, a menos que +se encuentre en una red corporativa muy invasiva:"> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +"Seguro, a menos que utilice una red corporativa con nombres secretos de servidor de intranet:"> + +<!ENTITY ssl-observatory.prefs.alt_roots +"Aplicar y verificar los certificados firmados por CAs no estandar"> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +"Es seguro (y una buena idea) habilitar esta opción, a menos que uses una red corporativa intrusiva o el antivirus Kaspersky que monitorea tu navegación con un proxy TLS y un Certificado de Autoridad de raíz privado. Si se habilita en dicha red, esta opción puede presentar evidencia de que dominios https:// estaban siendo visitados a través del proxy, debido a los certificados únicos que produciría. Por eso lo dejamos apagado por defecto."> + +<!ENTITY ssl-observatory.prefs.anonymous "Compruebe certificados usando Tor para el anonimato"> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +"Compruebe certificados usando Tor para el anonimato (requiere Tor)"> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +"Esta opción requiere Tor para ser instalado y en ejecución"> + +<!ENTITY ssl-observatory.prefs.asn +"Cuando veas un nuevo certificado, avisale al Observatorio a que ISP estás conectado"> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +"Esto buscará y enviará el "número de sistema autónomo" de su red. El fin es ayudar a localizar ataques contra HTTPS y determinar si tenemos observaciones de redes en lugares como Irán y Siria donde los mismos son muy comunes."> + +<!ENTITY ssl-observatory.prefs.show_cert_warning +"Mostrar una advertencia cuando el Observatorio detecte un certificado revocado no atrapado por tu navegador"> + +<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip +"Esto verificará los certificados presentados contra las listas de revocación de certificados conocidas. Desafortunadamente no podemos garantizar que marcaremos todos los certificados revocados, pero si ves una advertencia hay una buena probabilidad de que algo esté mal."> + +<!ENTITY ssl-observatory.prefs.done "Hecho"> + +<!ENTITY ssl-observatory.prefs.explanation +"HTTPS En cada lugar se puede utilizar el Observatorio SSL de EFF. Esto hace dos cosas: (1) envía copias de los certificados HTTPS al Observatorio, para ayudarnos a detectar ataques de "hombre en el medio" y mejorar la seguridad de la Web; +Y (2) nos permite advertirle sobre conexiones inseguras o ataques en su navegador."> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +"Por ejemplo, cuando visite https://www.something.com, el certificado +recibido por el Observatorio indicará que alguien visitó +www.something.com, pero no quién visitó el sitio, ni qué página +específica miraron. Pase el mouse sobre las opciones para obtener más detalles:"> + +<!ENTITY ssl-observatory.prefs.hide "Ocultar opciones avanzadas"> + +<!ENTITY ssl-observatory.prefs.nonanon +"Comprobar certificados aunque Tor no esté disponible"> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +"Seguiremos tratando de mantener los datos anónimos, pero esta opción es menos segura"> + +<!ENTITY ssl-observatory.prefs.priv_dns +"Enviar y comprobar certificados para nombres DNS no-públicos"> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +"A menos que se verifique esta opción, el Observatorio no registrará certificados para nombres que no pueda resolver a través del sistema DNS."> + +<!ENTITY ssl-observatory.prefs.show "Mostrar opciones avanzadas"> + +<!ENTITY ssl-observatory.prefs.title "Preferencias del Observatorio SSL"> + +<!ENTITY ssl-observatory.prefs.use "¿Usar el Observatorio?"> +<!ENTITY ssl-observatory.warning.title "ADVERTENCIA del Observatorio SSL de EFF"> +<!ENTITY ssl-observatory.warning.showcert "Mostrar la cadena de certificado"> +<!ENTITY ssl-observatory.warning.okay "Entiendo"> +<!ENTITY ssl-observatory.warning.text "El Observatorio SSL de EFF ha emitido una advertencia sobre el o los certificado(s) de HTTPS para este sitio:"> +<!ENTITY ssl-observatory.warning.defense "Si ha iniciado sesión en este sitio, puede ser aconsejable cambiar su contraseña una vez que tenga una conexión segura. (Estas advertencias se pueden desactivar en la pestaña "Observatorio SSL" del diálogo de preferencias HTTPS Everywhere)."> + +<!ENTITY ssl-observatory.prefs.self_signed +"Enviar y verificar firma de certificados"> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"Recomendación: Los problemas criptográficos son especialmente comunes en dispositivos con auto firma">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 17 May '17

17 May '17

commit 5aaa59f8efaf3a10deea841a44eeb02f0f78b7c4 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 17 15:45:22 2017 +0000 Update translations for https_everywhere --- es_AR/ssl-observatory.dtd | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/es_AR/ssl-observatory.dtd b/es_AR/ssl-observatory.dtd index 7fb1df9..6551a4d 100644 --- a/es_AR/ssl-observatory.dtd +++ b/es_AR/ssl-observatory.dtd @@ -48,15 +48,13 @@ se encuentre en una red corporativa muy invasiva:"> "Mostrar una advertencia cuando el Observatorio detecte un certificado revocado no atrapado por tu navegador"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> +"Esto verificará los certificados presentados contra las listas de revocación de certificados conocidas. Desafortunadamente no podemos garantizar que marcaremos todos los certificados revocados, pero si ves una advertencia hay una buena probabilidad de que algo esté mal."> <!ENTITY ssl-observatory.prefs.done "Hecho"> <!ENTITY ssl-observatory.prefs.explanation -"HTTPS Everywhere can use EFF's SSL Observatory. This does two things: (1) -sends copies of HTTPS certificates to the Observatory, to help us -detect 'man in the middle' attacks and improve the Web's security; and (2) -lets us warn you about insecure connections or attacks on your browser."> +"HTTPS En cada lugar se puede utilizar el Observatorio SSL de EFF. Esto hace dos cosas: (1) envía copias de los certificados HTTPS al Observatorio, para ayudarnos a detectar ataques de "hombre en el medio" y mejorar la seguridad de la Web; +Y (2) nos permite advertirle sobre conexiones inseguras o ataques en su navegador.">  <!ENTITY ssl-observatory.prefs.explanation2 -"For example, when you visit https://www.something.com, the certificate -received by the Observatory will indicate that somebody visited -www.something.com, but not who visited the site, or what specific page they -looked at. Mouseover the options for further details:"> +"Por ejemplo, cuando visite https://www.something.com, el certificado +recibido por el Observatorio indicará que alguien visitó +www.something.com, pero no quién visitó el sitio, ni qué página +específica miraron. Pase el mouse sobre las opciones para obtener más detalles:"> <!ENTITY ssl-observatory.prefs.hide "Ocultar opciones avanzadas"> @@ -76,13 +74,13 @@ looked at. Mouseover the options for further details:"> "Comprobar certificados aunque Tor no esté disponible"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -"We will still try to keep the data anonymous, but this option is less secure"> +"Seguiremos tratando de mantener los datos anónimos, pero esta opción es menos segura"> <!ENTITY ssl-observatory.prefs.priv_dns "Enviar y comprobar certificados para nombres DNS no-públicos"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -"Unless this option is checked, the Observatory will not record certificates for names that it cannot resolve through the DNS system."> +"A menos que se verifique esta opción, el Observatorio no registrará certificados para nombres que no pueda resolver a través del sistema DNS."> <!ENTITY ssl-observatory.prefs.show "Mostrar opciones avanzadas"> @@ -91,11 +89,11 @@ looked at. Mouseover the options for further details:"> <!ENTITY ssl-observatory.prefs.use "¿Usar el Observatorio?"> <!ENTITY ssl-observatory.warning.title "ADVERTENCIA del Observatorio SSL de EFF"> <!ENTITY ssl-observatory.warning.showcert "Mostrar la cadena de certificado"> -<!ENTITY ssl-observatory.warning.okay "I understand"> -<!ENTITY ssl-observatory.warning.text "EFF's SSL Observatory has issued a warning about the HTTPS certificiate(s) for this site:"> -<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)"> +<!ENTITY ssl-observatory.warning.okay "Entiendo"> +<!ENTITY ssl-observatory.warning.text "El Observatorio SSL de EFF ha emitido una advertencia sobre el o los certificado(s) de HTTPS para este sitio:"> +<!ENTITY ssl-observatory.warning.defense "Si ha iniciado sesión en este sitio, puede ser aconsejable cambiar su contraseña una vez que tenga una conexión segura. (Estas advertencias se pueden desactivar en la pestaña "Observatorio SSL" del diálogo de preferencias HTTPS Everywhere)."> <!ENTITY ssl-observatory.prefs.self_signed -"Submit and check self-signed certificates"> +"Enviar y verificar firma de certificados"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -"This is recommended; cryptographic problems are especially common in self-signed embedded devices"> +"Recomendación: Los problemas criptográficos son especialmente comunes en dispositivos con auto firma">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 17 May '17

17 May '17

commit aa7811944a5a22c4c3215aacdbbe30a7265e2250 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 17 15:15:23 2017 +0000 Update translations for https_everywhere --- es_AR/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_AR/ssl-observatory.dtd b/es_AR/ssl-observatory.dtd index 77478ef..7fb1df9 100644 --- a/es_AR/ssl-observatory.dtd +++ b/es_AR/ssl-observatory.dtd @@ -42,7 +42,7 @@ se encuentre en una red corporativa muy invasiva:"> "Cuando veas un nuevo certificado, avisale al Observatorio a que ISP estás conectado"> <!ENTITY ssl-observatory.prefs.asn_tooltip -"This will fetch and send the "Autonomous System number" of your network. This will help us locate attacks against HTTPS, and to determine whether we have observations from networks in places like Iran and Syria where attacks are comparatively common."> +"Esto buscará y enviará el "número de sistema autónomo" de su red. El fin es ayudar a localizar ataques contra HTTPS y determinar si tenemos observaciones de redes en lugares como Irán y Siria donde los mismos son muy comunes."> <!ENTITY ssl-observatory.prefs.show_cert_warning "Mostrar una advertencia cuando el Observatorio detecte un certificado revocado no atrapado por tu navegador">

1 0

[metrics-web/master] Update to metrics-lib 1.7.0.
by karsten＠torproject.org 17 May '17

17 May '17

commit b3410f7f74df36042b3c061ddc66202a35f0dad2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 17 15:10:13 2017 +0200 Update to metrics-lib 1.7.0. And while doing so, switch to streamlined digest methods to remove deprecation warnings. --- .../src/main/java/org/torproject/metrics/advbwdist/Main.java | 2 +- .../org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java | 6 +++--- shared/build-base.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/advbwdist/src/main/java/org/torproject/metrics/advbwdist/Main.java b/modules/advbwdist/src/main/java/org/torproject/metrics/advbwdist/Main.java index a3135c0..7193108 100644 --- a/modules/advbwdist/src/main/java/org/torproject/metrics/advbwdist/Main.java +++ b/modules/advbwdist/src/main/java/org/torproject/metrics/advbwdist/Main.java @@ -46,7 +46,7 @@ public class Main { continue; } ServerDescriptor serverDescriptor = (ServerDescriptor) descriptor; - String digest = serverDescriptor.getServerDescriptorDigest(); + String digest = serverDescriptor.getDigestSha1Hex(); long advertisedBandwidth = Math.min(Math.min( serverDescriptor.getBandwidthRate(), serverDescriptor.getBandwidthBurst()), diff --git a/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java b/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java index 657f0d7..a04f95f 100644 --- a/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java +++ b/modules/legacy/src/main/java/org/torproject/ernie/cron/RelayDescriptorDatabaseImporter.java @@ -892,13 +892,13 @@ public final class RelayDescriptorDatabaseImporter { private void addServerDescriptor(ServerDescriptor descriptor) { this.addServerDescriptorContents( - descriptor.getServerDescriptorDigest(), descriptor.getNickname(), + descriptor.getDigestSha1Hex(), descriptor.getNickname(), descriptor.getAddress(), descriptor.getOrPort(), descriptor.getDirPort(), descriptor.getFingerprint(), descriptor.getBandwidthRate(), descriptor.getBandwidthBurst(), descriptor.getBandwidthObserved(), descriptor.getPlatform(), descriptor.getPublishedMillis(), descriptor.getUptime(), - descriptor.getExtraInfoDigest()); + descriptor.getExtraInfoDigestSha1Hex()); } private void addExtraInfoDescriptor(ExtraInfoDescriptor descriptor) { @@ -917,7 +917,7 @@ public final class RelayDescriptorDatabaseImporter { bandwidthHistoryLines.add( descriptor.getDirreqReadHistory().getLine()); } - this.addExtraInfoDescriptorContents(descriptor.getExtraInfoDigest(), + this.addExtraInfoDescriptorContents(descriptor.getDigestSha1Hex(), descriptor.getNickname(), descriptor.getFingerprint().toLowerCase(), descriptor.getPublishedMillis(), bandwidthHistoryLines); diff --git a/shared/build-base.xml b/shared/build-base.xml index e9db803..c6f9920 100644 --- a/shared/build-base.xml +++ b/shared/build-base.xml @@ -8,7 +8,7 @@ <property name="classes" value="${generated}/classes/"/> <property name="testclasses" value="${generated}/test-classes/"/> <property name="source-and-target-java-version" value="1.7" /> - <property name="descriptorversion" value="1.6.0" /> + <property name="descriptorversion" value="1.7.0" /> <path id="base.classpath"> <pathelement path="${classes}"/>

1 0

[collector/master] Fix deprecation warnings from Apache Commons Codec.
by karsten＠torproject.org 17 May '17

17 May '17

commit 2593dce6d0aeb44cfe3f29566d220b37a36801c9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 13 20:25:26 2017 +0200 Fix deprecation warnings from Apache Commons Codec. --- .../collector/bridgedescs/BridgeSnapshotReader.java | 4 ++-- .../collector/bridgedescs/SanitizedBridgesWriter.java | 16 ++++++++-------- .../torproject/collector/persist/VotePersistence.java | 2 +- .../relaydescs/CachedRelayDescriptorReader.java | 6 +++--- .../collector/relaydescs/RelayDescriptorParser.java | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java index 9ffdf10..54aa891 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java @@ -141,7 +141,7 @@ public class BridgeSnapshotReader { if (allData.length == 0) { continue; } - String fileDigest = Hex.encodeHexString(DigestUtils.sha( + String fileDigest = Hex.encodeHexString(DigestUtils.sha1( allData)); String ascii = new String(allData, "US-ASCII"); BufferedReader br3 = new BufferedReader(new StringReader( @@ -194,7 +194,7 @@ public class BridgeSnapshotReader { System.arraycopy(allData, start, descBytes, 0, end - start); String descriptorDigest = Hex.encodeHexString( - DigestUtils.sha(descBytes)); + DigestUtils.sha1(descBytes)); if (!descriptorImportHistory.contains( descriptorDigest)) { bdp.parse(descBytes, dateTime, authorityFingerprint); diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index ae3db8f..6ad2325 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -521,14 +521,14 @@ public class SanitizedBridgesWriter extends CollecTorMain { } /* Write scrubbed r line to buffer. */ - byte[] hashedBridgeIdentity = DigestUtils.sha(fingerprintBytes); + byte[] hashedBridgeIdentity = DigestUtils.sha1(fingerprintBytes); String hashedBridgeIdentityBase64 = Base64.encodeBase64String( hashedBridgeIdentity).substring(0, 27); hashedBridgeIdentityHex = Hex.encodeHexString( hashedBridgeIdentity); String descriptorIdentifier = parts[3]; String hashedDescriptorIdentifier = Base64.encodeBase64String( - DigestUtils.sha(Base64.decodeBase64(descriptorIdentifier + DigestUtils.sha1(Base64.decodeBase64(descriptorIdentifier + "=="))).substring(0, 27); String scrubbedAddress = scrubIpv4Address(address, fingerprintBytes, @@ -725,7 +725,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { .replaceAll(" ", "").toLowerCase(); byte[] fingerprintBytes = Hex.decodeHex( fingerprint.toCharArray()); - hashedBridgeIdentity = DigestUtils.shaHex(fingerprintBytes) + hashedBridgeIdentity = DigestUtils.sha1Hex(fingerprintBytes) .toLowerCase(); try { scrubbedAddress = scrubIpv4Address(address, fingerprintBytes, @@ -799,7 +799,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { + "expected: '" + line + "'. Skipping descriptor."); return; } - scrubbed.append("extra-info-digest " + DigestUtils.shaHex( + scrubbed.append("extra-info-digest " + DigestUtils.sha1Hex( Hex.decodeHex(parts[1].toCharArray())).toUpperCase()); if (parts.length > 2) { if (!Base64.isBase64(parts[2])) { @@ -894,7 +894,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { StringBuilder familyLine = new StringBuilder("family"); for (String s : line.substring(7).split(" ")) { if (s.startsWith("$")) { - familyLine.append(" $" + DigestUtils.shaHex(Hex.decodeHex( + familyLine.append(" $" + DigestUtils.sha1Hex(Hex.decodeHex( s.substring(1).toCharArray())).toUpperCase()); } else { familyLine.append(" " + s); @@ -952,7 +952,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { if (start >= 0 && sig >= 0 && sig > start) { byte[] forDigest = new byte[sig - start]; System.arraycopy(data, start, forDigest, 0, sig - start); - descriptorDigest = DigestUtils.shaHex(DigestUtils.sha(forDigest)); + descriptorDigest = DigestUtils.sha1Hex(DigestUtils.sha1(forDigest)); } } catch (UnsupportedEncodingException e) { /* Handle below. */ @@ -1112,7 +1112,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { + "'. Skipping descriptor."); return; } - hashedBridgeIdentity = DigestUtils.shaHex(Hex.decodeHex( + hashedBridgeIdentity = DigestUtils.sha1Hex(Hex.decodeHex( parts[2].toCharArray())).toLowerCase(); scrubbed = new StringBuilder("extra-info " + parts[1] + " " + hashedBridgeIdentity.toUpperCase() + "\n"); @@ -1237,7 +1237,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { if (start >= 0 && sig >= 0 && sig > start) { byte[] forDigest = new byte[sig - start]; System.arraycopy(data, start, forDigest, 0, sig - start); - descriptorDigest = DigestUtils.shaHex(DigestUtils.sha(forDigest)); + descriptorDigest = DigestUtils.sha1Hex(DigestUtils.sha1(forDigest)); } } catch (UnsupportedEncodingException e) { /* Handle below. */ diff --git a/src/main/java/org/torproject/collector/persist/VotePersistence.java b/src/main/java/org/torproject/collector/persist/VotePersistence.java index c89ee51..26f9a72 100644 --- a/src/main/java/org/torproject/collector/persist/VotePersistence.java +++ b/src/main/java/org/torproject/collector/persist/VotePersistence.java @@ -55,7 +55,7 @@ public class VotePersistence sig += sigToken.length(); byte[] forDigest = new byte[sig - start]; System.arraycopy(bytes, start, forDigest, 0, sig - start); - digest = DigestUtils.shaHex(forDigest).toUpperCase(); + digest = DigestUtils.sha1Hex(forDigest).toUpperCase(); } else { log.error("No digest calculation possible. Returning empty string."); } diff --git a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java index 2fb9978..34da5fc 100644 --- a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java @@ -135,7 +135,7 @@ public class CachedRelayDescriptorReader { /* Parse the cached consensus if we haven't parsed it before * (but regardless of whether it's stale or not). */ if (rdp != null) { - String digest = Hex.encodeHexString(DigestUtils.sha( + String digest = Hex.encodeHexString(DigestUtils.sha1( allData)); if (!lastImportHistory.contains(digest) && !currentImportHistory.contains(digest)) { @@ -162,7 +162,7 @@ public class CachedRelayDescriptorReader { System.arraycopy(allData, start, rawNetworkStatusBytes, 0, next - start); if (rdp != null) { - String digest = Hex.encodeHexString(DigestUtils.sha( + String digest = Hex.encodeHexString(DigestUtils.sha1( rawNetworkStatusBytes)); if (!lastImportHistory.contains(digest) && !currentImportHistory.contains(digest)) { @@ -209,7 +209,7 @@ public class CachedRelayDescriptorReader { byte[] descBytes = new byte[end - start]; System.arraycopy(allData, start, descBytes, 0, end - start); if (rdp != null) { - String digest = Hex.encodeHexString(DigestUtils.sha( + String digest = Hex.encodeHexString(DigestUtils.sha1( descBytes)); if (!lastImportHistory.contains(digest) && !currentImportHistory.contains(digest)) { diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java index 7f4ab29..537572b 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java @@ -210,7 +210,7 @@ public class RelayDescriptorParser { sig += sigToken.length(); byte[] forDigest = new byte[sig - start]; System.arraycopy(data, start, forDigest, 0, sig - start); - String digest = DigestUtils.shaHex(forDigest).toUpperCase(); + String digest = DigestUtils.sha1Hex(forDigest).toUpperCase(); if (this.aw != null) { this.aw.storeVote(data, validAfter, dirSource, digest, serverDescriptorDigests); @@ -260,7 +260,7 @@ public class RelayDescriptorParser { if (start >= 0 || sig >= 0 || sig > start) { byte[] forDigest = new byte[sig - start]; System.arraycopy(data, start, forDigest, 0, sig - start); - digest = DigestUtils.shaHex(forDigest); + digest = DigestUtils.sha1Hex(forDigest); } if (this.aw != null && digest != null) { this.aw.storeServerDescriptor(data, digest, published, @@ -299,7 +299,7 @@ public class RelayDescriptorParser { if (start >= 0 && sig >= 0 && sig > start) { byte[] forDigest = new byte[sig - start]; System.arraycopy(data, start, forDigest, 0, sig - start); - digest = DigestUtils.shaHex(forDigest); + digest = DigestUtils.sha1Hex(forDigest); } if (this.aw != null && digest != null) { this.aw.storeExtraInfoDescriptor(data, digest, published);

1 0

[collector/master] Update to metrics-lib 1.7.0.
by karsten＠torproject.org 17 May '17

17 May '17

commit ee7f39ac9eb3427a9c60ef704bf75b5d6c7a1e39 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 17 14:56:44 2017 +0200 Update to metrics-lib 1.7.0. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 7b8bc42..15fb17e 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="release.version" value="1.1.2-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> - <property name="descriptorversion" value="1.6.0" /> + <property name="descriptorversion" value="1.7.0" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" >

1 0

[collector/master] Avoid DescriptorReader's setExcludeFiles().
by karsten＠torproject.org 17 May '17

17 May '17

commit 24a849780652cbf564651c4df2b811167e8f98fa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 13 20:31:36 2017 +0200 Avoid DescriptorReader's setExcludeFiles(). --- .../java/org/torproject/collector/relaydescs/ReferenceChecker.java | 3 ++- src/main/java/org/torproject/collector/sync/SyncManager.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java b/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java index 7c10379..1b0025b 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java +++ b/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java @@ -168,7 +168,7 @@ public class ReferenceChecker { DescriptorReader descriptorReader = DescriptorSourceFactory.createDescriptorReader(); descriptorReader.addDirectory(this.descriptorsDir); - descriptorReader.setExcludeFiles(this.historyFile); + descriptorReader.setHistoryFile(this.historyFile); Iterator<DescriptorFile> descriptorFiles = descriptorReader.readDescriptors(); while (descriptorFiles.hasNext()) { @@ -199,6 +199,7 @@ public class ReferenceChecker { } } } + descriptorReader.saveHistoryFile(this.historyFile); } private void readRelayNetworkStatusConsensusUnflavored( diff --git a/src/main/java/org/torproject/collector/sync/SyncManager.java b/src/main/java/org/torproject/collector/sync/SyncManager.java index b9df0bd..d8d2708 100644 --- a/src/main/java/org/torproject/collector/sync/SyncManager.java +++ b/src/main/java/org/torproject/collector/sync/SyncManager.java @@ -82,9 +82,10 @@ public class SyncManager { String histFileEnding = entry.getValue().getSimpleName() + (entry.getKey().contains("consensus-microdesc") ? "-micro" : ""); - descriptorReader.setExcludeFiles(new File(basePath.toFile(), + File historyFile = new File(basePath.toFile(), "sync-history-" + source.getHost() + "-" + marker + "-" - + histFileEnding)); + + histFileEnding); + descriptorReader.setHistoryFile(historyFile); log.info("Reading {} of type {} ... ", marker, histFileEnding); Iterator<DescriptorFile> descriptorFiles = descriptorReader.readDescriptors(); @@ -108,6 +109,7 @@ public class SyncManager { persist.storeDescs(descFile.getDescriptors(), descFile.getFile().getName(), collectionDate.getTime()); } + descriptorReader.saveHistoryFile(historyFile); } log.info("Done merging {} from {}.", marker, source.getHost()); }

1 0

[collector/master] Switch to streamlined digest methods.
by karsten＠torproject.org 17 May '17

17 May '17

commit 807cfeb5b29518ebcdadf83b2d70eee1c49a5104 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat May 13 20:39:09 2017 +0200 Switch to streamlined digest methods. --- .../collector/persist/BridgeExtraInfoPersistence.java | 2 +- .../persist/BridgeServerDescriptorPersistence.java | 2 +- .../torproject/collector/persist/ExtraInfoPersistence.java | 2 +- .../collector/persist/ServerDescriptorPersistence.java | 2 +- .../torproject/collector/relaydescs/ReferenceChecker.java | 13 +++++++------ 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java b/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java index 72db7c5..5bab4c0 100644 --- a/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java +++ b/src/main/java/org/torproject/collector/persist/BridgeExtraInfoPersistence.java @@ -24,7 +24,7 @@ public class BridgeExtraInfoPersistence BRIDGEDESCS, EXTRA_INFOS, file + DASH + EXTRA_INFOS).toString(); - String digest = desc.getExtraInfoDigest().toLowerCase(); + String digest = desc.getDigestSha1Hex().toLowerCase(); this.storagePath = Paths.get( BRIDGEDESCS, parts[0], // year diff --git a/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java b/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java index f1abb98..3b4227e 100644 --- a/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java +++ b/src/main/java/org/torproject/collector/persist/BridgeServerDescriptorPersistence.java @@ -24,7 +24,7 @@ public class BridgeServerDescriptorPersistence BRIDGEDESCS, SERVERDESCS, file + DASH + SERVERDESCS).toString(); - String digest = desc.getServerDescriptorDigest().toLowerCase(); + String digest = desc.getDigestSha1Hex().toLowerCase(); this.storagePath = Paths.get( BRIDGEDESCS, parts[0], // year diff --git a/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java b/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java index 9a944a7..a6ae774 100644 --- a/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java +++ b/src/main/java/org/torproject/collector/persist/ExtraInfoPersistence.java @@ -24,7 +24,7 @@ public class ExtraInfoPersistence RELAYDESCS, EXTRA_INFOS, file + DASH + EXTRA_INFOS).toString(); - String digest = desc.getExtraInfoDigest(); + String digest = desc.getDigestSha1Hex(); this.storagePath = Paths.get( RELAYDESCS, EXTRA_INFO, diff --git a/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java b/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java index 642da7b..e1adfbc 100644 --- a/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java +++ b/src/main/java/org/torproject/collector/persist/ServerDescriptorPersistence.java @@ -26,7 +26,7 @@ public class ServerDescriptorPersistence RELAY_DESCRIPTORS, SERVERDESCS, file + DASH + SERVERDESCS).toString(); - String digest = desc.getServerDescriptorDigest(); + String digest = desc.getDigestSha1Hex(); this.storagePath = Paths.get( RELAY_DESCRIPTORS, SERVERDESC, diff --git a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java b/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java index 1b0025b..59db27f 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java +++ b/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java @@ -238,7 +238,7 @@ public class ReferenceChecker { / ((double) consensus.getStatusEntries().size()); for (NetworkStatusEntry entry : consensus.getStatusEntries().values()) { - for (String digest : entry.getMicrodescriptorDigests()) { + for (String digest : entry.getMicrodescriptorDigestsSha256Base64()) { this.addReference(referencing, String.format("D-%s", digest), entryWeight, entry.getPublishedMillis() + THREE_HOURS); } @@ -259,23 +259,24 @@ public class ReferenceChecker { } private void readServerDescriptor(ServerDescriptor serverDescriptor) { - String referenced = serverDescriptor.getExtraInfoDigest() == null ? "" - : String.format("E-%s", serverDescriptor.getExtraInfoDigest()); + String referenced = serverDescriptor.getExtraInfoDigestSha1Hex() == null + ? "" : String.format("E-%s", + serverDescriptor.getExtraInfoDigestSha1Hex()); this.addReference(String.format("S-%s", - serverDescriptor.getServerDescriptorDigest()), referenced, 0.01, + serverDescriptor.getDigestSha1Hex()), referenced, 0.01, serverDescriptor.getPublishedMillis() + SIX_HOURS); } private void readExtraInfoDescriptor( ExtraInfoDescriptor extraInfoDescriptor) { this.addReference(String.format("E-%s", - extraInfoDescriptor.getExtraInfoDigest()), "", 0.005, + extraInfoDescriptor.getDigestSha1Hex()), "", 0.005, extraInfoDescriptor.getPublishedMillis() + SIX_HOURS); } private void readMicrodescriptor(Microdescriptor microdesc) { this.addReference( - String.format("D-%s", microdesc.getMicrodescriptorDigest()), "", + String.format("D-%s", microdesc.getDigestSha256Base64()), "", 0.0, this.currentTimeMillis + THIRTY_DAYS); }

1 0