April 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.0] control: Wrong check on base16_decode return value
by nickm＠torproject.org 24 Apr '17

24 Apr '17

commit 4a9f6894300781b998b0753dd0f5a388bb61cc91 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 21 11:49:30 2017 -0400 control: Wrong check on base16_decode return value The GETINFO extra-info/digest/<digest> broke in commit 568dc27a19 that refactored the base16_decode() API to return the decoded length. Unfortunately, that if() condition should have checked for the correct length instead of an error which broke the command in tor-0.2.9.1-alpha. Fixes #22034 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug22034 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug22034 b/changes/bug22034 new file mode 100644 index 0000000..6d9e188 --- /dev/null +++ b/changes/bug22034 @@ -0,0 +1,4 @@ + o Minor bugfixes (control port, regression): + - The GETINFO extra-info/digest/<digest> command was broken because of a + wrong base16 decode return value check. In was introduced in a refactor + of that API. Fixex bug #22034; bugfix on tor-0.2.9.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index c8c5062..1bf1e33 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2055,7 +2055,7 @@ getinfo_helper_dir(control_connection_t *control_conn, char d[DIGEST_LEN]; signed_descriptor_t *sd = NULL; if (base16_decode(d, sizeof(d), question, strlen(question)) - != sizeof(d)) { + == sizeof(d)) { /* XXXX this test should move into extrainfo_get_by_descriptor_digest, * but I don't want to risk affecting other parts of the code, * especially since the rules for using our own extrainfo (including

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 24 Apr '17

24 Apr '17

commit ddccc0f9b4d0cfe3de516765f575e2a73cb0ec74 Merge: 03e5216 ae374e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 24 09:31:35 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22034 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Add regression test for #22304
by nickm＠torproject.org 24 Apr '17

24 Apr '17

commit 7bc636fdc937c5cd050cb243e5bebb8a52c1c144 Author: Taylor Yu <catalyst(a)torproject.org> Date: Fri Apr 21 20:17:27 2017 -0400 Add regression test for #22304 --- src/or/control.c | 2 +- src/or/control.h | 4 ++++ src/or/routerlist.c | 4 ++-- src/or/routerlist.h | 3 ++- src/test/test_dir.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 8e86005..56f1329 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1873,7 +1873,7 @@ getinfo_helper_listeners(control_connection_t *control_conn, /** Implementation helper for GETINFO: knows the answers for questions about * directory information. */ -static int +STATIC int getinfo_helper_dir(control_connection_t *control_conn, const char *question, char **answer, const char **errmsg) diff --git a/src/or/control.h b/src/or/control.h index a786dfe..41a194b 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -290,6 +290,10 @@ STATIC int getinfo_helper_downloads( control_connection_t *control_conn, const char *question, char **answer, const char **errmsg); +STATIC int getinfo_helper_dir( + control_connection_t *control_conn, + const char *question, char **answer, + const char **errmsg); #endif diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 0b0bb4b..35fe501 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3045,8 +3045,8 @@ router_get_by_extrainfo_digest,(const char *digest)) /** Return the signed descriptor for the extrainfo_t in our routerlist whose * extra-info-digest is <b>digest</b>. Return NULL if no such extra-info * document is known. */ -signed_descriptor_t * -extrainfo_get_by_descriptor_digest(const char *digest) +MOCK_IMPL(signed_descriptor_t *, +extrainfo_get_by_descriptor_digest,(const char *digest)) { extrainfo_t *ei; tor_assert(digest); diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 5376369..5c1f76c 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -92,7 +92,8 @@ routerinfo_t *router_get_mutable_by_digest(const char *digest); signed_descriptor_t *router_get_by_descriptor_digest(const char *digest); MOCK_DECL(signed_descriptor_t *,router_get_by_extrainfo_digest, (const char *digest)); -signed_descriptor_t *extrainfo_get_by_descriptor_digest(const char *digest); +MOCK_DECL(signed_descriptor_t *,extrainfo_get_by_descriptor_digest, + (const char *digest)); const char *signed_descriptor_get_body(const signed_descriptor_t *desc); const char *signed_descriptor_get_annotations(const signed_descriptor_t *desc); routerlist_t *router_get_routerlist(void); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index e0c92a7..f6869cd 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -7,6 +7,7 @@ #include <math.h> #define CONFIG_PRIVATE +#define CONTROL_PRIVATE #define DIRSERV_PRIVATE #define DIRVOTE_PRIVATE #define ROUTER_PRIVATE @@ -19,6 +20,7 @@ #include "or.h" #include "confparse.h" #include "config.h" +#include "control.h" #include "crypto_ed25519.h" #include "directory.h" #include "dirserv.h" @@ -910,6 +912,23 @@ mock_get_by_ei_desc_digest(const char *d) } } +static signed_descriptor_t * +mock_ei_get_by_ei_digest(const char *d) +{ + char hex[HEX_DIGEST_LEN+1]; + base16_encode(hex, sizeof(hex), d, DIGEST_LEN); + signed_descriptor_t *sd = &sd_ei_minimal; + + if (!strcmp(hex, "11E0EDF526950739F7769810FCACAB8C882FAEEE")) { + sd->signed_descriptor_body = (char *)EX_EI_MINIMAL; + sd->signed_descriptor_len = sizeof(EX_EI_MINIMAL); + sd->annotations_len = 0; + sd->saved_location = SAVED_NOWHERE; + return sd; + } + return NULL; +} + static smartlist_t *mock_ei_insert_list = NULL; static was_router_added_t mock_ei_insert(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible) @@ -999,6 +1018,37 @@ test_dir_load_extrainfo(void *arg) } static void +test_dir_getinfo_extra(void *arg) +{ + int r; + char *answer = NULL; + const char *errmsg = NULL; + + (void)arg; + MOCK(extrainfo_get_by_descriptor_digest, mock_ei_get_by_ei_digest); + r = getinfo_helper_dir(NULL, "extra-info/digest/" + "11E0EDF526950739F7769810FCACAB8C882FAEEE", &answer, + &errmsg); + tt_int_op(0, OP_EQ, r); + tt_ptr_op(NULL, OP_EQ, errmsg); + tt_str_op(answer, OP_EQ, EX_EI_MINIMAL); + tor_free(answer); + + answer = NULL; + r = getinfo_helper_dir(NULL, "extra-info/digest/" + "NOTAVALIDHEXSTRINGNOTAVALIDHEXSTRINGNOTA", &answer, + &errmsg); + tt_int_op(0, OP_EQ, r); + /* getinfo_helper_dir() should maybe return an error here but doesn't */ + tt_ptr_op(NULL, OP_EQ, errmsg); + /* In any case, there should be no answer for an invalid hex string. */ + tt_ptr_op(NULL, OP_EQ, answer); + + done: + UNMOCK(extrainfo_get_by_descriptor_digest); +} + +static void test_dir_versions(void *arg) { tor_version_t ver1; @@ -5970,6 +6020,7 @@ struct testcase_t dir_tests[] = { DIR(parse_router_list, TT_FORK), DIR(load_routers, TT_FORK), DIR(load_extrainfo, TT_FORK), + DIR(getinfo_extra, 0), DIR_LEGACY(versions), DIR_LEGACY(fp_pairs), DIR(split_fps, 0),

