December 2016 - tor-commits - lists.torproject.org

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 20 Dec '16

20 Dec '16

commit 0429ab6736d7c30d76828f7a52dc04b147d5c5da Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 20 11:15:14 2016 +0000 Update translations for whisperback --- zh_TW/zh_TW.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index b3a987d..4b23634 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" … [View More] "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-12-20 10:41+0000\n" +"PO-Revision-Date: 2016-12-20 10:51+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -156,13 +156,13 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - 使用加密郵件來傳送意見反應。\nCopyright (C) 2009-2012 Tails 開發人員 <tails(a)boum.org>\n\n此程式為免費軟體: 您可以將它轉散發和/或修改，\n根據免費軟體基金會所發佈的 GNU 通用公共許可證條款，\n授權版本 3 或(由您選擇)任何更新的版本。\n\n散佈此程式希望它有用，\n但沒有任何擔保責任;沒有適合某特定用途之默示責任擔保。\n請參閱 GNU 通用公共許可證瞭解更多詳細資料。\n\n隨著此軟體您應該已收到 GNU 通用公共許可證副本。\n如果沒有，請參閱 <http://www.gnu.org/licenses/>。\n" +msgstr "WhisperBack - 使用加密郵件來傳送意見反應。\nCopyright (C) 2009-2012 Tails 開發人員 <tails(a)boum.org>\n\n此程式為自由軟體: 您可以將它轉散發和/或修改，\n根據自由軟體基金會所發佈的 GNU 公眾授權條款，\n授權版本 3 或(由您選擇)任何更新的版本。\n\n廣為散佈此程式的目的是希望它能發揮實用價值，\n但沒有任何擔保責任;更沒有意指任何適用於某特定用途之責任擔保。\n請參閱 GNU 公眾授權條款以瞭解更多細節。\n\n在取得此軟體的同時，您應該也同時收到 GNU 公眾授權條款之副本。\n如果沒有，請參閱 <http://www.gnu.org/licenses/>。\n" #: ../data/whisperback.ui.h:20 msgid "" "If you want us to encrypt messages when we respond to you, add your key ID, " "a link to your key, or the key as a public key block:" -msgstr "如果您想要我們回覆給您時將訊息加密，請附上您的金鑰 ID，一個您金鑰的連結，或是一個公開金鑰塊。" +msgstr "如果您想要我們以加密的訊息回覆您，請附上您的金鑰 ID、您金鑰的下載連結或是公開金鑰區塊。" #: ../data/whisperback.ui.h:22 msgid "Summary" @@ -174,19 +174,19 @@ msgstr "錯誤描述" #: ../data/whisperback.ui.h:24 msgid "Optional email address to contact you" -msgstr "與您聯絡的額外電子郵件位址" +msgstr "可與您聯絡的電子郵件位址" #: ../data/whisperback.ui.h:25 msgid "optional PGP key" -msgstr "選用的 PGP 金鑰" +msgstr "選擇性的 PGP 金鑰" #: ../data/whisperback.ui.h:26 msgid "Technical details to include" -msgstr "包含的技術詳細資料" +msgstr "欲包含的技術細節" #: ../data/whisperback.ui.h:27 msgid "headers" -msgstr "標題" +msgstr "標頭" #: ../data/whisperback.ui.h:28 msgid "debugging info" [View Less]

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 20 Dec '16

20 Dec '16

commit b4302f14d93742ba8aef880ac850737fa7a7fc95 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 20 10:45:19 2016 +0000 Update translations for whisperback_completed --- zh_TW/zh_TW.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index bcbb81b..b3a987d 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-… [View More]To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-11-26 06:39+0000\n" +"PO-Revision-Date: 2016-12-20 10:41+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgstr "不正確的聯絡信箱: %s" #: ../whisperBack/whisperback.py:73 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "不正確的連略 OpenPGP 金鑰: %s" +msgstr "不正確的 OpenPGP 金鑰: %s" #: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" @@ -61,7 +61,7 @@ msgstr "這可能需要一段時間..." #: ../whisperBack/gui.py:232 msgid "The contact email adress doesn't seem valid." -msgstr "聯絡電子郵件位址似乎不正確。" +msgstr "聯絡人的電子郵件位址似乎不正確。" #: ../whisperBack/gui.py:249 msgid "Unable to send the mail: SMTP error." @@ -82,7 +82,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "\n\n無法傳送錯誤報告，似乎是網路問題。請試著重新連線到網路並再次按一下〔傳送〕按鈕。\n\n如果還是不行，您需要儲存錯誤報告。" +msgstr "\n\n無法傳送錯誤報告，似乎是網路問題。請試著重新連線到網路並再次按一下〔傳送〕按鈕。\n\n如果還是不行，您可以儲存錯誤報告。" #: ../whisperBack/gui.py:269 msgid "Your message has been sent." @@ -129,7 +129,7 @@ msgstr "翻譯人員-製作群" #: ../whisperBack/gui.py:412 msgid "This doesn't seem to be a valid URL or OpenPGP key." -msgstr "似乎不是有效的網址或 OpenPGP 金鑰。" +msgstr "這似乎不是有效的網址或 OpenPGP 金鑰。" #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2012 tails(a)boum.org" [View Less]

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 20 Dec '16

