tor-commits November 2020

tor-commits@lists.torproject.org

16 participants
1820 discussions

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 03 Nov '20

03 Nov '20

commit 076acb6528332ec9926bf67dd99b58438900c49c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 3 22:45:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- ka/torbrowser_strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torbrowser_strings.xml b/ka/torbrowser_strings.xml index daa78adcfd..60e923d09a 100644 --- a/ka/torbrowser_strings.xml +++ b/ka/torbrowser_strings.xml @@ -66,7 +… [View More]

1 0

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

03 Nov '20

commit 9920067d3f1248be4cf7c7bd931c694c6a6b8878 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 3 22:17:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- ka/aboutdialog.dtd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ka/aboutdialog.dtd b/ka/aboutdialog.dtd index 487e33bf97..64469f934f 100644 --- a/ka/aboutdialog.dtd +++ b/ka/aboutdialog.dtd @@ -1,19 +1,19 @@ -… [View More]<!ENTITY project.start "&brandShortName;ს შემქმნელია"> +<!ENTITY project.start "">  -<!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end ", არამომგებიანი დაწესებულება, რომელიც საქმიანობს ინტერნეტში თქვენი პირადულობისა და თავისუფლების უზრუნველსაყოფად."> +<!ENTITY project.tpoLink ""> +<!ENTITY project.end ""> -<!ENTITY help.start "დახმარება გესაჭიროებათ?"> +<!ENTITY help.start "">  -<!ENTITY help.donateLink "გაიღეთ შემოწირულობა"> -<!ENTITY help.or "ან"> +<!ENTITY help.donateLink ""> +<!ENTITY help.or "">  -<!ENTITY help.getInvolvedLink "შემოგვიერთდით"> -<!ENTITY help.end "!"> +<!ENTITY help.getInvolvedLink ""> +<!ENTITY help.end "">  -<!ENTITY bottomLinks.questions "კითხვები გაქვთ?"> +<!ENTITY bottomLinks.questions "">  -<!ENTITY bottomLinks.grow "დაეხმარეთ Tor ქსელს გაფართოებაში!"> +<!ENTITY bottomLinks.grow "">  -<!ENTITY bottomLinks.license "სალიცენზიო მონაცემები"> -<!ENTITY tor.TrademarkStatement "„Tor“ და „Onion Logo“ წარმოადგენს Tor Project Inc-ის კუთვნილ სავაჭრო ნიშნებს."> +<!ENTITY bottomLinks.license ""> +<!ENTITY tor.TrademarkStatement ""> [View Less]

1 0

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

03 Nov '20

commit 537ec101eb9f2d17f02b301b56239fd7e29ea40b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 3 22:17:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-aboutdial… --- ka/aboutdialog.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/aboutdialog.dtd b/ka/aboutdialog.dtd index 487e33bf97..3320ad188a 100644 --- a/ka/aboutdialog.dtd +++ b/ka/aboutdialog.dtd @@ -3,7 +3,7 @@ <!ENTITY project.tpoLink … [View More]

1 0

[tpo/master] Add eoy redirects
by gus＠torproject.org 03 Nov '20

03 Nov '20

