October 2019 - tor-commits - lists.torproject.org

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit 95580c90b1d4e7f767beb276e2e22d9cb59ff91e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 20:45:25 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- pl/LC_MESSAGES/bridgedb.po | 224 +++++++++++++++++++++++---------------------- 1 file changed, 115 insertions(+), 109 deletions(-) diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po index 50acee4d7..87daba911 100644 --- a/pl/LC_MESSAGES/bridgedb.po +++ b/pl/LC_MESSAGES/bridgedb.po @@ -1,6 +1,6 @@ -# Translations template for BridgeDB. -# Copyright (C) 2015 'The Tor Project, Inc.' -# This file is distributed under the same license as the BridgeDB project. +# Translations template for bridgedb. +# Copyright (C) 2019 'The Tor Project, Inc.' +# This file is distributed under the same license as the bridgedb project. # # Translators: # Aron <aron.plotnikowski(a)cryptolab.net>, 2014 @@ -10,6 +10,7 @@ # Dawid Job <hoek(a)tuta.io>, 2014 # Rikson <Ers(a)mail2tor.com>, 2014 # Karol Obartuch <kobartuch(a)luc.edu>, 2015 +# Konrad Wila <360kon(a)gmail.com>, 2019 # Krzysztof Łojowski <maxxxrally(a)gmail.com>, 2014 # oirpos <kuba2707(a)gmail.com>, 2015 # sebx, 2014-2015 @@ -17,17 +18,36 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2019-01-15 12:20+0000\n" -"Last-Translator: erinm\n" +"POT-Creation-Date: 2019-10-03 15:04-0700\n" +"PO-Revision-Date: 2019-10-09 20:30+0000\n" +"Last-Translator: Konrad Wila <360kon(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 1.3\n" +"Generated-By: Babel 2.7.0\n" "Language: pl\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" +#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*- +#. This file is part of BridgeDB, a Tor bridge distribution system. +#. :authors: please see included AUTHORS file +#. :copyright: (c) 2007-2017, The Tor Project, Inc. +#. (c) 2013-2017, Isis Lovecruft +#. :license: see LICENSE for licensing information +#. : The path to the HTTPS distributor's web templates. (Should be the +#. : "templates" directory in the same directory as this file.) +#. Setting `filesystem_checks` to False is recommended for production servers, +#. due to potential speed increases. This means that the atimes of the Mako +#. template files aren't rechecked every time the template is requested +#. (otherwise, if they are checked, and the atime is newer, the template is +#. recompiled). `collection_size` sets the number of compiled templates which +#. are cached before the least recently used ones are removed. See: +#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup +#. : Localisations which BridgeDB supports which should be rendered right-to- +#. left. +#. We use our metrics singleton to keep track of BridgeDB metrics such as +#. "number of failed HTTPS bridge requests." #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): #. "BridgeDB" @@ -39,134 +59,130 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: bridgedb/https/server.py:167 +#: bridgedb/distributors/https/server.py:135 msgid "Sorry! Something went wrong with your request." msgstr "Przepraszamy! Ale coś poszło nie tak z Twoim zapytaniem." -#: bridgedb/https/templates/base.html:79 +#: bridgedb/distributors/https/templates/base.html:79 msgid "Report a Bug" -msgstr "Zgłoś Błąd" +msgstr "" -#: bridgedb/https/templates/base.html:82 +#: bridgedb/distributors/https/templates/base.html:82 msgid "Source Code" -msgstr "Kod źródłowy" +msgstr "" -#: bridgedb/https/templates/base.html:85 +#: bridgedb/distributors/https/templates/base.html:85 msgid "Changelog" -msgstr "Lista zmian" - -#: bridgedb/https/templates/base.html:88 -msgid "Contact" -msgstr "Kontakt" +msgstr "" -#: bridgedb/https/templates/bridges.html:35 +#: bridgedb/distributors/https/templates/bridges.html:35 msgid "Select All" -msgstr "Zaznacz wszystko" +msgstr "" -#: bridgedb/https/templates/bridges.html:40 +#: bridgedb/distributors/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "Pokaż KodQR" +msgstr "" -#: bridgedb/https/templates/bridges.html:52 +#: bridgedb/distributors/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "KodQR dla Twoich linii bridge" +msgstr "" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, #. for Italian, you might translate this into "Mama mia!", #. or for French: "Sacrebleu!". :) -#: bridgedb/https/templates/bridges.html:67 -#: bridgedb/https/templates/bridges.html:125 +#: bridgedb/distributors/https/templates/bridges.html:67 +#: bridgedb/distributors/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "Ups, coś poszło nie tak!" +msgstr "" -#: bridgedb/https/templates/bridges.html:68 +#: bridgedb/distributors/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "Wygląda na to, że napotkaliśmy na błąd podczas próby pobrania Twojego kodu QR." +msgstr "" -#: bridgedb/https/templates/bridges.html:73 +#: bridgedb/distributors/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Ten KodQR zawiera Twoje linie bridge. Przeskanuj je czytnikiem kodów QR, aby skopiować je do Twojego telefonu lub innych urządzeń." +msgstr "" -#: bridgedb/https/templates/bridges.html:131 +#: bridgedb/distributors/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Aktualnie nie ma dostępnych żadnych mostów..." +msgstr "" -#: bridgedb/https/templates/bridges.html:132 +#: bridgedb/distributors/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "Prawdpododobnie powinieneś spróbować %s wrócić %s i wybrać inny typ mostu!" +msgstr "" -#: bridgedb/https/templates/index.html:11 +#: bridgedb/distributors/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "Krok %s1%s" +msgstr "" -#: bridgedb/https/templates/index.html:13 +#: bridgedb/distributors/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Pobierz %s Tor Browser %s" +msgstr "" -#: bridgedb/https/templates/index.html:25 +#: bridgedb/distributors/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "Krok %s2%s" +msgstr "" -#: bridgedb/https/templates/index.html:27 +#: bridgedb/distributors/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "Pobierz %s mostki %s" -#: bridgedb/https/templates/index.html:36 +#: bridgedb/distributors/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "Krok %s3%s" +msgstr "" -#: bridgedb/https/templates/index.html:38 +#: bridgedb/distributors/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Teraz %s dodaj mosty do Tor Browser %s" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#: bridgedb/https/templates/options.html:38 +#: bridgedb/distributors/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sP%so prostu daj mi mosty!" +msgstr "" -#: bridgedb/https/templates/options.html:51 +#: bridgedb/distributors/https/templates/options.html:51 msgid "Advanced Options" -msgstr "Opcje zaawansowane" +msgstr "" -#: bridgedb/https/templates/options.html:86 +#: bridgedb/distributors/https/templates/options.html:86 msgid "No" -msgstr "Nie" +msgstr "" -#: bridgedb/https/templates/options.html:87 +#: bridgedb/distributors/https/templates/options.html:87 msgid "none" -msgstr "brak" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: bridgedb/https/templates/options.html:124 +#: bridgedb/distributors/https/templates/options.html:124 #, python-format msgid "%sY%ses!" -msgstr "%sT%sak!" +msgstr "" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: bridgedb/https/templates/options.html:147 +#: bridgedb/distributors/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sP%sozyskaj mosty" +msgstr "" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -207,7 +223,7 @@ msgstr "Witaj, %s!" msgid "Hello, friend!" msgstr "Witaj przyjacielu!" -#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 +#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58 msgid "Public Keys" msgstr "Klucze Publiczne" @@ -255,16 +271,16 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Dodatkowo, BridgeDB posiada sporo regularnych mostów %s bez \njakichkolwiek pluggable transports %s, które mogą wydawać się niezbyt przydatne, \njednak w wielu przypadkach mogą pomóc w obejściu cenzury.\n\n" +msgstr "" -#: bridgedb/strings.py:101 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 msgid "What are bridges?" msgstr "Czym są mostki?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Mosty %s są węzłami w sieci Tor pomagającymi w ominięciu cenzury." +msgstr "" #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" @@ -275,8 +291,8 @@ msgstr "Potrzebuję alternatywnego sposobu na pozyskanie mostków!" msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" -"%s, %s or %s." -msgstr "Innym sposobem na pozyskanie mostu jest wysłanie wiadomości e-mail na adres %s. Proszę pamiętać, że należy \nwysłać wiadomość używając adresu jednego z następujących dostawców poczty elektronicznej:\n%s, %s lub %s." +"%s or %s." +msgstr "" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -285,106 +301,96 @@ msgstr "Moje mostki nie działają! Potrzebuję pomocy!" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:117 #, python-format -msgid "If your Tor doesn't work, you should email %s." -msgstr "Jeśli Twój Tor nie działa, powinieneś wysłać wiadomość e-mail na adres %s." +msgid "If your Tor cannot connect, please take a look at the %s and our %s." +msgstr "" -#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#. TRANSLATORS: Please DO NOT translate "Tor Browser". -#. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:121 -msgid "" -"Try including as much info about your case as you can, including the list of\n" -"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" -"and any messages which Tor gave out, etc." -msgstr "Spróbuj zawrzeć jak najwiecej informacji o swoim problemie, uwzględniając listę mostów i Pluggable Transports, których próbowałeś użyć, wersję Tor Browser, wszelkie komunikaty, które zwrócił Tor i inne." - -#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Oto Twoje połączenia z wykorzystaniem mostów:" +msgstr "" -#: bridgedb/strings.py:129 +#: bridgedb/strings.py:122 msgid "Get Bridges!" -msgstr "Zdobądź Mosty!" +msgstr "" -#: bridgedb/strings.py:133 +#: bridgedb/strings.py:126 msgid "Please select options for bridge type:" -msgstr "Proszę wybrać opcje dla typu mostu:" +msgstr "" -#: bridgedb/strings.py:134 +#: bridgedb/strings.py:127 msgid "Do you need IPv6 addresses?" -msgstr "Czy potrzebujesz adresów IPv6?" +msgstr "" -#: bridgedb/strings.py:135 +#: bridgedb/strings.py:128 #, python-format msgid "Do you need a %s?" -msgstr "Czy potrzebujesz %s?" +msgstr "" -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:132 msgid "Your browser is not displaying images properly." -msgstr "Twoja przeglądarka nie wyświetla obrazów prawidłowo." +msgstr "" -#: bridgedb/strings.py:140 +#: bridgedb/strings.py:133 msgid "Enter the characters from the image above..." -msgstr "Wprowadź tekst z obrazka powyżej..." +msgstr "" -#: bridgedb/strings.py:144 +#: bridgedb/strings.py:137 msgid "How to start using your bridges" -msgstr "Jak zacząć używać mostów" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:146 +#: bridgedb/strings.py:139 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Aby wprowadzić mosty do Tor Browser, postępuj zgodnie z instrukcjami na %s stronie \npobierania Tor Browser %s, aby uruchomić Tor Browser." +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:151 +#: bridgedb/strings.py:144 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Po pojawieniu się okna 'Ustawienia Sieci Tor' naciśnij przycisk \"Konfiguruj\", a następnie postępuj zgodnie ze\nwskazówkami kreatora do momentu pytania o:" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:155 +#: bridgedb/strings.py:148 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "Czy Twój dostawca usług internetowych (ISP) blokuje lub cenzuruje połączenia do sieci Tor?" +msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:159 +#: bridgedb/strings.py:152 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Wybierz 'Tak' a następnie kliknij 'Dalej'. Aby skonfigurować swoje nowe \nmosty, skopiuj i wklej każdy most w nowym wierszu w polu tekstowym. \nNa koniec kliknij 'Połącz' i to wszystko! Jeśli napotkasz jakiekolwiek problemy, naciśnij przycisk 'Pomoc' w kreatorze 'Ustawienia Sieci Tor' w celu uzyskania dalszych porad." +msgstr "" -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:160 msgid "Displays this message." -msgstr "Wyświetla tę wiadomość." +msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:171 +#: bridgedb/strings.py:164 msgid "Request vanilla bridges." -msgstr "Poproś o regularne mosty." +msgstr "" -#: bridgedb/strings.py:172 +#: bridgedb/strings.py:165 msgid "Request IPv6 bridges." -msgstr "Poproś o mosty IPv6." +msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:174 +#: bridgedb/strings.py:167 msgid "Request a Pluggable Transport by TYPE." -msgstr "Poproś o Pluggable Transport przez TYPE." +msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:177 +#: bridgedb/strings.py:170 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Uzyskaj kopię klucza publicznego GnuPG BridgeDB." +msgstr ""

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 09 Oct '19

