tor-commits July 2016

tor-commits@lists.torproject.org

21 participants
1271 discussions

[translation/tor-messenger-authdtd_completed] Update translations for tor-messenger-authdtd_completed
by translation＠torproject.org 14 Jul '16

14 Jul '16

commit 95586e058c10b107a44789b7131e8f35d8933a27 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 14 18:47:26 2016 +0000 Update translations for tor-messenger-authdtd_completed --- sk_SK/auth.dtd | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sk_SK/auth.dtd b/sk_SK/auth.dtd new file mode 100644 index 0000000..1ae4620 --- /dev/null +++ b/sk_SK/auth.dtd @@ -0,0 +1,21 @@ +<!ENTITY authDialog.title "Overiť identitu kontaktu."> +<!ENTITY authDialog.authenticate "Overiť"> +<!ENTITY authDialog.cancel "Zrušiť"> +<!ENTITY authDialog.help "Pomocník"> +<!ENTITY authDialog.yes "Áno"> +<!ENTITY authDialog.no "Nie"> +<!ENTITY authDialog.verified "Overil som, že sa naozaj jedná o správny odtlačok."> +<!ENTITY authDialog.yourFingerprint "Váš odtlačok"> +<!ENTITY authDialog.theirFingerprint "Ich údajný odtlačok"> +<!ENTITY authDialog.manualVerification "Manuálne overenie odtlačku"> +<!ENTITY authDialog.questionAndAnswer "Otázka a odpoveď"> +<!ENTITY authDialog.sharedSecret "Zdieľané tajomstvo"> +<!ENTITY authDialog.manualInstruction "Na overenie odtlačku, kontaktujte svojho kamaráta cez autorizovaný kanál, napríklad telefónom alebo GPG podpísaným emailom. Vzájomne si vymeníte svoje odtlačky. Ak všetko sedí, mali by v diálogu dole uviesť, že ste odtlačky overili."> +<!ENTITY authDialog.choose "Vyberte"> +<!ENTITY authDialog.how "Ako chcete overiť totožnosť vášho kontaktu?"> +<!ENTITY authDialog.qaInstruction "Pre overenie totožnosti kontaktu, zvoľte otázku, ktorej odpoveď pozná len váš kontakt. Vložte túto otázku a odpoveď a počkajte, kým aj váš kontakt nevloží odpoveď. Ak sa odpovede nezhodujú, možno sa rozprávate s podvodníkom."> +<!ENTITY authDialog.secretInstruction "Pre overenie totožnosti kontaktu, zvoľte tajomstvo, ktoré poznáte len vy a váš kontakt. Vložte tajomstvo a počkate, kým ho vloží aj váš kontakt. Ak sa tajomstvá nezhodujú, možno sa rozprávate s podvodníkom."> +<!ENTITY authDialog.question "Vložte otázku:"> +<!ENTITY authDialog.answer "Vložte tajnú odpoveď (záleží na veľkosti písmen):"> +<!ENTITY authDialog.secret "Vložte tajomstvo:"> +<!ENTITY authDialog.waiting "Čaká sa na kontakt ..."> \ No newline at end of file

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 14 Jul '16

14 Jul '16

commit 64d25f08f00776827afafe634742d7e158ece135 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 14 18:47:20 2016 +0000 Update translations for tor-messenger-authdtd --- sk_SK/auth.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sk_SK/auth.dtd b/sk_SK/auth.dtd index ec74493..1ae4620 100644 --- a/sk_SK/auth.dtd +++ b/sk_SK/auth.dtd @@ -1,4 +1,4 @@ -<!ENTITY authDialog.title "Overiť kontaktnú identitu."> +<!ENTITY authDialog.title "Overiť identitu kontaktu."> <!ENTITY authDialog.authenticate "Overiť"> <!ENTITY authDialog.cancel "Zrušiť"> <!ENTITY authDialog.help "Pomocník"> @@ -10,12 +10,12 @@ <!ENTITY authDialog.manualVerification "Manuálne overenie odtlačku"> <!ENTITY authDialog.questionAndAnswer "Otázka a odpoveď"> <!ENTITY authDialog.sharedSecret "Zdieľané tajomstvo"> -<!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialog below that you have verified the fingerprint."> -<!ENTITY authDialog.choose "Choose"> -<!ENTITY authDialog.how "How would you like to verify your contact's identity?"> -<!ENTITY authDialog.qaInstruction "To verify their identity, pick a question whose answer is known only to you and your contact. Enter this question and answer, then wait for your contact to enter the answer as well. If the answers do not match, then you may be talking to an imposter."> -<!ENTITY authDialog.secretInstruction "To verify their identity, pick a secret known only to you and your contact. Enter this secret, then wait for your contact to enter it as well. If the secrets do not match, then you may be talking to an imposter."> -<!ENTITY authDialog.question "Enter question here:"> -<!ENTITY authDialog.answer "Enter secret answer here (case sensitive):"> -<!ENTITY authDialog.secret "Enter secret here:"> -<!ENTITY authDialog.waiting "Waiting for contact ..."> \ No newline at end of file +<!ENTITY authDialog.manualInstruction "Na overenie odtlačku, kontaktujte svojho kamaráta cez autorizovaný kanál, napríklad telefónom alebo GPG podpísaným emailom. Vzájomne si vymeníte svoje odtlačky. Ak všetko sedí, mali by v diálogu dole uviesť, že ste odtlačky overili."> +<!ENTITY authDialog.choose "Vyberte"> +<!ENTITY authDialog.how "Ako chcete overiť totožnosť vášho kontaktu?"> +<!ENTITY authDialog.qaInstruction "Pre overenie totožnosti kontaktu, zvoľte otázku, ktorej odpoveď pozná len váš kontakt. Vložte túto otázku a odpoveď a počkajte, kým aj váš kontakt nevloží odpoveď. Ak sa odpovede nezhodujú, možno sa rozprávate s podvodníkom."> +<!ENTITY authDialog.secretInstruction "Pre overenie totožnosti kontaktu, zvoľte tajomstvo, ktoré poznáte len vy a váš kontakt. Vložte tajomstvo a počkate, kým ho vloží aj váš kontakt. Ak sa tajomstvá nezhodujú, možno sa rozprávate s podvodníkom."> +<!ENTITY authDialog.question "Vložte otázku:"> +<!ENTITY authDialog.answer "Vložte tajnú odpoveď (záleží na veľkosti písmen):"> +<!ENTITY authDialog.secret "Vložte tajomstvo:"> +<!ENTITY authDialog.waiting "Čaká sa na kontakt ..."> \ No newline at end of file

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 14 Jul '16

14 Jul '16

commit fac6aa4b044c95b94ffc450afb713634852103f4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 14 18:17:23 2016 +0000 Update translations for tor-messenger-authdtd --- sk_SK/auth.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sk_SK/auth.dtd b/sk_SK/auth.dtd index 5c3d019..ec74493 100644 --- a/sk_SK/auth.dtd +++ b/sk_SK/auth.dtd @@ -1,15 +1,15 @@ -<!ENTITY authDialog.title "Verify contact's identity"> +<!ENTITY authDialog.title "Overiť kontaktnú identitu."> <!ENTITY authDialog.authenticate "Overiť"> <!ENTITY authDialog.cancel "Zrušiť"> <!ENTITY authDialog.help "Pomocník"> <!ENTITY authDialog.yes "Áno"> <!ENTITY authDialog.no "Nie"> -<!ENTITY authDialog.verified "I have verified that this is in fact the correct fingerprint."> -<!ENTITY authDialog.yourFingerprint "Your fingerprint"> -<!ENTITY authDialog.theirFingerprint "Their purported fingerprint"> -<!ENTITY authDialog.manualVerification "Manual fingerprint verification"> -<!ENTITY authDialog.questionAndAnswer "Question and answer"> -<!ENTITY authDialog.sharedSecret "Shared secret"> +<!ENTITY authDialog.verified "Overil som, že sa naozaj jedná o správny odtlačok."> +<!ENTITY authDialog.yourFingerprint "Váš odtlačok"> +<!ENTITY authDialog.theirFingerprint "Ich údajný odtlačok"> +<!ENTITY authDialog.manualVerification "Manuálne overenie odtlačku"> +<!ENTITY authDialog.questionAndAnswer "Otázka a odpoveď"> +<!ENTITY authDialog.sharedSecret "Zdieľané tajomstvo"> <!ENTITY authDialog.manualInstruction "To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the dialog below that you have verified the fingerprint."> <!ENTITY authDialog.choose "Choose"> <!ENTITY authDialog.how "How would you like to verify your contact's identity?">