commit e39a1408ff97f4be062adbcf70f41a2d3bcc7063 Author: gus <gus(a)torproject.org> Date: Tue Nov 3 16:03:29 2020 -0500 Add eoy redirects --- .htaccess | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.htaccess b/.htaccess index 91eca4c6..5a59be9c 100644 --- a/.htaccess +++ b/.htaccess @@ -166,3 +166,10 @@ RewriteRule ^donate/donate-tba-tb9(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-tba-tb10(.*) https://donate.torproject.org/ [R=302,L] … [View More]

1 0

[tpo/master] Merge branch 'friends-of-tor'
by gus＠torproject.org 03 Nov '20

03 Nov '20

commit 5ee0f509c38b6e6d1b363f699aa77ff17eec6268 Merge: 7a25c50e e39a1408 Author: gus <gus(a)torproject.org> Date: Tue Nov 3 16:10:42 2020 -0500 Merge branch 'friends-of-tor' .htaccess | 7 +++++++ 1 file changed, 7 insertions(+)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 03 Nov '20

03 Nov '20

commit fa2f581a6375d1830bf15047061b367f566ce22a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 3 17:48:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ja.po | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 9180ca240f..e75ad7d3b7 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -79,7 +79,7 @@ msgstr "Tor … [View More]Mobile" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) msgid "GetTor" -msgstr "GetTor" +msgstr "Tor の入手方法" #: https//support.torproject.org/connecting/ #: (content/connecting/contents+en.lrtopic.title) @@ -137,7 +137,7 @@ msgstr "諸々" #: https//support.torproject.org/misc/menu/ #: (content/misc/menu/contents+en.lrquestion.description) msgid "Get in Touch" -msgstr "コンタクト" +msgstr "連絡を取る" #: https//support.torproject.org/apt/ (content/apt/contents+en.lrtopic.title) #: https//support.torproject.org/misc/menu/ @@ -2615,7 +2615,7 @@ msgstr "" #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.title) msgid "What is Tor?" -msgstr "Torとは何ですか？" +msgstr "Tor とは何ですか？" #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -3770,7 +3770,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.title) msgid "How do I update Tor Browser?" -msgstr "Tor Browserをアップデートするにはどうしたらいいですか？" +msgstr "Tor Browser のアップデート方法は？" #: https//support.torproject.org/tbb/tbb-27/ #: (content/tbb/tbb-27/contents+en.lrquestion.description) @@ -3778,12 +3778,13 @@ msgid "" "Please see the [Updating section](https://tb-" "manual.torproject.org/updating/) in the Tor Browser Manual." msgstr "" -"[Updating section](https://tb-manual.torproject.org/updating/)をご覧ください。" +"Tor Browser マニュアルの[アップデートの項目](https://tb-" +"manual.torproject.org/updating/)をご覧ください。" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.title) msgid "How do I uninstall Tor Browser?" -msgstr "Tor Browserをアンインストールするにはどうしたらいいですか？" +msgstr "Tor Browser のアンインストール方法は？" #: https//support.torproject.org/tbb/tbb-28/ #: (content/tbb/tbb-28/contents+en.lrquestion.description) @@ -3791,7 +3792,7 @@ msgid "" "Please see the [Uninstalling section](https://tb-" "manual.torproject.org/uninstalling/) in the Tor Browser Manual." msgstr "" -"[Uninstalling section](https://tb-" +"Tor Browser マニュアルの[アンインストールの項目](https://tb-" "manual.torproject.org/uninstalling/)をご覧ください。" #: https//support.torproject.org/tbb/tbb-29/ @@ -3983,6 +3984,10 @@ msgid "" "app](https://play.google.com/store/apps/details?id=org.torproject.android) " "to route other apps on your Android device over the Tor network." msgstr "" +"[Android](https://www.torproject.org/download/#android) 用 Tor Browser " +"には複数のバージョンが存在し、[The Guardian Project](https://guardianproject.info) は、Tor " +"ネットワークを介してあなたの Android デバイス上の他のアプリをルーティングするための [Orbot " +"アプリ](https://play.google.com/store/apps/details?id=org.torproject.android)を…" #: https//support.torproject.org/tbb/tbb-31/ #: (content/tbb/tbb-31/contents+en.lrquestion.description) @@ -4481,7 +4486,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-46/ #: (content/tbb/tbb-46/contents+en.lrquestion.title) msgid "How do I install Tor Browser?" -msgstr "Tor Browserをアンインストールするにはどうしたらいいですか？" +msgstr "Tor Browser のインストール方法は？" #: https//support.torproject.org/tbb/tbb-46/ #: (content/tbb/tbb-46/contents+en.lrquestion.description) @@ -4489,8 +4494,8 @@ msgid "" "Please see the [Installation](https://tb-" "manual.torproject.org/installation/) section in the Tor Browser Manual." msgstr "" -"[Installation](https://tb-manual.torproject.org/installation/)Tor Browser " -"Manualのセクションをご覧ください。" +"Tor Browser マニュアルの[インストールの項目](https://tb-" +"manual.torproject.org/installation/)をご覧ください。" #: https//support.torproject.org/tbb/tbb-47/ #: (content/tbb/tbb-47/contents+en.lrquestion.title) @@ -4970,12 +4975,12 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.title) msgid "To use GetTor via email." -msgstr "メールでGetTorを使用する。" +msgstr "電子メール経由で Tor を入手する。" #: https//support.torproject.org/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.description) msgid "Send an email to gettor(a)torproject.org." -msgstr "gettor(a)torproject.xn--org-u63b4bub2ewa1a2cx3ar5azd4j0726k." +msgstr "gettor(a)torproject.org 宛に電子メールを送信してください。" #: https//support.torproject.org/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.description) @@ -4983,6 +4988,7 @@ msgid "" "Write your operating system (such as Windows, macOS, or Linux) in the body " "of the message and send." msgstr "" +"電子メールの本文にあなたの利用しているオペレーティングシステム（Windows、macOS、Linux など）を書き込んで送信してください。" #: https//support.torproject.org/gettor/gettor-2/ #: (content/gettor/gettor-2/contents+en.lrquestion.description) @@ -5004,7 +5010,7 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-3/ #: (content/gettor/gettor-3/contents+en.lrquestion.title) msgid "To use GetTor via Twitter." -msgstr "Twitter経由でGetTorを使用する。" +msgstr "Twitter 経由で Tor を入手する。" #: https//support.torproject.org/gettor/gettor-3/ #: (content/gettor/gettor-3/contents+en.lrquestion.description) @@ -5016,7 +5022,7 @@ msgstr "" #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.title) msgid "To use GetTor via XMPP (Jitsi, CoyIM)." -msgstr "XMPP (Jitsi、CoyIM)経由でGetTorを使用する。" +msgstr "XMPP (Jitsi、CoyIM) 経由で Tor を入手する。" #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.description) @@ -10181,7 +10187,7 @@ msgstr "Tor Project | サポート" #: templates/sidenav.html:4 templates/sidenav.html:35 msgid "Topics" -msgstr "話題" +msgstr "トピック" #: templates/macros/question.html:16 templates/word.html:23 msgid "Contributors to this page:" [View Less]

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 03 Nov '20

