tor-commits August 2017

tor-commits@lists.torproject.org

17 participants
1132 discussions

[tor-messenger-build/master] Update patch 0001 (all-instantbird.js)
by sukhbir＠torproject.org 29 Aug '17

29 Aug '17

commit 7dc624cfe9d6e8c7f58d481232b9be7e2a66b7ff Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Aug 28 22:13:42 2017 -0400 Update patch 0001 (all-instantbird.js) Set security.cert_pinning.enforcement_level to 2 just once. --- .../0001-Set-Tor-Messenger-preferences.patch | 21 ++++++++++++++++----- ...ac-21634-Autologin-default-should-be-false.patch | 2 +- .../0003-XMPP-in-band-registration.patch | 2 +- .../instantbird/0004-Remove-search-from-UI.patch | 2 +- .../0005-Add-Tor-Messenger-branding.patch | 2 +- ...ove-option-for-configuring-account-picture.patch | 2 +- .../0007-Modify-top-protocol-defaults.patch | 2 +- projects/instantbird/0008-Modify-IRC-defaults.patch | 2 +- .../0009-Do-not-set-default-XMPP-server.patch | 2 +- projects/instantbird/0010-Modify-themes.patch | 2 +- projects/instantbird/0011-Remove-logging-UI.patch | 2 +- projects/instantbird/0012-Cert-override.patch | 2 +- .../0013-Display-all-traffic-over-Tor.patch | 2 +- .../instantbird/0014-Trac-17480-Content-sink.patch | 2 +- .../0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...1-Use-built-in-functions-instead-of-an-svg.patch | 2 +- ...0-Add-a-pref-to-disable-JavaScript-in-brow.patch | 2 +- ...7517-Use-different-color-for-Add-Exception.patch | 2 +- ...-21736-Hide-account-timestamp-from-message.patch | 4 ++-- ...owed-duplicated-files-for-Windows-and-Linu.patch | 2 +- ...ug-13855-Use-known-onions-for-XMPP-servers.patch | 2 +- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 2 +- 22 files changed, 38 insertions(+), 27 deletions(-) diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 454b0e6..09ed103 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,14 +1,14 @@ -From 945f92e09e833c6e6a86d2abdea5eac0da6f21a2 Mon Sep 17 00:00:00 2001 +From 730e73eb45eb1bd60f48b887e08fea837eb2fb40 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 14:30:41 -0400 Subject: [PATCH 01/22] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 451 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 429 insertions(+), 22 deletions(-) + im/app/profile/all-instantbird.js | 455 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 431 insertions(+), 24 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 127c86a662..454ca7ea1b 100644 +index 127c86a662..fd95a1e6b1 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -1,3 +1,53 @@ @@ -124,6 +124,17 @@ index 127c86a662..454ca7ea1b 100644 // disable logging for the search service update system by default pref("browser.search.update.log", false); +@@ -220,8 +267,8 @@ pref("services.kinto.update_enabled", false); + // Block insecure active content on https pages + pref("security.mixed_content.block_active_content", true); + +-// 1 = allow MITM for certificate pinning checks. +-pref("security.cert_pinning.enforcement_level", 1); ++// 2 = Enforce strict cert pinning. ++pref("security.cert_pinning.enforcement_level", 2); + + /* Extension manager */ + pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul"); @@ -235,10 +282,10 @@ pref("extensions.ignoreMTimeChanges", false); pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -529,7 +540,7 @@ index 127c86a662..454ca7ea1b 100644 +pref("security.tls.unrestricted_rc4_fallback", false); + +// Enforce certificate pinning, see: https://bugs.torproject.org/16206 -+pref("security.cert_pinning.enforcement_level", 2); ++// pref("security.cert_pinning.enforcement_level", 2); // TM + +// Don't allow MitM via Microsoft Family Safety, see bug 21686 +pref("security.family_safety.mode", 0); diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index fdb5a5a..8a31703 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,4 +1,4 @@ -From daa4c63a9235f95096e878360e3e84f0d1da8eb6 Mon Sep 17 00:00:00 2001 +From f30bf9e5ec7b7cc90e2e1a2bf37ec5688d00297a Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/22] Trac 21634: Autologin default should be false diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index 3e2aa9d..a1ac6fd 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From a71e9f9b63396b38184c2ee9554a0c752eed898e Mon Sep 17 00:00:00 2001 +From 9c7ed538de969fdaef7de441d275d4c2cd294d9a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:09:40 -0400 Subject: [PATCH 03/22] XMPP in-band registration diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index ada0dc6..a63aed3 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 93d9f82d1f4c6bb6af794bbc78510440da96dc2e Mon Sep 17 00:00:00 2001 +From b6f227a7743eff289177a7c855eb60c87d492f47 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 04/22] Remove search from UI diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index dfc3bc0..7dff68d 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 2501959f0047cc79909fe5ea2d9cf36bb49b0e84 Mon Sep 17 00:00:00 2001 +From 752e23122e3d407fe1bb316e5f1ca71e53415d69 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:46:51 -0400 Subject: [PATCH 05/22] Add Tor Messenger branding diff --git a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch index 139eb03..161a25a 100644 --- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch +++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch @@ -1,4 +1,4 @@ -From 29aa4176a752fb024272145e1407c4c8294667a7 Mon Sep 17 00:00:00 2001 +From 90c949783c917b45c02ef7b6767ee22a4a8e92fe Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 06/22] Remove option for configuring account picture diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index 36a545e..db878ff 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 7e5fbd59826780777c7b92379d78862d8bd05612 Mon Sep 17 00:00:00 2001 +From e0736b7a8ca7cea1720015c47552b6b7d7175085 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 16:16:09 -0400 Subject: [PATCH 07/22] Modify top protocol defaults diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index 1dc5e0c..4ccae28 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 6024e2204e047b331726aa6e7d55f53d3f5b1f7a Mon Sep 17 00:00:00 2001 +From 14ebf2df4c9c5e7a0d2c3a9268e10b393fe63d3b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 08/22] Modify IRC defaults diff --git a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch index 605c89d..4af3d80 100644 --- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch +++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch @@ -1,4 +1,4 @@ -From e95333af34cbd0b25deb34eb30ad91a249f1273d Mon Sep 17 00:00:00 2001 +From 9ea7c5e3a1bc12ced843b1d4e19b67f333b47f10 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri, 28 Jul 2017 12:11:57 -0400 Subject: [PATCH 09/22] Do not set default XMPP server diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index 9158663..3998f61 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From 386c3799c372ceb41ff845e942d03d54cc8c05b9 Mon Sep 17 00:00:00 2001 +From 85ab3e684647cb41335fcc712c94a26248669a3d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 10/22] Modify themes diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 965a989..12ad58e 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From ae240a3b037a79565b22e2a4f2112769369485de Mon Sep 17 00:00:00 2001 +From 6427bba530252605b5895dca13514397b36bb086 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 11/22] Remove logging UI diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index e681f36..c306165 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From db82a34a94c888c4f5946a1c5741e64953145c3b Mon Sep 17 00:00:00 2001 +From e39504d2376db51c2cc5b77101b94a9fe13cd8ea Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 12/22] Cert override diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index 79fb463..b532820 100644 --- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From e0797717c02828c4c3cb6ba909e2dd7b60191a53 Mon Sep 17 00:00:00 2001 +From 3dc1f46d93c261253f12d108c6e06b715d0a9ba1 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 13/22] Display all traffic over Tor diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index f69e907..8f457f0 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 41d1a9ba1370706db0e3ac0be00e696234e557a7 Mon Sep 17 00:00:00 2001 +From 9ce5029c19bd6d1ddb1cd0d7f91b9fc3451cb7d8 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 14/22] Trac 17480: Content sink diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 39aab97..7b7f0e6 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From 6bdfde03b90d893e66697fab2edacf65189212fe Mon Sep 17 00:00:00 2001 +From 8e54edd20a485ac7e015d6371383e20afd5401e9 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE diff --git a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index 688d2ab..17acc1d 100644 --- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From a0d55979dcd4049dc03fc512be8dc7880af6cbfe Mon Sep 17 00:00:00 2001 +From ac74be92685ee7544465667b0acb55d1aedb814c Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 17:14:19 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg diff --git a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index c1554fa..2993bff 100644 --- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From f2c58bf5598e72f827dc785586a1130a859c99a7 Mon Sep 17 00:00:00 2001 +From ee7295bd39f49a23166feae02f2a1b68d52352c5 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 16:35:33 -0400 Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in diff --git a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch index a9e330d..91457c2 100644 --- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From e3338fcbf8b93f4503332b1b6a5b19b8260e044f Mon Sep 17 00:00:00 2001 +From 8514adfb848b12498b5e819b60211cd6d2a53dd0 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Wed, 26 Jul 2017 16:38:19 -0400 Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception diff --git a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch index cb76f05..9d661c8 100644 --- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch +++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch @@ -1,4 +1,4 @@ -From 630a3e4368eff760c8a8445f3743a15796facd19 Mon Sep 17 00:00:00 2001 +From 6234ea255a9e81a93287eab492733ffd8c03424f Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Sun, 2 Apr 2017 13:07:09 -0400 Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message @@ -44,7 +44,7 @@ index a723d742bf..95d917f0d7 100644 } diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 454ca7ea1b..e23c93a4b3 100644 +index fd95a1e6b1..fbc540bc5e 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -47,6 +47,11 @@ pref("extensions.systemAddon.update.url", ""); diff --git a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch index 510d3f1..4fbe1da 100644 --- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch +++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch @@ -1,4 +1,4 @@ -From fdaaef5f4d89795c9b8e6ae9f3abe036708572ff Mon Sep 17 00:00:00 2001 +From c73ff7051711ba1c44b8d3efc158930ee57b2b73 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu, 27 Jul 2017 15:16:54 -0400 Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index 9fe7a4f..e3abbd2 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,4 +1,4 @@ -From 13d28415441e3c6b481d9eed98658a6ee16784bf Mon Sep 17 00:00:00 2001 +From a98e6bc72aa36c55fc6eccd872ca943e61d752b3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 15 Aug 2017 16:40:33 -0400 Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 2a71000..51d95ed 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From f0e0efda610e24a5e191ac5e6fd583a5b6c99724 Mon Sep 17 00:00:00 2001 +From bf433088d6f7c9af269c0d42a623f164062f09ae Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts

