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

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 10 Sep '18

10 Sep '18

commit e5a94b53443badab85df17e6f535a30bdc1322ce Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 10 15:48:10 2018 +0000 Update translations for torbutton-browseronboardingproperties --- it/browserOnboarding.properties | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/it/browserOnboarding.properties b/it/browserOnboarding.properties index 7cde37e5c..5f7b43bb2 100644 --- a/it/browserOnboarding.properties +++ b/it/browserOnboarding.properties @@ -14,41 +14,41 @@ onboarding.tour-tor-privacy.button=Vai alla rete Tor onboarding.tour-tor-network=Rete Tor onboarding.tour-tor-network.title=Percorri una rete decentralizzata. -onboarding.tour-tor-network.description=Tor Browser ti connette alla rete Tor gestita da migliaia di volontari in tutto il mondo. Diversamente dalle VPN, non c'è nessun punto di fallimento o entità centralizzata di cui ti devi fidare per godere di internet privatamente. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network.description=Tor Browser ti connette alla rete Tor gestita da migliaia di volontari in tutto il mondo. Diversamente dalle VPN, non c'è nessun punto di fallimento o entità centralizzata di cui ti devi fidare per goderti internet privatamente. +onboarding.tour-tor-network.button=Visualizza il circuito -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Visualizzazione circuito +onboarding.tour-tor-circuit-display.title=Vedi il tuo percorso. +onboarding.tour-tor-circuit-display.description=Per ogni dominio che visiti, il tuo traffico è inoltrato e criptato in un circuito attraverso tre relay Tor sparsi nel mondo. Nessun sito sa da dove ti stai connettendo. Puoi richiedere un nuovo circuito cliccando ‘Nuovo circuito per questo sito’ nella visualizzazione del circuito. +onboarding.tour-tor-circuit-display.button=Vedi il mio percorso onboarding.tour-tor-security=Sicurezza -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=Scegli la tua esperienza. +onboarding.tour-tor-security.description=Ti forniamo anche impostazioni aggiuntive per aumentare la sicurezza del tuo browser. Le nostre impostazioni di sicurezza ti permettono di bloccare elementi che potrebbero essere utilizzati per attaccare il tuo computer. Clicca qui sotto per vedere cosa fanno le diverse opzioni. +onboarding.tour-tor-security.button=Valuta le impostazioni -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. +onboarding.tour-tor-expect-differences=Consigli per l'esperienza +onboarding.tour-tor-expect-differences.title=Aspettati delle differenze. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.button=Vedi le FAQ onboarding.tour-tor-onion-services=Servizi Onion -onboarding.tour-tor-onion-services.title=Be extra protected. +onboarding.tour-tor-onion-services.title=Sii super protetto. onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.button=Visita una Cipolla # Circuit Display onboarding. onboarding.tor-circuit-display.next=Successivo onboarding.tor-circuit-display.done=Fatto -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 di 3 +onboarding.tor-circuit-display.two-of-three=2 di 3 +onboarding.tor-circuit-display.three-of-three=3 di 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? +onboarding.tor-circuit-display.intro.title=Come funzionano i circuiti? onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. -onboarding.tor-circuit-display.diagram.title=Circuit Display +onboarding.tor-circuit-display.diagram.title=Visualizzazione circuito onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? +onboarding.tor-circuit-display.new-circuit.title=Ti serve un nuovo circuito? onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit.

1 0

[onionoo/master] Bump version to 7.0-1.18.0-dev.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit 7121a3a8d9b8e720586feb1c076b555ef3721ae2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 10 17:31:38 2018 +0200 Bump version to 7.0-1.18.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 65e5f84..c6ee36f 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.18.0"/> + value="${onionoo.protocol.version}-1.18.0-dev"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Remove unnecessary null check.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit 6deaf25b382869d3e25204213813c261d28d01ba Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:06:02 2018 +0200 Remove unnecessary null check. --- src/main/java/org/torproject/onionoo/updater/TorVersion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/updater/TorVersion.java b/src/main/java/org/torproject/onionoo/updater/TorVersion.java index d8e1683..6440283 100644 --- a/src/main/java/org/torproject/onionoo/updater/TorVersion.java +++ b/src/main/java/org/torproject/onionoo/updater/TorVersion.java @@ -104,7 +104,7 @@ public class TorVersion implements Comparable<TorVersion> { @Override public boolean equals(Object other) { - return null != other && other instanceof TorVersion + return other instanceof TorVersion && this.compareTo((TorVersion) other) == 0; }