03 Nov '20

commit df71377b9132caff7977aa601a8ca5f5d4d3b3d9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 3 17:18:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ja.po | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 98090f4b03..9180ca240f 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -15,6 +15,7 @@ # Ito Takeshi, … [View More]2020 # Gus, 2020 # 323484, 2020 +# Kaede, 2020 # msgid "" msgstr "" @@ -22,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-15 19:40+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: 323484, 2020\n" +"Last-Translator: Kaede, 2020\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1864,6 +1865,7 @@ msgid "" " advanced user who knows how to configure both in a way that doesn't " "compromise your privacy." msgstr "" +"あなたのプライバシーを損なわない方法で両者を併用する方法を知っている上級ユーザーでない限り、Tor と VPN を併用することはおすすめしません。" #: https//support.torproject.org/faq/faq-5/ #: (content/faq/faq-5/contents+en.lrquestion.description) @@ -1871,73 +1873,76 @@ msgid "" "You can find more detailed information about Tor + VPN at [our " "wiki](https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN)." msgstr "" +"Tor と VPN の併用に関する詳細な情報は、[私たちの " +"Wiki](https://trac.torproject.org/projects/tor/wiki/doc/TorPlusVPN) " +"でご確認いただけます。" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.title) msgid "Am I totally anonymous if I use Tor?" -msgstr "Tor を使用したら完全に匿名ですか?" +msgstr "Tor を使えば完全に匿名になれますか？" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "Generally it is impossible to have perfect anonymity, even with Tor." -msgstr "" +msgstr "Tor であっても完全な匿名性をを提供することはできないというのが一般的な意見です。" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "" "Though there are some things you can practice to improve your anonymity " "while using Tor and offline." -msgstr "" +msgstr "ただし、Tor の利用およびオフライン状態になることをうまく使えば、匿名性を向上させられる可能性はあります。" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "### Use Tor Browser and software specifically configured for Tor." -msgstr "" +msgstr "### Tor Browser と Tor 用に特別に設定されたソフトウェアを使用する。" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "" "Tor does not protect all of your computer's Internet traffic when you run " "it." -msgstr "" +msgstr "Tor は、コンピュータ使用時に、コンピュータのすべてのインターネットトラフィックを保護するわけではありません。" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "" "Tor only protects applications that are properly configured to send their " "Internet traffic through Tor." -msgstr "" +msgstr "Tor は、Tor を介してインターネットトラフィックを送信するように適切に設定されているアプリケーションのみを保護します。" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "Web browsing:" -msgstr "" +msgstr "ウェブブラウジング:" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "- Safe: [Tor Browser](https://www.torproject.org/download/)" -msgstr "" +msgstr "- 安全な方法: [Tor Browser](https://www.torproject.org/download/)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "" "- Unsafe: [Any other browser configured to use Tor as a proxy](/tbb/tbb-9)" -msgstr "" +msgstr "- 安全ではない方法: [Tor をプロキシとして使用するように設定されたその他のブラウザ](/tbb/tbb-9)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "File sharing:" -msgstr "" +msgstr "ファイル共有:" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "- Safe: [OnionShare](/misc/misc-12)" -msgstr "" +msgstr "- 安全な方法: [OnionShare](/misc/misc-12)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) msgid "- Unsafe: [BitTorret over Tor](/misc/misc-4)" -msgstr "" +msgstr "- 安全ではない方法: [BitTorret over Tor](/misc/misc-4)" #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -3955,7 +3960,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-31/ #: (content/tbb/tbb-31/contents+en.lrquestion.title) msgid "Which platforms is Tor Browser available for?" -msgstr "Tor Browserはどのプラットフォームに対応していますか？" +msgstr "Tor Browser はどのプラットフォームに対応していますか？" #: https//support.torproject.org/tbb/tbb-31/ #: (content/tbb/tbb-31/contents+en.lrquestion.description) [View Less]

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/185' into master
by asn＠torproject.org 03 Nov '20