09 Oct '19

commit 43c7f48fa77271c12e69e2ca036688d4188a1d5b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 9 20:45:18 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- pl/LC_MESSAGES/bridgedb.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po index c7c0778f9..096f6447f 100644 --- a/pl/LC_MESSAGES/bridgedb.po +++ b/pl/LC_MESSAGES/bridgedb.po @@ -10,6 +10,7 @@ # Dawid Job <hoek(a)tuta.io>, 2014 # Rikson <Ers(a)mail2tor.com>, 2014 # Karol Obartuch <kobartuch(a)luc.edu>, 2015 +# Konrad Wila <360kon(a)gmail.com>, 2019 # Krzysztof Łojowski <maxxxrally(a)gmail.com>, 2014 # oirpos <kuba2707(a)gmail.com>, 2015 # sebx, 2014-2015 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2019-10-03 15:04-0700\n" -"PO-Revision-Date: 2019-10-04 00:54+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-10-09 20:30+0000\n" +"Last-Translator: Konrad Wila <360kon(a)gmail.com>\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -301,7 +302,7 @@ msgstr "Moje mostki nie działają! Potrzebuję pomocy!" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor cannot connect, please take a look at the %s and our %s." -msgstr "" +msgstr "Jeżeli Tor nie może podłączyć proszę zobaczyć na %s i nasze 1%s" #: bridgedb/strings.py:121 msgid "Here are your bridge lines:"