1 0

[tor/master] control: Wrong check on base16_decode return value
by nickm＠torproject.org 24 Apr '17

24 Apr '17

commit 4a9f6894300781b998b0753dd0f5a388bb61cc91 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 21 11:49:30 2017 -0400 control: Wrong check on base16_decode return value The GETINFO extra-info/digest/<digest> broke in commit 568dc27a19 that refactored the base16_decode() API to return the decoded length. Unfortunately, that if() condition should have checked for the correct length instead of an error which broke the command in tor-0.2.9.1-alpha. Fixes #22034 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug22034 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug22034 b/changes/bug22034 new file mode 100644 index 0000000..6d9e188 --- /dev/null +++ b/changes/bug22034 @@ -0,0 +1,4 @@ + o Minor bugfixes (control port, regression): + - The GETINFO extra-info/digest/<digest> command was broken because of a + wrong base16 decode return value check. In was introduced in a refactor + of that API. Fixex bug #22034; bugfix on tor-0.2.9.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index c8c5062..1bf1e33 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -2055,7 +2055,7 @@ getinfo_helper_dir(control_connection_t *control_conn, char d[DIGEST_LEN]; signed_descriptor_t *sd = NULL; if (base16_decode(d, sizeof(d), question, strlen(question)) - != sizeof(d)) { + == sizeof(d)) { /* XXXX this test should move into extrainfo_get_by_descriptor_digest, * but I don't want to risk affecting other parts of the code, * especially since the rules for using our own extrainfo (including

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug22032_031_01'
by nickm＠torproject.org 24 Apr '17

24 Apr '17

commit 8ff2a8c0e2e5bc19de23adf131d726287319a276 Merge: 7bc636f 74f7657 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 24 09:30:30 2017 -0400 Merge remote-tracking branch 'dgoulet/bug22032_031_01' src/or/rendservice.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)

1 0