03 Nov '20

commit dd119b277b66c1a7209d4a345fd43878296a532e Merge: 4f5a116618 511822529a Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Nov 3 16:06:12 2020 +0200 Merge remote-tracking branch 'tor-gitlab/mr/185' into master changes/ticket32178 | 3 +++ src/feature/control/control_events.c | 26 ++++++++++++++++++++++---- src/feature/control/control_events.h | 2 ++ src/test/test_controller_events.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 4 deletions(-)

1 0

[tor/master] adds change file
by asn＠torproject.org 03 Nov '20

03 Nov '20

commit 4520fbc05e2e3f8288b7e27c45bb2aecbc849f33 Author: Amadeusz Pawlik <apawlik(a)protonmail.com> Date: Sat Oct 26 20:07:04 2019 +0200 adds change file --- changes/ticket32178 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket32178 b/changes/ticket32178 new file mode 100644 index 0000000000..ae8554d8a0 --- /dev/null +++ b/changes/ticket32178 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Remove trailing whitespaces from control event log messages. Fixes bug + 32178.

1 0

[tor/master] Revise fix for bug 32178 (spaces at end of log msg).
by asn＠torproject.org 03 Nov '20

03 Nov '20

commit 511822529ae1710e141bc26199ec5ff1d1abcd16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 28 09:39:21 2020 -0400 Revise fix for bug 32178 (spaces at end of log msg). The loop in the earlier patch would invoke undefined behavior in two ways: First, it would check whether it was looking at a space before it checked whether the pointer was in-range. Second, it would let a pointer reach a position _before_ the start of a string, which is … [View More]not allowed. I've removed the assertion about empty messages: empty messages can be their own warning IMO. I've also added tests for this formatting code, to make sure it actually works. --- changes/ticket32178 | 2 +- src/feature/control/control_events.c | 36 ++++++++++++++++++++++-------------- src/feature/control/control_events.h | 2 ++ src/test/test_controller_events.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 15 deletions(-) diff --git a/changes/ticket32178 b/changes/ticket32178 index ae8554d8a0..c13e490cb0 100644 --- a/changes/ticket32178 +++ b/changes/ticket32178 @@ -1,3 +1,3 @@ o Minor bugfixes (logging): - Remove trailing whitespaces from control event log messages. Fixes bug - 32178. + 32178; bugfix on 0.1.1.1-alpha. Based on a patch by Amadeusz Pawlik. diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 57cfb0d026..0dd52659ec 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1352,6 +1352,27 @@ enable_control_logging(void) tor_assert(0); } +/** Remove newline and carriage-return characters from @a msg, replacing them + * with spaces, and discarding any that appear at the end of the message */ +void +control_logmsg_strip_newlines(char *msg) +{ + char *cp; + for (cp = msg; *cp; ++cp) { + if (*cp == '\r' || *cp == '\n') { + *cp = ' '; + } + } + if (cp == msg) + return; + /* Remove trailing spaces */ + for (--cp; *cp == ' '; --cp) { + *cp = '\0'; + if (cp == msg) + break; + } +} + /** We got a log message: tell any interested control connections. */ void control_event_logmsg(int severity, log_domain_mask_t domain, const char *msg) @@ -1380,21 +1401,8 @@ control_event_logmsg(int severity, log_domain_mask_t domain, const char *msg) char *b = NULL; const char *s; if (strchr(msg, '\n')) { - char *cp; b = tor_strdup(msg); - for (cp = b; *cp; ++cp) - if (*cp == '\r' || *cp == '\n') - *cp = ' '; - - /* Remove trailing spaces */ - for (--cp; *cp == ' ' && cp >= b; --cp) - *cp = '\0'; - - if ( cp == b ){ - ++disable_log_messages; - tor_assert_nonfatal(*b); - --disable_log_messages; - } + control_logmsg_strip_newlines(b); } switch (severity) { case LOG_DEBUG: s = "DEBUG"; break; diff --git a/src/feature/control/control_events.h b/src/feature/control/control_events.h index 6e3cfef4e9..0ac233cc6e 100644 --- a/src/feature/control/control_events.h +++ b/src/feature/control/control_events.h @@ -341,6 +341,8 @@ struct control_event_t { extern const struct control_event_t control_event_table[]; +void control_logmsg_strip_newlines(char *msg); + #ifdef TOR_UNIT_TESTS MOCK_DECL(STATIC void, send_control_event_string,(uint16_t event, const char *msg)); diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index 60dfbd630a..3cd529fa10 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -436,6 +436,33 @@ test_cntev_signal(void *arg) UNMOCK(queue_control_event_string); } +static void +test_cntev_log_fmt(void *arg) +{ + (void) arg; + char *result = NULL; +#define CHECK(pre, post) \ + do { \ + result = tor_strdup((pre)); \ + control_logmsg_strip_newlines(result); \ + tt_str_op(result, OP_EQ, (post)); \ + tor_free(result); \ + } while (0) + + CHECK("There is a ", "There is a"); + CHECK("hello", "hello"); + CHECK("", ""); + CHECK("Put spaces at the end ", "Put spaces at the end"); + CHECK(" ", ""); + CHECK("\n\n\n", ""); + CHECK("Testing\r\n", "Testing"); + CHECK("T e s t\ni n g\n", "T e s t i n g"); + + done: + tor_free(result); +#undef CHECK +} + static void setup_orconn_state(orconn_state_msg_t *msg, uint64_t gid, uint64_t chan, int proxy_type) @@ -718,6 +745,7 @@ struct testcase_t controller_event_tests[] = { TEST(event_mask, TT_FORK), TEST(format_stream, TT_FORK), TEST(signal, TT_FORK), + TEST(log_fmt, 0), T_PUBSUB(dirboot_defer_desc, TT_FORK), T_PUBSUB(dirboot_defer_orconn, TT_FORK), T_PUBSUB(orconn_state, TT_FORK), [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2020