1 0

[tor/master] prop224: Add test that exposes the #23343 bug.
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit d4f1b566e14941245f101f443a073ca11aa64425 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Aug 28 16:30:39 2017 +0300 prop224: Add test that exposes the #23343 bug. --- src/test/test_hs_common.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index b1e47adf2..b9215ea18 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -703,13 +703,14 @@ test_hid_serv_request_tracker(void *arg) { (void) arg; time_t retval; - routerstatus_t *hsdir = NULL, *hsdir2 = NULL; + routerstatus_t *hsdir = NULL, *hsdir2 = NULL, *hsdir3 = NULL; time_t now = approx_time(); const char *req_key_str_first = "vd4zb6zesaubtrjvdqcr2w7x7lhw2up4Xnw4526ThUNbL5o1go+EdUuEqlKxHkNbnK41pRzizzs"; const char *req_key_str_second = "g53o7iavcd62oihswhr24u6czmqws5kpXnw4526ThUNbL5o1go+EdUuEqlKxHkNbnK41pRzizzs"; + const char *req_key_str_small = "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"; /*************************** basic test *******************************/ @@ -741,7 +742,7 @@ test_hid_serv_request_tracker(void *arg) /* Let's add another request for the same HS but on a different HSDir. */ hsdir2 = tor_malloc_zero(sizeof(routerstatus_t)); - memset(hsdir->identity_digest, 2, DIGEST_LEN); + memset(hsdir2->identity_digest, 2, DIGEST_LEN); retval = hs_lookup_last_hid_serv_request(hsdir2, req_key_str_first, now+3, 1); tt_int_op(retval, OP_EQ, now+3); @@ -755,16 +756,25 @@ test_hid_serv_request_tracker(void *arg) now+2, 0); tt_int_op(retval, OP_EQ, 0); + /* Now let's add a smaller req key str */ + hsdir3 = tor_malloc_zero(sizeof(routerstatus_t)); + memset(hsdir3->identity_digest, 3, DIGEST_LEN); + retval = hs_lookup_last_hid_serv_request(hsdir3, req_key_str_small, + now+4, 1); + tt_int_op(retval, OP_EQ, now+4); + tt_int_op(strmap_size(request_tracker),OP_EQ, 2); + /*************************** deleting entries **************************/ /* Add another request with very short key */ retval = hs_lookup_last_hid_serv_request(hsdir, "l", now, 1); + tt_int_op(strmap_size(request_tracker),OP_EQ, 3); /* Try deleting entries with a dummy key. Check that our previous requests * are still there */ tor_capture_bugs_(1); hs_purge_hid_serv_from_last_hid_serv_requests("a"); - tt_int_op(strmap_size(request_tracker),OP_EQ, 2); + tt_int_op(strmap_size(request_tracker),OP_EQ, 3); tor_end_capture_bugs_(); /* Try another dummy key. Check that requests are still there */ @@ -773,16 +783,16 @@ test_hid_serv_request_tracker(void *arg) memset(dummy, 'Z', 2000); dummy[1999] = '\x00'; hs_purge_hid_serv_from_last_hid_serv_requests(dummy); - tt_int_op(strmap_size(request_tracker),OP_EQ, 2); + tt_int_op(strmap_size(request_tracker),OP_EQ, 3); } /* Another dummy key! */ hs_purge_hid_serv_from_last_hid_serv_requests(req_key_str_second); - tt_int_op(strmap_size(request_tracker),OP_EQ, 2); + tt_int_op(strmap_size(request_tracker),OP_EQ, 3); /* Now actually delete a request! */ hs_purge_hid_serv_from_last_hid_serv_requests(req_key_str_first); - tt_int_op(strmap_size(request_tracker),OP_EQ, 1); + tt_int_op(strmap_size(request_tracker),OP_EQ, 2); /* Purge it all! */ hs_purge_last_hid_serv_requests(); @@ -792,6 +802,7 @@ test_hid_serv_request_tracker(void *arg) done: tor_free(hsdir); tor_free(hsdir2); + tor_free(hsdir3); } static void

