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

[tpo/master] Remove 9.0.6 from RecommendedTBBVersions
by boklm＠torproject.org 30 Mar '20

30 Mar '20

commit 3ecdde2eab73cfec369a74789561ea74d0f0a4d5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 30 21:32:16 2020 +0200 Remove 9.0.6 from RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index e4e69fd..110072c 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,10 +5,6 @@ _template: empty.html body: [ -"9.0.6", -"9.0.6-MacOS", -"9.0.6-Linux", -"9.0.6-Windows", "9.0.7", "9.0.7-MacOS", "9.0.7-Linux",

1 0

[tpo/master] Add new Tor Browser version: 9.5a9
by boklm＠torproject.org 30 Mar '20

30 Mar '20

commit 59a127f20e3cac59de5e612db92713b65be15a75 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 30 21:33:31 2020 +0200 Add new Tor Browser version: 9.5a9 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 110072c..1b89b5f 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -20,5 +20,9 @@ body: "9.5a8", "9.5a8-MacOS", "9.5a8-Linux", -"9.5a8-Windows" +"9.5a8-Windows", +"9.5a9", +"9.5a9-MacOS", +"9.5a9-Linux", +"9.5a9-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index ed48c5c..568129a 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 9.0.7 win32 = 0.4.2.7 [torbrowser-alpha] -version = 9.5a8 +version = 9.5a9 [tor-stable] version = 0.4.2.7

1 0

[gettor/master] Add signature verification instructions to email
by cohosh＠torproject.org 30 Mar '20

30 Mar '20

commit 63559201e21331ded6da078108ba903ffeebb38d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Mar 18 16:12:10 2020 -0400 Add signature verification instructions to email --- gettor/services/email/sendmail.py | 14 +++++++++++-- share/locale/en.json | 4 ++++ tests/test_email_service.py | 42 ++++++++++++++++++--------------------- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 22a5111..4d908b3 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -125,7 +125,6 @@ class Sendmail(object): link_msg = "" for link in links: - print(link) provider = link[5] version = link[4] arch = link[3] @@ -143,6 +142,16 @@ class Sendmail(object): def build_body_message(self, link_msg, platform, file): + signature_strings = { + "windows":"links_body_windows", + "linux":"links_body_linux", + "osx":"links_body_osx" + } + signature_cmds = { + "windows":"gpgv --keyring .\\tor.keyring Downloads\\{0}.asc Downloads\\{0}", + "linux":"gpgv --keyring ./tor.keyring ~/Downloads/{}{{.asc,}}", + "osx":"gpgv --keyring ./tor.keyring ~/Downloads/{}{{.asc,}}" + } body_msg = strings._("body_intro") body_msg += strings._("links_body_platform").format(platform) body_msg += strings._("links_body_step1").format(link_msg) @@ -150,8 +159,9 @@ class Sendmail(object): body_msg += strings._("links_body_internet_archive") body_msg += strings._("links_body_google_drive") body_msg += strings._("links_body_step2") + body_msg += strings._(signature_strings[platform]) + body_msg += strings._("links_body_all").format(signature_cmds[platform].format(file)) body_msg += strings._("links_body_step3") - print(body_msg) return body_msg diff --git a/share/locale/en.json b/share/locale/en.json index 9a97100..8737d51 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -6,6 +6,10 @@ "links_body_internet_archive": "\tInternet Archive: https://archive.org/details/@gettor\n\n", "links_body_google_drive": "\tGoogle Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n", "links_body_step2": "Step 2: Verify the signature (Optional)\n\n\tVerifying the signature ensures that a certain package was generated by its\n\tdevelopers, and has not been tampered with. This email provides links to signature\n\tfiles that have the same name as the Tor Browser file, but end with \".asc\" instead.\n\n", + "links_body_all":"\tThe Tor Browser team signs Tor Browser releases. Import the Tor Browser Developers\n\tsigning key (0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290):\n\n\t\tgpg --auto-key-locate nodefault,wkd --locate-keys torbrowser(a)torproject.org\n\n\tThis should show you something like:\n\n\t\tgpg: key 4E2C6E8793298290: public key \"Tor Browser Developers (signing key) <torbrowser(a)torproject.org>\" imported\n\t\tgpg: Total number processed: 1\n\t\tgpg: imported: 1\n\t\tpub rsa4096 2014-12-15 [C] [expires: 2020-08-24]\n\t\t EF6E286DDA85EA2A4BA7DE684E2C6E8793298290\n\t\tuid [ unknown] Tor Browser Developers (signing key) <torbrowser(a)torproject.org>\n\t\tsub rsa4096 2018-05-26 [S] [expires: 2020-09-12]\n\n\tAfter importing the key, you can save it to a file (identifying it by fingerprint here):\n\n\t\tgpg --output ./tor.keyring --export 0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290\n\n\tNext, you will need to download the corresponding \".asc\" signatur e file and verify it\n\twith the command:\n\n\t\t{}\n\n\tThe result of the command should produce something like this:\n\n\t\tgpgv: Signature made 07/08/19 04:03:49 Pacific Daylight Time\n\t\tgpgv: using RSA key EB774491D9FF06E2\n\t\tgpgv: Good signature from \"Tor Browser Developers (signing key) <torbrowser(a)torproject.org>\"\n\n", + "links_body_windows":"\tIf you run Windows, download Gpg4win and run its installer. In order to verify the\n\tsignature you will need to type a few commands in windows command-line, cmd.exe.\n\n", + "links_body_osx":"\tIf you are using macOS, you can install GPGTools. In order to verify the signature\n\tyou will need to type a few commands in the Terminal (under \"Applications\").\n\n", + "links_body_linux":"\tIf you are using GNU/Linux, then you probably already have GnuPG in your system,\n\tas most GNU/Linux distributions come with it preinstalled. In order to verify the\n\tsignature you will need to type a few commands in a terminal window.\n\n", "links_body_step3": "Step 3: Get Bridges (Optional)\n\n\tIf you believe that Tor is blocked where you are, you can use bridges to connect\n\tto Tor. Bridges are hidden Tor relays that can circumvent censorship.\n\tTor Browser includes a list of built-in bridges, which you should try first.\n\tYou can activate built-in bridges inside of Tor Browser's settings, under the\n\t\"Tor\" menu. If built-in bridges don't work, try requesting different bridges,\n\twhich you can also do in the \"Tor\" menu inside Tor Browser's settings.\n\n", "links_subject": "[GetTor] Links for your request", "help_body_intro": "GetTor can send you download links for Tor Browser.\n", diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 5c0ddfb..3803e79 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -17,18 +17,6 @@ class EmailServiceTests(unittest.TestCase): self.settings = conftests.options.parse_settings("en","tests/test.conf.json") self.sm_client = conftests.Sendmail(self.settings) self.locales = conftests.strings.get_locales() - self.links = [ - [ - "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/TorB…", - "osx", - "en-US", - "64", - "9.0.3", - "gitlab", - "ACTIVE", - "TorBrowser-9.0.3-osx64_en-US.dmg" - ] - ] def tearDown(self): print("tearDown()") @@ -182,22 +170,30 @@ class EmailServiceTests(unittest.TestCase): self.assertEqual(request["language"], "es-AR") del ep + @pytest_twisted.inlineCallbacks def test_sent_links_message(self): ep = self.sm_client - links = self.links - link_msg, file = ep.build_link_strings(links, "osx", "en") - assert "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/TorB…" in link_msg - assert "osx" in link_msg - - self.assertEqual("TorBrowser-9.0.3-osx64_en-US.dmg", file) - - def test_sent_body_message(self): - ep = self.sm_client - links = self.links - link_msg, file = ep.build_link_strings(links, "osx", "en") + links = yield ep.conn.get_links( + platform="osx", language="en-US", status="ACTIVE" + ) + link_msg, file = ep.build_link_strings(links, "osx", "en-US") body_msg = ep.build_body_message(link_msg, "osx", file) assert "You requested Tor Browser for osx" in body_msg + links = yield ep.conn.get_links( + platform="windows", language="en-US", status="ACTIVE" + ) + link_msg, file = ep.build_link_strings(links, "windows", "en-US") + body_msg = ep.build_body_message(link_msg, "windows", file) + assert "You requested Tor Browser for windows" in body_msg + + links = yield ep.conn.get_links( + platform="linux", language="en-US", status="ACTIVE" + ) + link_msg, file = ep.build_link_strings(links, "linux", "en-US") + body_msg = ep.build_body_message(link_msg, "linux", file) + assert "You requested Tor Browser for linux" in body_msg + @pytest_twisted.inlineCallbacks def test_help_body_message(self): ep = self.sm_client

1 0

[gettor/master] Update GetTor links message
by cohosh＠torproject.org 30 Mar '20

30 Mar '20

commit 36820cc1510db8dea1667af53bdbe6f2caf4cb6d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Mar 18 14:57:45 2020 -0400 Update GetTor links message This makes the following changes to the links message: - Breaks user actions into steps - Simplifies wordings - Includes signature verification and bridge instructions --- gettor/services/email/sendmail.py | 21 +++++++++++---------- share/locale/en.json | 12 ++++++------ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 07d343b..22a5111 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -122,9 +122,10 @@ class Sendmail(object): Build the links strings """ - link_msg = None + link_msg = "" for link in links: + print(link) provider = link[5] version = link[4] arch = link[3] @@ -132,11 +133,9 @@ class Sendmail(object): file = link[7] sig_url = url + ".asc" - link_str = "Tor Browser {} for {}-{}-{} ({}): {}\n".format( - version, platform, locale, arch, provider, url - ) + link_str = "\t{}: {}\n".format(provider, url) - link_str += "Signature file: {}\n".format(sig_url) + link_str += "\tSignature file: {}\n".format(sig_url) link_msg = "{}\n{}".format(link_msg, link_str) @@ -144,13 +143,15 @@ class Sendmail(object): def build_body_message(self, link_msg, platform, file): - body_msg = strings._("links_body_platform").format(platform) - body_msg += strings._("links_body_links").format(link_msg) - body_msg += strings._("links_body_archive") + body_msg = strings._("body_intro") + body_msg += strings._("links_body_platform").format(platform) + body_msg += strings._("links_body_step1").format(link_msg) + body_msg += strings._("links_body_archive").format(file) body_msg += strings._("links_body_internet_archive") body_msg += strings._("links_body_google_drive") - body_msg += strings._("links_body_download_filename").format(file) - body_msg += strings._("links_body_ending") + body_msg += strings._("links_body_step2") + body_msg += strings._("links_body_step3") + print(body_msg) return body_msg diff --git a/share/locale/en.json b/share/locale/en.json index fd47984..9a97100 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -1,12 +1,12 @@ { "body_intro": "This is an automated email response from GetTor.\n\n", "links_body_platform": "You requested Tor Browser for {}.\n\n", - "links_body_links": "You will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\n", - "links_body_archive": "Should you have issues with any of the links above you can access the following archives:\n\n", - "links_body_internet_archive": "- Internet Archive: https://archive.org/details/@gettor\n\n", - "links_body_google_drive": "- Google Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n", - "links_body_download_filename": "Download the file: {}\n\n", - "links_body_ending": "\n--\nGetTor", + "links_body_step1": "Step 1: Download Tor Browser\n\n\tFirst, try downloading Tor Browser from either GitLab or GitHub:\n\n{}\n\n", + "links_body_archive": "\tIf you cannot download Tor Browser from GitLab or GitHub,\n\ttry downloading the file {}\n\tfrom the following archives:\n\n", + "links_body_internet_archive": "\tInternet Archive: https://archive.org/details/@gettor\n\n", + "links_body_google_drive": "\tGoogle Drive folder: https://drive.google.com/open?id=13CADQTsCwrGsIID09YQbNz2DfRMUoxUU\n\n", + "links_body_step2": "Step 2: Verify the signature (Optional)\n\n\tVerifying the signature ensures that a certain package was generated by its\n\tdevelopers, and has not been tampered with. This email provides links to signature\n\tfiles that have the same name as the Tor Browser file, but end with \".asc\" instead.\n\n", + "links_body_step3": "Step 3: Get Bridges (Optional)\n\n\tIf you believe that Tor is blocked where you are, you can use bridges to connect\n\tto Tor. Bridges are hidden Tor relays that can circumvent censorship.\n\tTor Browser includes a list of built-in bridges, which you should try first.\n\tYou can activate built-in bridges inside of Tor Browser's settings, under the\n\t\"Tor\" menu. If built-in bridges don't work, try requesting different bridges,\n\twhich you can also do in the \"Tor\" menu inside Tor Browser's settings.\n\n", "links_subject": "[GetTor] Links for your request", "help_body_intro": "GetTor can send you download links for Tor Browser.\n", "help_body_support": "Simply reply to this email and write the operating system you want to install Tor Browser on in your response. We support the following operating systems:\n\n",

1 0

[gettor/master] Update GetTor help message
by cohosh＠torproject.org 30 Mar '20

30 Mar '20

commit 7f1fd7e2c8ad5235af99ff3af9c5e5c94d16e5f8 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Mar 18 14:18:05 2020 -0400 Update GetTor help message This restructures the GetTor help message. The message now includes: - instructions to reply to the message for links - available locales - a valid example links request --- gettor/services/email/sendmail.py | 22 +++++++++++++++++----- share/locale/en.json | 9 ++++++--- tests/test_email_service.py | 8 ++++++-- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/gettor/services/email/sendmail.py b/gettor/services/email/sendmail.py index 754fb5b..07d343b 100644 --- a/gettor/services/email/sendmail.py +++ b/gettor/services/email/sendmail.py @@ -98,11 +98,21 @@ class Sendmail(object): requireTransportSecurity=True ).addCallback(self.sendmail_callback).addErrback(self.sendmail_errback) - - def build_help_body_message(self): - body_msg = strings._("help_body_intro") - body_msg += strings._("help_body_paragraph") + def build_locale_string(self, locales): + locale_string = "" + for locale in locales: + locale_string += "\t" + locale[0] + "\n" + return locale_string + + def build_help_body_message(self, locale_string): + body_msg = strings._("body_intro") + body_msg += strings._("help_body_intro") body_msg += strings._("help_body_support") + body_msg += "\twindows\n\tlinux\n\tosx\n\n" + body_msg += strings._("help_body_respond") + body_msg += strings._("help_body_locale") + body_msg += locale_string + "\n" + body_msg += strings._("help_body_example").format("Windows", "Arabic", "windows ar") return body_msg @@ -176,8 +186,10 @@ class Sendmail(object): hid.hexdigest() ) ) + locales = yield self.conn.get_locales() + locale_string = self.build_locale_string(locales) - body_msg = self.build_help_body_message() + body_msg = self.build_help_body_message(locale_string) yield self.sendmail( email_addr=id, diff --git a/share/locale/en.json b/share/locale/en.json index dba3047..fd47984 100644 --- a/share/locale/en.json +++ b/share/locale/en.json @@ -1,4 +1,5 @@ { + "body_intro": "This is an automated email response from GetTor.\n\n", "links_body_platform": "You requested Tor Browser for {}.\n\n", "links_body_links": "You will need only one of the links below to download the bundle. If a link does not work for you, try the next one.\n\n{}\n\n", "links_body_archive": "Should you have issues with any of the links above you can access the following archives:\n\n", @@ -7,9 +8,11 @@ "links_body_download_filename": "Download the file: {}\n\n", "links_body_ending": "\n--\nGetTor", "links_subject": "[GetTor] Links for your request", - "help_body_intro": "This is how you can request a tor browser bundle link.\n\n", - "help_body_paragraph": "Send an email to: gettor(a)torproject.org\n\nIn the body of the email only write: <operating system> <language>.\n\n", - "help_body_support": "We only support windows, osx and linux as operating systems.\n\n", + "help_body_intro": "GetTor can send you download links for Tor Browser.\n", + "help_body_support": "Simply reply to this email and write the operating system you want to install Tor Browser on in your response. We support the following operating systems:\n\n", + "help_body_respond": "GetTor will then respond with download instructions.\n\n", + "help_body_locale": "If you want Tor Browser in a language other than English, mention one of the following language codes in your response:\n\n", + "help_body_example": "For example, if you want Tor Browser for {} in {} your email content will look like:\n\n\t{}\n\n", "help_subject": "[GetTor] Help Email", "help_debug": "Log application errors to stdout", "help_config": "Custom config file location (optional)", diff --git a/tests/test_email_service.py b/tests/test_email_service.py index 4326b9c..5c0ddfb 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -198,10 +198,14 @@ class EmailServiceTests(unittest.TestCase): body_msg = ep.build_body_message(link_msg, "osx", file) assert "You requested Tor Browser for osx" in body_msg + @pytest_twisted.inlineCallbacks def test_help_body_message(self): ep = self.sm_client - help_msg = ep.build_help_body_message() - assert "This is how you can request a tor browser bundle link" in help_msg + locales = yield ep.conn.get_locales() + locale_string = ep.build_locale_string(locales) + help_msg = ep.build_help_body_message(locale_string) + assert "This is an automated email response from GetTor." in help_msg + assert "\twindows\n\tlinux\n\tosx\n" in help_msg @pytest_twisted.inlineCallbacks def test_get_locales(self):

1 0

[tor/maint-0.4.3] hs-v3: Relax severity of a log message when decoding descriptors.
by dgoulet＠torproject.org 30 Mar '20

30 Mar '20

commit 42e56f5bacc6ead39bfef790c6f9ca9be0419739 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 11 15:18:47 2020 +0200 hs-v3: Relax severity of a log message when decoding descriptors. Make it LOG_PROTOCOL_WARN and also add the expiration timestamp in there to ease debugging in the future. --- changes/bug31669 | 4 ++++ src/feature/hs/hs_descriptor.c | 14 ++++++++++++-- src/test/test_hs_descriptor.c | 26 ++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/changes/bug31669 b/changes/bug31669 new file mode 100644 index 000000000..8079c98f6 --- /dev/null +++ b/changes/bug31669 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services v3): + - Relax severity of a log message that can appear naturally when decoding + onion service descriptors as a relay. Also add some diagnostics to debug + any future bugs in that area. Fixes bug 31669; bugfix on 0.3.0.1-alpha. \ No newline at end of file diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 65d6c7a58..4d4200bd6 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -56,6 +56,7 @@ #define HS_DESCRIPTOR_PRIVATE #include "core/or/or.h" +#include "app/config/config.h" #include "trunnel/ed25519_cert.h" /* Trunnel interface. */ #include "feature/hs/hs_descriptor.h" #include "core/or/circuitbuild.h" @@ -1287,11 +1288,20 @@ cert_is_valid(tor_cert_t *cert, uint8_t type, const char *log_obj_type) log_warn(LD_REND, "Signing key is NOT included for %s.", log_obj_type); goto err; } + /* The following will not only check if the signature matches but also the * expiration date and overall validity. */ if (tor_cert_checksig(cert, &cert->signing_key, approx_time()) < 0) { - log_warn(LD_REND, "Invalid signature for %s: %s", log_obj_type, - tor_cert_describe_signature_status(cert)); + if (cert->cert_expired) { + char expiration_str[ISO_TIME_LEN+1]; + format_iso_time(expiration_str, cert->valid_until); + log_fn(LOG_PROTOCOL_WARN, LD_REND, "Invalid signature for %s: %s (%s)", + log_obj_type, tor_cert_describe_signature_status(cert), + expiration_str); + } else { + log_warn(LD_REND, "Invalid signature for %s: %s", + log_obj_type, tor_cert_describe_signature_status(cert)); + } goto err; } diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 43ac5490a..c5077f714 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -14,6 +14,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "trunnel/ed25519_cert.h" #include "core/or/or.h" +#include "app/config/config.h" #include "feature/hs/hs_descriptor.h" #include "test/test.h" #include "feature/nodelist/torcert.h" @@ -37,7 +38,6 @@ test_cert_encoding(void *arg) { int ret; char *encoded = NULL; - time_t now = time(NULL); ed25519_keypair_t kp; ed25519_public_key_t signed_key; ed25519_secret_key_t secret_key; @@ -45,6 +45,10 @@ test_cert_encoding(void *arg) (void) arg; + /* Change time to 03-01-2002 23:36 UTC */ + update_approx_time(1010101010); + time_t now = approx_time(); + ret = ed25519_keypair_generate(&kp, 0); tt_int_op(ret, == , 0); ret = ed25519_secret_key_generate(&secret_key, 0); @@ -88,13 +92,31 @@ test_cert_encoding(void *arg) /* The cert did have the signing key? */ ret= ed25519_pubkey_eq(&parsed_cert->signing_key, &kp.pubkey); tt_int_op(ret, OP_EQ, 1); - tor_cert_free(parsed_cert); /* Get to the end part of the certificate. */ pos += b64_cert_len; tt_int_op(strcmpstart(pos, "-----END ED25519 CERT-----"), OP_EQ, 0); pos += strlen("-----END ED25519 CERT-----"); tt_str_op(pos, OP_EQ, ""); + + /* Check that certificate expiry works properly and emits the right log + message */ + const char *msg = "fire"; + /* Move us forward 4 hours so that the the certificate is definitely + expired */ + update_approx_time(approx_time() + 3600*4); + setup_full_capture_of_logs(LOG_PROTOCOL_WARN); + ret = cert_is_valid(parsed_cert, CERT_TYPE_SIGNING_AUTH, msg); + tt_int_op(ret, OP_EQ, 0); + /* Since the current time at the creation of the cert was "03-01-2002 + * 23:36", and the expiration date of the cert was two hours, the Tor code + * will ceiling that and make it 02:00. Make sure that the right log + * message is emitted */ + expect_log_msg_containing("Invalid signature for fire: expired" + " (2002-01-04 02:00:00)"); + teardown_capture_of_logs(); + + tor_cert_free(parsed_cert); } done:

1 0

[tor/master] hs-v3: Relax severity of a log message when decoding descriptors.
by dgoulet＠torproject.org 30 Mar '20

30 Mar '20

commit 42e56f5bacc6ead39bfef790c6f9ca9be0419739 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 11 15:18:47 2020 +0200 hs-v3: Relax severity of a log message when decoding descriptors. Make it LOG_PROTOCOL_WARN and also add the expiration timestamp in there to ease debugging in the future. --- changes/bug31669 | 4 ++++ src/feature/hs/hs_descriptor.c | 14 ++++++++++++-- src/test/test_hs_descriptor.c | 26 ++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/changes/bug31669 b/changes/bug31669 new file mode 100644 index 000000000..8079c98f6 --- /dev/null +++ b/changes/bug31669 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services v3): + - Relax severity of a log message that can appear naturally when decoding + onion service descriptors as a relay. Also add some diagnostics to debug + any future bugs in that area. Fixes bug 31669; bugfix on 0.3.0.1-alpha. \ No newline at end of file diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 65d6c7a58..4d4200bd6 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -56,6 +56,7 @@ #define HS_DESCRIPTOR_PRIVATE #include "core/or/or.h" +#include "app/config/config.h" #include "trunnel/ed25519_cert.h" /* Trunnel interface. */ #include "feature/hs/hs_descriptor.h" #include "core/or/circuitbuild.h" @@ -1287,11 +1288,20 @@ cert_is_valid(tor_cert_t *cert, uint8_t type, const char *log_obj_type) log_warn(LD_REND, "Signing key is NOT included for %s.", log_obj_type); goto err; } + /* The following will not only check if the signature matches but also the * expiration date and overall validity. */ if (tor_cert_checksig(cert, &cert->signing_key, approx_time()) < 0) { - log_warn(LD_REND, "Invalid signature for %s: %s", log_obj_type, - tor_cert_describe_signature_status(cert)); + if (cert->cert_expired) { + char expiration_str[ISO_TIME_LEN+1]; + format_iso_time(expiration_str, cert->valid_until); + log_fn(LOG_PROTOCOL_WARN, LD_REND, "Invalid signature for %s: %s (%s)", + log_obj_type, tor_cert_describe_signature_status(cert), + expiration_str); + } else { + log_warn(LD_REND, "Invalid signature for %s: %s", + log_obj_type, tor_cert_describe_signature_status(cert)); + } goto err; } diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 43ac5490a..c5077f714 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -14,6 +14,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "trunnel/ed25519_cert.h" #include "core/or/or.h" +#include "app/config/config.h" #include "feature/hs/hs_descriptor.h" #include "test/test.h" #include "feature/nodelist/torcert.h" @@ -37,7 +38,6 @@ test_cert_encoding(void *arg) { int ret; char *encoded = NULL; - time_t now = time(NULL); ed25519_keypair_t kp; ed25519_public_key_t signed_key; ed25519_secret_key_t secret_key; @@ -45,6 +45,10 @@ test_cert_encoding(void *arg) (void) arg; + /* Change time to 03-01-2002 23:36 UTC */ + update_approx_time(1010101010); + time_t now = approx_time(); + ret = ed25519_keypair_generate(&kp, 0); tt_int_op(ret, == , 0); ret = ed25519_secret_key_generate(&secret_key, 0); @@ -88,13 +92,31 @@ test_cert_encoding(void *arg) /* The cert did have the signing key? */ ret= ed25519_pubkey_eq(&parsed_cert->signing_key, &kp.pubkey); tt_int_op(ret, OP_EQ, 1); - tor_cert_free(parsed_cert); /* Get to the end part of the certificate. */ pos += b64_cert_len; tt_int_op(strcmpstart(pos, "-----END ED25519 CERT-----"), OP_EQ, 0); pos += strlen("-----END ED25519 CERT-----"); tt_str_op(pos, OP_EQ, ""); + + /* Check that certificate expiry works properly and emits the right log + message */ + const char *msg = "fire"; + /* Move us forward 4 hours so that the the certificate is definitely + expired */ + update_approx_time(approx_time() + 3600*4); + setup_full_capture_of_logs(LOG_PROTOCOL_WARN); + ret = cert_is_valid(parsed_cert, CERT_TYPE_SIGNING_AUTH, msg); + tt_int_op(ret, OP_EQ, 0); + /* Since the current time at the creation of the cert was "03-01-2002 + * 23:36", and the expiration date of the cert was two hours, the Tor code + * will ceiling that and make it 02:00. Make sure that the right log + * message is emitted */ + expect_log_msg_containing("Invalid signature for fire: expired" + " (2002-01-04 02:00:00)"); + teardown_capture_of_logs(); + + tor_cert_free(parsed_cert); } done:

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by dgoulet＠torproject.org 30 Mar '20

30 Mar '20

commit 7d6e9d7d95be2d6ec8b4af8d7b6685508c7eda1c Merge: 78ac7c751 42e56f5ba Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Mar 30 13:38:57 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 changes/bug31669 | 4 ++++ src/feature/hs/hs_descriptor.c | 14 ++++++++++++-- src/test/test_hs_descriptor.c | 26 ++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.3] hs-v3: Relax severity of a log message when decoding descriptors.
by dgoulet＠torproject.org 30 Mar '20

30 Mar '20

commit 42e56f5bacc6ead39bfef790c6f9ca9be0419739 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Mar 11 15:18:47 2020 +0200 hs-v3: Relax severity of a log message when decoding descriptors. Make it LOG_PROTOCOL_WARN and also add the expiration timestamp in there to ease debugging in the future. --- changes/bug31669 | 4 ++++ src/feature/hs/hs_descriptor.c | 14 ++++++++++++-- src/test/test_hs_descriptor.c | 26 ++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/changes/bug31669 b/changes/bug31669 new file mode 100644 index 000000000..8079c98f6 --- /dev/null +++ b/changes/bug31669 @@ -0,0 +1,4 @@ + o Minor bugfixes (onion services v3): + - Relax severity of a log message that can appear naturally when decoding + onion service descriptors as a relay. Also add some diagnostics to debug + any future bugs in that area. Fixes bug 31669; bugfix on 0.3.0.1-alpha. \ No newline at end of file diff --git a/src/feature/hs/hs_descriptor.c b/src/feature/hs/hs_descriptor.c index 65d6c7a58..4d4200bd6 100644 --- a/src/feature/hs/hs_descriptor.c +++ b/src/feature/hs/hs_descriptor.c @@ -56,6 +56,7 @@ #define HS_DESCRIPTOR_PRIVATE #include "core/or/or.h" +#include "app/config/config.h" #include "trunnel/ed25519_cert.h" /* Trunnel interface. */ #include "feature/hs/hs_descriptor.h" #include "core/or/circuitbuild.h" @@ -1287,11 +1288,20 @@ cert_is_valid(tor_cert_t *cert, uint8_t type, const char *log_obj_type) log_warn(LD_REND, "Signing key is NOT included for %s.", log_obj_type); goto err; } + /* The following will not only check if the signature matches but also the * expiration date and overall validity. */ if (tor_cert_checksig(cert, &cert->signing_key, approx_time()) < 0) { - log_warn(LD_REND, "Invalid signature for %s: %s", log_obj_type, - tor_cert_describe_signature_status(cert)); + if (cert->cert_expired) { + char expiration_str[ISO_TIME_LEN+1]; + format_iso_time(expiration_str, cert->valid_until); + log_fn(LOG_PROTOCOL_WARN, LD_REND, "Invalid signature for %s: %s (%s)", + log_obj_type, tor_cert_describe_signature_status(cert), + expiration_str); + } else { + log_warn(LD_REND, "Invalid signature for %s: %s", + log_obj_type, tor_cert_describe_signature_status(cert)); + } goto err; } diff --git a/src/test/test_hs_descriptor.c b/src/test/test_hs_descriptor.c index 43ac5490a..c5077f714 100644 --- a/src/test/test_hs_descriptor.c +++ b/src/test/test_hs_descriptor.c @@ -14,6 +14,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "trunnel/ed25519_cert.h" #include "core/or/or.h" +#include "app/config/config.h" #include "feature/hs/hs_descriptor.h" #include "test/test.h" #include "feature/nodelist/torcert.h" @@ -37,7 +38,6 @@ test_cert_encoding(void *arg) { int ret; char *encoded = NULL; - time_t now = time(NULL); ed25519_keypair_t kp; ed25519_public_key_t signed_key; ed25519_secret_key_t secret_key; @@ -45,6 +45,10 @@ test_cert_encoding(void *arg) (void) arg; + /* Change time to 03-01-2002 23:36 UTC */ + update_approx_time(1010101010); + time_t now = approx_time(); + ret = ed25519_keypair_generate(&kp, 0); tt_int_op(ret, == , 0); ret = ed25519_secret_key_generate(&secret_key, 0); @@ -88,13 +92,31 @@ test_cert_encoding(void *arg) /* The cert did have the signing key? */ ret= ed25519_pubkey_eq(&parsed_cert->signing_key, &kp.pubkey); tt_int_op(ret, OP_EQ, 1); - tor_cert_free(parsed_cert); /* Get to the end part of the certificate. */ pos += b64_cert_len; tt_int_op(strcmpstart(pos, "-----END ED25519 CERT-----"), OP_EQ, 0); pos += strlen("-----END ED25519 CERT-----"); tt_str_op(pos, OP_EQ, ""); + + /* Check that certificate expiry works properly and emits the right log + message */ + const char *msg = "fire"; + /* Move us forward 4 hours so that the the certificate is definitely + expired */ + update_approx_time(approx_time() + 3600*4); + setup_full_capture_of_logs(LOG_PROTOCOL_WARN); + ret = cert_is_valid(parsed_cert, CERT_TYPE_SIGNING_AUTH, msg); + tt_int_op(ret, OP_EQ, 0); + /* Since the current time at the creation of the cert was "03-01-2002 + * 23:36", and the expiration date of the cert was two hours, the Tor code + * will ceiling that and make it 02:00. Make sure that the right log + * message is emitted */ + expect_log_msg_containing("Invalid signature for fire: expired" + " (2002-01-04 02:00:00)"); + teardown_capture_of_logs(); + + tor_cert_free(parsed_cert); } done:

1 0

[tor/master] Merge branch 'maint-0.4.3'
by dgoulet＠torproject.org 30 Mar '20

30 Mar '20

commit ca8e6451f2be09415eb6ebf66f22272b13d02246 Merge: ec8d41e69 42e56f5ba Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Mar 30 13:38:58 2020 -0400 Merge branch 'maint-0.4.3' changes/bug31669 | 4 ++++ src/feature/hs/hs_descriptor.c | 14 ++++++++++++-- src/test/test_hs_descriptor.c | 26 ++++++++++++++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-)

1 0