[tor-commits] [tor-messenger-build/master] Fix 233e7b23 after dbf84f58

commit 022f322487e917311d8a1ef99fc508c93459f84b Author: Arlo Breault arlolra@gmail.com Date: Tue Nov 8 10:48:21 2016 -0800

Fix 233e7b23 after dbf84f58

* Setting "external-default" to true is undesirable. We're relying on imContentSink.jsm to filter all protocols, save for https?/mailto.

* In im/components/contentHandler.js, exposed https? call out to the external handler. Seemingly "external.http?" would be enough, however setting those takes precedence over expose and then accounts don't connect.

* In trac 16494, we'd want to port TorButton's external-app-blocker.js Also, see https://bugzilla.mozilla.org/show_bug.cgi?id=440892 --- .../0001-Set-Tor-Messenger-preferences.patch | 8 ++++---- .../0002-Trac-16489-Prevent-account-autologin.patch | 2 +- ...7896-Support-Special-Characters-input-prompt-o.patch | 2 +- ...7494-Better-error-reporting-for-failed-outgoin.patch | 2 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +- ...18193-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +- ...46431-XMPP-createConversation-should-handle-in.patch | 2 +- ...98574-Set-_userVCard-own-property-when-downloa.patch | 2 +- .../instantbird/0009-XMPP-in-band-registration.patch | 2 +- projects/instantbird/0010-Remove-search-from-UI.patch | 2 +- .../instantbird/0011-Add-Tor-Messenger-branding.patch | 2 +- projects/instantbird/0012-Account-picture.patch | 2 +- .../instantbird/0013-Modify-protocol-defaults.patch | 2 +- projects/instantbird/0014-Modify-IRC-defaults.patch | 2 +- projects/instantbird/0015-Modify-themes.patch | 2 +- projects/instantbird/0016-Modify-XMPP-defaults.patch | 2 +- projects/instantbird/0017-Remove-logging-UI.patch | 2 +- projects/instantbird/0018-Cert-override.patch | 2 +- .../instantbird/0019-Display-all-traffic-over-Tor.patch | 2 +- projects/instantbird/0020-Trac-17480-Content-sink.patch | 17 +++++++++++++---- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...13137-msg-is-not-defined-error-in-irc.js-chang.patch | 2 +- ...4368-Contact-list-entries-should-adapt-their-h.patch | 2 +- ...-Bug-1187281-Only-show-close-button-on-Windows.patch | 2 +- 24 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 55861c9..ed4f073 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,4 +1,4 @@ -From b229ec3ed7af7f4e78b1d75a26c1ed76046ad3fe Mon Sep 17 00:00:00 2001 +From 6d141536baa7461f99f8067a2a93fd10740569c1 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:48:41 -0700 Subject: [PATCH 01/24] Set Tor Messenger preferences @@ -8,7 +8,7 @@ Subject: [PATCH 01/24] Set Tor Messenger preferences 1 file changed, 378 insertions(+), 21 deletions(-)

diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index b7a3970..a4e0654 100644 +index b7a3970..09cfee3 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -1,3 +1,46 @@ @@ -352,8 +352,8 @@ index b7a3970..a4e0654 100644 +pref("network.proxy.type", 1); +pref("network.security.ports.banned", "9050,9051,9150,9151"); +pref("network.dns.disablePrefetch", true); -+pref("network.protocol-handler.external-default", false); -+pref("network.protocol-handler.external.mailto", false); ++//pref("network.protocol-handler.external-default", false); // TM ++//pref("network.protocol-handler.external.mailto", false); // TM +pref("network.protocol-handler.external.news", false); +pref("network.protocol-handler.external.nntp", false); +pref("network.protocol-handler.external.snews", false); diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index 0164642..c5c01b4 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,4 +1,4 @@ -From facec2ac69b9068c63278572ffdfa432f259f373 Mon Sep 17 00:00:00 2001 +From 7c9ac99bbcb06d68fb908333eb8cc5143637154a Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/24] Trac 16489: Prevent account autologin diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index 78751e2..204be81 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,4 +1,4 @@ -From e8cbcbe0aab97d75fec3abe65b575f3e814e7837 Mon Sep 17 00:00:00 2001 +From 2613a52919e2418eb1203ced487e220d9b41095d Mon Sep 17 00:00:00 2001 From: aleth aleth@instantbird.org Date: Sat, 30 Jan 2016 20:56:38 +0100 Subject: [PATCH 03/24] Trac 17896: Support "Special Characters" input prompt diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 9ead7ba..653080f 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,4 +1,4 @@ -From 922480805c668eecb6edbbda2b2a4dfb61107144 Mon Sep 17 00:00:00 2001 +From 92e7071ae41a3c93b39e0f1199aa11c027d86b05 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 2 Feb 2016 16:04:51 -0800 Subject: [PATCH 04/24] Trac 17494: Better error reporting for failed outgoing diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index a76c4c0..2755d7d 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,4 +1,4 @@ -From 6990be2c6ac257be6f8aa284814489be2c6f25ea Mon Sep 17 00:00:00 2001 +From 18c08ca0d6a94cb77bf2a9b35d45c4be3dff86f3 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Tue, 15 Mar 2016 17:40:42 -0700 Subject: [PATCH 05/24] Trac 13312: OTR over Twitter DMs diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index ed73418..3b52744 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,4 +1,4 @@ -From ef854ddec3ec3f62d612484d7099e461fe18d128 Mon Sep 17 00:00:00 2001 +From 6dc11e3fa7ce0719021b7c0934c5e183f206e461 Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya nhnt11@gmail.com Date: Sun, 9 Oct 2016 21:53:04 -0700 Subject: [PATCH 06/24] Bug 1218193 - Fix tab strip background colour on OS X. diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index 965c3c8..9dc8e12 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,4 +1,4 @@ -From a60538df8166c6eb8e267ac92598706c25ff35f8 Mon Sep 17 00:00:00 2001 +From de331fcdf0cc8a9aa02842cce5a906f55dc96000 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 9 Oct 2016 21:57:07 -0700 Subject: [PATCH 07/24] Bug 1246431 - XMPP createConversation should handle diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch index d33a7e5..4b70b8e 100644 --- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch +++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch @@ -1,4 +1,4 @@ -From 2ed57a22907efdee880b30d956391d52417b01a6 Mon Sep 17 00:00:00 2001 +From 64add4a690525d378c41a87ccaa127a9a92ed0a3 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 28 Aug 2016 08:57:41 -0700 Subject: [PATCH 08/24] Bug 1298574 - Set _userVCard own property when diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index be06a9a..127a925 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From d28b2c39b8f9249490dc6499d831e6e6adbe838a Mon Sep 17 00:00:00 2001 +From 01347aee5ea469a8d491baec2f6d8ad93e33aa92 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:42:25 -0700 Subject: [PATCH 09/24] XMPP in-band registration diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index be853f8..3825fa1 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 33ec527a5ba77bbe3af57666c9a25b54d2d97512 Mon Sep 17 00:00:00 2001 +From 5c32bcb15c37b9b56313abda82e11920f5b2623a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 10/24] Remove search from UI diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index 3897cb6..33e1502 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 41c60f97c6049e4e3bc130fa963616e9ddc77af6 Mon Sep 17 00:00:00 2001 +From da207230ff44df7db7e0591d1e87208c60a3efd9 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 18:56:27 -0700 Subject: [PATCH 11/24] Add Tor Messenger branding diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index 96ab4fd..e97c9bf 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,4 +1,4 @@ -From 65de52be6fbf68084231270ec14c84f225ed0fed Mon Sep 17 00:00:00 2001 +From 6201f00e2487bc187183690778ecc5ba5064ce86 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 12/24] Account picture diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index aa9d4fe..fea4828 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 8dd9a15845160e182b8ca44e6f4d07fdd59ffed0 Mon Sep 17 00:00:00 2001 +From 274c4787f0458da7427a93e69f6ace6bb08b11ed Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:25:34 -0700 Subject: [PATCH 13/24] Modify protocol defaults diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index 1962753..27459e1 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From ac449194473c8d254672c653b73f66350e665cc8 Mon Sep 17 00:00:00 2001 +From a2553fd55f027979f643d2d0a70b6675087e11fb Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 14/24] Modify IRC defaults diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index bf52e2a..6008fc5 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,4 +1,4 @@ -From 38fbe7232753738d91ce12c4df53fe83a3192e16 Mon Sep 17 00:00:00 2001 +From 00be98b4b335bdf0903ea496e1a3bd8170ce0bc9 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 15/24] Modify themes diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index 609a00d..b35b90a 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,4 +1,4 @@ -From 64746206241b088e2a609662fcbe0edc3baad88b Mon Sep 17 00:00:00 2001 +From efceb9ec5be40e3e3881dfb2bd6d4b9e5d9343b3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:38:49 -0700 Subject: [PATCH 16/24] Modify XMPP defaults diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index e651833..26befca 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 47bb9db3798b59d066399ec289295229a1aa4168 Mon Sep 17 00:00:00 2001 +From 5f4e7fe4ac8dce025442aebff7234fe53bf9422c Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 17/24] Remove logging UI diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index 2868e33..708b2c3 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,4 +1,4 @@ -From 9ded93b407e23a54bd335d273d31496bc426ffd1 Mon Sep 17 00:00:00 2001 +From 4a181acfe5b127e8b7122f77f37ebc56f00918cc Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 18/24] Cert override diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index 6bc0776..471a267 100644 --- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From 119c059b638fcb772c4e9aa952d9899d58d93264 Mon Sep 17 00:00:00 2001 +From f6d53ed6b3e1ca51d1cc78be5cdbb9937e02ccc5 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh sukhbir@torproject.org Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 19/24] Display all traffic over Tor diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 7c7d911..9f824e9 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,17 +1,26 @@ -From 7512783d8cbcd15c9b0c2bfd07fbf4c2ff628f6e Mon Sep 17 00:00:00 2001 +From a9951d83efad660b1e900a49a64abaf15547db80 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 20/24] Trac 17480: Content sink

