tor-commits April 2018

tor-commits@lists.torproject.org

17 participants
1638 discussions

[translation/support-connecting] Update translations for support-connecting
by translation＠torproject.org 18 Apr '18

18 Apr '18

commit 002874af664d6593928044adef709ee7401d784c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 18 07:49:54 2018 +0000 Update translations for support-connecting --- ja.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja.json b/ja.json index 4a2169eb3..e1eece31b 100644 --- a/ja.json +++ b/ja.json @@ -9,7 +9,7 @@ "id": "#接続-2", "control": "接続-2", "title": "Torにアクセスできないが、何が問題なのか分かりません。", - "description": "<p class=\"mb-3\">If you’re having trouble connecting, please select the option to \"copy Tor log to clipboard.\" Then paste the Tor log into a text file or other document. You should see one of these common log errors (look for the following lines in your Tor log):</p><h5>Common log error #1: Proxy connection failure</h5><p class=\"mb-3\"><pre><code> 2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\"general SOCKS server failure\") \n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect toxx..xxx..xxx.xx:xxxxx (\"general SOCKS server fa ilure\")</code></pre></p><p class=\"mb-3\">If you see lines like these in your Tor log, it means you are failing to connect to a SOCKS proxy. If a SOCKS proxy is required for your network setup, then please make sure you’ve entered your proxy details correctly. If a SOCKS proxy is not required, or you’re not sure, please try connecting to the Tor network without a SOCKS proxy.<p><h5>Common log error #2: Can’t reach guard relays</h5><p class=\"mb-3\"><pre><code> 11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor network \n 11/1/2017 21:11:44 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit. \n 11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake with first hop \n 11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit.</code></pre></p><p class=\"mb-3\">If you see lines like these in your Tor log, it means your Tor failed to connect to the first node in the Tor circuit. This could mean that you’re on a network that’s censored. Please try connecting with bridges, and that should fix the problem.</p><h5>Common log error #3: Failed to complete TLS handshake</h5><p class=\"mb-3\"><pre><code> 13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 13-11-17 19:53:49.300 [WARN] Problem bootstrapping. Stuck at 10%: Finishing handshake with directory server. (DONE; DONE; count 10; recommendation warn; host [host] at xxx.xxx.xxx.xx:xxx) \n 13-11-17 19:53:49.300 [WARN] 10 connections have failed: \n 13-11-17 19:53:49.300 [WARN] 9 connections died in state handshaking (TLS) with SSL state SSLv2/v3 read server hello A in HANDSHAKE \n 13-11-17 19:53:49.300 [WARN] 1 connections died in state connect()ing with SSL state (No SSL object)</code></pre></p><p class=\"mb-3\">If you see lines like this in your Tor log, it means that Tor failed to complete a TLS handshake with the directory authorities. Using bridges will likely fix this.</p><h5>Common log error #4: Clock skew</h5><p class=\"mb-3\"><pre><code> 19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \n 19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting to directory server \n 19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \n 19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is ahead. \n Tor requires an accurate clock to work: please check your time, timezone, and date settings.</code></pre></p><p class=\"mb-3\">If you see lines like this in your Tor log, it means your system clock is incorrect. Please make sure your clock is set accurately, including the correct timezone. Then restart Tor. </p>" + "description": "<p class=\\\"mb-3\\\">Torにアクセスできない場合、「Torログをクリップボードにコピーする」選択肢を選んで、ログをメモ帳あるいはドキュメントファイルに貼り付けて下さい。以下の良くあるエラーメッセージを見つけるはずです：</p><h5>よくあるログエラー#1: プロキシ接続失敗</h5><p class=\\\"mb-3\\\"><pre><code> 2017-10-29 09:23:40.800 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \\n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 5%: Connecting to directory server \\n 2017-10-29 09:23:47.900 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \\n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\\\"general SOCKS server failure\\\") \\n 2017-10-29 09:24:08.900 [WARN] Proxy Client: unable to connect to xx..xxx..xxx.xx:xxxxx (\\\"general SOCKS server failure\\\") \\n 2017-10-29 09:24:08.900 [WARN] Proxy Client: una ble to connect toxx..xxx..xxx.xx:xxxxx (\\\"general SOCKS server failure\\\")</code></pre></p><p class=\\\"mb-3\\\">Torログにこのような行があれば、SOCKSプロキシと繋がれないということです。ネットワークにはSOCKSプロキシが必要なら、設定を確認して下さい。SOCKSプロキシが必要ではない場合、あるいはよく分からない場合、SOCKSプロキシ無しでTorにアクセスしてみて下さい。<p><h5>よくあるログエラー#2: ガードリレーと接続できない</h5><p class=\\\"mb-3\\\"><pre><code> 11/1/2017 21:11:43 PM.500 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \\n 11/1/2017 21:11:44 PM.300 [NOTICE] Bootstrapped 80%: Connecting to the Tor network \\n 11/1/2017 21:11:44 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit. \\n 11/1/2017 21:11:44 PM.500 [NOTICE] Bootstrapped 85%: Finishing handshake with first hop \\n 11/1/2017 21:11:45 PM.300 [WARN] Failed to find node for hop 0 of our path. Discarding this circuit.</code></pre></p><p class=\\\"mb-3\\\">Torログにこのような行があれば、Torはcircuitの最初のノードと接続できなかったということです。検閲されるネットワークに接続している可能性があります。ブリッジを使ってTorにアクセスしたら問題を解決できるはずです。</p><h5>よくあるログエラー#3: TLSハンドシェイクの失敗</h5><p class=\\\"mb-3\\\"><pre><code> 13-11-17 19:52:24.300 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \\n 13-11-17 19:53:49.300 [WARN] Problem bootstrapping. Stuck at 10%: Finishing handshake with directory server. (DONE; DONE; count 10; recommendation warn; host [host] at xxx.xxx.xxx.xx:xxx) \\n 13-11-17 19:53:49.300 [WARN] 10 connections have failed: \\n 13-11-17 19:53:49.300 [WARN] 9 connections died in state handshaking (TLS) with SSL state SSLv2/v3 read server hello A in HANDSHAKE \\n 13-11-17 19:53:49.300 [WARN] 1 connections died in state connect()ing with SSL state (No SSL object)</code></pre></p><p class=\\\"mb-3\\\">Torログにこのような行があれば、TorがディレクトリオーソリティとTLSハンドシェイクを完了できなかったということです。ブリッジを使ってTorにアクセスしたら問題を解決できる可能性がある。</p><h5>よくあるログエラー#4: クロックスキュー</h5><p class=\\\"mb-3\\\"><pre><code> 19.11.2017 00:04:47.400 [NOTICE] Opening Socks listener on 127.0.0.1:9150 \\n 19.11.2017 00:04:48.000 [NOTICE] Bootstrapped 5%: Connecting to directory server \\n 19.11.2017 00:04:48.200 [NOTICE] Bootstrapped 10%: Finishing handshake with directory server \\n 19.11.2017 00:04:48.800 [WARN] Received NETINFO cell with skewed time (OR:xxx.xx.x.xx:xxxx): It seems that our clock is behind by 1 days, 0 hours, 1 minutes, or that theirs is ahead. \\n Tor requires an accurate clock to work: please check yo ur time, timezone, and date settings.</code></pre></p><p class=\\\"mb-3\\\">Torログにこのような行があれば、システム・クロックには間違った時刻が設定されます。システム・クロックを正しい時刻とタイムゾーンに合わせてからTorを再起動して下さい。 </p>" }, "connecting-3": { "id": "#接続-3",

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 18 Apr '18

18 Apr '18

commit 94625e523e86e84d2379363e7c5793f62ebcc9a9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 18 07:47:35 2018 +0000 Update translations for tails-perl5lib_completed --- ja.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ja.po b/ja.po index 1a7429210..06bca613e 100644 --- a/ja.po +++ b/ja.po @@ -5,13 +5,14 @@ # Translators: # Eshin Kunishima <ek(a)esh.ink>, 2016 # nord stream <nord-stream(a)ochaken.jp.eu.org>, 2016 +# Tokumei Nanashi, 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2017-05-20 10:59+0200\n" -"PO-Revision-Date: 2017-09-19 22:59+0000\n" -"Last-Translator: nord stream <nord-stream(a)ochaken.jp.eu.org>\n" +"POT-Creation-Date: 2018-03-15 12:15+0000\n" +"PO-Revision-Date: 2018-04-18 07:43+0000\n" +"Last-Translator: Tokumei Nanashi\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,12 +26,12 @@ msgstr "エラー" #: ../lib/Tails/RunningSystem.pm:161 msgid "" -"The device Tails is running from cannot be found. Maybe you used the `toram'" +"The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" msgstr "Tailsが動作しているデバイスを発見出来ませんでした。もしかして`toram' オプションを使ってはいませんか？" #: ../lib/Tails/RunningSystem.pm:192 msgid "" -"The drive Tails is running from cannot be found. Maybe you used the `toram' " +"The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" msgstr "Tailsが動作しているドライブを発見出来ませんでした。もしかして`toram' オプションを使ってはいませんか？"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 18 Apr '18

18 Apr '18

commit e748281735116c3bed3b75dd57bc7007414eb49f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 18 07:47:30 2018 +0000 Update translations for tails-perl5lib --- ja.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ja.po b/ja.po index d291112c6..06bca613e 100644 --- a/ja.po +++ b/ja.po @@ -5,13 +5,14 @@ # Translators: # Eshin Kunishima <ek(a)esh.ink>, 2016 # nord stream <nord-stream(a)ochaken.jp.eu.org>, 2016 +# Tokumei Nanashi, 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2018-03-15 12:15+0000\n" -"PO-Revision-Date: 2018-03-31 13:21+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-04-18 07:43+0000\n" +"Last-Translator: Tokumei Nanashi\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,10 +28,10 @@ msgstr "エラー" msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "" +msgstr "Tailsが動作しているデバイスを発見出来ませんでした。もしかして`toram' オプションを使ってはいませんか？" #: ../lib/Tails/RunningSystem.pm:192 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "" +msgstr "Tailsが動作しているドライブを発見出来ませんでした。もしかして`toram' オプションを使ってはいませんか？"

1 0

[tor-browser/tor-browser-52.7.3esr-7.5-1] Bug 25331: Fix failing test from #18192
by gk＠torproject.org 18 Apr '18

18 Apr '18

commit 8592446c194092c93c854611fc7dadd1fd3f3917 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 18 07:31:48 2018 +0000 Bug 25331: Fix failing test from #18192 This patch was written by mcs and brade --- .../tests/chrome/test_0790_check_certPinning_noUpdate.xul | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul b/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul index f5a97cf204ac..fcb571a4ddc6 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul @@ -27,9 +27,13 @@ const TESTS = [ { buttonClick: "finish" } ]; +const kCertPinningEnforcementLevelPref = "security.cert_pinning.enforcement_level"; + function runTest() { debugDump("entering"); + SpecialPowers.setIntPref(kCertPinningEnforcementLevelPref, 2); // strict + // Set the update URL. // https://badchain.include-subdomains.pinning.example.com is preconfigured // by the test framework for use in key pinning tests. @@ -43,6 +47,12 @@ function runTest() { gUP.checkForUpdates(); } +function finishTest() +{ + SpecialPowers.clearUserPref(kCertPinningEnforcementLevelPref); + finishTestDefault(); +} + function checkErrorCode() { // From security/manager/ssl/tests/unit/head_psm.js: const MOZILLA_PKIX_ERROR_BASE = Ci.nsINSSErrorsService.MOZILLA_PKIX_ERROR_BASE;

1 0

[tor-browser/tor-browser-52.7.3esr-8.0-1] Bug 25331: Fix failing test from #18192
by gk＠torproject.org 18 Apr '18

18 Apr '18

commit 292456846d8420e88b19664e36562cb4d6169776 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 18 07:31:48 2018 +0000 Bug 25331: Fix failing test from #18192 This patch was written by mcs and brade --- .../tests/chrome/test_0790_check_certPinning_noUpdate.xul | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul b/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul index f5a97cf204ac..fcb571a4ddc6 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul @@ -27,9 +27,13 @@ const TESTS = [ { buttonClick: "finish" } ]; +const kCertPinningEnforcementLevelPref = "security.cert_pinning.enforcement_level"; + function runTest() { debugDump("entering"); + SpecialPowers.setIntPref(kCertPinningEnforcementLevelPref, 2); // strict + // Set the update URL. // https://badchain.include-subdomains.pinning.example.com is preconfigured // by the test framework for use in key pinning tests. @@ -43,6 +47,12 @@ function runTest() { gUP.checkForUpdates(); } +function finishTest() +{ + SpecialPowers.clearUserPref(kCertPinningEnforcementLevelPref); + finishTestDefault(); +} + function checkErrorCode() { // From security/manager/ssl/tests/unit/head_psm.js: const MOZILLA_PKIX_ERROR_BASE = Ci.nsINSSErrorsService.MOZILLA_PKIX_ERROR_BASE;

1 0

[torspec/master] fix some sort of weird encoding mistake
by arma＠torproject.org 18 Apr '18

18 Apr '18

commit 066c24c46df457eb5d1ca2d8c2428664374ae7e7 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 18 03:19:03 2018 -0400 fix some sort of weird encoding mistake --- proposals/291-two-guard-nodes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/291-two-guard-nodes.txt b/proposals/291-two-guard-nodes.txt index 2a884ef..52f7f1e 100644 --- a/proposals/291-two-guard-nodes.txt +++ b/proposals/291-two-guard-nodes.txt @@ -27,7 +27,7 @@ Status: Open This will be accomplished by setting the guard-n-primary-guards-to-use consensus parameter to 2, as well as guard-n-primary-guards to 2. (Section 3.1 covers the reason for both parameters). This is equivalent - to using the torrc option NumEntryGuards=3D2, which can be used for + to using the torrc option NumEntryGuards=2, which can be used for testing behavior prior to the consensus update. 1.2. Enforce Tor's path restrictions across this guard layer

1 0

[metrics-lib/master] Use the descriptor file name for determining descriptor type.
by karsten＠torproject.org 18 Apr '18

18 Apr '18

commit 7b859f8dc21c801f0bf707ceac6703f84c056497 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Mar 27 07:25:37 2018 +0000 Use the descriptor file name for determining descriptor type. Initial solution suggested by Karsten. In addition, add a test that would fail without this patch and adapt old test to expect the correct behavior. Also provide the origin of the descriptor with getDescriptorFile. Include a test for this functionality in log descriptors. Provide proper file name to log descriptor classes, because this filename contains log metadata for storing log files properly. Solves task-25332. --- CHANGELOG.md | 3 +++ .../descriptor/impl/DescriptorParserImpl.java | 4 ++-- .../descriptor/log/LogDescriptorImpl.java | 19 ++++++++-------- .../descriptor/log/WebServerAccessLogImpl.java | 25 +++++++++++++-------- .../descriptor/impl/DescriptorParserImplTest.java | 18 +++++++++++++++ .../descriptor/log/LogDescriptorTest.java | 4 ++-- .../descriptor/log/WebServerAccessLogTest.java | 2 +- .../descriptor/log/WebServerModuleTest.java | 18 +++++---------- src/test/resources/webstats-2015-02.tar | Bin 0 -> 20480 bytes 9 files changed, 58 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d64d58d..5edc519 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ - Replace ServerDescriptor#getHiddenServiceDirVersions with ServerDescriptor#isHiddenServiceDir, because Tor has never supported versions in the hidden-service-dir descriptor line. + - Add support for reading web server logs contained in tarballs by + providing file names of both the tarball and of contained files + to WebServerAccessLog. * Minor changes - Override logLines() method from LogDescriptor in diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java index be9041f..713170e 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorParserImpl.java @@ -130,8 +130,8 @@ public class DescriptorParserImpl implements DescriptorParser { } else if (firstLines.startsWith("@type torperf 1.")) { return TorperfResultImpl.parseTorperfResults(rawDescriptorBytes, sourceFile); - } else if (sourceFile.getName().contains(LogDescriptorImpl.MARKER)) { - return LogDescriptorImpl.parse(rawDescriptorBytes, sourceFile); + } else if (fileName.contains(LogDescriptorImpl.MARKER)) { + return LogDescriptorImpl.parse(rawDescriptorBytes, sourceFile, fileName); } else { throw new DescriptorParseException("Could not detect descriptor " + "type in descriptor starting with '" + firstLines + "'."); diff --git a/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java b/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java index 3583d26..b730465 100644 --- a/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/log/LogDescriptorImpl.java @@ -64,14 +64,15 @@ public abstract class LogDescriptorImpl * @since 2.2.0 */ protected LogDescriptorImpl(byte[] logBytes, File descriptorFile, - FileType defaultCompression) throws DescriptorParseException { + String logName, FileType defaultCompression) + throws DescriptorParseException { this.logBytes = logBytes; this.descriptorFile = descriptorFile; try { - Matcher mat = filenamePattern.matcher(descriptorFile.getName()); + Matcher mat = filenamePattern.matcher(logName); if (!mat.find()) { throw new DescriptorParseException( - "Log file name doesn't comply to standard: " + descriptorFile); + "Log file name doesn't comply to standard: " + logName); } this.fileType = FileType.findType(mat.group(1).toUpperCase()); if (FileType.PLAIN == this.fileType) { @@ -80,7 +81,7 @@ public abstract class LogDescriptorImpl } } catch (Exception ex) { throw new DescriptorParseException("Cannot parse file " - + descriptorFile.getName(), ex); + + logName + " from file " + descriptorFile.getName(), ex); } } @@ -112,13 +113,13 @@ public abstract class LogDescriptorImpl * @since 2.2.0 */ public static List<Descriptor> parse(byte[] logBytes, - File descriptorFile) throws DescriptorParseException { - if (descriptorFile.getName().contains(InternalWebServerAccessLog.MARKER)) { + File descriptorFile, String logName) throws DescriptorParseException { + if (logName.contains(InternalWebServerAccessLog.MARKER)) { return Arrays.asList(new Descriptor[]{ - new WebServerAccessLogImpl(logBytes, descriptorFile)}); + new WebServerAccessLogImpl(logBytes, descriptorFile, logName)}); } else { - throw new DescriptorParseException("Cannot parse file " - + descriptorFile.getName()); + throw new DescriptorParseException("Cannot parse file " + logName + + " from file " + descriptorFile.getName()); } } diff --git a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java index 3666d5d..ffaef7b 100644 --- a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java +++ b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogImpl.java @@ -13,6 +13,7 @@ import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.File; import java.io.InputStreamReader; +import java.nio.file.Paths; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -65,28 +66,34 @@ public class WebServerAccessLogImpl extends LogDescriptorImpl * The immediate parent name is taken to be the physical host collecting the * logs.</p> */ - protected WebServerAccessLogImpl(byte[] logBytes, File file) + protected WebServerAccessLogImpl(byte[] logBytes, File file, String logName) throws DescriptorParseException { - this(logBytes, file, FileType.XZ); + this(logBytes, file, logName, FileType.XZ); } /** For internal use only. */ public WebServerAccessLogImpl(byte[] bytes, String filename, boolean validate) throws DescriptorParseException { - this(bytes, new File(filename), FileType.XZ, validate); + this(bytes, null, filename, FileType.XZ, validate); } - private WebServerAccessLogImpl(byte[] logBytes, File file, + /** For internal use only. */ + public WebServerAccessLogImpl(byte[] bytes, File sourceFile, String filename, + boolean validate) throws DescriptorParseException { + this(bytes, sourceFile, filename, FileType.XZ, validate); + } + + private WebServerAccessLogImpl(byte[] logBytes, File file, String logName, FileType defaultCompression) throws DescriptorParseException { - this(logBytes, file, defaultCompression, true); + this(logBytes, file, logName, defaultCompression, true); } - private WebServerAccessLogImpl(byte[] logBytes, File file, + private WebServerAccessLogImpl(byte[] logBytes, File file, String logName, FileType defaultCompression, boolean validate) throws DescriptorParseException { - super(logBytes, file, defaultCompression); + super(logBytes, file, logName, defaultCompression); try { - String fn = file.toPath().getFileName().toString(); + String fn = Paths.get(logName).getFileName().toString(); Matcher mat = filenamePattern.matcher(fn); if (!mat.find()) { throw new DescriptorParseException( @@ -110,7 +117,7 @@ public class WebServerAccessLogImpl extends LogDescriptorImpl throw dpe; // escalate } catch (Exception pe) { throw new DescriptorParseException( - "Cannot parse WebServerAccessLog file: " + file, pe); + "Cannot parse WebServerAccessLog file: " + logName, pe); } } diff --git a/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java b/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java index d9dd178..70594d8 100644 --- a/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/DescriptorParserImplTest.java @@ -4,9 +4,13 @@ package org.torproject.descriptor.impl; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParseException; +import org.torproject.descriptor.DescriptorReader; +import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.descriptor.WebServerAccessLog; import org.junit.Rule; import org.junit.Test; @@ -48,6 +52,20 @@ public class DescriptorParserImplTest { } @Test + public void testParseDescriptorTar() throws Exception { + DescriptorReader dr = DescriptorSourceFactory.createDescriptorReader(); + int count = 0; + for (Descriptor desc : dr.readDescriptors(new File(getClass() + .getClassLoader().getResource("webstats-2015-02.tar").toURI()))) { + assertTrue(desc instanceof WebServerAccessLog); + assertTrue(desc.getDescriptorFile().toString() + .endsWith("webstats-2015-02.tar")); + count++; + } + assertEquals(7, count); + } + + @Test public void testParseDescriptor() throws DescriptorParseException { Constructor<? extends DescriptorImpl> constructor; try { diff --git a/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java b/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java index 0ff3e62..e76566a 100644 --- a/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java +++ b/src/test/java/org/torproject/descriptor/log/LogDescriptorTest.java @@ -149,8 +149,8 @@ public class LogDescriptorTest { File invalidFile = new File(this.reader.getParsedFiles().firstKey() .replace("access", "-")); List<Descriptor> descs = new ArrayList<>(); - for (Descriptor desc // note: only 'invalidFile' is used by LogDescriptor - : dp.parseDescriptors(new byte[]{}, invalidFile, logFile.getName())) { + for (Descriptor desc // note: only 'invalidFile' is used by DescriptorReader + : dp.parseDescriptors(new byte[]{}, logFile, invalidFile.getName())) { descs.add(desc); } assertTrue(dataUsed() + "\nWrong type: " diff --git a/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java b/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java index 3e98f13..b64c4df 100644 --- a/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java +++ b/src/test/java/org/torproject/descriptor/log/WebServerAccessLogTest.java @@ -79,7 +79,7 @@ public class WebServerAccessLogTest { @Test public void testValidation() throws Exception { WebServerAccessLogImpl wsal - = new WebServerAccessLogImpl(real.getBytes(), file); + = new WebServerAccessLogImpl(real.getBytes(), file, fn); wsal.validate(); if (valid) { assertEquals(0, wsal.getUnrecognizedLines().size()); diff --git a/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java b/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java index 66c8f54..c5cf6e5 100644 --- a/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java +++ b/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java @@ -14,7 +14,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import java.io.File; import java.util.Arrays; import java.util.stream.Collectors; @@ -31,8 +30,7 @@ public class WebServerModuleTest { thrown.expectMessage(Matchers .containsString("Cannot parse WebServerAccessLog file: " + filename)); - new WebServerAccessLogImpl(new byte[0], - new File(filename)); + new WebServerAccessLogImpl(new byte[0], null, filename); } @Test @@ -42,8 +40,7 @@ public class WebServerModuleTest { thrown.expectMessage(Matchers .containsString("Cannot parse WebServerAccessLog file: " + filename)); - new WebServerAccessLogImpl(new byte[0], - new File(filename)); + new WebServerAccessLogImpl(new byte[0], null, filename); } @Test @@ -53,8 +50,7 @@ public class WebServerModuleTest { thrown.expectMessage(Matchers .containsString("WebServerAccessLog " + "file name doesn't comply to standard: " + filename)); - new WebServerAccessLogImpl(new byte[0], - new File(filename)); + new WebServerAccessLogImpl(new byte[0], null, filename); } @Test @@ -64,8 +60,7 @@ public class WebServerModuleTest { thrown.expectMessage(Matchers .containsString("WebServerAccessLog " + "file name doesn't comply to standard: " + filename)); - new WebServerAccessLogImpl(new byte[0], - new File(filename)); + new WebServerAccessLogImpl(new byte[0], null, filename); } @Test @@ -75,8 +70,7 @@ public class WebServerModuleTest { thrown.expectMessage(Matchers .containsString("WebServerAccessLog " + "file name doesn't comply to standard: " + filename)); - new WebServerAccessLogImpl(new byte[0], - new File(filename)); + new WebServerAccessLogImpl(new byte[0], null, filename); } private static String[] logLines = { @@ -103,7 +97,7 @@ public class WebServerModuleTest { @Test public void testBasics() throws Exception { WebServerAccessLogImpl wsal = new WebServerAccessLogImpl(logText.getBytes(), - new File("vhost_host7_access.log_20170530")); + null, "vhost_host7_access.log_20170530"); assertEquals(wsal.getAnnotations().size(), 0); assertEquals(logText, new String(FileType.XZ.decompress(wsal.getRawDescriptorBytes()))); diff --git a/src/test/resources/webstats-2015-02.tar b/src/test/resources/webstats-2015-02.tar new file mode 100644 index 0000000..ffb3fc7 Binary files /dev/null and b/src/test/resources/webstats-2015-02.tar differ

1 0

[chutney/master] Ignore a variant of the "Valid-After times do not match" warning
by teor＠torproject.org 18 Apr '18

18 Apr '18

commit 373346998014b14cfe9e75a66854226178cd9d69 Author: teor <teor2345(a)gmail.com> Date: Wed Apr 18 11:15:45 2018 +1000 Ignore a variant of the "Valid-After times do not match" warning Closes #25829 --- tools/ignore.warnings | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ignore.warnings b/tools/ignore.warnings index 463ce6c..48c7570 100644 --- a/tools/ignore.warnings +++ b/tools/ignore.warnings @@ -57,6 +57,7 @@ This copy of Tor was compiled.*to run in a non-anonymous mode # Chutney does not use DNS by default Unable to parse '.*', or no nameservers in '.*' # Tor Bug 21525? +Unable to add signatures to consensus: Valid-After times do not match Unable to store signatures posted by .* Mismatched digest Unable to store signatures posted by .* Valid-After times do not match # We ignore consensus failure warnings

1 0

[snowflake/master] Fix text-shadow CSS.
by dcf＠torproject.org 18 Apr '18

18 Apr '18

commit fd9efa10016c7b361dc1829f370e879aa08ffe45 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 17 17:21:46 2018 -0700 Fix text-shadow CSS. The semicolons made it look like the end of a declaration. I got these errors in the Firefox console: Expected declaration but found ‘1px’. Skipped to next declaration. 1 embed.html:29:17 Expected declaration but found ‘-1px’. Skipped to next declaration. 1 embed.html:30:17 --- proxy/static/embed.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/static/embed.html b/proxy/static/embed.html index d1d4e77..65303b5 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -25,8 +25,8 @@ font-variant: small-caps; text-shadow: 0 0 5px #fef, 0 1px 2px #fef, - 0 -1px 2px #fef; - 1px 0px 3px #fef; + 0 -1px 2px #fef, + 1px 0px 3px #fef, -1px 0px 3px #fef; } .active {

1 0

[tor/master] Fix a pointer size error in test_bridges.c
by nickm＠torproject.org 17 Apr '18

17 Apr '18

commit 3bf9974b6c4ee9f2a8204c058e1b7c206b99d620 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 19:44:09 2018 -0400 Fix a pointer size error in test_bridges.c sizeof(ret) is the size of the pointer, not the size of what it points to. Fortunately, we already have a function to compare tor_addr_port_t values for equality. Bugfix on c2c5b13e5d8a77e; bug not in any released Tor. Found by clang's scan-build. --- src/test/test_bridges.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c index b5bd27e09..c4a4cacd9 100644 --- a/src/test/test_bridges.c +++ b/src/test/test_bridges.c @@ -234,7 +234,7 @@ test_bridges_get_configured_bridge_by_orports_digest(void *arg) ret = get_configured_bridge_by_orports_digest(digest, orports); tt_ptr_op(ret, OP_NE, NULL); - tt_mem_op(addrport1, OP_EQ, bridge_get_addr_port(ret), sizeof(ret)); + tt_assert(tor_addr_port_eq(addrport1, bridge_get_addr_port(ret))); done: smartlist_free(orports);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2018