[tor/master] hs: Fix a spurious warn in rend_log_intro_limit
by nickm＠torproject.org 24 Apr '17

24 Apr '17

commit 74f7657e5637ce1fb6a6b059a41b6573587db057 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 21 11:09:34 2017 -0400 hs: Fix a spurious warn in rend_log_intro_limit We do dump HS stats now at log info everytime the intro circuit creation retry period limit has been reached. However, the log was upgraded to warning if we actually were over the elapsed time (plus an extra slop). It is actually something that will happen in tor in normal case. For instance, if the network goes down for 10 minutes then back up again making have_completed_a_circuit() return false which results in never updating that retry period marker for a service. Fixes #22032 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/rendservice.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 3c4b677..c19c85f 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1054,20 +1054,13 @@ rend_log_intro_limit(const rend_service_t *service, int min_severity) } time_t intro_period_elapsed = time(NULL) - service->intro_period_started; tor_assert_nonfatal(intro_period_elapsed >= 0); - /* We delayed resuming circuits longer than expected */ - int exceeded_elapsed = (intro_period_elapsed > INTRO_CIRC_RETRY_PERIOD + - INTRO_CIRC_RETRY_PERIOD_SLOP); - if (exceeded_elapsed) { - severity = LOG_WARN; - } log_fn(severity, LD_REND, "Hidden service %s %s %d intro points in the last " - "%d seconds%s. Intro circuit launches are limited to %d per %d " + "%d seconds. Intro circuit launches are limited to %d per %d " "seconds.", service->service_id, exceeded_limit ? "exceeded launch limit with" : "launched", service->n_intro_circuits_launched, (int)intro_period_elapsed, - exceeded_elapsed ? " (delayed)" : "", rend_max_intro_circs_per_period(service->n_intro_points_wanted), INTRO_CIRC_RETRY_PERIOD); rend_service_dump_stats(severity);

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 24 Apr '17

24 Apr '17

commit ae374e0a56014b72e54adf2afb5676ae6788124c Merge: f1613b5 4a9f689 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 24 09:20:26 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22034 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.0'
by nickm＠torproject.org 24 Apr '17

24 Apr '17

commit 8b89faf424e662d09bec57c96e923773438e737e Merge: b7dd351 ae374e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 24 09:20:43 2017 -0400 Merge branch 'maint-0.3.0' changes/bug22034 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor-animation/master] Remove translation credit per request.
by karsten＠torproject.org 24 Apr '17

24 Apr '17

commit f4244e47947c6975abdb5de9bb61aa4af14f5461 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 24 12:11:25 2017 +0200 Remove translation credit per request. --- Tor_animation.tl-PH.srt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tor_animation.tl-PH.srt b/Tor_animation.tl-PH.srt index 6ad9e49..533e926 100644 --- a/Tor_animation.tl-PH.srt +++ b/Tor_animation.tl-PH.srt @@ -143,5 +143,5 @@ Kaya'y i-download mo na ang Tor at gamitin! O kaya'y magpatakbo ng relay! 36 00:02:12,400 --> 00:02:15,200 -Isinalin (translated) ni Gary David Ruiz dela Rosa +Isinalin (translated) ni anonymous contributor

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 24 Apr '17

24 Apr '17