1 0

[onionoo/release] Avoid integer overflow in tests.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit ed9c9f342716edcb7ada756c4d5713e6296abf3d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:07:29 2018 +0200 Avoid integer overflow in tests. --- src/test/java/org/torproject/onionoo/server/ResourceServletTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 063f550..58bab5d 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -1367,7 +1367,7 @@ public class ResourceServletTest { public void testFirstSeenDaysMaxIntPlusOne() { this.assertErrorStatusCode( "/summary?first_seen_days=" - + String.valueOf(Integer.MAX_VALUE + 1), 400); + + String.valueOf(((long) Integer.MAX_VALUE) + 1L), 400); } @Test(timeout = 100)

1 0

[onionoo/release] Bulk-add elements rather than loop over them.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit 62e30fc658918a483cf54b4da5e79ee56f692eac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:21:36 2018 +0200 Bulk-add elements rather than loop over them. --- .../onionoo/writer/DetailsDocumentWriter.java | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java index 6519de5..99b4e5d 100644 --- a/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java @@ -120,27 +120,18 @@ public class DetailsDocumentWriter implements DocumentWriter { detailsDocument.setPlatform(detailsStatus.getPlatform()); if (detailsStatus.getAllegedFamily() != null && !detailsStatus.getAllegedFamily().isEmpty()) { - SortedSet<String> allegedFamily = new TreeSet<>(); - for (String familyMember : detailsStatus.getAllegedFamily()) { - allegedFamily.add(familyMember); - } - detailsDocument.setAllegedFamily(allegedFamily); + detailsDocument.setAllegedFamily( + new TreeSet<>(detailsStatus.getAllegedFamily())); } if (detailsStatus.getEffectiveFamily() != null && !detailsStatus.getEffectiveFamily().isEmpty()) { - SortedSet<String> effectiveFamily = new TreeSet<>(); - for (String familyMember : detailsStatus.getEffectiveFamily()) { - effectiveFamily.add(familyMember); - } - detailsDocument.setEffectiveFamily(effectiveFamily); + detailsDocument.setEffectiveFamily( + new TreeSet<>(detailsStatus.getEffectiveFamily())); } if (detailsStatus.getIndirectFamily() != null && !detailsStatus.getIndirectFamily().isEmpty()) { - SortedSet<String> indirectFamily = new TreeSet<>(); - for (String familyMember : detailsStatus.getIndirectFamily()) { - indirectFamily.add(familyMember); - } - detailsDocument.setIndirectFamily(indirectFamily); + detailsDocument.setIndirectFamily( + new TreeSet<>(detailsStatus.getIndirectFamily())); } detailsDocument.setExitPolicyV6Summary( detailsStatus.getExitPolicyV6Summary());

1 0

[onionoo/release] Use Arrays.asList with varargs.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit 81b186c3bf2b97c8eb35cc6e83588ad9d2e94800 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:16:12 2018 +0200 Use Arrays.asList with varargs. --- .../onionoo/server/MostFrequentString.java | 2 +- .../torproject/onionoo/server/ResourceServlet.java | 4 +- .../onionoo/docs/SummaryDocumentTest.java | 14 +++--- .../torproject/onionoo/docs/UptimeStatusTest.java | 4 +- .../onionoo/server/ResourceServletTest.java | 53 +++++++++++----------- .../server/SummaryDocumentComparatorTest.java | 14 +++--- .../onionoo/writer/UptimeDocumentWriterTest.java | 8 ++-- 7 files changed, 50 insertions(+), 49 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/MostFrequentString.java b/src/main/java/org/torproject/onionoo/server/MostFrequentString.java index dc9bb02..3d4d4c2 100644 --- a/src/main/java/org/torproject/onionoo/server/MostFrequentString.java +++ b/src/main/java/org/torproject/onionoo/server/MostFrequentString.java @@ -35,7 +35,7 @@ class MostFrequentString { for (Map.Entry<String, Integer> e : stringFrequencies.entrySet()) { if (!sortedFrequencies.containsKey(e.getValue())) { sortedFrequencies.put(e.getValue(), new TreeSet<>( - Arrays.asList(new String[] { e.getKey() } ))); + Arrays.asList(e.getKey()))); } else { sortedFrequencies.get(e.getValue()).add(e.getKey()); } diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index dce5601..4257348 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -592,10 +592,10 @@ public class ResourceServlet extends HttpServlet { Pattern.compile("^[0-9a-zA-Z_,-]*$"); private static HashSet<String> knownOrderParameters = new HashSet<>( - Arrays.asList(new String[] { OrderParameterValues.CONSENSUS_WEIGHT_ASC, + Arrays.asList(OrderParameterValues.CONSENSUS_WEIGHT_ASC, OrderParameterValues.CONSENSUS_WEIGHT_DES, OrderParameterValues.FIRST_SEEN_ASC, - OrderParameterValues.FIRST_SEEN_DES })); + OrderParameterValues.FIRST_SEEN_DES)); private String[] parseOrderParameter(String parameter) { if (!orderParameterPattern.matcher(parameter).matches()) { diff --git a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java index 120a226..be183e3 100644 --- a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java +++ b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java @@ -16,18 +16,18 @@ public class SummaryDocumentTest { private SummaryDocument createSummaryDocumentRelayTorkaZ() { return new SummaryDocument(true, "TorkaZ", "000C5F55BD4814B917CC474BD537F1A3B33CCE2A", Arrays.asList( - new String[] { "62.216.201.221", "62.216.201.222", - "62.216.201.223" }), DateTimeHelper.parse("2013-04-19 05:00:00"), - false, new TreeSet<>(Arrays.asList(new String[] { "Running", - "Valid" })), 20L, "de", + "62.216.201.221", "62.216.201.222", + "62.216.201.223"), DateTimeHelper.parse("2013-04-19 05:00:00"), + false, new TreeSet<>(Arrays.asList("Running", + "Valid")), 20L, "de", DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767", "m-net telekommunikations gmbh", "torkaz <klaus dot zufall at gmx dot de> " + "<fb-token:np5_g_83jmf=>", new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC", - "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), + "001C13B3A55A71B977CA65EC85539D79C653A3FC", + "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B")), new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null, + "001C13B3A55A71B977CA65EC85539D79C653A3FC")), null, null, null, null, true); } diff --git a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java index 1b567ac..31a7ef9 100644 --- a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java +++ b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java @@ -201,7 +201,7 @@ public class UptimeStatusTest { } private static final SortedSet<String> RUNNING_FLAG = - new TreeSet<>(Arrays.asList(new String[] { "Running" })); + new TreeSet<>(Arrays.asList("Running")); @Test() public void testAddFlagsToNoFlagsEnd() { @@ -251,7 +251,7 @@ public class UptimeStatusTest { } private static final SortedSet<String> RUNNING_VALID_FLAGS = - new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" })); + new TreeSet<>(Arrays.asList("Running", "Valid")); @Test() public void testDontCompressDifferentFlags() { diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 74fec21..022381b 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -134,49 +134,50 @@ public class ResourceServletTest { org.torproject.onionoo.docs.SummaryDocument relayTorkaZ = new org.torproject.onionoo.docs.SummaryDocument(true, "TorkaZ", "000C5F55BD4814B917CC474BD537F1A3B33CCE2A", Arrays.asList( - new String[] { "62.216.201.221", "62.216.201.222", - "62.216.201.223" }), DateTimeHelper.parse("2013-04-19 05:00:00"), - false, new TreeSet<>(Arrays.asList(new String[] { "Running", - "Valid" })), 20L, "de", + "62.216.201.221", "62.216.201.222", + "62.216.201.223"), DateTimeHelper.parse("2013-04-19 05:00:00"), + false, new TreeSet<>(Arrays.asList("Running", + "Valid")), 20L, "de", DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767", "m-net telekommunikations gmbh", "torkaz <klaus dot zufall at gmx dot de> " + "<fb-token:np5_g_83jmf=>", new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC", - "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), + "001C13B3A55A71B977CA65EC85539D79C653A3FC", + "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B")), new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), + "001C13B3A55A71B977CA65EC85539D79C653A3FC")), "0.2.3.25", "linux", new TreeSet<>(Arrays.asList( - new String[] { "ppp-62-216-201-221.dynamic.mnet-online.de" })), + "ppp-62-216-201-221.dynamic.mnet-online.de")), null, true); this.relays.put("000C5F55BD4814B917CC474BD537F1A3B33CCE2A", relayTorkaZ); org.torproject.onionoo.docs.SummaryDocument relayFerrari458 = new org.torproject.onionoo.docs.SummaryDocument(true, "Ferrari458", "001C13B3A55A71B977CA65EC85539D79C653A3FC", Arrays.asList( - new String[] { "68.38.171.200", "[2001:4f8:3:2e::51]" }), + "68.38.171.200", "[2001:4f8:3:2e::51]"), DateTimeHelper.parse("2013-04-24 12:00:00"), true, - new TreeSet<>(Arrays.asList(new String[] { "Fast", "Named", - "Running", "V2Dir", "Valid" })), 1140L, "us", + new TreeSet<>(Arrays.asList("Fast", "Named", + "Running", "V2Dir", "Valid")), 1140L, "us", DateTimeHelper.parse("2013-04-16 18:00:00"), "AS7922", "comcast cable communications, llc", null, - new TreeSet<>(Arrays.asList(new String[]{ - "000C5F55BD4814B917CC474BD537F1A3B33CCE2A"})), - new TreeSet<>(Arrays.asList(new String[] { - "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), null, null, new TreeSet<>(Arrays.asList( - new String[] {"c-68-38-171-200.hsd1.in.comcast.net"})), + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A")), + new TreeSet<>(Arrays.asList( + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A")), + null, null, + new TreeSet<>(Arrays.asList( + "c-68-38-171-200.hsd1.in.comcast.net")), null, null); this.relays.put("001C13B3A55A71B977CA65EC85539D79C653A3FC", relayFerrari458); org.torproject.onionoo.docs.SummaryDocument relayTimMayTribute = new org.torproject.onionoo.docs.SummaryDocument(true, "TimMayTribute", "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B", Arrays.asList( - new String[] { "89.69.68.246" }), + "89.69.68.246"), DateTimeHelper.parse("2013-04-22 20:00:00"), false, - new TreeSet<>(Arrays.asList(new String[] { "Fast", - "Running", "Unnamed", "V2Dir", "Valid" })), 63L, "a1", + new TreeSet<>(Arrays.asList("Fast", + "Running", "Unnamed", "V2Dir", "Valid")), 63L, "a1", DateTimeHelper.parse("2013-04-16 18:00:00"), null, "liberty global operations b.v.", "1024d/51e2a1c7 \"steven j. murdoch\" " @@ -189,9 +190,9 @@ public class ResourceServletTest { org.torproject.onionoo.docs.SummaryDocument bridgeec2bridgercc7f31fe = new org.torproject.onionoo.docs.SummaryDocument(false, "ec2bridgercc7f31fe", "0000831B236DFF73D409AD17B40E2A728A53994F", - Arrays.asList(new String[] { "10.199.7.176" }), + Arrays.asList("10.199.7.176"), DateTimeHelper.parse("2013-04-21 18:07:03"), false, - new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, + new TreeSet<>(Arrays.asList("Valid")), -1L, null, DateTimeHelper.parse("2013-04-20 15:37:04"), null, null, null, null, null, "0.2.2.39", null, null, null, true); this.bridges.put("0000831B236DFF73D409AD17B40E2A728A53994F", @@ -199,9 +200,9 @@ public class ResourceServletTest { org.torproject.onionoo.docs.SummaryDocument bridgeUnnamed = new org.torproject.onionoo.docs.SummaryDocument(false, "Unnamed", "0002D9BDBBC230BD9C78FF502A16E0033EF87E0C", Arrays.asList( - new String[] { "10.0.52.84" }), + "10.0.52.84"), DateTimeHelper.parse("2013-04-20 17:37:04"), false, - new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, + new TreeSet<>(Arrays.asList("Valid")), -1L, null, DateTimeHelper.parse("2013-04-14 07:07:05"), null, null, null, null, null, null, null, null, null, null); this.bridges.put("0002D9BDBBC230BD9C78FF502A16E0033EF87E0C", @@ -209,10 +210,10 @@ public class ResourceServletTest { org.torproject.onionoo.docs.SummaryDocument bridgegummy = new org.torproject.onionoo.docs.SummaryDocument(false, "gummy", "1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", Arrays.asList( - new String[] { "10.63.169.98" }), + "10.63.169.98"), DateTimeHelper.parse("2013-04-24 01:07:04"), true, - new TreeSet<>(Arrays.asList(new String[] { "Running", - "Valid" })), -1L, null, + new TreeSet<>(Arrays.asList("Running", + "Valid")), -1L, null, DateTimeHelper.parse("2013-01-16 21:07:04"), null, null, null, null, null, "0.2.4.4-alpha-dev", "windows 7", null, null, false); this.bridges.put("1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", diff --git a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java index 44db510..92922f0 100644 --- a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java +++ b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java @@ -29,18 +29,18 @@ public class SummaryDocumentComparatorTest { private SummaryDocument createSummaryDoc() { return new SummaryDocument(true, "TorkaZ", "000C5F55BD4814B917CC474BD537F1A3B33CCE2A", Arrays.asList( - new String[] { "62.216.201.221", "62.216.201.222", - "62.216.201.223" }), DateTimeHelper.parse("2013-04-19 05:00:00"), - false, new TreeSet<>(Arrays.asList(new String[] { "Running", - "Valid" })), 20L, "de", + "62.216.201.221", "62.216.201.222", + "62.216.201.223"), DateTimeHelper.parse("2013-04-19 05:00:00"), + false, new TreeSet<>(Arrays.asList("Running", + "Valid")), 20L, "de", DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767", "m-net telekommunikations gmbh", "torkaz <klaus dot zufall at gmx dot de> " + "<fb-token:np5_g_83jmf=>", new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC", - "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), + "001C13B3A55A71B977CA65EC85539D79C653A3FC", + "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B")), new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null, + "001C13B3A55A71B977CA65EC85539D79C653A3FC")), null, null, null, null, null); } diff --git a/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java b/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java index 2f322bd..795db56 100644 --- a/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java +++ b/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java @@ -167,7 +167,7 @@ public class UptimeDocumentWriterTest { UptimeDocument.class, GABELMOO_FINGERPRINT); this.assertOneWeekGraph(document, 1, "2014-03-23 09:30:00", "2014-03-23 11:30:00", 3, - Arrays.asList(new Integer[] { 999, 0, 999 })); + Arrays.asList(999, 0, 999)); } @Test @@ -183,7 +183,7 @@ public class UptimeDocumentWriterTest { UptimeDocument.class, GABELMOO_FINGERPRINT); this.assertOneWeekGraph(document, 1, "2014-03-23 09:30:00", "2014-03-23 11:30:00", 3, - Arrays.asList(new Integer[] { 999, 999, 0 })); + Arrays.asList(999, 999, 0)); } @Test @@ -244,7 +244,7 @@ public class UptimeDocumentWriterTest { UptimeDocument.class, GABELMOO_FINGERPRINT); this.assertOneMonthGraph(document, 2, "2014-03-16 10:00:00", "2014-03-16 14:00:00", 2, - Arrays.asList(new Integer[] { 999, 499 })); + Arrays.asList(999, 499)); } @Test @@ -280,7 +280,7 @@ public class UptimeDocumentWriterTest { UptimeDocument document = this.documentStore.getDocument( UptimeDocument.class, GABELMOO_FINGERPRINT); this.assertFiveYearGraph(document, 1, "2012-03-06 00:00:00", - "2012-03-16 00:00:00", 2, Arrays.asList(new Integer[] { 999, 999 })); + "2012-03-16 00:00:00", 2, Arrays.asList(999, 999)); } }

1 0

[onionoo/release] Delete methods that only call their super.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit 0e11a8d1382867f119ff8f4d6a32b8178d4f8008 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:16:18 2018 +0200 Delete methods that only call their super. --- .../org/torproject/onionoo/docs/DateTimeHelper.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java b/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java index 7966af8..9162edc 100644 --- a/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java +++ b/src/main/java/org/torproject/onionoo/docs/DateTimeHelper.java @@ -73,24 +73,7 @@ public class DateTimeHelper { public static final String DATEHOUR_NOSPACE_FORMAT = "yyyy-MM-dd-HH"; private static ThreadLocal<Map<String, DateFormat>> dateFormats = - new ThreadLocal<Map<String, DateFormat>>() { - - public Map<String, DateFormat> get() { - return super.get(); - } - - protected Map<String, DateFormat> initialValue() { - return new HashMap<>(); - } - - public void remove() { - super.remove(); - } - - public void set(Map<String, DateFormat> value) { - super.set(value); - } - }; + ThreadLocal.withInitial(HashMap::new); private static DateFormat getDateFormat(String format) { Map<String, DateFormat> threadDateFormats = dateFormats.get();

1 0

[onionoo/release] Replace addAll with parameterized constructor call.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit c8c64e8833d1003219a7e396e63ca44fa9ef299e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:24:40 2018 +0200 Replace addAll with parameterized constructor call. --- src/main/java/org/torproject/onionoo/docs/UptimeHistory.java | 3 +-- .../java/org/torproject/onionoo/updater/DummyDescriptorSource.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java index 8ddfc2b..ef73a1c 100644 --- a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java @@ -88,8 +88,7 @@ public class UptimeHistory implements Comparable<UptimeHistory> { } SortedSet<String> flags = null; if (parts[0].equals("R")) { - flags = new TreeSet<>(); - flags.addAll(Arrays.asList(parts).subList(3, parts.length)); + flags = new TreeSet<>(Arrays.asList(parts).subList(3, parts.length)); } return new UptimeHistory(relay, startMillis, uptimeHours, flags); } diff --git a/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java b/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java index c985090..22ae477 100644 --- a/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java +++ b/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java @@ -52,8 +52,8 @@ public class DummyDescriptorSource extends DescriptorSource { @Override public void readDescriptors() { - Set<DescriptorType> descriptorTypes = new HashSet<>(); - descriptorTypes.addAll(this.descriptorListeners.keySet()); + Set<DescriptorType> descriptorTypes = new HashSet<>( + this.descriptorListeners.keySet()); for (DescriptorType descriptorType : descriptorTypes) { boolean relay; switch (descriptorType) {

1 0

[onionoo/release] Use parameterized map for parameters.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit ff82fdaa8a58ace4719a694cbd2b3c2fb11d2ec4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:13:05 2018 +0200 Use parameterized map for parameters. --- .../org/torproject/onionoo/server/HttpServletRequestWrapper.java | 3 +-- src/main/java/org/torproject/onionoo/server/ResourceServlet.java | 6 +++--- .../java/org/torproject/onionoo/server/ResourceServletTest.java | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java b/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java index 904e55c..c8771c8 100644 --- a/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java +++ b/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java @@ -20,8 +20,7 @@ public class HttpServletRequestWrapper { return this.request.getRequestURI(); } - @SuppressWarnings("rawtypes") - protected Map getParameterMap() { + protected Map<String, String[]> getParameterMap() { return this.request.getParameterMap(); } diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 1c72b9e..dce5601 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -133,10 +133,10 @@ public class ResourceServlet extends HttpServlet { /* Extract parameters either from the old-style URI or from request * parameters. */ Map<String, String> parameterMap = new HashMap<>(); - for (Object parameterKey : request.getParameterMap().keySet()) { + for (String parameterKey : request.getParameterMap().keySet()) { String[] parameterValues = - request.getParameterValues((String) parameterKey); - parameterMap.put((String) parameterKey, parameterValues[0]); + request.getParameterValues(parameterKey); + parameterMap.put(parameterKey, parameterValues[0]); } /* Make sure that the request doesn't contain any unknown diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 58bab5d..74fec21 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -64,8 +64,7 @@ public class ResourceServletTest { return this.requestUri; } - @SuppressWarnings("rawtypes") - protected Map getParameterMap() { + protected Map<String, String[]> getParameterMap() { return this.parameterMap; }

1 0

[onionoo/release] Remove redundant escape in regular expressions.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit 225d504fcf7b36df7fb9f0f36c5dc07c1d4cb6ed Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:47:55 2018 +0200 Remove redundant escape in regular expressions. Turns out that characters inside square brackets don't need to be escaped. In fact, "^[0-9\\.]{7,15}$" does not only match valid IPv4 addresses but also strings like "1\2\3\4". --- .../java/org/torproject/onionoo/server/ResourceServlet.java | 10 +++++----- .../java/org/torproject/onionoo/updater/LookupService.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 8f956a6..7567233 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -76,7 +76,7 @@ public class ResourceServlet extends HttpServlet { + "offset,fields").split(","))); private static String ipv6AddressPatternString = - "^\\[?[0-9a-fA-F:\\.]{1,39}\\]?$"; + "^\\[?[0-9a-fA-F:.]{1,39}\\]?$"; private static Pattern ipv6AddressPattern = Pattern.compile(ipv6AddressPatternString); @@ -424,14 +424,14 @@ public class ResourceServlet extends HttpServlet { } private static Pattern searchQueryStringPattern = - Pattern.compile("(?:.*[\\?&])*?" // lazily skip other parameters + Pattern.compile("(?:.*[?&])*?" // lazily skip other parameters + "search=([\\p{Graph} &&[^&]]+)" // capture parameter + "(?:&.*)*"); // skip remaining parameters private static Pattern searchParameterPattern = Pattern.compile("^\\$?[0-9a-fA-F]{1,40}$|" /* Hex fingerprint. */ + "^[0-9a-zA-Z+/]{1,27}$|" /* Base64 fingerprint. */ - + "^[0-9a-zA-Z\\.]{1,19}$|" /* Nickname or IPv4 address. */ + + "^[0-9a-zA-Z.]{1,19}$|" /* Nickname or IPv4 address. */ + ipv6AddressPatternString + "|" /* IPv6 address. */ + "^[a-zA-Z_]+:\"?[\\p{Graph} ]+\"?$"); /* Qualified search term. */ @@ -630,7 +630,7 @@ public class ResourceServlet extends HttpServlet { } private static Pattern versionParameterPattern = - Pattern.compile("^[0-9a-zA-Z\\.-]+$"); + Pattern.compile("^[0-9a-zA-Z.-]+$"); private String parseVersionParameter(String parameter) { if (!versionParameterPattern.matcher(parameter).matches()) { @@ -651,7 +651,7 @@ public class ResourceServlet extends HttpServlet { } private static Pattern hostNameParameterPattern = - Pattern.compile("^[0-9A-Za-z_\\.\\-]+$"); + Pattern.compile("^[0-9A-Za-z_.\\-]+$"); private String parseHostNameParameter(String parameter) { if (!hostNameParameterPattern.matcher(parameter).matches()) { diff --git a/src/main/java/org/torproject/onionoo/updater/LookupService.java b/src/main/java/org/torproject/onionoo/updater/LookupService.java index 9c07e68..976a9ca 100644 --- a/src/main/java/org/torproject/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/onionoo/updater/LookupService.java @@ -70,7 +70,7 @@ public class LookupService { this.hasAllFiles = true; } - private Pattern ipv4Pattern = Pattern.compile("^[0-9\\.]{7,15}$"); + private Pattern ipv4Pattern = Pattern.compile("^[0-9.]{7,15}$"); private long parseAddressString(String addressString) { long addressNumber = -1L;

1 0