20 Dec '16

commit c8942cf3d1f1c64401c20c9da147d5300b2b5f14 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 20 10:45:14 2016 +0000 Update translations for whisperback --- zh_TW/zh_TW.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index bcbb81b..b3a987d 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "… [View More]POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2016-11-26 06:39+0000\n" +"PO-Revision-Date: 2016-12-20 10:41+0000\n" "Last-Translator: Agustín Wu <losangwuyts(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgstr "不正確的聯絡信箱: %s" #: ../whisperBack/whisperback.py:73 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "不正確的連略 OpenPGP 金鑰: %s" +msgstr "不正確的 OpenPGP 金鑰: %s" #: ../whisperBack/whisperback.py:75 msgid "Invalid contact OpenPGP public key block" @@ -61,7 +61,7 @@ msgstr "這可能需要一段時間..." #: ../whisperBack/gui.py:232 msgid "The contact email adress doesn't seem valid." -msgstr "聯絡電子郵件位址似乎不正確。" +msgstr "聯絡人的電子郵件位址似乎不正確。" #: ../whisperBack/gui.py:249 msgid "Unable to send the mail: SMTP error." @@ -82,7 +82,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "\n\n無法傳送錯誤報告，似乎是網路問題。請試著重新連線到網路並再次按一下〔傳送〕按鈕。\n\n如果還是不行，您需要儲存錯誤報告。" +msgstr "\n\n無法傳送錯誤報告，似乎是網路問題。請試著重新連線到網路並再次按一下〔傳送〕按鈕。\n\n如果還是不行，您可以儲存錯誤報告。" #: ../whisperBack/gui.py:269 msgid "Your message has been sent." @@ -129,7 +129,7 @@ msgstr "翻譯人員-製作群" #: ../whisperBack/gui.py:412 msgid "This doesn't seem to be a valid URL or OpenPGP key." -msgstr "似乎不是有效的網址或 OpenPGP 金鑰。" +msgstr "這似乎不是有效的網址或 OpenPGP 金鑰。" #: ../data/whisperback.ui.h:1 msgid "Copyright © 2009-2012 tails(a)boum.org" [View Less]

1 0

[sandboxed-tor-browser/master] Keep the PaX attributes around, regardless of browser version.
by yawning＠torproject.org 20 Dec '16

20 Dec '16

commit ff38c2a7695e27bf164569a1b34387449a78f285 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Tue Dec 20 08:24:53 2016 +0000 Keep the PaX attributes around, regardless of browser version. This won't work even with ESR52, and will probably require a JIT rewrite because of the way the JIT expects to be able to modify mapping permissions. --- ChangeLog | 5 ++--- src/cmd/sandboxed-tor-browser/internal/… [View More]

1 0

[metrics-lib/master] Add methods for loading and saving a history file.
by karsten＠torproject.org 20 Dec '16

20 Dec '16

