Bug 1122567 - Change JS-XMPP default to require encryption. r=clokep
authoraleth <aleth@instantbird.org>
Mon, 19 Jan 2015 20:39:31 +0100
changeset 17379 14d3088e8af240787bf77dc7142ff1dda6a84bf8
parent 17378 adcfb9a1a25277f9163f0253cfb93dee2bfd3941
child 17380 83d228d1abd54ef88b72c48a5c33b2c0e0706aa5
push id10716
push useraleth@instantbird.org
push dateMon, 19 Jan 2015 19:42:09 +0000
treeherdercomm-central@f28ff368b740 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersclokep
bugs1122567
Bug 1122567 - Change JS-XMPP default to require encryption. r=clokep
chat/protocols/facebook/facebook.js
chat/protocols/xmpp/xmpp.js
--- a/chat/protocols/facebook/facebook.js
+++ b/chat/protocols/facebook/facebook.js
@@ -33,17 +33,17 @@ FacebookAccount.prototype = {
         this.reportDisconnected();
         return;
       }
     }
 
     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);
   }
 };
 
 function FacebookProtocol() {
 }
 FacebookProtocol.prototype = {
--- a/chat/protocols/xmpp/xmpp.js
+++ b/chat/protocols/xmpp/xmpp.js
@@ -34,17 +34,17 @@ XMPPProtocol.prototype = {
       get label() _("options.connectionSecurity"),
       listValues: {
         get require_tls() _("options.connectionSecurity.requireEncryption"),
         get opportunistic_tls() _("options.connectionSecurity.opportunisticTLS"),
         get allow_unencrypted_plain_auth() _("options.connectionSecurity.allowUnencryptedAuth"),
         // "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}
   },
   get chatHasTopic() true,
 
   classID: Components.ID("{dde786d1-6f59-43d0-9bc8-b505a757fb30}")
 };