1 0

[tor/master] prop224: Fix length check when purging hidserv requests.
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit 93a0a4a4221b5c60b3c4fe22d38c81914176dedb Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Aug 28 16:30:51 2017 +0300 prop224: Fix length check when purging hidserv requests. That check was wrong: a) We should be making sure that the size of `key` is big enough before proceeding, since that's the buffer that we would overread with the tor_memeq() below. The old check used to check that `req_key_str` is big enough which is not right, since we won't read deep into that buffer. The new check makes sure that `key` has enough size to survive the tor_memeq(), and if not it moves to the next element of the strmap. b) That check shouldn't be a BUG since that strmap contains variable-sized elements and we should not be bugging out if we happen to compare a small sized element (v2) to a bigger one (v3). --- src/or/hs_common.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 03dd07f6c..a4b8ba3e8 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -1453,14 +1453,12 @@ hs_purge_hid_serv_from_last_hid_serv_requests(const char *req_key_str) /* XXX: The use of REND_DESC_ID_V2_LEN_BASE32 is very wrong in terms of * semantic, see #23305. */ - /* Length check on the strings we are about to compare. The "key" contains - * both the base32 HSDir identity digest and the requested key at the + /* This strmap contains variable-sized elements so this is a basic length + * check on the strings we are about to compare. The "key" contains both + * the base32 HSDir identity digest and the requested key at the * directory. The "req_key_str" can either be a base32 descriptor ID or a - * base64 blinded key which should be the second part of "key". BUG on - * this check because both strings are internally controlled so this - * should never happen. */ - if (BUG((strlen(req_key_str) + REND_DESC_ID_V2_LEN_BASE32) < - strlen(key))) { + * base64 blinded key which should be the second part of "key". */ + if (strlen(key) < REND_DESC_ID_V2_LEN_BASE32 + strlen(req_key_str)) { iter = strmap_iter_next(last_hid_serv_requests, iter); continue; }