commit 56840df1956bc3ac4521d6fddac4d9abddf926ee Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 1 15:38:00 2016 +0100 Add methods for loading and saving a history file. The history file implementation in `DescriptorReader` writes the history file passed in `setExcludeFiles()` immediately after reading and parsing the last descriptor and putting it into the queue, regardless of whether the application has finished processing those … [View More]descriptors. If the application fails after the history file is written, it may not be able to process descriptors in the next execution that have still been in the queue at the time of failing. This commit deprecates the `setExcludeFiles()` method and replaces it by a `setHistoryFile()` and a `saveHistoryFile()` method. Applications would use `setHistoryFile()` before starting to read descriptors, process all descriptors, perform any cleaning up, and then call `saveHistoryFile()`. Implements #20521. --- CHANGELOG.md | 8 +++ .../torproject/descriptor/DescriptorReader.java | 29 +++++++++++ .../descriptor/impl/DescriptorReaderImpl.java | 60 ++++++++++++++++------ 3 files changed, 80 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a62c987..2a90b84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Changes in version 1.6.0 - 2016-??-?? + + * Medium changes + - Add two methods for loading and saving a parse history file in + the descriptor reader to avoid situations where applications fail + after all descriptors are read but before they are all processed. + + # Changes in version 1.5.0 - 2016-10-19 * Major changes diff --git a/src/main/java/org/torproject/descriptor/DescriptorReader.java b/src/main/java/org/torproject/descriptor/DescriptorReader.java index 771755e..076a7f0 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorReader.java +++ b/src/main/java/org/torproject/descriptor/DescriptorReader.java @@ -68,11 +68,40 @@ public interface DescriptorReader { * Lines in the history file contain the last modified time in * milliseconds since the epoch and the absolute path of a file. * + * @deprecated Replaced by {@link #setHistoryFile()} and + * {@link #saveHistoryFile()} which let the application explicitly tell us + * when it's done processing read descriptors. + * * @since 1.0.0 */ public void setExcludeFiles(File historyFile); /** + * Set a history file to load before reading descriptors and exclude + * descriptor files that haven't changed since they have last been read. + * + * Lines in the history file contain the last modified time in + * milliseconds since the epoch and the absolute path of a file, separated by + * a space. + * + * @since 1.6.0 + */ + public void setHistoryFile(File historyFile); + + /** + * Save a history file with file names and last modified timestamps of + * descriptor files that exist in the input directory or directories and that + * have either been parsed or excluded from parsing. + * + * Lines in the history file contain the last modified time in + * milliseconds since the epoch and the absolute path of a file, separated by + * a space. + * + * @since 1.6.0 + */ + public void saveHistoryFile(File historyFile); + + /** * Exclude files if they haven't changed since the corresponding last * modified timestamps. * diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index 020cdd7..9adc446 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -62,7 +62,9 @@ public class DescriptorReaderImpl implements DescriptorReader { this.tarballs.add(tarball); } - private File historyFile; + private File autoSaveHistoryFile; + + private File manualSaveHistoryFile; @Override public void setExcludeFiles(File historyFile) { @@ -70,7 +72,16 @@ public class DescriptorReaderImpl implements DescriptorReader { throw new IllegalStateException("Reconfiguration is not permitted " + "after starting to read."); } - this.historyFile = historyFile; + this.autoSaveHistoryFile = historyFile; + } + + @Override + public void setHistoryFile(File historyFile) { + if (this.hasStartedReading) { + throw new IllegalStateException("Reconfiguration is not permitted " + + "after starting to read."); + } + this.manualSaveHistoryFile = historyFile; } private SortedMap<String, Long> excludedFiles; @@ -139,12 +150,22 @@ public class DescriptorReaderImpl implements DescriptorReader { : new BlockingIteratorImpl<DescriptorFile>( this.maxDescriptorFilesInQueue); this.reader = new DescriptorReaderRunnable(this.directories, - this.tarballs, descriptorQueue, this.historyFile, - this.excludedFiles, this.failUnrecognizedDescriptorLines); + this.tarballs, descriptorQueue, this.autoSaveHistoryFile, + this.manualSaveHistoryFile, this.excludedFiles, + this.failUnrecognizedDescriptorLines); new Thread(this.reader).start(); return descriptorQueue; } + @Override + public void saveHistoryFile(File historyFile) { + if (!this.reader.hasFinishedReading) { + throw new IllegalStateException("Saving history is only permitted after " + + "reading descriptors."); + } + this.reader.writeNewHistory(historyFile); + } + private static class DescriptorReaderRunnable implements Runnable { private List<File> directories; @@ -153,7 +174,9 @@ public class DescriptorReaderImpl implements DescriptorReader { private BlockingIteratorImpl<DescriptorFile> descriptorQueue; - private File historyFile; + private File autoSaveHistoryFile; + + private File manualSaveHistoryFile; private SortedMap<String, Long> excludedFilesBefore = new TreeMap<>(); @@ -168,12 +191,14 @@ public class DescriptorReaderImpl implements DescriptorReader { private DescriptorReaderRunnable(List<File> directories, List<File> tarballs, BlockingIteratorImpl<DescriptorFile> descriptorQueue, - File historyFile, SortedMap<String, Long> excludedFiles, + File autoSaveHistoryFile, File manualSaveHistoryFile, + SortedMap<String, Long> excludedFiles, boolean failUnrecognizedDescriptorLines) { this.directories = directories; this.tarballs = tarballs; this.descriptorQueue = descriptorQueue; - this.historyFile = historyFile; + this.autoSaveHistoryFile = autoSaveHistoryFile; + this.manualSaveHistoryFile = manualSaveHistoryFile; if (excludedFiles != null) { this.excludedFilesBefore = excludedFiles; } @@ -184,7 +209,8 @@ public class DescriptorReaderImpl implements DescriptorReader { public void run() { try { - this.readOldHistory(); + this.readOldHistory(this.autoSaveHistoryFile); + this.readOldHistory(this.manualSaveHistoryFile); this.readDescriptors(); this.readTarballs(); this.hasFinishedReading = true; @@ -195,17 +221,17 @@ public class DescriptorReaderImpl implements DescriptorReader { this.descriptorQueue.setOutOfDescriptors(); } if (this.hasFinishedReading) { - this.writeNewHistory(); + this.writeNewHistory(this.autoSaveHistoryFile); } } - private void readOldHistory() { - if (this.historyFile == null || !this.historyFile.exists()) { + private void readOldHistory(File historyFile) { + if (historyFile == null || !historyFile.exists()) { return; } try { BufferedReader br = new BufferedReader(new FileReader( - this.historyFile)); + historyFile)); String line; while ((line = br.readLine()) != null) { if (!line.contains(" ")) { @@ -223,16 +249,16 @@ public class DescriptorReaderImpl implements DescriptorReader { } } - private void writeNewHistory() { - if (this.historyFile == null) { + private void writeNewHistory(File historyFile) { + if (historyFile == null) { return; } try { - if (this.historyFile.getParentFile() != null) { - this.historyFile.getParentFile().mkdirs(); + if (historyFile.getParentFile() != null) { + historyFile.getParentFile().mkdirs(); } BufferedWriter bw = new BufferedWriter(new FileWriter( - this.historyFile)); + historyFile)); SortedMap<String, Long> newHistory = new TreeMap<>(); newHistory.putAll(this.excludedFilesAfter); newHistory.putAll(this.parsedFilesAfter); [View Less]

