November 2019 - tor-commits - lists.torproject.org

[metrics-lib/master] Use StandardCharsets.US_ASCII instead of "US-ASCII".
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 75e1d31465aceb31c81f86575dc71abdab77095a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:04:29 2019 +0100 Use StandardCharsets.US_ASCII instead of "US-ASCII". --- .../java/org/torproject/descriptor/impl/ExitListImplTest.java | 9 +++++---- .../org/torproject/descriptor/impl/TorperfResultImplTest.java | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java index 0b53250..44a868b 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java @@ -12,6 +12,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import java.nio.charset.StandardCharsets; import java.util.Map; public class ExitListImplTest { @@ -22,7 +23,7 @@ public class ExitListImplTest { @Test public void testAnnotatedInput() throws Exception { ExitListImpl result = new ExitListImpl((tordnselAnnotation + input) - .getBytes("US-ASCII"), null, fileName); + .getBytes(StandardCharsets.US_ASCII), null, fileName); assertEquals("Expected one annotation.", 1, result.getAnnotations().size()); assertEquals(tordnselAnnotation.substring(0, 18), @@ -38,7 +39,7 @@ public class ExitListImplTest { public void testMultipleExitAddresses() throws Exception { ExitListImpl result = new ExitListImpl( (tordnselAnnotation + multiExitAddressInput) - .getBytes("US-ASCII"), null, fileName); + .getBytes(StandardCharsets.US_ASCII), null, fileName); assertTrue("Unrecognized lines: " + result.getUnrecognizedLines(), result.getUnrecognizedLines().isEmpty()); Map<String, Long> map = result.getEntries() @@ -54,7 +55,7 @@ public class ExitListImplTest { this.thrown.expect(DescriptorParseException.class); this.thrown.expectMessage("Missing 'ExitAddress' line in exit list entry."); new ExitListImpl((tordnselAnnotation + insufficientInput[0]) - .getBytes("US-ASCII"), null, fileName); + .getBytes(StandardCharsets.US_ASCII), null, fileName); } @Test @@ -62,7 +63,7 @@ public class ExitListImplTest { this.thrown.expect(DescriptorParseException.class); this.thrown.expectMessage("Missing 'Published' line in exit list entry."); new ExitListImpl((tordnselAnnotation + insufficientInput[1]) - .getBytes("US-ASCII"), null, fileName); + .getBytes(StandardCharsets.US_ASCII), null, fileName); } private static final String tordnselAnnotation = "@type tordnsel 1.0\n"; diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java index 2af458f..b56490a 100644 --- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java @@ -22,7 +22,7 @@ public class TorperfResultImplTest { public void testAnnotatedInput() throws Exception { TorperfResultImpl result = (TorperfResultImpl) (TorperfResultImpl.parseTorperfResults((torperfAnnotation + input) - .getBytes("US-ASCII"), null).get(0)); + .getBytes(StandardCharsets.US_ASCII), null).get(0)); assertEquals("Expected one annotation.", 1, result.getAnnotations().size()); assertEquals(torperfAnnotation.substring(0, 17), @@ -37,7 +37,7 @@ public class TorperfResultImplTest { @Test public void testPartiallyAnnotatedInput() throws Exception { byte[] asciiBytes = (torperfAnnotation - + input + input + input).getBytes("US-ASCII"); + + input + input + input).getBytes(StandardCharsets.US_ASCII); List<Descriptor> result = TorperfResultImpl.parseTorperfResults( asciiBytes, null); assertEquals("Expected one annotation.", 1, @@ -53,7 +53,7 @@ public class TorperfResultImplTest { public void testAllAnnotatedInput() throws Exception { byte[] asciiBytes = (torperfAnnotation + input + torperfAnnotation + input - + torperfAnnotation + input).getBytes("US-ASCII"); + + torperfAnnotation + input).getBytes(StandardCharsets.US_ASCII); List<Descriptor> result = TorperfResultImpl.parseTorperfResults( asciiBytes, null); assertEquals("Expected one annotation.", 1, @@ -68,7 +68,7 @@ public class TorperfResultImplTest { @Test public void testTrailingNewlinesRetained() throws Exception { byte[] asciiBytes = (torperfAnnotation + input - + torperfAnnotation + input).getBytes("US-ASCII"); + + torperfAnnotation + input).getBytes(StandardCharsets.US_ASCII); List<Descriptor> result = TorperfResultImpl.parseTorperfResults( asciiBytes, null); for (Descriptor descriptor : result) {

1 0

[metrics-lib/master] Simplify method call.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 5af3f60993a5ccf68545ca83a485e966a66343a9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:07:49 2019 +0100 Simplify method call. --- src/main/java/org/torproject/descriptor/impl/KeyValueMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java b/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java index 08ad84e..6cb4680 100644 --- a/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java +++ b/src/main/java/org/torproject/descriptor/impl/KeyValueMap.java @@ -20,7 +20,7 @@ public class KeyValueMap<T> extends TreeMap<String, T> { private void putPair(String key, T value, String line, String listElement, int keyLength) throws DescriptorParseException { - if (this.keySet().contains(key)) { + if (this.containsKey(key)) { throw new DescriptorParseException("Line '" + line + "' contains " + "duplicate key '" + key + "'."); }

1 0

[metrics-lib/master] Fix logging.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 2614e6137ce7ddac40eb369175f3f24aad45d4ab Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:03:05 2019 +0100 Fix logging. --- .../java/org/torproject/descriptor/index/DescriptorIndexCollector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java index 9e053dc..c472da0 100644 --- a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java +++ b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java @@ -181,7 +181,7 @@ public class DescriptorIndexCollector implements DescriptorCollector { } catch (IOException ioe) { log.warn("Cannot index local directory {} to skip any remote files that " + "already exist locally. Continuing with an either empty or " - + "incomplete index of local files.", ioe); + + "incomplete index of local files.", localDir, ioe); } return locals; }

1 0

[metrics-lib/master] Simplify switch/case statement.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit a18c70b33e89ac6a9c241860b15e46a1b54d0ea6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:07:01 2019 +0100 Simplify switch/case statement. --- src/main/java/org/torproject/descriptor/impl/ExitListImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java b/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java index bd5b2b6..b1ffa67 100644 --- a/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ExitListImpl.java @@ -77,11 +77,7 @@ public class ExitListImpl extends DescriptorImpl implements ExitList { sb.append(line).append(ExitList.EOL); break; case "Published": - sb.append(line).append(ExitList.EOL); - break; case "LastStatus": - sb.append(line).append(ExitList.EOL); - break; case "ExitAddress": sb.append(line).append(ExitList.EOL); break;

1 0

[metrics-lib/master] Remove unused suppression.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit b3b12366411eaba769dfc95b4edd64c4e534487b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:10:40 2019 +0100 Remove unused suppression. --- src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java index 3df90cc..995909c 100644 --- a/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/ServerDescriptorImpl.java @@ -844,7 +844,6 @@ public abstract class ServerDescriptorImpl extends DescriptorImpl } @Override - @SuppressWarnings("deprecation") public List<Integer> getHiddenServiceDirVersions() { return this.hiddenServiceDir ? null : Collections.singletonList(2); }

1 0

[metrics-lib/master] Make inner class static.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 26874eb8a9af953b907fbe90cd6a604626312f6d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:08:57 2019 +0100 Make inner class static. --- src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java index 5d661e4..657b90e 100644 --- a/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/BandwidthFileImpl.java @@ -165,7 +165,7 @@ public class BandwidthFileImpl extends DescriptorImpl implements BandwidthFile { } } - private class RelayLineImpl implements RelayLine { + private static class RelayLineImpl implements RelayLine { private String nodeId;

1 0

[metrics-web/master] Fix logging bugs.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 1d7691bba248f2d0a1fb4cc8053f6f8a18388853 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:46:22 2019 +0100 Fix logging bugs. --- src/main/java/org/torproject/metrics/stats/main/Main.java | 3 ++- src/main/java/org/torproject/metrics/web/UpdateNews.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/main/Main.java b/src/main/java/org/torproject/metrics/stats/main/Main.java index 3dc2775..1dec6a3 100644 --- a/src/main/java/org/torproject/metrics/stats/main/Main.java +++ b/src/main/java/org/torproject/metrics/stats/main/Main.java @@ -68,7 +68,8 @@ public class Main { } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { log.warn("Caught an exception when invoking the main method of the {} " - + "module. Moving on to the next module, if available.", e); + + "module. Moving on to the next module, if available.", + module.getName(), e); } } diff --git a/src/main/java/org/torproject/metrics/web/UpdateNews.java b/src/main/java/org/torproject/metrics/web/UpdateNews.java index abce4f1..92103fe 100644 --- a/src/main/java/org/torproject/metrics/web/UpdateNews.java +++ b/src/main/java/org/torproject/metrics/web/UpdateNews.java @@ -77,7 +77,7 @@ public class UpdateNews { int space = desc.indexOf(" ", open); int close = desc.indexOf("]", open); if (open < 0 || space < 0 || close < 0) { - log.warn("Cannot convert link in line {}. Exiting."); + log.warn("Cannot convert link in line {}. Exiting.", line); System.exit(1); } desc = desc.substring(0, open) + "<a href=\"" @@ -89,7 +89,7 @@ public class UpdateNews { int open = desc.indexOf("`"); int close = desc.indexOf("`", open + 1); if (open < 0 || close < 0) { - log.warn("Cannot convert code fragment in line {}. Exiting."); + log.warn("Cannot convert code fragment in line {}. Exiting.", line); System.exit(1); } desc = desc.substring(0, open) + "<code>"

1 0

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit 1a8c233a572257c9b9e557506d0c966aa4ec6dac Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 11:21:32 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- nl/torbutton.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd index da214afca..260fc7af9 100644 --- a/nl/torbutton.dtd +++ b/nl/torbutton.dtd @@ -1,11 +1,11 @@ <!ENTITY torbutton.context_menu.new_identity "Nieuwe identiteit"> -<!ENTITY torbutton.context_menu.new_identity_key "I"> +<!ENTITY torbutton.context_menu.new_identity_key "i"> <!ENTITY torbutton.context_menu.new_circuit "Nieuw Tor-circuit voor deze website"> -<!ENTITY torbutton.context_menu.new_circuit_key "C"> +<!ENTITY torbutton.context_menu.new_circuit_key "c"> <!ENTITY torbutton.context_menu.networksettings "Tor-netwerkinstellingen…"> -<!ENTITY torbutton.context_menu.networksettings.key "N"> +<!ENTITY torbutton.context_menu.networksettings.key "n"> <!ENTITY torbutton.context_menu.downloadUpdate "Controleren op Tor Browser-update…"> -<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> +<!ENTITY torbutton.context_menu.downloadUpdate.key "u"> <!ENTITY torbutton.context_menu.cookieProtections "Cookiebeschermingen…"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Klik om Torbutton te initialiseren"> @@ -45,8 +45,8 @@ <!ENTITY torbutton.prefs.sec_custom_summary "Uw aangepaste browservoorkeuren hebben tot ongebruikelijke beveiligingsinstellingen geleid. Uit veiligheids- en privacyoverwegingen raden we aan een van de standaard beveiligingsniveaus te kiezen."> <!ENTITY torbutton.prefs.sec_restore_defaults "Standaardwaarden herstellen"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Geavanceerde beveiligingsinstellingen…"> -<!ENTITY torbutton.circuit_display.title "Torcircuit"> +<!ENTITY torbutton.circuit_display.title "Tor-circuit"> <!ENTITY torbutton.circuit_display.new_circuit "Nieuw circuit voor deze website">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Clientauthenticatieprompt voor onion-service openen">

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit fd261f565ffbc33821351d220d7969c2ab9f21de Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 11:21:19 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- lt/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/torbutton.properties b/lt/torbutton.properties index f0f541d5c..2636a44f9 100644 --- a/lt/torbutton.properties +++ b/lt/torbutton.properties @@ -67,4 +67,4 @@ onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion se onionServices.authPrompt.done=Atlikta onionServices.authPrompt.doneAccessKey=u onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.failedToSetKey=Nepavyko konfigūruoti Tor naudojant jūsų raktą

1 0

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit ea87e8cedc958c2a06344a92e89827ecf16e8e8d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 10:51:38 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- es-ES/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es-ES/torbutton.dtd b/es-ES/torbutton.dtd index 7669c3386..d75b9829c 100644 --- a/es-ES/torbutton.dtd +++ b/es-ES/torbutton.dtd @@ -49,4 +49,4 @@ <!ENTITY torbutton.circuit_display.new_circuit "Nuevo Circuito para este Sitio">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Solicitud de autentificación de cliente de servicio de Open cebolla">

1 0