1 0

[tor/master] fixup! prop224: Fix length check when purging hidserv requests.
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit e94f68e301caf2d01659e7ba24fb1ba678ad3233 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Aug 28 19:55:26 2017 +0300 fixup! prop224: Fix length check when purging hidserv requests. Improve doc based on david's comments. --- src/or/hs_common.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index a4b8ba3e8..d866ab6a8 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -1357,7 +1357,7 @@ hs_hsdir_requery_period(const or_options_t *options) * * where 'hsdir_identity' is the identity digest of the HSDir node, and * 'hs_identity' is the descriptor ID of the HS in the v2 case, or the ed25519 - * identity public key of the HS in the v3 case. */ + * blinded public key of the HS in the v3 case. */ static strmap_t *last_hid_serv_requests_ = NULL; /** Returns last_hid_serv_requests_, initializing it to a new strmap if @@ -1454,10 +1454,11 @@ hs_purge_hid_serv_from_last_hid_serv_requests(const char *req_key_str) * semantic, see #23305. */ /* This strmap contains variable-sized elements so this is a basic length - * check on the strings we are about to compare. The "key" contains both - * the base32 HSDir identity digest and the requested key at the - * directory. The "req_key_str" can either be a base32 descriptor ID or a - * base64 blinded key which should be the second part of "key". */ + * check on the strings we are about to compare. The key is variable sized + * since it's composed as follows: + * key = base32(hsdir_identity) + base32(req_key_str) + * where 'req_key_str' is the descriptor ID of the HS in the v2 case, or + * the ed25519 blinded public key of the HS in the v3 case. */ if (strlen(key) < REND_DESC_ID_V2_LEN_BASE32 + strlen(req_key_str)) { iter = strmap_iter_next(last_hid_serv_requests, iter); continue;

1 0

[tor/master] Merge remote-tracking branch 'asn/bug23343'
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit 3cf8da02f7e74334e17b84a77be1a0bacc77def1 Merge: 5ef656e7d e94f68e30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 28 15:49:11 2017 -0400 Merge remote-tracking branch 'asn/bug23343' src/or/hs_common.c | 17 ++++++++--------- src/test/test_hs_common.c | 23 +++++++++++++++++------ 2 files changed, 25 insertions(+), 15 deletions(-)

1 0

[tor-browser-bundle/maint-7.0] Bug 23258: Fix broken HTTPS-Everywhere on higher security levels
by gk＠torproject.org 28 Aug '17

28 Aug '17

commit 35ebe6d5e7f1e33f5cb1b67f0a4022814fd72a15 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 24 08:39:13 2017 +0000 Bug 23258: Fix broken HTTPS-Everywhere on higher security levels Shipping HTTPS-Everywhere based on the new WebExtensions model broke its functionality on higher security levels as our JavaScript blocking does not whitelist `moz-extension:` which is needed. It turns out that vanilla Firefox 52 ESR is affected as well but differently: Backorting https://bugzilla.mozilla.org/show_bug.cgi?id=1329731 does not help us as NoScript is regulating JavaScript related things. This fixes #21270 as well. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index d6e5546..ded3d5b 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index d6e5546..ded3d5b 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index d6e5546..ded3d5b 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[tor-browser-bundle/master] Bug 23258: Fix broken HTTPS-Everywhere on higher security levels
by gk＠torproject.org 28 Aug '17

28 Aug '17

commit 32dc8cef283f739bdc045918adbd448c9d78a746 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 24 08:39:13 2017 +0000 Bug 23258: Fix broken HTTPS-Everywhere on higher security levels Shipping HTTPS-Everywhere based on the new WebExtensions model broke its functionality on higher security levels as our JavaScript blocking does not whitelist `moz-extension:` which is needed. It turns out that vanilla Firefox 52 ESR is affected as well but differently: Backorting https://bugzilla.mozilla.org/show_bug.cgi?id=1329731 does not help us as NoScript is regulating JavaScript related things. This fixes #21270 as well. --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- .../Data/Browser/profile.default/preferences/extension-overrides.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index d6e5546..ded3d5b 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index d6e5546..ded3d5b 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index d6e5546..ded3d5b 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -8,9 +8,9 @@ pref("extensions.https_everywhere.toolbar_hint_shown", true); # NoScript Preferences: pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("capability.policy.maonoscript.sites", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.default", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); +pref("noscript.mandatory", "about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); pref("noscript.ABE.enabled", false); pref("noscript.ABE.notify", false); pref("noscript.ABE.wanIpAsLocal", false);

1 0

[stem/master] Integ test missing --dryrun argument
by atagar＠torproject.org 28 Aug '17

28 Aug '17

commit eed9a6f2dd917c785440162132f6fb0264530771 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 28 12:37:32 2017 -0700 Integ test missing --dryrun argument Oops, earlier change to add the --dryrun argument to our setup.py broke one of our integ tests. --- test/integ/installation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index e52cc637..04d8d1fd 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -114,7 +114,7 @@ class TestInstallation(unittest.TestCase): try: try: - stem.util.system.call('%s setup.py sdist' % PYTHON_EXE, timeout = 60, cwd = test.STEM_BASE) + stem.util.system.call('%s setup.py sdist --dryrun' % PYTHON_EXE, timeout = 60, cwd = test.STEM_BASE) except Exception as exc: raise AssertionError("Unable to run 'python setup.py sdist': %s" % exc)

1 0

[stem/master] Versioning for manual's sqlite schema
by atagar＠torproject.org 28 Aug '17

28 Aug '17

commit 20d95610e29e7fd60a38512d96a5094d0200e2ae Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 28 12:35:38 2017 -0700 Versioning for manual's sqlite schema We'll adjust the schema from time to time so we need to be able to detect if a loaded database is compatable with us. --- stem/cached_tor_manual.sqlite | Bin 217088 -> 217088 bytes stem/manual.py | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/stem/cached_tor_manual.sqlite b/stem/cached_tor_manual.sqlite index b35a3c5e..81d0b230 100644 Binary files a/stem/cached_tor_manual.sqlite and b/stem/cached_tor_manual.sqlite differ diff --git a/stem/manual.py b/stem/manual.py index 9537c740..e520f2f8 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -84,6 +84,7 @@ Category = stem.util.enum.Enum('GENERAL', 'CLIENT', 'RELAY', 'DIRECTORY', 'AUTHO GITWEB_MANUAL_URL = 'https://gitweb.torproject.org/tor.git/plain/doc/tor.1.txt' CACHE_PATH = os.path.join(os.path.dirname(__file__), 'cached_tor_manual.sqlite') DATABASE = None # cache database connections +SCHEMA_VERSION = 1 # version of the schema used by our sqlite cache CATEGORY_SECTIONS = OrderedDict(( ('GENERAL OPTIONS', Category.GENERAL), @@ -357,7 +358,8 @@ class Manual(object): :returns: :class:`~stem.manual.Manual` with our bundled manual information - :raises: **IOError** if a **path** was provided and we were unable to read it + :raises: **IOError** if a **path** was provided and we were unable to read + it or the schema is out of date """ # TODO: drop _from_config_cache() with stem 2.x @@ -376,7 +378,13 @@ class Manual(object): raise IOError("%s doesn't exist" % path) with sqlite3.connect(path) as conn: - name, synopsis, description, man_commit, stem_commit = conn.execute('SELECT name, synopsis, description, man_commit, stem_commit FROM metadata').fetchone() + try: + name, synopsis, description, man_commit, stem_commit, schema = conn.execute('SELECT name, synopsis, description, man_commit, stem_commit, schema FROM metadata').fetchone() + except sqlite3.OperationalError as exc: + raise IOError('Failed to read database metadata from %s: %s' % (path, exc)) + + if schema != SCHEMA_VERSION: + raise IOError("Stem's current manual schema version is %s, but %s was version %s" % (SCHEMA_VERSION, path, schema)) commandline = dict(conn.execute('SELECT name, description FROM commandline').fetchall()) signals = dict(conn.execute('SELECT name, description FROM signals').fetchall()) @@ -528,13 +536,13 @@ class Manual(object): def _save_as_sqlite(self, path): with sqlite3.connect(path + '.new') as conn: - conn.execute('CREATE TABLE metadata(name TEXT, synopsis TEXT, description TEXT, man_commit TEXT, stem_commit TEXT)') + conn.execute('CREATE TABLE metadata(name TEXT, synopsis TEXT, description TEXT, man_commit TEXT, stem_commit TEXT, schema NUMBER)') conn.execute('CREATE TABLE commandline(name TEXT PRIMARY KEY, description TEXT)') conn.execute('CREATE TABLE signals(name TEXT PRIMARY KEY, description TEXT)') conn.execute('CREATE TABLE files(name TEXT PRIMARY KEY, description TEXT)') conn.execute('CREATE TABLE torrc(key TEXT PRIMARY KEY, name TEXT, category TEXT, usage TEXT, summary TEXT, description TEXT, position NUMBER)') - conn.execute('INSERT INTO metadata(name, synopsis, description, man_commit, stem_commit) VALUES (?,?,?,?,?)', (self.name, self.synopsis, self.description, self.man_commit, self.stem_commit)) + conn.execute('INSERT INTO metadata(name, synopsis, description, man_commit, stem_commit, schema) VALUES (?,?,?,?,?,?)', (self.name, self.synopsis, self.description, self.man_commit, self.stem_commit, SCHEMA_VERSION)) for k, v in self.commandline_options.items(): conn.execute('INSERT INTO commandline(name, description) VALUES (?,?)', (k, v))

1 0

[tor/master] Temporarily disable compilation of the v3 hs fuzzing code
by nickm＠torproject.org 28 Aug '17

28 Aug '17

commit 5ef656e7d1b1e1e74c46bd02ce8faaa1d8d09403 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 28 14:12:56 2017 -0400 Temporarily disable compilation of the v3 hs fuzzing code Turns out, it wasn't up-to-date with the latest v3 hs API :( --- scripts/codegen/fuzzing_include_am.py | 1 - src/test/fuzz/include.am | 28 +++------------------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index f2936ef4e..045d0f892 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -7,7 +7,6 @@ FUZZERS = """ diff-apply extrainfo hsdescv2 - hsdescv3 http iptsv2 microdesc diff --git a/src/test/fuzz/include.am b/src/test/fuzz/include.am index 6836fb071..8a043cd76 100644 --- a/src/test/fuzz/include.am +++ b/src/test/fuzz/include.am @@ -17,8 +17,9 @@ FUZZING_LIBS = \ src/trunnel/libor-trunnel-testing.a \ $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ - @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ \ + @TOR_LIBEVENT_LIBS@ \ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ \ @TOR_SYSTEMD_LIBS@ \ @TOR_LZMA_LIBS@ \ @TOR_ZSTD_LIBS@ @@ -94,14 +95,6 @@ src_test_fuzz_fuzz_hsdescv2_CFLAGS = $(FUZZING_CFLAGS) src_test_fuzz_fuzz_hsdescv2_LDFLAGS = $(FUZZING_LDFLAG) src_test_fuzz_fuzz_hsdescv2_LDADD = $(FUZZING_LIBS) -src_test_fuzz_fuzz_hsdescv3_SOURCES = \ - src/test/fuzz/fuzzing_common.c \ - src/test/fuzz/fuzz_hsdescv3.c -src_test_fuzz_fuzz_hsdescv3_CPPFLAGS = $(FUZZING_CPPFLAGS) -src_test_fuzz_fuzz_hsdescv3_CFLAGS = $(FUZZING_CFLAGS) -src_test_fuzz_fuzz_hsdescv3_LDFLAGS = $(FUZZING_LDFLAG) -src_test_fuzz_fuzz_hsdescv3_LDADD = $(FUZZING_LIBS) - src_test_fuzz_fuzz_http_SOURCES = \ src/test/fuzz/fuzzing_common.c \ src/test/fuzz/fuzz_http.c @@ -141,7 +134,6 @@ FUZZERS = \ src/test/fuzz/fuzz-diff-apply \ src/test/fuzz/fuzz-extrainfo \ src/test/fuzz/fuzz-hsdescv2 \ - src/test/fuzz/fuzz-hsdescv3 \ src/test/fuzz/fuzz-http \ src/test/fuzz/fuzz-iptsv2 \ src/test/fuzz/fuzz-microdesc \ @@ -192,13 +184,6 @@ src_test_fuzz_lf_fuzz_hsdescv2_CFLAGS = $(LIBFUZZER_CFLAGS) src_test_fuzz_lf_fuzz_hsdescv2_LDFLAGS = $(LIBFUZZER_LDFLAG) src_test_fuzz_lf_fuzz_hsdescv2_LDADD = $(LIBFUZZER_LIBS) -src_test_fuzz_lf_fuzz_hsdescv3_SOURCES = \ - $(src_test_fuzz_fuzz_hsdescv3_SOURCES) -src_test_fuzz_lf_fuzz_hsdescv3_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) -src_test_fuzz_lf_fuzz_hsdescv3_CFLAGS = $(LIBFUZZER_CFLAGS) -src_test_fuzz_lf_fuzz_hsdescv3_LDFLAGS = $(LIBFUZZER_LDFLAG) -src_test_fuzz_lf_fuzz_hsdescv3_LDADD = $(LIBFUZZER_LIBS) - src_test_fuzz_lf_fuzz_http_SOURCES = \ $(src_test_fuzz_fuzz_http_SOURCES) src_test_fuzz_lf_fuzz_http_CPPFLAGS = $(LIBFUZZER_CPPFLAGS) @@ -234,7 +219,6 @@ LIBFUZZER_FUZZERS = \ src/test/fuzz/lf-fuzz-diff-apply \ src/test/fuzz/lf-fuzz-extrainfo \ src/test/fuzz/lf-fuzz-hsdescv2 \ - src/test/fuzz/lf-fuzz-hsdescv3 \ src/test/fuzz/lf-fuzz-http \ src/test/fuzz/lf-fuzz-iptsv2 \ src/test/fuzz/lf-fuzz-microdesc \ @@ -277,11 +261,6 @@ src_test_fuzz_liboss_fuzz_hsdescv2_a_SOURCES = \ src_test_fuzz_liboss_fuzz_hsdescv2_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) src_test_fuzz_liboss_fuzz_hsdescv2_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) -src_test_fuzz_liboss_fuzz_hsdescv3_a_SOURCES = \ - $(src_test_fuzz_fuzz_hsdescv3_SOURCES) -src_test_fuzz_liboss_fuzz_hsdescv3_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) -src_test_fuzz_liboss_fuzz_hsdescv3_a_CFLAGS = $(LIBOSS_FUZZ_CFLAGS) - src_test_fuzz_liboss_fuzz_http_a_SOURCES = \ $(src_test_fuzz_fuzz_http_SOURCES) src_test_fuzz_liboss_fuzz_http_a_CPPFLAGS = $(LIBOSS_FUZZ_CPPFLAGS) @@ -309,7 +288,6 @@ OSS_FUZZ_FUZZERS = \ src/test/fuzz/liboss-fuzz-diff-apply.a \ src/test/fuzz/liboss-fuzz-extrainfo.a \ src/test/fuzz/liboss-fuzz-hsdescv2.a \ - src/test/fuzz/liboss-fuzz-hsdescv3.a \ src/test/fuzz/liboss-fuzz-http.a \ src/test/fuzz/liboss-fuzz-iptsv2.a \ src/test/fuzz/liboss-fuzz-microdesc.a \

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
114
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2017