1 0

[tor-commits] [translation/tor-messenger-accountsproperties_completed] Update translations for tor-messenger-accountsproperties_completed
by translation＠torproject.org 14 Jul '16

14 Jul '16

commit f9487580661196ce937d9b640af95b04cf9f19ad Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 14 18:17:19 2016 +0000 Update translations for tor-messenger-accountsproperties_completed --- sk_SK/accounts.properties | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sk_SK/accounts.properties b/sk_SK/accounts.properties new file mode 100644 index 0000000..4f2562d --- /dev/null +++ b/sk_SK/accounts.properties @@ -0,0 +1,9 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText): +# %S is replaced with the name of the account +passwordPromptTitle=Heslo pre %S +passwordPromptText=Pre prihlásenie zadajte prosím vaše heslo pre %S. +passwordPromptSaveCheckbox=Použite Password Manager na zapamätanie tohto hesla.

1 0

[translation/tor-messenger-accountsproperties] Update translations for tor-messenger-accountsproperties
by translation＠torproject.org 14 Jul '16

14 Jul '16

commit 6c5547e7d6ea81c5b9244a6079c5ee5ba7aa3a74 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 14 18:17:15 2016 +0000 Update translations for tor-messenger-accountsproperties --- sk_SK/accounts.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sk_SK/accounts.properties b/sk_SK/accounts.properties index 051ba0d..4f2562d 100644 --- a/sk_SK/accounts.properties +++ b/sk_SK/accounts.properties @@ -4,6 +4,6 @@ # LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText): # %S is replaced with the name of the account -passwordPromptTitle=Password for %S -passwordPromptText=Please enter your password for %S in order to connect it. -passwordPromptSaveCheckbox=Use Password Manager to remember this password. +passwordPromptTitle=Heslo pre %S +passwordPromptText=Pre prihlásenie zadajte prosím vaše heslo pre %S. +passwordPromptSaveCheckbox=Použite Password Manager na zapamätanie tohto hesla.

1 0

[stem/master] Add OnionLauncher and TorNova to examples
by atagar＠torproject.org 14 Jul '16

14 Jul '16

commit 2a869fc4987caeaf006673f6686e64ee3374ad22 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 14 09:35:34 2016 -0700 Add OnionLauncher and TorNova to examples Neat Qt and GTK launchers by Neel... https://lists.torproject.org/pipermail/tor-talk/2016-July/041770.html --- docs/tutorials/double_double_toil_and_trouble.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 8dfbf4b..d5f7e79 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -57,6 +57,8 @@ Applications research paper. =========================================================================================================== ========== +`OnionLauncher <https://github.com/neelchauhan/OnionLauncher>`_ Qt interface for launching tor. +`TorNova <https://github.com/neelchauhan/TorNova>`_ GTK interface for launching tor. `BeagleBone for Secret Agents <https://github.com/jbdatko/beagle-bone-for-secret-agents>`_ Bridge with a `bandwidth monitor <https://github.com/jbdatko/beagle-bone-for-secret-agents/blob/master/ch2/be…>`_ on a BeagleBoard. `NavigaTor <https://naviga-tor.github.io>`_ Measures round-trip times for Tor circuits. `TorPS <https://www.torproject.org/getinvolved/volunteer.html.en#project-torps>`_ Tor path simulator.

1 0

[tor-browser/tor-browser-45.2.0esr-6.5-1] Bug 18923: Add a script to run all Tor Browser specific tests
by gk＠torproject.org 14 Jul '16

14 Jul '16

commit 1198d77c4ef82db7878e04920523b13ab0e678e6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 14 17:09:12 2016 +0200 Bug 18923: Add a script to run all Tor Browser specific tests --- run-tbb-tests | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tbb-tests-ignore.txt | 4 ++++ 2 files changed, 64 insertions(+) diff --git a/run-tbb-tests b/run-tbb-tests new file mode 100755 index 0000000..5e266f9 --- /dev/null +++ b/run-tbb-tests @@ -0,0 +1,60 @@ +#!/bin/bash + +# This script runs all the Mochitest tests that have been added or +# modified since the last ffxbld commit. +# +# It does not currently run XPCShell tests. We should change this if we +# start using this type or other types of tests. +# +# The logs of the tests are stored in the tbb-tests.log file. +# Ignored tests are listed in the tbb-tests-ignore.txt file. +# +# https://trac.torproject.org/projects/tor/ticket/18923 + +IFS=$'\n' + +if [ -n "$USE_TESTS_LIST" ] && [ -f tbb-tests-list.txt ] +then + echo "Using tests list from file tbb-tests-list.txt" + tests=($(cat tbb-tests-list.txt)) +else + ffxbld_commit=$(git log -500 --format='%an %H' | grep '^ffxbld ' \ + | head -1 | cut -d ' ' -f 2) + + tests=($(git diff --name-status "$ffxbld_commit" HEAD | \ + grep -e '^[AM].*/test_[^/]\+\.$html\|xul$$' \ + -e '^[AM].*/browser_[^/]\+\.js$' \ + | sed 's/^[AM]\s\+//')) +fi + +echo 'The following tests will be run:' +for i in "${!tests[@]}" +do + if [ -z "$USE_TESTS_LIST" ] \ + && grep -q "^${tests[$i]}$" tbb-tests-ignore.txt + then + unset "tests[$i]" + continue + fi + echo "- ${tests[$i]}" +done + +if [ -n "$WRITE_TESTS_LIST" ] +then + rm -f tbb-tests-list.txt + for i in "${!tests[@]}" + do + echo "${tests[$i]}" >> tbb-tests-list.txt + done + exit 0 +fi + +rm -f tbb-tests.log +echo $'\n''Starting tests' +./mach mochitest --log-tbpl tbb-tests.log --setpref security.nocertdb=false \ + "${tests[@]}" + +echo "*************************" +echo "*************************" +echo "Summary of failed tests:" +grep --color=never TEST-UNEXPECTED-FAIL tbb-tests.log diff --git a/tbb-tests-ignore.txt b/tbb-tests-ignore.txt new file mode 100644 index 0000000..00978df --- /dev/null +++ b/tbb-tests-ignore.txt @@ -0,0 +1,4 @@ +# This file contains the list of tests ignored by the run-tbb-tests script + +#19575: Test for privacy.thirdparty.isolate fails with a timeout +dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html

1 0

[collector/master] Enable suppression annotations for checkstyle.
by karsten＠torproject.org 14 Jul '16

14 Jul '16

commit 4383ae9386a0cc41d48885266313eb94253301a8 Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jul 13 17:54:58 2016 +0200 Enable suppression annotations for checkstyle. --- src/test/resources/metrics_checks.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/resources/metrics_checks.xml b/src/test/resources/metrics_checks.xml index 0777894..2df2f2a 100644 --- a/src/test/resources/metrics_checks.xml +++ b/src/test/resources/metrics_checks.xml @@ -14,6 +14,8 @@ - Relaxed requirement that catch parameters must be at least two characters long [CatchParameterName]. + - Enabled suppression of warnings using annotations. + Checkstyle is very configurable. Be sure to read the documentation at http://checkstyle.sf.net (or in your downloaded distribution). @@ -34,6 +36,7 @@ <property name="eachLine" value="true"/> </module> + <module name="SuppressWarningsFilter" /> <module name="TreeWalker"> <module name="OuterTypeFilename"/> <module name="IllegalTokenText"> @@ -213,5 +216,6 @@ <property name="exceptionVariableName" value="expected"/> </module> <module name="CommentsIndentation"/> + <module name="SuppressWarningsHolder" /> </module> </module>

1 0

[collector/master] Write Javadocs to appease checkstyle.
by karsten＠torproject.org 14 Jul '16

14 Jul '16