1 0

[metrics-lib/master] Some read/write modernization of DescriptorReaderImpl.
by karsten＠torproject.org 20 Dec '16

20 Dec '16

commit f0db82ad75a83d112100349cfdba0e8e7a753407 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Nov 8 18:02:25 2016 +0100 Some read/write modernization of DescriptorReaderImpl. --- .../descriptor/impl/DescriptorReaderImpl.java | 67 +++++++++------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index 9adc446.… [View More].cf2939a 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -18,14 +18,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.BufferedInputStream; -import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; -import java.io.FileWriter; import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -229,23 +228,23 @@ public class DescriptorReaderImpl implements DescriptorReader { if (historyFile == null || !historyFile.exists()) { return; } + List<String> lines = null; try { - BufferedReader br = new BufferedReader(new FileReader( - historyFile)); - String line; - while ((line = br.readLine()) != null) { - if (!line.contains(" ")) { - log.warn("Unexpected line structure in old history: " + line); - continue; - } - long lastModifiedMillis = Long.parseLong(line.substring(0, - line.indexOf(" "))); - String absolutePath = line.substring(line.indexOf(" ") + 1); - this.excludedFilesBefore.put(absolutePath, lastModifiedMillis); - } - br.close(); + lines = Files.readAllLines(historyFile.toPath(), + StandardCharsets.UTF_8); } catch (IOException | NumberFormatException e) { - log.warn("Trouble reading old history.", e); + log.warn("Trouble reading given history file {}.", historyFile, e); + return; + } + for (String line : lines) { + if (!line.contains(" ")) { + log.warn("Unexpected line structure in old history: {}", line); + continue; + } + long lastModifiedMillis = Long.parseLong(line.substring(0, + line.indexOf(" "))); + String absolutePath = line.substring(line.indexOf(" ") + 1); + this.excludedFilesBefore.put(absolutePath, lastModifiedMillis); } } @@ -253,24 +252,23 @@ public class DescriptorReaderImpl implements DescriptorReader { if (historyFile == null) { return; } - try { - if (historyFile.getParentFile() != null) { - historyFile.getParentFile().mkdirs(); - } - BufferedWriter bw = new BufferedWriter(new FileWriter( - historyFile)); + if (historyFile.getParentFile() != null) { + historyFile.getParentFile().mkdirs(); + } + try (BufferedWriter bw = Files.newBufferedWriter(historyFile.toPath(), + StandardCharsets.UTF_8)) { SortedMap<String, Long> newHistory = new TreeMap<>(); newHistory.putAll(this.excludedFilesAfter); newHistory.putAll(this.parsedFilesAfter); for (Map.Entry<String, Long> e : newHistory.entrySet()) { String absolutePath = e.getKey(); - long lastModifiedMillis = e.getValue(); - bw.write(String.valueOf(lastModifiedMillis) + " " + absolutePath - + "\n"); + String lastModifiedMillis = String.valueOf(e.getValue()); + bw.write(lastModifiedMillis + " " + absolutePath); + bw.newLine(); } - bw.close(); } catch (IOException e) { - log.warn("Trouble writing new history.", e); + log.warn("Trouble writing new history file '{}'.", + historyFile, e); } } @@ -395,16 +393,7 @@ public class DescriptorReaderImpl implements DescriptorReader { private List<Descriptor> readFile(File file) throws IOException, DescriptorParseException { - FileInputStream fis = new FileInputStream(file); - BufferedInputStream bis = new BufferedInputStream(fis); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len; - byte[] data = new byte[1024]; - while ((len = bis.read(data, 0, 1024)) >= 0) { - baos.write(data, 0, len); - } - bis.close(); - byte[] rawDescriptorBytes = baos.toByteArray(); + byte[] rawDescriptorBytes = Files.readAllBytes(file.toPath()); return this.descriptorParser.parseDescriptors(rawDescriptorBytes, file.getName()); } [View Less]

1 0

[metrics-lib/master] Added test and cure for corrupted history file.
by karsten＠torproject.org 20 Dec '16

20 Dec '16

commit 3e37f25eb203a24c4b7b9d807a28b1a98a4e323e Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Dec 13 20:14:44 2016 +0100 Added test and cure for corrupted history file. In that case a warning is logged and parsing continued. Warning makes sense, as it could be due to problems with the file system, which an operator can do something about. --- .../descriptor/impl/DescriptorReaderImpl.java | 20 ++++++++++---------- .../descriptor/impl/… [View More]DescriptorReaderImplTest.java | 18 +++++++++++++++++- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index cf2939a..6a3cd64 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -232,20 +232,20 @@ public class DescriptorReaderImpl implements DescriptorReader { try { lines = Files.readAllLines(historyFile.toPath(), StandardCharsets.UTF_8); + for (String line : lines) { + if (!line.contains(" ")) { + log.warn("Unexpected line structure in old history: {}", line); + continue; + } + long lastModifiedMillis = Long.parseLong(line.substring(0, + line.indexOf(" "))); + String absolutePath = line.substring(line.indexOf(" ") + 1); + this.excludedFilesBefore.put(absolutePath, lastModifiedMillis); + } } catch (IOException | NumberFormatException e) { log.warn("Trouble reading given history file {}.", historyFile, e); return; } - for (String line : lines) { - if (!line.contains(" ")) { - log.warn("Unexpected line structure in old history: {}", line); - continue; - } - long lastModifiedMillis = Long.parseLong(line.substring(0, - line.indexOf(" "))); - String absolutePath = line.substring(line.indexOf(" ") + 1); - this.excludedFilesBefore.put(absolutePath, lastModifiedMillis); - } } private void writeNewHistory(File historyFile) { diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java index d5b1572..c01984d 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java @@ -62,12 +62,15 @@ public class DescriptorReaderImplTest { parseHistoryContents.getBytes(StandardCharsets.UTF_8)); } - private void readAllDescriptors() { + private int readAllDescriptors() { Iterator<DescriptorFile> descriptorFiles = this.descriptorReader.readDescriptors(); + int count = 0; while (descriptorFiles.hasNext()) { + count++; descriptorFiles.next(); } + return count; } private void assertExcludedFilesParsedFilesAndHistoryFileLines( @@ -147,5 +150,18 @@ public class DescriptorReaderImplTest { this.readAllDescriptors(); this.assertExcludedFilesParsedFilesAndHistoryFileLines(0, 0, 1); } + + @Test + public void testSetHistoryCorruptFile() throws IOException { + File corruptHistoryFile = this.temporaryFolder.newFile("corruptHistory"); + Files.write(corruptHistoryFile.toPath(),"1293145200000 \n ".getBytes()); + this.descriptorReader.setHistoryFile(corruptHistoryFile); + this.descriptorReader.addDirectory(this.inputDirectory); + int count = this.readAllDescriptors(); + assertEquals("Two files should have been parsed.", 2, count); + descriptorReader.saveHistoryFile(this.historyFile); + this.assertExcludedFilesParsedFilesAndHistoryFileLines(0, 2, 2); + } + } [View Less]

1 0

[metrics-lib/master] Add tests for descriptor reader.
by karsten＠torproject.org 20 Dec '16

20 Dec '16

commit 2f9c942ca1a325d11b3ba063b8c5711e47cab85e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Dec 3 20:49:22 2016 +0100 Add tests for descriptor reader. --- .../descriptor/impl/DescriptorReaderImplTest.java | 151 +++++++++++++++++++++ .../fafaa9366f010db805de13a4b7348aba2acb6f17 | 30 ++++ .../ffe08f10c0ca5198f7cfa8787651bee538f4f7e0 | 50 +++++++ 3 files changed, 231 insertions(+) diff --git a/src/test/java/org/torproject/descriptor/impl/… [View More]DescriptorReaderImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java new file mode 100644 index 0000000..d5b1572 --- /dev/null +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorReaderImplTest.java @@ -0,0 +1,151 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor.impl; + +import static org.junit.Assert.assertEquals; + +import org.torproject.descriptor.DescriptorFile; +import org.torproject.descriptor.DescriptorReader; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.Iterator; +import java.util.SortedMap; +import java.util.TreeMap; + +/** Tests the descriptor reader by preparing a temporary folder with two input + * descriptor files and a parse history file, running the reader with different + * configurations, and verifying the reader's state afterwards. */ +public class DescriptorReaderImplTest { + + /** Temporary folder containing all files for this test. */ + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + + /** Directory containing two input descriptor files. */ + private File inputDirectory; + + /** Parse history map. */ + private SortedMap<String, Long> historyMap; + + /** Parse history file. */ + private File historyFile; + + /** Descriptor reader used in this test. */ + private DescriptorReader descriptorReader = new DescriptorReaderImpl(); + + /** Prepares the temporary folder and writes files to it for this test. */ + @Before + public void createTemporaryFolderAndContents() throws IOException { + this.inputDirectory = this.temporaryFolder.newFolder("in"); + File fafaFile = new File(this.inputDirectory, "fafa"); + File ffe0File = new File(this.inputDirectory, "ffe0"); + Files.copy(getClass().getClassLoader().getResource( + "fafaa9366f010db805de13a4b7348aba2acb6f17").openStream(), + fafaFile.toPath()); + Files.copy(getClass().getClassLoader().getResource( + "ffe08f10c0ca5198f7cfa8787651bee538f4f7e0").openStream(), + ffe0File.toPath()); + this.historyMap = new TreeMap<>(); + this.historyMap.put(fafaFile.getAbsolutePath(), fafaFile.lastModified()); + String parseHistoryContents = String.format("%d %s%n", + fafaFile.lastModified(), fafaFile.getAbsolutePath()); + this.historyFile = this.temporaryFolder.newFile("history"); + Files.write(this.historyFile.toPath(), + parseHistoryContents.getBytes(StandardCharsets.UTF_8)); + } + + private void readAllDescriptors() { + Iterator<DescriptorFile> descriptorFiles = + this.descriptorReader.readDescriptors(); + while (descriptorFiles.hasNext()) { + descriptorFiles.next(); + } + } + + private void assertExcludedFilesParsedFilesAndHistoryFileLines( + int expectedExcludedFiles, int expectedParsedFiles, + int expectedHistoryFileLines) throws IOException { + assertEquals(expectedExcludedFiles, + this.descriptorReader.getExcludedFiles().size()); + assertEquals(expectedParsedFiles, + this.descriptorReader.getParsedFiles().size()); + assertEquals(expectedHistoryFileLines, + Files.readAllLines(this.historyFile.toPath(), + StandardCharsets.UTF_8).size()); + } + + @Test + public void testDescriptors() throws IOException { + this.descriptorReader.addDirectory(this.inputDirectory); + this.readAllDescriptors(); + this.assertExcludedFilesParsedFilesAndHistoryFileLines(0, 2, 1); + } + + @Test + public void testNoDescriptors() throws IOException { + this.readAllDescriptors(); + this.assertExcludedFilesParsedFilesAndHistoryFileLines(0, 0, 1); + } + + @Test + @SuppressWarnings("deprecation") + public void testSetExcludeFilesDescriptors() throws InterruptedException, + IOException { + this.descriptorReader.setExcludeFiles(this.historyFile); + this.descriptorReader.addDirectory(this.inputDirectory); + this.readAllDescriptors(); + Thread.sleep(100L); /* It may take a moment to write the history file. */ + this.assertExcludedFilesParsedFilesAndHistoryFileLines(1, 1, 2); + } + + @Test + @SuppressWarnings("deprecation") + public void testSetExcludeFilesNoDescriptors() throws InterruptedException, + IOException { + this.descriptorReader.setExcludeFiles(this.historyFile); + this.readAllDescriptors(); + Thread.sleep(100L); /* It may take a moment to write the history file. */ + this.assertExcludedFilesParsedFilesAndHistoryFileLines(0, 0, 0); + } + + @Test + public void testSetHistoryFileDescriptors() throws IOException { + this.descriptorReader.setHistoryFile(this.historyFile); + this.descriptorReader.addDirectory(this.inputDirectory); + this.readAllDescriptors(); + descriptorReader.saveHistoryFile(this.historyFile); + this.assertExcludedFilesParsedFilesAndHistoryFileLines(1, 1, 2); + } + + @Test + public void testSetHistoryFileNoDescriptors() throws IOException { + this.descriptorReader.setHistoryFile(this.historyFile); + this.readAllDescriptors(); + this.descriptorReader.saveHistoryFile(this.historyFile); + this.assertExcludedFilesParsedFilesAndHistoryFileLines(0, 0, 0); + } + + @Test + public void testSetExcludedFilesDescriptors() throws IOException { + this.descriptorReader.setExcludedFiles(this.historyMap); + this.descriptorReader.addDirectory(this.inputDirectory); + this.readAllDescriptors(); + this.assertExcludedFilesParsedFilesAndHistoryFileLines(1, 1, 1); + } + + @Test + public void testSetExcludedFilesNoDescriptors() throws IOException { + this.descriptorReader.setExcludedFiles(this.historyMap); + this.readAllDescriptors(); + this.assertExcludedFilesParsedFilesAndHistoryFileLines(0, 0, 1); + } +} + diff --git a/src/test/resources/fafaa9366f010db805de13a4b7348aba2acb6f17 b/src/test/resources/fafaa9366f010db805de13a4b7348aba2acb6f17 new file mode 100644 index 0000000..143c348 --- /dev/null +++ b/src/test/resources/fafaa9366f010db805de13a4b7348aba2acb6f17 @@ -0,0 +1,30 @@ +@type server-descriptor 1.0 +router kouettng 163.172.27.62 9001 0 9030 +platform Tor 0.2.4.27 on Linux +protocols Link 1 2 Circuit 1 +published 2016-12-01 05:34:06 +fingerprint 1B95 9E07 DF0C 33C1 E956 C8D8 FA41 5AB5 2F07 6FB7 +uptime 21297741 +bandwidth 5120000 10240000 6494197 +extra-info-digest EC116B121B2E59095003761F49004CACA0C30692 +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALlqdCYEaNqaCtZgExgbsEaUPpcbSxVKFHg0GQQyX///WxzpXNliaIWq +npKXhsTyW2Bn1gcilvYXY/kLx8LV8c5QnolrJUClL3IQp0Mbt+VPk+rG8QfxqltV +bcXKh2sgRCtS1oWlnuaVlbjz+y/xpjNGxI3ejKc1ttvJ+RMH0fAHAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAK7E60fMuLIln5nJtDV2ldKw+bulhV4MrD634RpleWc6gMFgEulZmEy1 +8aCEtFk8OpbCHjFb6+ppsNmvZGmQ15lvYe3B7n92cYDe4y+ChVs3MGOkT7k+PjVu +pujkT428JsG1T5yfiagLxWJkUqP/pG5SHNpgKEViGaPhY1WG5gW7AgMBAAE= +-----END RSA PUBLIC KEY----- +hidden-service-dir +ntor-onion-key 9LojUfBId8wzCfFwgWrTKB1l3m3hwCJ1MJFD/sugM2U= +reject *:* +router-signature +-----BEGIN SIGNATURE----- +Z4I3KQDvcAhJsnhSiAj/Y0Mf7AJgYDtPnKR7ToPqsRxG2HqtOmK9LdJPK1oeJO3F +k1fNdhXaEsaRYkzwrdchyRUgiY2GBOuWpCsz00NDwVPpuv8FFGwVXwNhiTOmU6uW +f/5FMuIDdB8PqMJ69UvGPRg2EXBmuPIUqEsISw6ut7I= +-----END SIGNATURE----- diff --git a/src/test/resources/ffe08f10c0ca5198f7cfa8787651bee538f4f7e0 b/src/test/resources/ffe08f10c0ca5198f7cfa8787651bee538f4f7e0 new file mode 100644 index 0000000..fa5f0cd --- /dev/null +++ b/src/test/resources/ffe08f10c0ca5198f7cfa8787651bee538f4f7e0 @@ -0,0 +1,50 @@ +@type server-descriptor 1.0 +router furrygame 94.242.222.217 13092 0 30290 +identity-ed25519 +-----BEGIN ED25519 CERT----- +AQQABkkTAR0R1n6VRb7QkovMZ+OusX4bef/HnXdt0H81hkBRAxKiAQAgBADX6pg7 +pPLS47bkSTGXPwz+jUQZvJrzjMPZSz7dmHB2sihGOwFr5/gZ7nvRbV+qbdmQfUVI +tNfUeAdnTKhjFEziSN6PbEmlWNJBFJKrOJVN5+ERu+8tFM505XZ4S5WmlgQ= +-----END ED25519 CERT----- +master-key-ed25519 1+qYO6Ty0uO25Ekxlz8M/o1EGbya84zD2Us+3ZhwdrI +platform Tor 0.2.7.6 on Linux +protocols Link 1 2 Circuit 1 +published 2016-12-01 05:00:12 +fingerprint 1531 9513 EEF1 F22E E864 BD65 02BC 3570 0912 6586 +uptime 237671 +bandwidth 1024000 2048000 1219736 +extra-info-digest 686607A7AAAD4114A79D98DB5565AB87F63370DC kr42DOkso/qzzOGNGjHG2YWBaJ9xHZR6Uw0LxH54aQA +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAKRdqE8SW8dH9yDyvwLzNOFoCbzh32q+hkuaUDE6DEq7vdjMcIw0zk6K +sRnJ3nshGyrg3hNR+szL8aej4UsKW3NLMXmEekaI714+Moh8GxDuS9IyHSoQd4fZ +muLD/J9xZzNaEaGDumH9HP2ehIYnzHXGA4c75+lcyaK1PSa0vCetAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAL3guVgxitCW1ruuUlMLk4MCc8vxTniyvHjbBM9ovmzkYglXc/YiHss+ +5h/ovHbF37A5inKvKP9eA5yhS1AuNOssf8wjQHxfZIkiXW8px+7ULcuDacsJA/TH +dPHciCWO/K8iFIJr7g16sHciXz4tmaQ2HYWCHefV6WSYahWt2KgZAgMBAAE= +-----END RSA PUBLIC KEY----- +onion-key-crosscert +-----BEGIN CROSSCERT----- +mqzk1B7XIf5NggmpGzCnOBmuRxNc4RnMRpKSSvOjG+X4OoBbUXiaLDBvO+llD0PK +lGrMec7KGbCbbRGfjVwWOail9x/O6rpldS1JFRTaDUfBNfP0WTWwt/lncpX1LqeN +wFBoAySa/yOPfO9ZAuDFArKoOM1Ft2yXzLm1HP8kf5Q= +-----END CROSSCERT----- +ntor-onion-key-crosscert 0 +-----BEGIN ED25519 CERT----- +AQoABkcuAdfqmDuk8tLjtuRJMZc/DP6NRBm8mvOMw9lLPt2YcHayAAIwXxeXxgCc +mcrTnpPccnuiRK222AyWNaGXT7/xcspVt4rR1iyo44P0Z/gS0BDwefaHQjLWXUTq +pOZUVj94ygM= +-----END ED25519 CERT----- +hidden-service-dir +ntor-onion-key EJIyF9uU6SqdqLJOTU9XoP4H/vKCFbr9xCigdoQAOQY= +reject *:* +router-sig-ed25519 CkfG+ZTC6GfVNdeew765sqcWu8zmWuXgMlGxP/f6Ihd9jnJPMzVNuE8Im13QALNAP8Sh0tpAABa6WKmxycXyDg +router-signature +-----BEGIN SIGNATURE----- +I4cNr+Ax6/IIvOUbewQgj07L9b6YoOkO23LaLqaX67bQNYNUgMNp21M0QogI7zkz +zwMdgbMN6PIgn9tRIO+jfDNr6j768si8cAilwiuSz9Qkz8mlExoNIW6uGsh8NI2l +73f91vRyzFBDJpUXNCrwcEE6uyaOgq+iLgpoHSguHEQ= +-----END SIGNATURE----- [View Less]

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 20 Dec '16

20 Dec '16

commit 9455e819f00a984b7c8c3ebf089db6a62f758fd7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 20 07:18:22 2016 +0000 Update translations for tor-browser-manual_completed --- zh_TW/zh_TW.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index a255d52..977b7eb 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -1274,7 +1274,7 @@ msgid "" "obfs3 makes Tor traffic look random, so that it does … [View More]not look like Tor or " "any other protocol. obfs3 bridges will work in most places." msgstr "" -"obfs3 可以讓洋蔥路由傳送的資料訊號看起來像是隨機亂數，因此讓網路的過濾阻檔機制難以判定此網路連線是否為洋蔥路由網路之連線。在大多數的情況下 " +"obfs3 可以讓洋蔥路由傳送的網路訊號看起來像是隨機亂數，因此讓網路的過濾阻檔機制難以判定此網路連線是否為洋蔥路由網路之連線。在大多數的情況下 " "obfs3 橋接器皆可以正常運行。" #: transports.page:42 @@ -1288,7 +1288,7 @@ msgid "" "be blocked than obfs3 bridges." msgstr "" "obfs4 可以像 obfs3 " -"一樣讓洋蔥路由所傳送的資料看起來像是隨機亂數一般，並且還可以避免網路過濾監控機制利用網段掃描法找出橋接器的位址，因此相較之下 obfs4 " +"一樣讓洋蔥路由所傳送的網路訊號看起來像是隨機亂數一般，並且還可以避免網路過濾監控機制利用網段掃描法找出橋接器的位址，因此相較之下 obfs4 " "橋接器更能夠迴避被過濾機制阻擋。" #: transports.page:56 @@ -1321,8 +1321,8 @@ msgid "" "site; and meek-google makes it look like you are using Google search." msgstr "" "這些 Pluggable Transport 都可以讓您在使用洋蔥路由來上網時，在網路上傳輸的資料訊號看起來就像是在瀏覽普通網站一樣，meek-" -"amazon 可以讓您的網路資料訊號看起來像是在造訪亞馬遜網路服務一樣；meek-azure " -"則可以讓您的網路資料訊號看起來像是正在使用微軟的網路雲端服務一般；而 meek-google 會讓您的網路資料訊號看起來像是在使用谷歌搜尋引擎一樣。" +"amazon 可以讓您的網路訊號看起來像是在造訪亞馬遜網路服務一樣；meek-azure " +"則可以讓您的網路訊號看起來像是正在使用微軟的網路雲端服務一般；而 meek-google 會讓您的網路訊號看起來像是在使用谷歌搜尋引擎一樣。" #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" [View Less]

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 20 Dec '16

20 Dec '16

commit 054c22ae207b79ecce46035b5801a1e747c31654 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 20 07:18:18 2016 +0000 Update translations for tor-browser-manual --- zh_TW/zh_TW.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_TW/zh_TW.po b/zh_TW/zh_TW.po index a255d52..977b7eb 100644 --- a/zh_TW/zh_TW.po +++ b/zh_TW/zh_TW.po @@ -1274,7 +1274,7 @@ msgid "" "obfs3 makes Tor traffic look random, so that it does not look … [View More]like Tor or " "any other protocol. obfs3 bridges will work in most places." msgstr "" -"obfs3 可以讓洋蔥路由傳送的資料訊號看起來像是隨機亂數，因此讓網路的過濾阻檔機制難以判定此網路連線是否為洋蔥路由網路之連線。在大多數的情況下 " +"obfs3 可以讓洋蔥路由傳送的網路訊號看起來像是隨機亂數，因此讓網路的過濾阻檔機制難以判定此網路連線是否為洋蔥路由網路之連線。在大多數的情況下 " "obfs3 橋接器皆可以正常運行。" #: transports.page:42 @@ -1288,7 +1288,7 @@ msgid "" "be blocked than obfs3 bridges." msgstr "" "obfs4 可以像 obfs3 " -"一樣讓洋蔥路由所傳送的資料看起來像是隨機亂數一般，並且還可以避免網路過濾監控機制利用網段掃描法找出橋接器的位址，因此相較之下 obfs4 " +"一樣讓洋蔥路由所傳送的網路訊號看起來像是隨機亂數一般，並且還可以避免網路過濾監控機制利用網段掃描法找出橋接器的位址，因此相較之下 obfs4 " "橋接器更能夠迴避被過濾機制阻擋。" #: transports.page:56 @@ -1321,8 +1321,8 @@ msgid "" "site; and meek-google makes it look like you are using Google search." msgstr "" "這些 Pluggable Transport 都可以讓您在使用洋蔥路由來上網時，在網路上傳輸的資料訊號看起來就像是在瀏覽普通網站一樣，meek-" -"amazon 可以讓您的網路資料訊號看起來像是在造訪亞馬遜網路服務一樣；meek-azure " -"則可以讓您的網路資料訊號看起來像是正在使用微軟的網路雲端服務一般；而 meek-google 會讓您的網路資料訊號看起來像是在使用谷歌搜尋引擎一樣。" +"amazon 可以讓您的網路訊號看起來像是在造訪亞馬遜網路服務一樣；meek-azure " +"則可以讓您的網路訊號看起來像是正在使用微軟的網路雲端服務一般；而 meek-google 會讓您的網路訊號看起來像是在使用谷歌搜尋引擎一樣。" #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" [View Less]

1 0