1 0

[tor/master] tls: Log TLS read buffer length bugs once
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit ff304f3be7d6b5753d2066a0af9772b451f7f442 Author: teor <teor(a)torproject.org> Date: Fri Oct 4 12:33:34 2019 +1000 tls: Log TLS read buffer length bugs once Rather than filling the logs with similar warnings. Fixes bug 31939; bugfix on 0.3.0.4-rc. --- changes/bug31939 | 3 +++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug31939 b/changes/bug31939 new file mode 100644 index 000000000..a36ea495d --- /dev/null +++ b/changes/bug31939 @@ -0,0 +1,3 @@ + o Minor bugfixes (tls, logging): + - Log TLS read buffer length bugs once, rather than filling the logs + with similar warnings. Fixes bug 31939; bugfix on 0.3.0.4-rc. diff --git a/src/lib/tls/buffers_tls.c b/src/lib/tls/buffers_tls.c index c176162c3..e92cb9163 100644 --- a/src/lib/tls/buffers_tls.c +++ b/src/lib/tls/buffers_tls.c @@ -68,9 +68,9 @@ buf_read_from_tls(buf_t *buf, tor_tls_t *tls, size_t at_most) check_no_tls_errors(); - if (BUG(buf->datalen >= INT_MAX)) + IF_BUG_ONCE(buf->datalen >= INT_MAX) return -1; - if (BUG(buf->datalen >= INT_MAX - at_most)) + IF_BUG_ONCE(buf->datalen >= INT_MAX - at_most) return -1; while (at_most > total_read) {

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1394'
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 0d82a8be77ae8d7fb06c8702bfbf1ebbaf370c94 Merge: ab064cf76 ff304f3be Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 16:44:12 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1394' changes/bug31939 | 3 +++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1399'
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit ab064cf762f0049913ae346dc9b500bc9580395a Merge: 755f00160 081bd3731 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 16:37:47 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1399' changes/bug31995 | 3 +++ src/test/test_hs_service.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Fix flapping of test_service_intro_point() unittest.
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 081bd37315a57616144a8e6272a2ea796ace989e Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Oct 8 18:59:27 2019 +0300 Fix flapping of test_service_intro_point() unittest. --- changes/bug31995 | 3 +++ src/test/test_hs_service.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug31995 b/changes/bug31995 new file mode 100644 index 000000000..c7ddd437a --- /dev/null +++ b/changes/bug31995 @@ -0,0 +1,3 @@ + o Minor bugfixes (testing): + - Avoid intermittent test failures due to a test that had relied on + inconsistent timing sources. Fixes bug 31995; bugfix on 0.3.1.3-alpha. diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index c5854f0ff..8993ce3fe 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -674,9 +674,11 @@ test_service_intro_point(void *arg) (void) arg; + update_approx_time(1481621834); + /* Test simple creation of an object. */ { - time_t now = time(NULL); + time_t now = approx_time(); ip = helper_create_service_ip(); tt_assert(ip); /* Make sure the authentication keypair is not zeroes. */

1 0

[tor/master] hs-v3: Do not remove intro point if circuit exists
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit f50de3a91872014f03856cf4c889f029ec5a1892 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Sep 10 14:40:40 2019 -0400 hs-v3: Do not remove intro point if circuit exists When considering introduction point of a service's descriptor, do not remove an intro point that has an established or pending circuit. Fixes #31652 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug31652 | 5 +++ src/feature/hs/hs_service.c | 87 +++++++++++++++++++++++++++++++++------------ src/test/test_hs_service.c | 1 + 3 files changed, 70 insertions(+), 23 deletions(-) diff --git a/changes/bug31652 b/changes/bug31652 new file mode 100644 index 000000000..c4eca7994 --- /dev/null +++ b/changes/bug31652 @@ -0,0 +1,5 @@ + o Minor bugfixes (onion services): + - When we clean up intro circuits for a v3 onion service, don't remove + circuits that have an established or pending circuit even if ran out of + retries. This way, we don't cleanup the circuit of the last retry. Fixes + bug 31652; bugfix on 0.3.2.1-alpha. diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index f81987f69..18c38ebc0 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -2333,15 +2333,70 @@ intro_point_should_expire(const hs_service_intro_point_t *ip, return 1; } -/* Go over the given set of intro points for each service and remove any - * invalid ones. The conditions for removal are: +/* Return true iff we should remove the intro point ip from its service. * - * - The node doesn't exists anymore (not in consensus) - * OR - * - The intro point maximum circuit retry count has been reached and no - * circuit can be found associated with it. - * OR - * - The intro point has expired and we should pick a new one. + * We remove an intro point from the service descriptor list if one of + * these criteria is met: + * - It has expired (either in INTRO2 count or in time). + * - No node was found (fell off the consensus). + * - We are over the maximum amount of retries. + * + * If an established or pending circuit is found for the given ip object, this + * return false indicating it should not be removed. */ +static bool +should_remove_intro_point(hs_service_intro_point_t *ip, time_t now) +{ + bool ret = false; + + tor_assert(ip); + + /* Any one of the following needs to be True to furfill the criteria to + * remove an intro point. */ + bool has_no_retries = (ip->circuit_retries > + MAX_INTRO_POINT_CIRCUIT_RETRIES); + bool has_no_node = (get_node_from_intro_point(ip) == NULL); + bool has_expired = intro_point_should_expire(ip, now); + + /* If the node fell off the consensus or the IP has expired, we have to + * remove it now. */ + if (has_no_node || has_expired) { + ret = true; + goto end; + } + + /* Pass this point, even though we might be over the retry limit, we check + * if a circuit (established or pending) exists. In that case, we should not + * remove it because it might simply be valid and opened at the previous + * scheduled event for the last retry. */ + + /* Did we established already? */ + if (ip->circuit_established) { + goto end; + } + /* Do we simply have an existing circuit regardless of its state? */ + if (hs_circ_service_get_intro_circ(ip)) { + goto end; + } + + /* Getting here means we have _no_ circuits so then return if we have any + * remaining retries. */ + ret = has_no_retries; + + end: + /* Meaningful log in case we are about to remove the IP. */ + if (ret) { + log_info(LD_REND, "Intro point %s%s (retried: %u times). " + "Removing it.", + describe_intro_point(ip), + has_expired ? " has expired" : + (has_no_node) ? " fell off the consensus" : "", + ip->circuit_retries); + } + return ret; +} + +/* Go over the given set of intro points for each service and remove any + * invalid ones. * * If an intro point is removed, the circuit (if any) is immediately close. * If a circuit can't be found, the intro point is kept if it hasn't reached @@ -2366,21 +2421,7 @@ cleanup_intro_points(hs_service_t *service, time_t now) * valid and remove any of them that aren't. */ DIGEST256MAP_FOREACH_MODIFY(desc->intro_points.map, key, hs_service_intro_point_t *, ip) { - const node_t *node = get_node_from_intro_point(ip); - int has_expired = intro_point_should_expire(ip, now); - - /* We cleanup an intro point if it has expired or if we do not know the - * node_t anymore (removed from our latest consensus) or if we've - * reached the maximum number of retry with a non existing circuit. */ - if (has_expired || node == NULL || - ip->circuit_retries > MAX_INTRO_POINT_CIRCUIT_RETRIES) { - log_info(LD_REND, "Intro point %s%s (retried: %u times). " - "Removing it.", - describe_intro_point(ip), - has_expired ? " has expired" : - (node == NULL) ? " fell off the consensus" : "", - ip->circuit_retries); - + if (should_remove_intro_point(ip, now)) { /* We've retried too many times, remember it as a failed intro point * so we don't pick it up again for INTRO_CIRC_RETRY_PERIOD sec. */ if (ip->circuit_retries > MAX_INTRO_POINT_CIRCUIT_RETRIES) { diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index c5854f0ff..a2594ed6a 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1300,6 +1300,7 @@ test_service_event(void *arg) OP_EQ, 1); /* Remove the IP object at once for the next test. */ ip->circuit_retries = MAX_INTRO_POINT_CIRCUIT_RETRIES + 1; + ip->circuit_established = 0; run_housekeeping_event(now); tt_int_op(digest256map_size(service->desc_current->intro_points.map), OP_EQ, 0);

1 0

[tor/master] test: New behavior on IP retry for HSv3
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 7c1b2fceb7d46aed8945d86806dc791f97c47125 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Sep 18 11:40:10 2019 -0400 test: New behavior on IP retry for HSv3 Unit test for #31652 where if we are over the retry limit for the IP but we have an established circuit, we don't remove the IP. Part of #31652 --- src/test/test_hs_service.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index a2594ed6a..efe4166bf 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1298,6 +1298,11 @@ test_service_event(void *arg) run_housekeeping_event(now); tt_int_op(digest256map_size(service->desc_current->intro_points.map), OP_EQ, 1); + /* No removal if we have an established circuit after retries. */ + ip->circuit_retries = MAX_INTRO_POINT_CIRCUIT_RETRIES + 1; + run_housekeeping_event(now); + tt_int_op(digest256map_size(service->desc_current->intro_points.map), + OP_EQ, 1); /* Remove the IP object at once for the next test. */ ip->circuit_retries = MAX_INTRO_POINT_CIRCUIT_RETRIES + 1; ip->circuit_established = 0;

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1401'
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 755f0016009424935f3b9216cad79d54129614cc Merge: 99809834a 7c1b2fceb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 16:29:46 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1401' changes/bug31652 | 5 +++ src/feature/hs/hs_service.c | 87 +++++++++++++++++++++++++++++++++------------ src/test/test_hs_service.c | 6 ++++ 3 files changed, 75 insertions(+), 23 deletions(-)

1 0

[tor/master] Merge branch 'bug30344_squashed_035'
by nickm＠torproject.org 09 Oct '19

09 Oct '19

commit 99809834a7aac5239b4b1bd7c74215d53856663b Merge: 1f60337da 841cff6e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 16:26:31 2019 -0400 Merge branch 'bug30344_squashed_035' changes/bug30344 | 4 ++++ src/core/mainloop/connection.c | 18 ++++++++++++------ src/core/mainloop/mainloop.c | 10 ++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-)

1 0