commit a5062808d24b9687b939c07e898e83fdc5a8f691 Author: Sukhbir Singh <sukhbir@torproject.org> Date: Wed Oct 22 13:05:52 2014 +0530 Ensure SSL/TLS is used by default for Facebook, IRC, and XMPP accounts --- projects/instantbird/facebook.patch | 20 ++++++++++++++++++++ projects/instantbird/irc.patch | 22 ++++++++++++++++++++++ projects/instantbird/xmpp.patch | 20 ++++++++++++++++++++ 3 files changed, 62 insertions(+) diff --git a/projects/instantbird/facebook.patch b/projects/instantbird/facebook.patch new file mode 100644 index 0000000..bb6fe05 --- /dev/null +++ b/projects/instantbird/facebook.patch @@ -0,0 +1,20 @@ +# HG changeset patch +# User Sukhbir Singh <sukhbir@torproject.org> +# Date 1413962210 -19800 +# Wed Oct 22 12:46:50 2014 +0530 +# Node ID ce691e5400583295a0cc0d0d43a3382a2f95940f +# Parent 1172d3f8ed1dd3d7d6f892f4d123b109499e24d3 +Ensure TLS/SSL is used by default for Facebook accounts + +diff --git a/chat/protocols/facebook/facebook.js b/chat/protocols/facebook/facebook.js +--- a/chat/protocols/facebook/facebook.js ++++ b/chat/protocols/facebook/facebook.js +@@ -38,7 +38,7 @@ + let server = "chat.facebook.com"; + if (this.prefs.prefHasUserValue("server")) + server = this.getString("server"); +- this._connection = new XMPPSession(server, 5222, "opportunistic_tls", ++ this._connection = new XMPPSession(server, 5222, "require_tls", + this._jid, this.imAccount.password, + this); + } diff --git a/projects/instantbird/irc.patch b/projects/instantbird/irc.patch new file mode 100644 index 0000000..10d84e2 --- /dev/null +++ b/projects/instantbird/irc.patch @@ -0,0 +1,22 @@ +# HG changeset patch +# User Sukhbir Singh <sukhbir@torproject.org> +# Date 1413961999 -19800 +# Wed Oct 22 12:43:19 2014 +0530 +# Node ID bdb1f40bcd898f205de1f67b6947a9c77bbea651 +# Parent ce8c62cb7b7c24bb68fc5d16eba25b3f43c30786 +Ensure TLS/SSL is used by default for IRC accounts + +diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js +--- a/chat/protocols/irc/irc.js ++++ b/chat/protocols/irc/irc.js +@@ -1808,8 +1808,8 @@ + + options: { + // TODO Default to IRC over SSL. +- "port": {get label() _("options.port"), default: 6667}, +- "ssl": {get label() _("options.ssl"), default: false}, ++ "port": {get label() _("options.port"), default: 6697}, ++ "ssl": {get label() _("options.ssl"), default: true}, + // TODO We should attempt to auto-detect encoding instead. + "encoding": {get label() _("options.encoding"), default: "UTF-8"}, + "quitmsg": {get label() _("options.quitMessage"), diff --git a/projects/instantbird/xmpp.patch b/projects/instantbird/xmpp.patch new file mode 100644 index 0000000..554f602 --- /dev/null +++ b/projects/instantbird/xmpp.patch @@ -0,0 +1,20 @@ +# HG changeset patch +# User Sukhbir Singh <sukhbir@torproject.org> +# Date 1413962112 -19800 +# Wed Oct 22 12:45:12 2014 +0530 +# Node ID 1172d3f8ed1dd3d7d6f892f4d123b109499e24d3 +# Parent bdb1f40bcd898f205de1f67b6947a9c77bbea651 +Ensure TLS/SSL is used by default for XMPP accounts + +diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js +--- a/chat/protocols/xmpp/xmpp.js ++++ b/chat/protocols/xmpp/xmpp.js +@@ -39,7 +39,7 @@ + // "old_ssl" and "none" are also supported, but not exposed in the UI. + // Any unknown value will fallback to the opportunistic_tls behavior. + }, +- default: "opportunistic_tls" ++ default: "require_tls" + }, + server: {get label() _("options.connectServer"), default: ""}, + port: {get label() _("options.connectPort"), default: 5222}