commit 74bae5b448fd8684fcbfe06a409df459d1f539d3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 14 14:04:20 2016 +0200 Write Javadocs to appease checkstyle. --- .../bridgedescs/BridgeDescriptorParser.java | 6 +++-- .../bridgedescs/SanitizedBridgesWriter.java | 3 ++- .../collector/exitlists/ExitListDownloader.java | 2 +- .../collector/index/CreateIndexJson.java | 3 ++- .../org/torproject/collector/main/LockFile.java | 6 +++-- .../collector/relaydescs/ArchiveReader.java | 9 ++++++-- .../collector/relaydescs/ArchiveWriter.java | 26 +++++++++++++--------- .../relaydescs/CachedRelayDescriptorReader.java | 3 ++- .../collector/relaydescs/ReferenceChecker.java | 5 +++-- .../relaydescs/RelayDescriptorParser.java | 9 ++++++-- .../collector/torperf/TorperfDownloader.java | 2 +- 11 files changed, 49 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java index 337c2a3..6dc05b6 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java +++ b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java @@ -16,14 +16,16 @@ public class BridgeDescriptorParser { private Logger logger; - @SuppressWarnings("checkstyle:javadocmethod") + /** Initializes a new bridge descriptor parser and links it to a + * sanitized bridges writer to sanitize and store bridge descriptors. */ public BridgeDescriptorParser(SanitizedBridgesWriter sbw) { this.sbw = sbw; this.logger = LoggerFactory.getLogger(BridgeDescriptorParser.class); } - @SuppressWarnings("checkstyle:javadocmethod") + /** Parses the first line of the given descriptor data to determine the + * descriptor type and passes it to the sanitized bridges writer. */ public void parse(byte[] allData, String dateTime) { try { BufferedReader br = new BufferedReader(new StringReader( diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index 1f48fb7..b1b9589 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -54,7 +54,8 @@ public class SanitizedBridgesWriter extends Thread { private static Logger logger = LoggerFactory.getLogger(SanitizedBridgesWriter.class); - @SuppressWarnings("checkstyle:javadocmethod") + /** Executes the bridge-descriptors module using the given + * configuration. */ public static void main(Configuration config) throws ConfigurationException { logger.info("Starting bridge-descriptors module of CollecTor."); diff --git a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java index f54a427..5e17971 100644 --- a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java @@ -36,7 +36,7 @@ public class ExitListDownloader extends Thread { private static Logger logger = LoggerFactory.getLogger(ExitListDownloader.class); - @SuppressWarnings("checkstyle:javadocmethod") + /** Execute the exit-lists module using the given configuration. */ public static void main(Configuration config) throws ConfigurationException { logger.info("Starting exit-lists module of CollecTor."); diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/collector/index/CreateIndexJson.java index 70886bc..a39ef67 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java @@ -52,7 +52,8 @@ public class CreateIndexJson { static final TimeZone dateTimezone = TimeZone.getTimeZone("UTC"); - @SuppressWarnings("checkstyle:javadocmethod") + /** Creates indexes of directories containing archived and recent + * descriptors and write index files to disk. */ public static void main(Configuration config) throws ConfigurationException, IOException { indexJsonFile = new File(config.getPath(Key.IndexPath).toFile(), "index.json"); diff --git a/src/main/java/org/torproject/collector/main/LockFile.java b/src/main/java/org/torproject/collector/main/LockFile.java index 83cb603..977b0b9 100644 --- a/src/main/java/org/torproject/collector/main/LockFile.java +++ b/src/main/java/org/torproject/collector/main/LockFile.java @@ -28,7 +28,9 @@ public class LockFile { this.moduleName = moduleName; } - @SuppressWarnings("checkstyle:javadocmethod") + /** Acquires the lock by checking whether a lock file already exists, + * and if not, by creating one with the current system time as + * content. */ public boolean acquireLock() { this.logger.debug("Trying to acquire lock..."); try { @@ -54,7 +56,7 @@ public class LockFile { } } - @SuppressWarnings("checkstyle:javadocmethod") + /** Releases the lock by deleting the lock file, if present. */ public void releaseLock() { this.logger.debug("Releasing lock..."); this.lockFile.delete(); diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java index 8d82f5c..25f5859 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java @@ -43,7 +43,9 @@ public class ArchiveReader { private Map<String, Set<String>> microdescriptorValidAfterTimes = new HashMap<String, Set<String>>(); - @SuppressWarnings("checkstyle:javadocmethod") + /** Reads all descriptors from the given directory, possibly using a + * parse history file, and passes them to the given descriptor + * parser. */ public ArchiveReader(RelayDescriptorParser rdp, File archivesDirectory, File statsDirectory, boolean keepImportHistory) { @@ -272,7 +274,10 @@ public class ArchiveReader { + ignoredFiles + " files."); } - @SuppressWarnings("checkstyle:javadocmethod") + /** Stores the valid-after time and microdescriptor digests of a given + * microdesc consensus, so that microdescriptors (which don't contain a + * publication time) can later be sorted into the correct month + * folders. */ public void haveParsedMicrodescConsensus(String validAfterTime, SortedSet<String> microdescriptorDigests) { for (String microdescriptor : microdescriptorDigests) { diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java index 3c3272c..3715a9f 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java @@ -108,7 +108,8 @@ public class ArchiveWriter extends Thread { private static final String MICRODESC = "microdesc"; private static final String MICRODESCS = "microdescs"; - @SuppressWarnings("checkstyle:javadocmethod") + /** Executes the relay-descriptors module using the given + * configuration. */ public static void main(Configuration config) throws ConfigurationException { logger.info("Starting relay-descriptors module of CollecTor."); @@ -134,7 +135,7 @@ public class ArchiveWriter extends Thread { logger.info("Terminating relay-descriptors module of CollecTor."); } - @SuppressWarnings("checkstyle:javadocmethod") + /** Initialize an archive writer with a given configuration. */ public ArchiveWriter(Configuration config) throws ConfigurationException { this.config = config; storedServerDescriptorsFile = @@ -319,7 +320,8 @@ public class ArchiveWriter extends Thread { } } - @SuppressWarnings("checkstyle:javadocmethod") + /** Compiles a message with statistics on stored descriptors by type for + * later inclusion in the log and resets counters. */ public void intermediateStats(String event) { intermediateStats.append("While " + event + ", we stored " + this.storedConsensusesCounter + " consensus(es), " @@ -649,7 +651,8 @@ public class ArchiveWriter extends Thread { } } - @SuppressWarnings("checkstyle:javadocmethod") + /** Stores a consensus to disk and adds all referenced votes and server + * descriptors to the list of missing descriptors. */ public void storeConsensus(byte[] data, long validAfter, SortedSet<String> dirSources, SortedSet<String> serverDescriptorDigests) { @@ -672,7 +675,8 @@ public class ArchiveWriter extends Thread { } } - @SuppressWarnings("checkstyle:javadocmethod") + /** Stores a microdesc consensus to disk and adds all referenced + * microdescriptors to the list of missing descriptors. */ public void storeMicrodescConsensus(byte[] data, long validAfter, SortedSet<String> microdescriptorDigests) { SimpleDateFormat yearMonthDirectoryFormat = new SimpleDateFormat( @@ -699,7 +703,8 @@ public class ArchiveWriter extends Thread { } } - @SuppressWarnings("checkstyle:javadocmethod") + /** Stores a vote to disk and adds all referenced server descriptors to + * the list of missing descriptors. */ public void storeVote(byte[] data, long validAfter, String fingerprint, String digest, SortedSet<String> serverDescriptorDigests) { @@ -727,7 +732,7 @@ public class ArchiveWriter extends Thread { } } - @SuppressWarnings("checkstyle:javadocmethod") + /** Stores a key certificate to disk. */ public void storeCertificate(byte[] data, String fingerprint, long published) { SimpleDateFormat printFormat = new SimpleDateFormat( @@ -741,7 +746,8 @@ public class ArchiveWriter extends Thread { } } - @SuppressWarnings("checkstyle:javadocmethod") + /** Stores a server descriptor to disk and adds the referenced + * extra-info descriptor to the list of missing descriptors. */ public void storeServerDescriptor(byte[] data, String digest, long published, String extraInfoDigest) { SimpleDateFormat printFormat = new SimpleDateFormat("yyyy/MM/"); @@ -770,7 +776,7 @@ public class ArchiveWriter extends Thread { } } - @SuppressWarnings("checkstyle:javadocmethod") + /** Stores an extra-info descriptor to disk. */ public void storeExtraInfoDescriptor(byte[] data, String extraInfoDigest, long published) { SimpleDateFormat descriptorFormat = new SimpleDateFormat("yyyy/MM/"); @@ -798,7 +804,7 @@ public class ArchiveWriter extends Thread { } } - @SuppressWarnings("checkstyle:javadocmethod") + /** Stores a microdescriptor to disk. */ public void storeMicrodescriptor(byte[] data, String microdescriptorDigest, long validAfter) { /* TODO We could check here whether we already stored the diff --git a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java index f947895..6c18cdb 100644 --- a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java @@ -36,7 +36,8 @@ import java.util.TreeSet; */ public class CachedRelayDescriptorReader { - @SuppressWarnings("checkstyle:javadocmethod") + /** Reads cached-descriptor files from one or more directories and + * passes them to the given descriptor parser. */ public CachedRelayDescriptorReader(RelayDescriptorParser rdp, String[] inputDirectories, File statsDirectory) { diff --git a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java b/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java index efbcbe0..a749ff5 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java +++ b/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java @@ -68,7 +68,7 @@ public class ReferenceChecker { private static final long THIRTY_DAYS = 30L * ONE_DAY; - @SuppressWarnings("checkstyle:javadocmethod") + /** Initializes a reference checker using the given file paths. */ public ReferenceChecker(File descriptorsDir, File referencesFile, File historyFile) { this.descriptorsDir = descriptorsDir; @@ -76,7 +76,8 @@ public class ReferenceChecker { this.historyFile = historyFile; } - @SuppressWarnings("checkstyle:javadocmethod") + /** Checks references between descriptors, and if too many referenced + * descriptors are missing, puts out a warning to the logs. */ public void check() { this.getCurrentTimeMillis(); this.readReferencesFile(); diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java index 027237e..946a494 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java @@ -70,7 +70,10 @@ public class RelayDescriptorParser { this.ar = ar; } - @SuppressWarnings("checkstyle:javadocmethod") + /** Parses the given bytes to find out the contained descriptor type, + * forwards them to the archive writer to store them to disk, and tells + * the relay descriptor downloader and archive reader about the + * contained descriptor and all referenced descriptors. */ public boolean parse(byte[] data) { boolean stored = false; try { @@ -326,7 +329,9 @@ public class RelayDescriptorParser { return stored; } - @SuppressWarnings("checkstyle:javadocmethod") + /** Forwards the given microdescriptor to the archive writer to store + * it to disk and tells the relay descriptor downloader that this + * microdescriptor is not missing anymore. */ public void storeMicrodescriptor(byte[] data, String digest256Hex, String digest256Base64, long validAfter) { if (this.aw != null) { diff --git a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java index 02d17ed..25164c9 100644 --- a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java +++ b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java @@ -36,7 +36,7 @@ import java.util.TreeMap; public class TorperfDownloader extends Thread { private static Logger logger = LoggerFactory.getLogger(TorperfDownloader.class); - @SuppressWarnings("checkstyle:javadocmethod") + /** Executes the torperf module using the given configuration. */ public static void main(Configuration config) throws ConfigurationException { logger.info("Starting torperf module of CollecTor.");

1 0

[collector/master] Checkstyle warnings down to zero.
by karsten＠torproject.org 14 Jul '16

14 Jul '16

commit ae4be6f06be911b5e6607fcc2c698d3c2b7b463c Author: iwakeh <iwakeh(a)torproject.org> Date: Wed Jul 13 17:55:39 2016 +0200 Checkstyle warnings down to zero. --- .../bridgedescs/BridgeDescriptorParser.java | 2 + .../bridgedescs/BridgeSnapshotReader.java | 7 ++- .../bridgedescs/SanitizedBridgesWriter.java | 54 ++++++++-------- .../java/org/torproject/collector/conf/Key.java | 2 +- .../collector/exitlists/ExitListDownloader.java | 8 ++- .../collector/index/CreateIndexJson.java | 11 ++-- .../org/torproject/collector/main/LockFile.java | 2 + .../collector/relaydescs/ArchiveReader.java | 2 + .../collector/relaydescs/ArchiveWriter.java | 18 +++++- .../relaydescs/CachedRelayDescriptorReader.java | 2 + .../collector/relaydescs/ReferenceChecker.java | 2 + .../relaydescs/RelayDescriptorDownloader.java | 71 +++++++++++----------- .../relaydescs/RelayDescriptorParser.java | 2 + .../collector/torperf/TorperfDownloader.java | 67 +++++++++++--------- src/main/resources/collector.properties | 2 +- .../collector/conf/ConfigurationTest.java | 4 +- 16 files changed, 147 insertions(+), 109 deletions(-) diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java index 94d554f..337c2a3 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java +++ b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java @@ -16,12 +16,14 @@ public class BridgeDescriptorParser { private Logger logger; + @SuppressWarnings("checkstyle:javadocmethod") public BridgeDescriptorParser(SanitizedBridgesWriter sbw) { this.sbw = sbw; this.logger = LoggerFactory.getLogger(BridgeDescriptorParser.class); } + @SuppressWarnings("checkstyle:javadocmethod") public void parse(byte[] allData, String dateTime) { try { BufferedReader br = new BufferedReader(new StringReader( diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java index b1aacec..169731b 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java @@ -27,10 +27,11 @@ import java.util.SortedSet; import java.util.Stack; import java.util.TreeSet; -/** - * Reads the half-hourly snapshots of bridge descriptors from Tonga. - */ public class BridgeSnapshotReader { + + /** + * Reads the half-hourly snapshots of bridge descriptors from Tonga. + */ public BridgeSnapshotReader(BridgeDescriptorParser bdp, File bridgeDirectoriesDir, File statsDirectory) { diff --git a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java index e483353..1f48fb7 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java @@ -54,6 +54,7 @@ public class SanitizedBridgesWriter extends Thread { private static Logger logger = LoggerFactory.getLogger(SanitizedBridgesWriter.class); + @SuppressWarnings("checkstyle:javadocmethod") public static void main(Configuration config) throws ConfigurationException { logger.info("Starting bridge-descriptors module of CollecTor."); @@ -89,11 +90,11 @@ public class SanitizedBridgesWriter extends Thread { */ private File sanitizedBridgesDirectory; - private boolean replaceIPAddressesWithHashes; + private boolean replaceIpAddressesWithHashes; private boolean persistenceProblemWithSecrets; - private SortedMap<String, byte[]> secretsForHashingIPAddresses; + private SortedMap<String, byte[]> secretsForHashingIpAddresses; private String bridgeSanitizingCutOffTimestamp; @@ -119,10 +120,6 @@ public class SanitizedBridgesWriter extends Thread { config.getPath(Key.BridgeSnapshotsDirectory).toFile(); File sanitizedBridgesDirectory = config.getPath(Key.SanitizedBridgesWriteDirectory).toFile(); - boolean replaceIPAddressesWithHashes = - config.getBool(Key.ReplaceIPAddressesWithHashes); - long limitBridgeSanitizingInterval = - config.getInt(Key.BridgeDescriptorMappingsLimit); File statsDirectory = new File("stats"); if (bridgeDirectoriesDirectory == null @@ -133,8 +130,8 @@ public class SanitizedBridgesWriter extends Thread { /* Memorize argument values. */ this.bridgeDirectoriesDirectory = bridgeDirectoriesDirectory; this.sanitizedBridgesDirectory = sanitizedBridgesDirectory; - this.replaceIPAddressesWithHashes = replaceIPAddressesWithHashes; - + this.replaceIpAddressesWithHashes = + config.getBool(Key.ReplaceIpAddressesWithHashes); SimpleDateFormat rsyncCatFormat = new SimpleDateFormat( "yyyy-MM-dd-HH-mm-ss"); rsyncCatFormat.setTimeZone(TimeZone.getTimeZone("UTC")); @@ -142,7 +139,7 @@ public class SanitizedBridgesWriter extends Thread { System.currentTimeMillis()); /* Initialize secure random number generator if we need it. */ - if (this.replaceIPAddressesWithHashes) { + if (this.replaceIpAddressesWithHashes) { try { this.secureRandom = SecureRandom.getInstance("SHA1PRNG", "SUN"); } catch (GeneralSecurityException e) { @@ -155,7 +152,7 @@ public class SanitizedBridgesWriter extends Thread { /* Read hex-encoded secrets for replacing IP addresses with hashes * from disk. */ - this.secretsForHashingIPAddresses = new TreeMap<String, byte[]>(); + this.secretsForHashingIpAddresses = new TreeMap<String, byte[]>(); this.bridgeIpSecretsFile = new File(statsDirectory, "bridge-ip-secrets"); if (this.bridgeIpSecretsFile.exists()) { @@ -177,12 +174,12 @@ public class SanitizedBridgesWriter extends Thread { } String month = parts[0]; byte[] secret = Hex.decodeHex(parts[1].toCharArray()); - this.secretsForHashingIPAddresses.put(month, secret); + this.secretsForHashingIpAddresses.put(month, secret); } br.close(); if (!this.persistenceProblemWithSecrets) { this.logger.debug("Read " - + this.secretsForHashingIPAddresses.size() + " secrets for " + + this.secretsForHashingIpAddresses.size() + " secrets for " + "hashing bridge IP addresses."); } } catch (DecoderException e) { @@ -198,6 +195,9 @@ public class SanitizedBridgesWriter extends Thread { } } + long limitBridgeSanitizingInterval = + config.getInt(Key.BridgeDescriptorMappingsLimit); + /* If we're configured to keep secrets only for a limited time, define * the cut-off day and time. */ if (limitBridgeSanitizingInterval >= 0L) { @@ -249,7 +249,7 @@ public class SanitizedBridgesWriter extends Thread { private String scrubIpv4Address(String address, byte[] fingerprintBytes, String published) throws IOException { - if (this.replaceIPAddressesWithHashes) { + if (this.replaceIpAddressesWithHashes) { if (this.persistenceProblemWithSecrets) { /* There's a persistence problem, so we shouldn't scrub more IP * addresses in this execution. */ @@ -278,13 +278,12 @@ public class SanitizedBridgesWriter extends Thread { private String scrubIpv6Address(String address, byte[] fingerprintBytes, String published) throws IOException { StringBuilder sb = new StringBuilder("[fd9f:2e19:3bcf::"); - if (this.replaceIPAddressesWithHashes) { + if (this.replaceIpAddressesWithHashes) { if (this.persistenceProblemWithSecrets) { /* There's a persistence problem, so we shouldn't scrub more IP * addresses in this execution. */ return null; } - byte[] hashInput = new byte[16 + 20 + 19]; String[] doubleColonSeparatedParts = address.substring(1, address.length() - 1).split("::", -1); if (doubleColonSeparatedParts.length > 2) { @@ -344,6 +343,7 @@ public class SanitizedBridgesWriter extends Thread { /* TODO Invalid IPv6 address. */ return null; } + byte[] hashInput = new byte[16 + 20 + 19]; System.arraycopy(ipBytes, 0, hashInput, 0, 16); System.arraycopy(fingerprintBytes, 0, hashInput, 16, 20); String month = published.substring(0, "yyyy-MM".length()); @@ -360,12 +360,12 @@ public class SanitizedBridgesWriter extends Thread { } private byte[] getSecretForMonth(String month) throws IOException { - if (!this.secretsForHashingIPAddresses.containsKey(month) - || this.secretsForHashingIPAddresses.get(month).length == 31) { + if (!this.secretsForHashingIpAddresses.containsKey(month) + || this.secretsForHashingIpAddresses.get(month).length == 31) { byte[] secret = new byte[50]; this.secureRandom.nextBytes(secret); - if (this.secretsForHashingIPAddresses.containsKey(month)) { - System.arraycopy(this.secretsForHashingIPAddresses.get(month), 0, + if (this.secretsForHashingIpAddresses.containsKey(month)) { + System.arraycopy(this.secretsForHashingIpAddresses.get(month), 0, secret, 0, 31); } if (month.compareTo( @@ -393,9 +393,9 @@ public class SanitizedBridgesWriter extends Thread { throw new IOException(e); } } - this.secretsForHashingIPAddresses.put(month, secret); + this.secretsForHashingIpAddresses.put(month, secret); } - return this.secretsForHashingIPAddresses.get(month); + return this.secretsForHashingIpAddresses.get(month); } private String maxNetworkStatusPublishedTime = "1970-01-01 00:00:00"; @@ -467,9 +467,7 @@ public class SanitizedBridgesWriter extends Thread { /* Parse the relevant parts of this r line. */ String[] parts = line.split(" "); - String nickname = parts[1]; fingerprintBytes = Base64.decodeBase64(parts[2] + "=="); - String descriptorIdentifier = parts[3]; descPublicationTime = parts[4] + " " + parts[5]; String address = parts[6]; String orPort = parts[7]; @@ -489,12 +487,14 @@ public class SanitizedBridgesWriter extends Thread { hashedBridgeIdentity).substring(0, 27); hashedBridgeIdentityHex = Hex.encodeHexString( hashedBridgeIdentity); + String descriptorIdentifier = parts[3]; String hashedDescriptorIdentifier = Base64.encodeBase64String( DigestUtils.sha(Base64.decodeBase64(descriptorIdentifier + "=="))).substring(0, 27); String scrubbedAddress = scrubIpv4Address(address, fingerprintBytes, descPublicationTime); + String nickname = parts[1]; scrubbed.append("r " + nickname + " " + hashedBridgeIdentityBase64 + " " + hashedDescriptorIdentifier + " " + descPublicationTime @@ -1242,8 +1242,8 @@ public class SanitizedBridgesWriter extends Thread { public void finishWriting() { /* Delete secrets that we don't need anymore. */ - if (!this.secretsForHashingIPAddresses.isEmpty() - && this.secretsForHashingIPAddresses.firstKey().compareTo( + if (!this.secretsForHashingIpAddresses.isEmpty() + && this.secretsForHashingIpAddresses.firstKey().compareTo( this.bridgeSanitizingCutOffTimestamp) < 0) { try { int kept = 0; @@ -1251,7 +1251,7 @@ public class SanitizedBridgesWriter extends Thread { BufferedWriter bw = new BufferedWriter(new FileWriter( this.bridgeIpSecretsFile)); for (Map.Entry<String, byte[]> e : - this.secretsForHashingIPAddresses.entrySet()) { + this.secretsForHashingIpAddresses.entrySet()) { if (e.getKey().compareTo( this.bridgeSanitizingCutOffTimestamp) < 0) { deleted++; @@ -1310,7 +1310,7 @@ public class SanitizedBridgesWriter extends Thread { } } - /* Delete all files from the rsync directory that have not been modified + /** Delete all files from the rsync directory that have not been modified * in the last three days, and remove the .tmp extension from newly * written files. */ public void cleanUpRsyncDirectory() { diff --git a/src/main/java/org/torproject/collector/conf/Key.java b/src/main/java/org/torproject/collector/conf/Key.java index 67f91c5..21e536d 100644 --- a/src/main/java/org/torproject/collector/conf/Key.java +++ b/src/main/java/org/torproject/collector/conf/Key.java @@ -32,7 +32,7 @@ public enum Key { ImportCachedRelayDescriptors(Boolean.class), ImportDirectoryArchives(Boolean.class), KeepDirectoryArchiveImportHistory(Boolean.class), - ReplaceIPAddressesWithHashes(Boolean.class), + ReplaceIpAddressesWithHashes(Boolean.class), BridgeDescriptorMappingsLimit(Integer.class), SanitizedBridgesWriteDirectory(Path.class), TorperfOutputDirectory(Path.class), diff --git a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java index 65d7b87..f54a427 100644 --- a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java @@ -36,6 +36,7 @@ public class ExitListDownloader extends Thread { private static Logger logger = LoggerFactory.getLogger(ExitListDownloader.class); + @SuppressWarnings("checkstyle:javadocmethod") public static void main(Configuration config) throws ConfigurationException { logger.info("Starting exit-lists module of CollecTor."); @@ -54,6 +55,7 @@ public class ExitListDownloader extends Thread { public ExitListDownloader(Configuration config) {} + @Override public void run() { try { startProcessing(); @@ -79,8 +81,8 @@ public class ExitListDownloader extends Thread { + "\n"); String exitAddressesUrl = "http://exitlist.torproject.org/exit-addresses"; - URL u = new URL(exitAddressesUrl); - HttpURLConnection huc = (HttpURLConnection) u.openConnection(); + URL url = new URL(exitAddressesUrl); + HttpURLConnection huc = (HttpURLConnection) url.openConnection(); huc.setRequestMethod("GET"); huc.connect(); int response = huc.getResponseCode(); @@ -194,7 +196,7 @@ public class ExitListDownloader extends Thread { this.cleanUpRsyncDirectory(); } - /* Delete all files from the rsync directory that have not been modified + /** Delete all files from the rsync directory that have not been modified * in the last three days. */ public void cleanUpRsyncDirectory() { long cutOffMillis = System.currentTimeMillis() diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/collector/index/CreateIndexJson.java index 639a4be..70886bc 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java @@ -52,6 +52,7 @@ public class CreateIndexJson { static final TimeZone dateTimezone = TimeZone.getTimeZone("UTC"); + @SuppressWarnings("checkstyle:javadocmethod") public static void main(Configuration config) throws ConfigurationException, IOException { indexJsonFile = new File(config.getPath(Key.IndexPath).toFile(), "index.json"); @@ -73,11 +74,12 @@ public class CreateIndexJson { this.directories = directories; } - public int compareTo(DirectoryNode o) { - return this.path.compareTo(o.path); + public int compareTo(DirectoryNode other) { + return this.path.compareTo(other.path); } } + @SuppressWarnings({"checkstyle:membername", "checkstyle:parametername"}) static class IndexNode { String index_created; String path; @@ -94,6 +96,7 @@ public class CreateIndexJson { } } + @SuppressWarnings({"checkstyle:membername", "checkstyle:parametername"}) static class FileNode implements Comparable<FileNode> { String path; long size; @@ -105,8 +108,8 @@ public class CreateIndexJson { this.last_modified = last_modified; } - public int compareTo(FileNode o) { - return this.path.compareTo(o.path); + public int compareTo(FileNode other) { + return this.path.compareTo(other.path); } } diff --git a/src/main/java/org/torproject/collector/main/LockFile.java b/src/main/java/org/torproject/collector/main/LockFile.java index 0931d1f..83cb603 100644 --- a/src/main/java/org/torproject/collector/main/LockFile.java +++ b/src/main/java/org/torproject/collector/main/LockFile.java @@ -28,6 +28,7 @@ public class LockFile { this.moduleName = moduleName; } + @SuppressWarnings("checkstyle:javadocmethod") public boolean acquireLock() { this.logger.debug("Trying to acquire lock..."); try { @@ -53,6 +54,7 @@ public class LockFile { } } + @SuppressWarnings("checkstyle:javadocmethod") public void releaseLock() { this.logger.debug("Releasing lock..."); this.lockFile.delete(); diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java index c1981cc..8d82f5c 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java @@ -43,6 +43,7 @@ public class ArchiveReader { private Map<String, Set<String>> microdescriptorValidAfterTimes = new HashMap<String, Set<String>>(); + @SuppressWarnings("checkstyle:javadocmethod") public ArchiveReader(RelayDescriptorParser rdp, File archivesDirectory, File statsDirectory, boolean keepImportHistory) { @@ -271,6 +272,7 @@ public class ArchiveReader { + ignoredFiles + " files."); } + @SuppressWarnings("checkstyle:javadocmethod") public void haveParsedMicrodescConsensus(String validAfterTime, SortedSet<String> microdescriptorDigests) { for (String microdescriptor : microdescriptorDigests) { diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java index 6495df6..3c3272c 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java @@ -107,6 +107,8 @@ public class ArchiveWriter extends Thread { private static final String CONSENSUS_MICRODESC = "consensus-microdesc"; private static final String MICRODESC = "microdesc"; private static final String MICRODESCS = "microdescs"; + + @SuppressWarnings("checkstyle:javadocmethod") public static void main(Configuration config) throws ConfigurationException { logger.info("Starting relay-descriptors module of CollecTor."); @@ -132,6 +134,7 @@ public class ArchiveWriter extends Thread { logger.info("Terminating relay-descriptors module of CollecTor."); } + @SuppressWarnings("checkstyle:javadocmethod") public ArchiveWriter(Configuration config) throws ConfigurationException { this.config = config; storedServerDescriptorsFile = @@ -142,6 +145,7 @@ public class ArchiveWriter extends Thread { new File(config.getPath(Key.StatsPath).toFile(), "stored-microdescriptors"); } + @Override public void run() { try { startProcessing(); @@ -315,6 +319,7 @@ public class ArchiveWriter extends Thread { } } + @SuppressWarnings("checkstyle:javadocmethod") public void intermediateStats(String event) { intermediateStats.append("While " + event + ", we stored " + this.storedConsensusesCounter + " consensus(es), " @@ -365,8 +370,6 @@ public class ArchiveWriter extends Thread { this.storedConsensuses.entrySet()) { long validAfterMillis = c.getKey(); String validAfterTime = dateTimeFormat.format(validAfterMillis); - int allVotes = this.expectedVotes.containsKey(validAfterMillis) - ? this.expectedVotes.get(validAfterMillis) : 0; int foundVotes = 0; if (this.storedVotes.containsKey(validAfterMillis)) { foundVotes = this.storedVotes.get(validAfterMillis).size(); @@ -444,6 +447,8 @@ public class ArchiveWriter extends Thread { } } sb.append("\nC, " + validAfterTime); + int allVotes = this.expectedVotes.containsKey(validAfterMillis) + ? this.expectedVotes.get(validAfterMillis) : 0; if (allVotes > 0) { sb.append(String.format(", %d/%d V (%.1f%%)", foundVotes, allVotes, 100.0D * (double) foundVotes / (double) allVotes)); @@ -565,7 +570,7 @@ public class ArchiveWriter extends Thread { } } - /* Delete all files from the rsync directory that have not been modified + /** Delete all files from the rsync directory that have not been modified * in the last three days (except for microdescriptors which are kept * for up to thirty days), and remove the .tmp extension from newly * written files. */ @@ -644,6 +649,7 @@ public class ArchiveWriter extends Thread { } } + @SuppressWarnings("checkstyle:javadocmethod") public void storeConsensus(byte[] data, long validAfter, SortedSet<String> dirSources, SortedSet<String> serverDescriptorDigests) { @@ -666,6 +672,7 @@ public class ArchiveWriter extends Thread { } } + @SuppressWarnings("checkstyle:javadocmethod") public void storeMicrodescConsensus(byte[] data, long validAfter, SortedSet<String> microdescriptorDigests) { SimpleDateFormat yearMonthDirectoryFormat = new SimpleDateFormat( @@ -692,6 +699,7 @@ public class ArchiveWriter extends Thread { } } + @SuppressWarnings("checkstyle:javadocmethod") public void storeVote(byte[] data, long validAfter, String fingerprint, String digest, SortedSet<String> serverDescriptorDigests) { @@ -719,6 +727,7 @@ public class ArchiveWriter extends Thread { } } + @SuppressWarnings("checkstyle:javadocmethod") public void storeCertificate(byte[] data, String fingerprint, long published) { SimpleDateFormat printFormat = new SimpleDateFormat( @@ -732,6 +741,7 @@ public class ArchiveWriter extends Thread { } } + @SuppressWarnings("checkstyle:javadocmethod") public void storeServerDescriptor(byte[] data, String digest, long published, String extraInfoDigest) { SimpleDateFormat printFormat = new SimpleDateFormat("yyyy/MM/"); @@ -760,6 +770,7 @@ public class ArchiveWriter extends Thread { } } + @SuppressWarnings("checkstyle:javadocmethod") public void storeExtraInfoDescriptor(byte[] data, String extraInfoDigest, long published) { SimpleDateFormat descriptorFormat = new SimpleDateFormat("yyyy/MM/"); @@ -787,6 +798,7 @@ public class ArchiveWriter extends Thread { } } + @SuppressWarnings("checkstyle:javadocmethod") public void storeMicrodescriptor(byte[] data, String microdescriptorDigest, long validAfter) { /* TODO We could check here whether we already stored the diff --git a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java index 6bee6d6..f947895 100644 --- a/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/collector/relaydescs/CachedRelayDescriptorReader.java @@ -35,6 +35,8 @@ import java.util.TreeSet; * into directory structure in directory-archive/. */ public class CachedRelayDescriptorReader { + + @SuppressWarnings("checkstyle:javadocmethod") public CachedRelayDescriptorReader(RelayDescriptorParser rdp, String[] inputDirectories, File statsDirectory) { diff --git a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java b/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java index 0255163..efbcbe0 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java +++ b/src/main/java/org/torproject/collector/relaydescs/ReferenceChecker.java @@ -68,6 +68,7 @@ public class ReferenceChecker { private static final long THIRTY_DAYS = 30L * ONE_DAY; + @SuppressWarnings("checkstyle:javadocmethod") public ReferenceChecker(File descriptorsDir, File referencesFile, File historyFile) { this.descriptorsDir = descriptorsDir; @@ -75,6 +76,7 @@ public class ReferenceChecker { this.historyFile = historyFile; } + @SuppressWarnings("checkstyle:javadocmethod") public void check() { this.getCurrentTimeMillis(); this.readReferencesFile(); diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java index fe3d504..efe4676 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java +++ b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java @@ -49,13 +49,14 @@ public class RelayDescriptorDownloader { /** * Text file containing the descriptors that we are missing and that we * want to download. Lines are formatted as: - * - * - "consensus,<validafter>,<parsed>", - * - "consensus-microdesc,<validafter>,<parsed>", - * - "vote,<validafter>,<fingerprint>,<parsed>", - * - "server,<published>,<relayid>,<descid>,<parsed>", - * - "extra,<published>,<relayid>,<descid>,<parsed>", or - * - "micro,<validafter>,<relayid>,<descid>,<parsed>". + * <p> + * - "consensus,<validafter>,<parsed>", + * - "consensus-microdesc,<validafter>,<parsed>", + * - "vote,<validafter>,<fingerprint>,<parsed>", + * - "server,<published>,<relayid>,<descid>,<parsed>", + * - "extra,<published>,<relayid>,<descid>,<parsed>", or + * - "micro,<validafter>,<relayid>,<descid>,<parsed>". + * </p> */ private File missingDescriptorsFile; @@ -69,10 +70,10 @@ public class RelayDescriptorDownloader { /** * Map from base64 microdescriptor digests to keys in missingDescriptors - * ("micro,<validafter>,<relayid>,<descid>"). We need this map, because - * we can't learn <validafter> or <relayid> from parsing - * microdescriptors, but we need to know <validafter> to store - * microdescriptors to disk and both <validafter> and <relayid> to + * ("micro,<validafter>,<relayid>,<descid>"). We need this map, because + * we can't learn <validafter> or <relayid> from parsing + * microdescriptors, but we need to know <validafter> to store + * microdescriptors to disk and both <validafter> and <relayid> to * remove microdescriptors from the missing list. There are potentially * many matching keys in missingDescriptors for the same microdescriptor * digest. Also, in rare cases relays share the same microdescriptor @@ -83,7 +84,7 @@ public class RelayDescriptorDownloader { /** * Set of microdescriptor digests that are currently missing. Used for - * logging statistics instead of "micro,<validafter>,..." keys which may + * logging statistics instead of "micro,<validafter>,..." keys which may * contain the same microdescriptor digest multiple times. */ private Set<String> missingMicrodescriptors; @@ -122,54 +123,54 @@ public class RelayDescriptorDownloader { private List<String> authorityFingerprints; /** - * Should we try to download the current consensus if we don't have it? + * Try to download the current consensus if we don't have it. */ private boolean downloadCurrentConsensus; /** - * Should we try to download the current microdesc consensus if we don't - * have it? + * Try to download the current microdesc consensus if we don't + * have it. */ private boolean downloadCurrentMicrodescConsensus; /** - * Should we try to download current votes if we don't have them? + * Try to download current votes if we don't have them. */ private boolean downloadCurrentVotes; /** - * Should we try to download missing server descriptors that have been - * published within the past 24 hours? + * Try to download missing server descriptors that have been + * published within the past 24 hours. */ private boolean downloadMissingServerDescriptors; /** - * Should we try to download missing extra-info descriptors that have - * been published within the past 24 hours? + * Try to download missing extra-info descriptors that have + * been published within the past 24 hours. */ private boolean downloadMissingExtraInfos; /** - * Should we try to download missing microdescriptors that have been - * published within the past 24 hours? + * Try to download missing microdescriptors that have been + * published within the past 24 hours. */ private boolean downloadMissingMicrodescriptors; /** - * Should we try to download all server descriptors from the authorities - * once every 24 hours? + * Try to download all server descriptors from the authorities + * once every 24 hours. */ private boolean downloadAllServerDescriptors; /** - * Should we try to download all extra-info descriptors from the - * authorities once every 24 hours? + * Try to download all extra-info descriptors from the + * authorities once every 24 hours. */ private boolean downloadAllExtraInfos; /** - * Should we download zlib-compressed versions of descriptors by adding - * ".z" to URLs? + * Download zlib-compressed versions of descriptors by adding + * ".z" to URLs. */ private boolean downloadCompressed; @@ -475,7 +476,7 @@ public class RelayDescriptorDownloader { * We have parsed a consensus. Take this consensus off the missing list * and add the votes created by the given <code>authorities</code> and * the <code>serverDescriptors</code> which are in the format - * "<published>,<relayid>,<descid>" to that list. + * "<published>,<relayid>,<descid>" to that list. */ public void haveParsedConsensus(String validAfter, Set<String> authorities, Set<String> serverDescriptors) { @@ -512,7 +513,7 @@ public class RelayDescriptorDownloader { /** * We have parsed a microdesc consensus. Take this microdesc consensus * off the missing list and add the <code>microdescriptors</code> which - * are in the format "<validafter>,<relayid>,<descid>" to that + * are in the format "<validafter>,<relayid>,<descid>" to that * list. */ public void haveParsedMicrodescConsensus(String validAfter, @@ -571,7 +572,7 @@ public class RelayDescriptorDownloader { /** * We have parsed a vote. Take this vote off the missing list and add * the <code>serverDescriptors</code> which are in the format - * "<published>,<relayid>,<descid>" to that list. + * "<published>,<relayid>,<descid>" to that list. */ public void haveParsedVote(String validAfter, String fingerprint, Set<String> serverDescriptors) { @@ -865,8 +866,8 @@ public class RelayDescriptorDownloader { String fullUrl = "http://" + authority + resource + (this.downloadCompressed && !resource.startsWith("/tor/extra/") ? ".z" : ""); - URL u = new URL(fullUrl); - HttpURLConnection huc = (HttpURLConnection) u.openConnection(); + URL url = new URL(fullUrl); + HttpURLConnection huc = (HttpURLConnection) url.openConnection(); huc.setRequestMethod("GET"); huc.connect(); int response = huc.getResponseCode(); @@ -1038,7 +1039,6 @@ public class RelayDescriptorDownloader { this.logger.warn("Failed writing " + this.missingDescriptorsFile.getAbsolutePath() + "!", e); } - int missingMicrodescriptors = this.missingMicrodescriptors.size(); /* Write text file containing the directory authorities and when we * last downloaded all server and extra-info descriptors from them to @@ -1124,7 +1124,8 @@ public class RelayDescriptorDownloader { + missingMicrodescConsensuses + " microdesc consensus(es), " + missingVotes + " vote(s), " + missingServerDescriptors + " server descriptor(s), " + missingExtraInfoDescriptors - + " extra-info descriptor(s), and " + missingMicrodescriptors + + " extra-info descriptor(s), and " + + this.missingMicrodescriptors.size() + " microdescriptor(s), some of which we may try in the next " + "execution."); } diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java index 125b32a..027237e 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorParser.java @@ -70,6 +70,7 @@ public class RelayDescriptorParser { this.ar = ar; } + @SuppressWarnings("checkstyle:javadocmethod") public boolean parse(byte[] data) { boolean stored = false; try { @@ -325,6 +326,7 @@ public class RelayDescriptorParser { return stored; } + @SuppressWarnings("checkstyle:javadocmethod") public void storeMicrodescriptor(byte[] data, String digest256Hex, String digest256Base64, long validAfter) { if (this.aw != null) { diff --git a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java index 53b1523..02d17ed 100644 --- a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java +++ b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java @@ -36,6 +36,7 @@ import java.util.TreeMap; public class TorperfDownloader extends Thread { private static Logger logger = LoggerFactory.getLogger(TorperfDownloader.class); + @SuppressWarnings("checkstyle:javadocmethod") public static void main(Configuration config) throws ConfigurationException { logger.info("Starting torperf module of CollecTor."); @@ -63,6 +64,7 @@ public class TorperfDownloader extends Thread { private String[] torperfFilesLines = null; private SimpleDateFormat dateFormat; + @Override public void run() { try { startProcessing(); @@ -83,10 +85,10 @@ public class TorperfDownloader extends Thread { this.dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); this.readLastMergedTimestamps(); for (String[] source : config.getStringArrayArray(Key.TorperfSources)) { - torperfSources.put(source[0], source[1]); + torperfSources.put(source[0], source[1]); } for (String torperfFilesLine : this.torperfFilesLines) { - this.downloadAndMergeFiles(torperfFilesLine); + this.downloadAndMergeFiles(torperfFilesLine); } this.writeLastMergedTimestamps(); @@ -211,7 +213,7 @@ public class TorperfDownloader extends Thread { } } - private boolean downloadAndAppendFile(String url, File outputFile, + private boolean downloadAndAppendFile(String urlString, File outputFile, boolean isDataFile) { /* Read an existing output file to determine which line will be the @@ -241,10 +243,10 @@ public class TorperfDownloader extends Thread { } try { this.logger.debug("Downloading " + (isDataFile ? ".data" : - ".extradata") + " file from '" + url + "' and merging it into " - + "'" + outputFile.getAbsolutePath() + "'."); - URL u = new URL(url); - HttpURLConnection huc = (HttpURLConnection) u.openConnection(); + ".extradata") + " file from '" + urlString + "' and merging it " + + "into '" + outputFile.getAbsolutePath() + "'."); + URL url = new URL(urlString); + HttpURLConnection huc = (HttpURLConnection) url.openConnection(); huc.setRequestMethod("GET"); huc.connect(); BufferedReader br = new BufferedReader(new InputStreamReader( @@ -276,7 +278,7 @@ public class TorperfDownloader extends Thread { } } catch (IOException e) { this.logger.warn("Failed downloading and/or merging '" - + url + "'.", e); + + urlString + "'.", e); return false; } if (lastTimestampLine == null) { @@ -320,8 +322,8 @@ public class TorperfDownloader extends Thread { BufferedReader brE = new BufferedReader(new FileReader(extradataFile)); String lineD = brD.readLine(); String lineE = brE.readLine(); - int d = 1; - int e = 1; + int skippedLineCount = 1; + int skippedExtraDataCount = 1; String maxDataComplete = null; String maxUsedAt = null; while (lineD != null) { @@ -331,14 +333,14 @@ public class TorperfDownloader extends Thread { * file or without it. */ if (lineD.isEmpty()) { this.logger.trace("Skipping empty line " + dataFile.getName() - + ":" + d++ + "."); + + ":" + skippedLineCount++ + "."); lineD = brD.readLine(); continue; } SortedMap<String, String> data = this.parseDataLine(lineD); if (data == null) { this.logger.trace("Skipping illegal line " + dataFile.getName() - + ":" + d++ + " '" + lineD + "'."); + + ":" + skippedLineCount++ + " '" + lineD + "'."); lineD = brD.readLine(); continue; } @@ -346,7 +348,7 @@ public class TorperfDownloader extends Thread { double dataCompleteSeconds = Double.parseDouble(dataComplete); if (skipUntil != null && dataComplete.compareTo(skipUntil) < 0) { this.logger.trace("Skipping " + dataFile.getName() + ":" - + d++ + " which we already processed before."); + + skippedLineCount++ + " which we already processed before."); lineD = brD.readLine(); continue; } @@ -358,33 +360,35 @@ public class TorperfDownloader extends Thread { while (lineE != null) { if (lineE.isEmpty()) { this.logger.trace("Skipping " + extradataFile.getName() + ":" - + e++ + " which is empty."); + + skippedExtraDataCount++ + " which is empty."); lineE = brE.readLine(); continue; } if (lineE.startsWith("BUILDTIMEOUT_SET ")) { this.logger.trace("Skipping " + extradataFile.getName() + ":" - + e++ + " which is a BUILDTIMEOUT_SET line."); + + skippedExtraDataCount++ + " which is a BUILDTIMEOUT_SET " + + "line."); lineE = brE.readLine(); continue; } else if (lineE.startsWith("ok ") || lineE.startsWith("error ")) { this.logger.trace("Skipping " + extradataFile.getName() + ":" - + e++ + " which is in the old format."); + + skippedExtraDataCount++ + " which is in the old format."); lineE = brE.readLine(); continue; } extradata = this.parseExtradataLine(lineE); if (extradata == null) { this.logger.trace("Skipping Illegal line " - + extradataFile.getName() + ":" + e++ + " '" + lineE - + "'."); + + extradataFile.getName() + ":" + skippedExtraDataCount++ + + " '" + lineE + "'."); lineE = brE.readLine(); continue; } if (!extradata.containsKey("USED_AT")) { this.logger.trace("Skipping " + extradataFile.getName() + ":" - + e++ + " which doesn't contain a USED_AT element."); + + skippedExtraDataCount++ + " which doesn't contain a " + + "USED_AT element."); lineE = brE.readLine(); continue; } @@ -392,14 +396,15 @@ public class TorperfDownloader extends Thread { double usedAtSeconds = Double.parseDouble(usedAt); if (skipUntil != null && usedAt.compareTo(skipUntil) < 0) { this.logger.trace("Skipping " + extradataFile.getName() + ":" - + e++ + " which we already processed before."); + + skippedExtraDataCount++ + " which we already processed " + + "before."); lineE = brE.readLine(); continue; } maxUsedAt = usedAt; if (Math.abs(usedAtSeconds - dataCompleteSeconds) <= 1.0) { this.logger.debug("Merging " + extradataFile.getName() + ":" - + e++ + " into the current .data line."); + + skippedExtraDataCount++ + " into the current .data line."); lineE = brE.readLine(); break; } else if (usedAtSeconds > dataCompleteSeconds) { @@ -409,8 +414,9 @@ public class TorperfDownloader extends Thread { break; } else { this.logger.trace("Skipping " + extradataFile.getName() + ":" - + e++ + " which is too old to be merged with " - + dataFile.getName() + ":" + d + "."); + + skippedExtraDataCount++ + " which is too old to be " + + "merged with " + dataFile.getName() + ":" + + skippedLineCount + "."); lineE = brE.readLine(); continue; } @@ -424,14 +430,15 @@ public class TorperfDownloader extends Thread { } keysAndValues.putAll(data); keysAndValues.putAll(config); - this.logger.debug("Writing " + dataFile.getName() + ":" + d++ + "."); + this.logger.debug("Writing " + dataFile.getName() + ":" + + skippedLineCount++ + "."); lineD = brD.readLine(); try { this.writeTpfLine(source, fileSize, keysAndValues); } catch (IOException ex) { this.logger.warn("Error writing output line. " + "Aborting to merge " + dataFile.getName() + " and " - + extradataFile.getName() + ".", e); + + extradataFile.getName() + ".", skippedExtraDataCount); break; } } @@ -480,11 +487,11 @@ public class TorperfDownloader extends Thread { SortedMap<String, String> data = new TreeMap<String, String>(); try { for (Map.Entry<Integer, String> e : this.dataTimestamps.entrySet()) { - int i = e.getKey(); - if (parts.length > i + 1) { + int intKey = e.getKey(); + if (parts.length > intKey + 1) { String key = e.getValue(); - String value = String.format("%s.%02d", parts[i], - Integer.parseInt(parts[i + 1]) / 10000); + String value = String.format("%s.%02d", parts[intKey], + Integer.parseInt(parts[intKey + 1]) / 10000); data.put(key, value); } } @@ -623,7 +630,7 @@ public class TorperfDownloader extends Thread { this.cachedTpfLines = null; } - /* Delete all files from the rsync directory that have not been modified + /** Delete all files from the rsync directory that have not been modified * in the last three days. */ public void cleanUpRsyncDirectory() { long cutOffMillis = System.currentTimeMillis() diff --git a/src/main/resources/collector.properties b/src/main/resources/collector.properties index 2645d01..c7df21f 100644 --- a/src/main/resources/collector.properties +++ b/src/main/resources/collector.properties @@ -84,7 +84,7 @@ BridgeSnapshotsDirectory = in/bridge-descriptors/ ## Replace IP addresses in sanitized bridge descriptors with 10.x.y.z ## where x.y.z = H(IP address | bridge identity | secret)[:3], so that we ## can learn about IP address changes. -ReplaceIPAddressesWithHashes = false +ReplaceIpAddressesWithHashes = false # ## Limit internal bridge descriptor mapping state to the following number ## of days, or inf for unlimited. diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java index aa98031..2ecbe00 100644 --- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java @@ -63,10 +63,10 @@ public class ConfigurationTest { Configuration conf = new Configuration(); conf.load(new ByteArrayInputStream(("CompressRelayDescriptorDownloads=false" + "\nImportDirectoryArchives = trUe" - + "\nReplaceIPAddressesWithHashes= false").getBytes())); + + "\nReplaceIpAddressesWithHashes= false").getBytes())); assertFalse(conf.getBool(Key.CompressRelayDescriptorDownloads)); assertTrue(conf.getBool(Key.ImportDirectoryArchives)); - assertFalse(conf.getBool(Key.ReplaceIPAddressesWithHashes)); + assertFalse(conf.getBool(Key.ReplaceIpAddressesWithHashes)); } @Test()

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2016