commit 5ad45b1449713147b102f96d8f56b5500cd30f1f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 24 07:18:14 2017 +0000 Update translations for tails-greeter-2_completed --- tr/tr.po | 88 ++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 35 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 7adad47..2743842 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-31 10:47+0100\n" +"POT-Creation-Date: 2017-03-20 09:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Yasin Özel <iletisim(a)yasinozel.com.tr>, 2016\n" +"Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>, 2017\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -91,7 +91,7 @@ msgstr "Tüm MAC adresleri yanıltılsın (varsayılan)" msgid "Don't spoof MAC addresses" msgstr "MAC adresleri yanıltılmasın" -#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514 +#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:529 msgid "Cannot unlock encrypted storage with this passphrase." msgstr "Bu parola ile şifreli depolama alanının kilidi açılamadı." @@ -127,24 +127,24 @@ msgid "Save Language & Region Settings" msgstr "Dil ve Bölge Ayarlarını Kaydet" #: ../data/greeter.ui.h:25 -msgid "Language" -msgstr "Dil" +msgid "_Language" +msgstr "_Dil" #: ../data/greeter.ui.h:26 -msgid "Keyboard Layout" -msgstr "Tuş Takımı Düzeni" +msgid "_Keyboard Layout" +msgstr "_Klavye Yerleşimi" #: ../data/greeter.ui.h:27 -msgid "Formats" -msgstr "Biçimler" +msgid "_Formats" +msgstr "_Biçimler" #: ../data/greeter.ui.h:28 -msgid "Time Zone" -msgstr "Saat Dilimi" +msgid "_Time Zone" +msgstr "_Zaman Dilimi" #: ../data/greeter.ui.h:29 -msgid "Encrypted Persistent Storage" -msgstr "Şifreli Kalıcı Depolama" +msgid "Encrypted _Persistent Storage" +msgstr "Şifrelenmiş _Kalıcı Depo" #: ../data/greeter.ui.h:30 msgid "Show Passphrase" @@ -158,8 +158,8 @@ msgstr "Kalıcı Depolama Ayarları" msgid "Enter your passphrase to unlock the persistent storage" msgstr "Kalıcı depolamanın kilidini açmak için parolanızı yazın" -#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 -#: ../tailsgreeter/gui.py:510 +#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:475 +#: ../tailsgreeter/gui.py:525 msgid "Unlock" msgstr "Kilidi Aç" @@ -173,9 +173,9 @@ msgstr "" "Kalıcı depolama kilidi açıldı. Yeniden kilitlemek için Tails uygulamasını " "yeniden başlatın." -#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 -msgid "Additional Settings" -msgstr "Ek Ayarlar" +#: ../data/greeter.ui.h:36 +msgid "_Additional Settings" +msgstr "_Ek Ayarlar" #: ../data/greeter.ui.h:37 msgid "Save Additional Settings" @@ -221,58 +221,76 @@ msgstr "" " eklemek için aşağıdaki \"+\" düğmesine tıklayın." #: ../data/greeter.ui.h:45 +msgid "_Administration Password" +msgstr "_Yönetici Parolası" + +#: ../data/greeter.ui.h:46 msgid "Off (default)" msgstr "Kapalı (varsayılan)" -#: ../data/greeter.ui.h:46 +#: ../data/greeter.ui.h:47 +msgid "_MAC Address Spoofing" +msgstr "_MAC Adresi Aldatma" + +#: ../data/greeter.ui.h:48 msgid "On (default)" msgstr "Açık (varsayılan)" -#: ../data/greeter.ui.h:47 -msgid "Network Connection" -msgstr "Ağ Bağlantısı" +#: ../data/greeter.ui.h:49 +msgid "_Network Connection" +msgstr "_Ağ Bağlantısı" -#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367 +#: ../data/greeter.ui.h:50 ../tailsgreeter/gui.py:382 msgid "Direct (default)" msgstr "Doğrudan (varsayılan)" -#: ../tailsgreeter/gui.py:373 +#: ../data/greeter.ui.h:51 +msgid "_Windows Camouflage" +msgstr "_Windows Kamuflajı" + +#: ../tailsgreeter/gui.py:388 msgid "Bridge & Proxy" msgstr "Köprü ve Vekil Sunucu" -#: ../tailsgreeter/gui.py:379 +#: ../tailsgreeter/gui.py:394 msgid "Offline" msgstr "Çevrim Dışı" -#: ../tailsgreeter/gui.py:463 +#: ../tailsgreeter/gui.py:478 msgid "Failed to relock persistent storage." msgstr "Kalıcı depolama yeniden kilitlenemedi." -#: ../tailsgreeter/gui.py:481 +#: ../tailsgreeter/gui.py:496 msgid "Unlocking…" msgstr "Kilit açılıyor..." -#: ../tailsgreeter/gui.py:562 +#: ../tailsgreeter/gui.py:591 +msgid "Additional Settings" +msgstr "Ek Ayarlar" + +#: ../tailsgreeter/gui.py:599 msgid "Cancel" msgstr "İptal" -#: ../tailsgreeter/gui.py:566 +#: ../tailsgreeter/gui.py:605 msgid "Add" msgstr "Ekle" -#: ../tailsgreeter/gui.py:572 +#: ../tailsgreeter/gui.py:613 msgid "Back" msgstr "Geri" -#: ../tailsgreeter/gui.py:658 +#: ../tailsgreeter/gui.py:716 msgid "Shutdown" msgstr "Kapat" -#: ../tailsgreeter/gui.py:664 -msgid "Start Tails" -msgstr "Tails Başlatılsın" +#: ../tailsgreeter/gui.py:721 +msgid "_Start Tails" +msgstr "_Tails'i Başlat" -#: ../tailsgreeter/language.py:119 +#. Translators: translate to default:RTL if your language +#. is written from right to left +#: ../tailsgreeter/language.py:133 msgid "default:LTR" msgstr "Varsayılan: Soldan Sağa"

1 0