--- - chat/modules/imContentSink.jsm | 30 +++++------------------------- + chat/modules/imContentSink.jsm | 32 ++++++-------------------------- im/content/preferences/content.xul | 2 +- - 2 files changed, 6 insertions(+), 26 deletions(-) + 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm -index ee067af..534f1ef 100644 +index ee067af..9f42607 100644 --- a/chat/modules/imContentSink.jsm +++ b/chat/modules/imContentSink.jsm +@@ -42,7 +42,7 @@ this.EXPORTED_SYMBOLS = [ + * See the 3 examples of rulesets below. + */ + +-var kAllowedURLs = aValue => /^(https?|ftp|mailto):/.test(aValue); ++var kAllowedURLs = aValue => /^(https?|mailto):/.test(aValue); + var kAllowedMozClasses = + aClassName => aClassName == "moz-txt-underscore" || + aClassName == "moz-txt-tag" || @@ -59,10 +59,6 @@ var kStrictMode = { attrs: { },

diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index 5fd96c5..7455ebe 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From d6b9d9b02c72f979a8a01eef2bd6c358dfc5394b Mon Sep 17 00:00:00 2001 +From e491d72574569b18ff08e8e9eface244235a94fb Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 21/24] SASL ECDSA-NIST256P-CHALLENGE diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index df7305a..4faa099 100644 --- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,4 +1,4 @@ -From 6c0d0db66b8375dd63a1f7bfe1661c8956f6d6cb Mon Sep 17 00:00:00 2001 +From 9aae674e02a0a0be09ee6732c9701a6d1c94b880 Mon Sep 17 00:00:00 2001 From: aleth aleth@instantbird.org Date: Wed, 26 Oct 2016 20:16:58 +0200 Subject: [PATCH 22/24] Bug 1313137 - "msg is not defined" error in diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch index 4131428..e64f5d2 100644 --- a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch +++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -1,4 +1,4 @@ -From b55560a8e94434e8320e428145f9d93ca494ce04 Mon Sep 17 00:00:00 2001 +From a8110cf4903739733c9e51da3ec521fe5c2ecb30 Mon Sep 17 00:00:00 2001 From: aleth aleth@instantbird.org Date: Thu, 12 May 2016 15:10:43 +0200 Subject: [PATCH 23/24] Bug 954368 - Contact list entries should adapt their diff --git a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch index db8d41b..97701b5 100644 --- a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch +++ b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch @@ -1,4 +1,4 @@ -From aae841a7013929d5ba53e379de0d8b9b947d3789 Mon Sep 17 00:00:00 2001 +From 48f4f902f6d737e7dbe9970b17893fe02b0bc65f Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sat, 5 Nov 2016 14:55:20 -0700 Subject: [PATCH 24/24] Bug 1187281 - Only show "close" button on Windows