July 2020 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'tor-github/pr/1962' into maint-0.4.4
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit 05ca50c9a3d7a7b3c6d8684d9743333f65bfabd7 Merge: 18fa53fdf 6ff459675 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 15:54:24 2020 +0300 Merge branch 'tor-github/pr/1962' into maint-0.4.4 changes/ticket40003 | 3 +++ src/feature/rend/rendservice.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --cc src/feature/rend/rendservice.c index a88c2080f,eaf0432a7..83388a72e --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@@ -725,12 -739,17 +741,15 @@@ rend_config_service(const hs_opts_t *hs const or_options_t *options, hs_service_config_t *config) { - const config_line_t *line; rend_service_t *service = NULL; - /* line_ can be NULL which would mean that the service configuration only - * have one line that is the directory directive. */ tor_assert(options); + tor_assert(hs_opts); tor_assert(config); + /* We are about to configure a version 2 service. Warn of deprecation. */ + WARN_ONCE_DEPRECATION(); + /* Use the staging service list so that we can check then do the pruning * process using the main list at the end. */ if (rend_service_staging_list == NULL) {

1 0

[tor/master] Merge branch 'maint-0.4.4'
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit 00f921edb90f6267b22748c86caf4de707df4425 Merge: 3bb9b7e74 05ca50c9a Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 15:54:41 2020 +0300 Merge branch 'maint-0.4.4' changes/ticket40003 | 3 +++ src/feature/rend/rendservice.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+)

1 0

[tor/master] hs-v2: Add deprecation warning for service
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit 6ff45967530130396317203c297d5353b73d74cf Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 1 10:53:30 2020 -0400 hs-v2: Add deprecation warning for service If at least one service is configured as a version 2, a log warning is emitted once and only once. Closes #40003 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40003 | 3 +++ src/feature/rend/rendservice.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/changes/ticket40003 b/changes/ticket40003 new file mode 100644 index 000000000..240f46435 --- /dev/null +++ b/changes/ticket40003 @@ -0,0 +1,3 @@ + o Deprecated features (onion service v2): + - Add deprecation warning for onion service version 2. Tor now logs a + warning once if a version 2 service is configured. Closes ticket 40003. diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index c96ecec30..eaf0432a7 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -130,6 +130,22 @@ static smartlist_t *rend_service_list = NULL; * service on config reload. */ static smartlist_t *rend_service_staging_list = NULL; +/** Helper: log the deprecation warning for version 2 only once. */ +static void +log_once_deprecation_warning(void) +{ + static bool logged_once = false; + if (!logged_once) { + log_warn(LD_REND, "DEPRECATED: Onion service version 2 are deprecated. " + "Please use version 3 which is the default now. " + "Currently, version 2 is planned to be obsolete in " + "the Tor version 0.4.6 stable series."); + logged_once = true; + } +} +/** Macro to make it very explicit that we are warning about deprecation. */ +#define WARN_ONCE_DEPRECATION() log_once_deprecation_warning() + /* Like rend_get_service_list_mutable, but returns a read-only list. */ static const smartlist_t* rend_get_service_list(const smartlist_t* substitute_service_list) @@ -731,6 +747,9 @@ rend_config_service(const config_line_t *line_, tor_assert(options); tor_assert(config); + /* We are about to configure a version 2 service. Warn of deprecation. */ + WARN_ONCE_DEPRECATION(); + /* Use the staging service list so that we can check then do the pruning * process using the main list at the end. */ if (rend_service_staging_list == NULL) {

1 0

[tor/release-0.4.4] hs-v2: Add deprecation warning for service
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit 6ff45967530130396317203c297d5353b73d74cf Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 1 10:53:30 2020 -0400 hs-v2: Add deprecation warning for service If at least one service is configured as a version 2, a log warning is emitted once and only once. Closes #40003 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40003 | 3 +++ src/feature/rend/rendservice.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/changes/ticket40003 b/changes/ticket40003 new file mode 100644 index 000000000..240f46435 --- /dev/null +++ b/changes/ticket40003 @@ -0,0 +1,3 @@ + o Deprecated features (onion service v2): + - Add deprecation warning for onion service version 2. Tor now logs a + warning once if a version 2 service is configured. Closes ticket 40003. diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index c96ecec30..eaf0432a7 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -130,6 +130,22 @@ static smartlist_t *rend_service_list = NULL; * service on config reload. */ static smartlist_t *rend_service_staging_list = NULL; +/** Helper: log the deprecation warning for version 2 only once. */ +static void +log_once_deprecation_warning(void) +{ + static bool logged_once = false; + if (!logged_once) { + log_warn(LD_REND, "DEPRECATED: Onion service version 2 are deprecated. " + "Please use version 3 which is the default now. " + "Currently, version 2 is planned to be obsolete in " + "the Tor version 0.4.6 stable series."); + logged_once = true; + } +} +/** Macro to make it very explicit that we are warning about deprecation. */ +#define WARN_ONCE_DEPRECATION() log_once_deprecation_warning() + /* Like rend_get_service_list_mutable, but returns a read-only list. */ static const smartlist_t* rend_get_service_list(const smartlist_t* substitute_service_list) @@ -731,6 +747,9 @@ rend_config_service(const config_line_t *line_, tor_assert(options); tor_assert(config); + /* We are about to configure a version 2 service. Warn of deprecation. */ + WARN_ONCE_DEPRECATION(); + /* Use the staging service list so that we can check then do the pruning * process using the main list at the end. */ if (rend_service_staging_list == NULL) {

1 0

[tor/release-0.4.4] Merge branch 'tor-github/pr/1962' into maint-0.4.4
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit 05ca50c9a3d7a7b3c6d8684d9743333f65bfabd7 Merge: 18fa53fdf 6ff459675 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 15:54:24 2020 +0300 Merge branch 'tor-github/pr/1962' into maint-0.4.4 changes/ticket40003 | 3 +++ src/feature/rend/rendservice.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --cc src/feature/rend/rendservice.c index a88c2080f,eaf0432a7..83388a72e --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@@ -725,12 -739,17 +741,15 @@@ rend_config_service(const hs_opts_t *hs const or_options_t *options, hs_service_config_t *config) { - const config_line_t *line; rend_service_t *service = NULL; - /* line_ can be NULL which would mean that the service configuration only - * have one line that is the directory directive. */ tor_assert(options); + tor_assert(hs_opts); tor_assert(config); + /* We are about to configure a version 2 service. Warn of deprecation. */ + WARN_ONCE_DEPRECATION(); + /* Use the staging service list so that we can check then do the pruning * process using the main list at the end. */ if (rend_service_staging_list == NULL) {

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by asn＠torproject.org 03 Jul '20

03 Jul '20

commit 6f882490e330a104bda2f24513a76d5431a7b8d6 Merge: 30e265221 05ca50c9a Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jul 3 15:54:41 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket40003 | 3 +++ src/feature/rend/rendservice.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+)

1 0

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

03 Jul '20

commit 10d8b307385388aaa8670959c7662653fcfa1d8a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 3 12:17:14 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- fr/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torbutton.properties b/fr/torbutton.properties index 80aa4ebfcc..18edd134b1 100644 --- a/fr/torbutton.properties +++ b/fr/torbutton.properties @@ -87,7 +87,7 @@ onionServices.introFailed.longDescription=Détails : %S – Échec de présenta # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Problème de chargement du site onion onionServices.rendezvousFailed.header=Impossible de se connecter au site onion -onionServices.rendezvousFailed=Le site onion est occupé ou le réseau Tor est surchargé. Veuillez ressayer ultérieurement. +onionServices.rendezvousFailed=Le site onion est occupé ou le réseau Tor est surchargé. Veuillez ressayer plus tard. onionServices.rendezvousFailed.longDescription=Détails : %S – Échec de rencontre du client avec le service, ce qui signifie que le client n’a pas réussi à finaliser la connexion. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Une autorisation est exigée

1 0

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

03 Jul '20

commit ac9bcda2ee19684b1ae0905d060747b8a35853e7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 3 12:17:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- fr/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torbutton.properties b/fr/torbutton.properties index 80aa4ebfcc..18edd134b1 100644 --- a/fr/torbutton.properties +++ b/fr/torbutton.properties @@ -87,7 +87,7 @@ onionServices.introFailed.longDescription=Détails : %S – Échec de présenta # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Problème de chargement du site onion onionServices.rendezvousFailed.header=Impossible de se connecter au site onion -onionServices.rendezvousFailed=Le site onion est occupé ou le réseau Tor est surchargé. Veuillez ressayer ultérieurement. +onionServices.rendezvousFailed=Le site onion est occupé ou le réseau Tor est surchargé. Veuillez ressayer plus tard. onionServices.rendezvousFailed.longDescription=Détails : %S – Échec de rencontre du client avec le service, ce qui signifie que le client n’a pas réussi à finaliser la connexion. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Une autorisation est exigée

1 0

[translation/tails-iuk_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk_completed
by translation＠torproject.org 03 Jul '20

03 Jul '20

commit 895f473aecb3305d590a0438ef0184e135b17d4a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 3 12:16:29 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk_completed --- fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr.po b/fr.po index 1941fde4c3..bc489dd8c4 100644 --- a/fr.po +++ b/fr.po @@ -36,7 +36,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-11-28 16:51+0100\n" -"PO-Revision-Date: 2020-06-29 14:57+0000\n" +"PO-Revision-Date: 2020-07-03 11:52+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr "Mettre à niveau maintenant" #: ../lib/Tails/IUK/Frontend.pm:388 msgid "Upgrade later" -msgstr "Mettre à niveau ultérieurement" +msgstr "Mettre à niveau plus tard" #: ../lib/Tails/IUK/Frontend.pm:396 #, perl-brace-format @@ -249,7 +249,7 @@ msgstr "Redémarrer maintenant" #: ../lib/Tails/IUK/Frontend.pm:628 msgid "Restart later" -msgstr "Redémarrer ultérieurement" +msgstr "Redémarrer plus tard" #: ../lib/Tails/IUK/Frontend.pm:639 msgid "Error while restarting the system"

1 0

[translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
by translation＠torproject.org 03 Jul '20

03 Jul '20

commit 893810129575db5e3272bfc69098611027bd5a20 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 3 12:16:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr.po b/fr.po index 1941fde4c3..bc489dd8c4 100644 --- a/fr.po +++ b/fr.po @@ -36,7 +36,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-11-28 16:51+0100\n" -"PO-Revision-Date: 2020-06-29 14:57+0000\n" +"PO-Revision-Date: 2020-07-03 11:52+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -147,7 +147,7 @@ msgstr "Mettre à niveau maintenant" #: ../lib/Tails/IUK/Frontend.pm:388 msgid "Upgrade later" -msgstr "Mettre à niveau ultérieurement" +msgstr "Mettre à niveau plus tard" #: ../lib/Tails/IUK/Frontend.pm:396 #, perl-brace-format @@ -249,7 +249,7 @@ msgstr "Redémarrer maintenant" #: ../lib/Tails/IUK/Frontend.pm:628 msgid "Restart later" -msgstr "Redémarrer ultérieurement" +msgstr "Redémarrer plus tard" #: ../lib/Tails/IUK/Frontend.pm:639 msgid "Error while restarting the system"

1 0