From 10da240e7ed556a717adef6aa36e9efd709cd887 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Fri, 16 Sep 2016 12:35:02 +0000 Subject: [PATCH] New release 2.0.0 --- bower.json | 2 +- dist/converse-mobile.js | 849 +++++++++++++---------- dist/converse-no-dependencies.js | 569 ++++++++++------ dist/converse.js | 893 +++++++++++++++---------- dist/locales.js | 36 +- dist/templates.js | 16 +- docs/CHANGES.md | 2 +- docs/source/conf.py | 4 +- docs/source/configuration.rst | 12 +- locale/af/LC_MESSAGES/converse.json | 22 +- locale/af/LC_MESSAGES/converse.po | 235 ++++--- locale/ca/LC_MESSAGES/converse.json | 20 +- locale/ca/LC_MESSAGES/converse.po | 232 ++++--- locale/converse.pot | 218 +++--- locale/de/LC_MESSAGES/converse.json | 22 +- locale/de/LC_MESSAGES/converse.po | 229 ++++--- locale/en/LC_MESSAGES/converse.json | 28 +- locale/en/LC_MESSAGES/converse.po | 219 +++--- locale/es/LC_MESSAGES/converse.json | 22 +- locale/es/LC_MESSAGES/converse.po | 235 ++++--- locale/fr/LC_MESSAGES/converse.json | 22 +- locale/fr/LC_MESSAGES/converse.po | 235 ++++--- locale/he/LC_MESSAGES/converse.json | 24 +- locale/he/LC_MESSAGES/converse.po | 240 ++++--- locale/hu/LC_MESSAGES/converse.json | 24 +- locale/hu/LC_MESSAGES/converse.po | 240 ++++--- locale/id/LC_MESSAGES/converse.json | 18 +- locale/id/LC_MESSAGES/converse.po | 237 ++++--- locale/it/LC_MESSAGES/converse.json | 20 +- locale/it/LC_MESSAGES/converse.po | 242 ++++--- locale/ja/LC_MESSAGES/converse.json | 18 +- locale/ja/LC_MESSAGES/converse.po | 237 ++++--- locale/nb/LC_MESSAGES/converse.json | 22 +- locale/nb/LC_MESSAGES/converse.po | 229 ++++--- locale/nl/LC_MESSAGES/converse.json | 18 +- locale/nl/LC_MESSAGES/converse.po | 237 ++++--- locale/pl/LC_MESSAGES/converse.json | 24 +- locale/pl/LC_MESSAGES/converse.po | 237 ++++--- locale/pt_BR/LC_MESSAGES/converse.json | 18 +- locale/pt_BR/LC_MESSAGES/converse.po | 237 ++++--- locale/ru/LC_MESSAGES/converse.json | 20 +- locale/ru/LC_MESSAGES/converse.po | 242 ++++--- locale/uk/LC_MESSAGES/converse.json | 22 +- locale/uk/LC_MESSAGES/converse.po | 229 ++++--- locale/zh/LC_MESSAGES/converse.json | 18 +- locale/zh/LC_MESSAGES/converse.po | 237 ++++--- package.json | 2 +- 47 files changed, 4116 insertions(+), 3098 deletions(-) diff --git a/bower.json b/bower.json index a073a448b..14fbb0d3f 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "converse.js", "description": "Web-based XMPP/Jabber chat client written in javascript", - "version": "1.0.6", + "version": "2.0.0", "license": "MPL-2.0", "devDependencies": { "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x", diff --git a/dist/converse-mobile.js b/dist/converse-mobile.js index fcc35e8b2..f0f36cd36 100644 --- a/dist/converse-mobile.js +++ b/dist/converse-mobile.js @@ -425,7 +425,7 @@ var requirejs, require, define; }; }()); -define("components/almond/almond.js", function(){}); +define("almond", function(){}); /*! * jQuery JavaScript Library v1.12.3 @@ -19000,7 +19000,6 @@ Strophe = { XHTML: "http://www.w3.org/1999/xhtml" }, - /** Constants: XHTML_IM Namespace * contains allowed tags, tag attributes, and css properties. * Used in the createHtml function to filter incoming html into the allowed XHTML-IM subset. @@ -19008,64 +19007,63 @@ Strophe = { * allowed tags and their attributes. */ XHTML: { - tags: ['a','blockquote','br','cite','em','img','li','ol','p','span','strong','ul','body'], - attributes: { - 'a': ['href'], - 'blockquote': ['style'], - 'br': [], - 'cite': ['style'], - 'em': [], - 'img': ['src', 'alt', 'style', 'height', 'width'], - 'li': ['style'], - 'ol': ['style'], - 'p': ['style'], - 'span': ['style'], - 'strong': [], - 'ul': ['style'], - 'body': [] - }, - css: ['background-color','color','font-family','font-size','font-style','font-weight','margin-left','margin-right','text-align','text-decoration'], - /** Function: XHTML.validTag - * - * Utility method to determine whether a tag is allowed - * in the XHTML_IM namespace. - * - * XHTML tag names are case sensitive and must be lower case. - */ - validTag: function(tag) { - for (var i = 0; i < Strophe.XHTML.tags.length; i++) { - if (tag == Strophe.XHTML.tags[i]) { - return true; - } - } - return false; - }, - /** Function: XHTML.validAttribute - * - * Utility method to determine whether an attribute is allowed - * as recommended per XEP-0071 - * - * XHTML attribute names are case sensitive and must be lower case. - */ - validAttribute: function(tag, attribute) { - if(typeof Strophe.XHTML.attributes[tag] !== 'undefined' && Strophe.XHTML.attributes[tag].length > 0) { - for(var i = 0; i < Strophe.XHTML.attributes[tag].length; i++) { - if(attribute == Strophe.XHTML.attributes[tag][i]) { - return true; - } - } - } - return false; - }, - validCSS: function(style) - { - for(var i = 0; i < Strophe.XHTML.css.length; i++) { - if(style == Strophe.XHTML.css[i]) { - return true; - } - } - return false; + tags: ['a','blockquote','br','cite','em','img','li','ol','p','span','strong','ul','body'], + attributes: { + 'a': ['href'], + 'blockquote': ['style'], + 'br': [], + 'cite': ['style'], + 'em': [], + 'img': ['src', 'alt', 'style', 'height', 'width'], + 'li': ['style'], + 'ol': ['style'], + 'p': ['style'], + 'span': ['style'], + 'strong': [], + 'ul': ['style'], + 'body': [] + }, + css: ['background-color','color','font-family','font-size','font-style','font-weight','margin-left','margin-right','text-align','text-decoration'], + /** Function: XHTML.validTag + * + * Utility method to determine whether a tag is allowed + * in the XHTML_IM namespace. + * + * XHTML tag names are case sensitive and must be lower case. + */ + validTag: function(tag) { + for (var i = 0; i < Strophe.XHTML.tags.length; i++) { + if (tag == Strophe.XHTML.tags[i]) { + return true; } + } + return false; + }, + /** Function: XHTML.validAttribute + * + * Utility method to determine whether an attribute is allowed + * as recommended per XEP-0071 + * + * XHTML attribute names are case sensitive and must be lower case. + */ + validAttribute: function(tag, attribute) { + if (typeof Strophe.XHTML.attributes[tag] !== 'undefined' && Strophe.XHTML.attributes[tag].length > 0) { + for (var i = 0; i < Strophe.XHTML.attributes[tag].length; i++) { + if (attribute == Strophe.XHTML.attributes[tag][i]) { + return true; + } + } + } + return false; + }, + validCSS: function(style) { + for (var i = 0; i < Strophe.XHTML.css.length; i++) { + if (style == Strophe.XHTML.css[i]) { + return true; + } + } + return false; + } }, /** Constants: Connection Status Constants @@ -19772,14 +19770,10 @@ Strophe = { result = "<" + nodeName; for (i = 0; i < elem.attributes.length; i++) { - if(elem.attributes[i].nodeName != "_realname") { - result += " " + elem.attributes[i].nodeName + - "='" + elem.attributes[i].value - .replace(/&/g, "&") - .replace(/\'/g, "'") - .replace(/>/g, ">") - .replace(/ 0) { @@ -20379,6 +20373,10 @@ Strophe.TimedHandler.prototype = { * Access-Control-Allow-Origin header can't be set to the wildcard "*", but * instead must be restricted to actual domains. * + * The "contentType" option can be set to change the default Content-Type + * of "text/xml; charset=utf-8", which can be useful to reduce the amount of + * CORS preflight requests that are sent to the server. + * * Parameters: * (String) service - The BOSH or WebSocket service URL. * (Object) options - A hash of configuration options @@ -20583,6 +20581,14 @@ Strophe.Connection.prototype = { * (String) route - The optional route value. * (String) authcid - The optional alternative authentication identity * (username) if intending to impersonate another user. + * When using the SASL-EXTERNAL authentication mechanism, for example + * with client certificates, then the authcid value is used to + * determine whether an authorization JID (authzid) should be sent to + * the server. The authzid should not be sent to the server if the + * authzid and authcid are the same. So to prevent it from being sent + * (for example when the JID is already contained in the client + * certificate), set authcid to that same JID. See XEP-178 for more + * details. */ connect: function (jid, pass, callback, wait, hold, route, authcid) { this.jid = jid; @@ -20590,18 +20596,22 @@ Strophe.Connection.prototype = { * Authorization identity. */ this.authzid = Strophe.getBareJidFromJid(this.jid); + /** Variable: authcid * Authentication identity (User name). */ this.authcid = authcid || Strophe.getNodeFromJid(this.jid); + /** Variable: pass * Authentication identity (User password). */ this.pass = pass; + /** Variable: servtype * Digest MD5 compatibility. */ this.servtype = "xmpp"; + this.connect_callback = callback; this.disconnecting = false; this.connected = false; @@ -20952,7 +20962,6 @@ Strophe.Connection.prototype = { message: "Cannot queue non-DOMElement." }; } - this._data.push(element); }, @@ -20961,9 +20970,7 @@ Strophe.Connection.prototype = { */ _sendRestart: function () { this._data.push("restart"); - this._proto._sendRestart(); - // XXX: setTimeout should be called only with function expressions (23974bc1) this._idleTimeout = setTimeout(function() { this._onIdle(); @@ -21357,7 +21364,6 @@ Strophe.Connection.prototype = { this._authentication.sasl_plain = false; this._authentication.sasl_digest_md5 = false; this._authentication.sasl_anonymous = false; - this._authentication.legacy_auth = false; // Check for the stream:features tag @@ -21422,7 +21428,7 @@ Strophe.Connection.prototype = { // run each mechanism var mechanism_found = false; for (i = 0; i < matched.length; ++i) { - if (!matched[i].test(this)) continue; + if (!matched[i].prototype.test(this)) continue; this._sasl_success_handler = this._addSysHandler( this._sasl_success_cb.bind(this), null, @@ -21446,9 +21452,7 @@ Strophe.Connection.prototype = { var response = this._sasl_mechanism.onChallenge(this, null); request_auth_exchange.t(Base64.encode(response)); } - this.send(request_auth_exchange.tree()); - mechanism_found = true; break; } @@ -21466,23 +21470,20 @@ Strophe.Connection.prototype = { this._changeConnectStatus(Strophe.Status.AUTHENTICATING, null); this._addSysHandler(this._auth1_cb.bind(this), null, null, null, "_auth_1"); - this.send($iq({ - type: "get", - to: this.domain, - id: "_auth_1" + type: "get", + to: this.domain, + id: "_auth_1" }).c("query", { - xmlns: Strophe.NS.AUTH + xmlns: Strophe.NS.AUTH }).c("username", {}).t(Strophe.getNodeFromJid(this.jid)).tree()); } } - }, _sasl_challenge_cb: function(elem) { var challenge = Base64.decode(Strophe.getText(elem)); var response = this._sasl_mechanism.onChallenge(this, challenge); - var stanza = $build('response', { xmlns: Strophe.NS.SASL }); @@ -21526,9 +21527,7 @@ Strophe.Connection.prototype = { this._addSysHandler(this._auth2_cb.bind(this), null, null, null, "_auth_2"); - this.send(iq.tree()); - return false; }, /* jshint unused:true */ @@ -21568,8 +21567,9 @@ Strophe.Connection.prototype = { Strophe.info("SASL authentication succeeded."); - if(this._sasl_mechanism) + if (this._sasl_mechanism) { this._sasl_mechanism.onSuccess(); + } // remove old handlers this.deleteHandler(this._sasl_failure_handler); @@ -21612,9 +21612,7 @@ Strophe.Connection.prototype = { _sasl_auth1_cb: function (elem) { // save stream:features for future usage this.features = elem; - var i, child; - for (i = 0; i < elem.childNodes.length; i++) { child = elem.childNodes[i]; if (child.nodeName == 'bind') { @@ -21819,17 +21817,12 @@ Strophe.Connection.prototype = { * Returns: * false to remove the handler. */ - _onDisconnectTimeout: function () - { + _onDisconnectTimeout: function () { Strophe.info("_onDisconnectTimeout was called"); - this._changeConnectStatus(Strophe.Status.CONNTIMEOUT, null); - this._proto._onDisconnectTimeout(); - // actually disconnect this._doDisconnect(); - return false; }, @@ -21839,8 +21832,7 @@ Strophe.Connection.prototype = { * This handler is called every 100ms to fire timed handlers that * are ready and keep poll requests going. */ - _onIdle: function () - { + _onIdle: function () { var i, thand, since, newList; // add timed handlers scheduled for addition @@ -21901,9 +21893,12 @@ Strophe.Connection.prototype = { * * By default, all mechanisms are enabled and the priorities are * + * EXTERNAL - 60 + * OAUTHBEARER - 50 * SCRAM-SHA1 - 40 * DIGEST-MD5 - 30 - * Plain - 20 + * PLAIN - 20 + * ANONYMOUS - 10 */ /** @@ -22017,46 +22012,47 @@ Strophe.SASLMechanism.prototype = { /** Constants: SASL mechanisms * Available authentication mechanisms * - * Strophe.SASLAnonymous - SASL Anonymous authentication. - * Strophe.SASLPlain - SASL Plain authentication. - * Strophe.SASLMD5 - SASL Digest-MD5 authentication + * Strophe.SASLAnonymous - SASL ANONYMOUS authentication. + * Strophe.SASLPlain - SASL PLAIN authentication. + * Strophe.SASLMD5 - SASL DIGEST-MD5 authentication * Strophe.SASLSHA1 - SASL SCRAM-SHA1 authentication * Strophe.SASLOAuthBearer - SASL OAuth Bearer authentication + * Strophe.SASLExternal - SASL EXTERNAL authentication */ // Building SASL callbacks /** PrivateConstructor: SASLAnonymous - * SASL Anonymous authentication. + * SASL ANONYMOUS authentication. */ Strophe.SASLAnonymous = function() {}; Strophe.SASLAnonymous.prototype = new Strophe.SASLMechanism("ANONYMOUS", false, 10); -Strophe.SASLAnonymous.test = function(connection) { - return connection.authcid === null; +Strophe.SASLAnonymous.prototype.test = function(connection) { + return connection.authcid === null; }; Strophe.Connection.prototype.mechanisms[Strophe.SASLAnonymous.prototype.name] = Strophe.SASLAnonymous; /** PrivateConstructor: SASLPlain - * SASL Plain authentication. + * SASL PLAIN authentication. */ Strophe.SASLPlain = function() {}; Strophe.SASLPlain.prototype = new Strophe.SASLMechanism("PLAIN", true, 20); -Strophe.SASLPlain.test = function(connection) { - return connection.authcid !== null; +Strophe.SASLPlain.prototype.test = function(connection) { + return connection.authcid !== null; }; Strophe.SASLPlain.prototype.onChallenge = function(connection) { - var auth_str = connection.authzid; - auth_str = auth_str + "\u0000"; - auth_str = auth_str + connection.authcid; - auth_str = auth_str + "\u0000"; - auth_str = auth_str + connection.pass; - return utils.utf16to8(auth_str); + var auth_str = connection.authzid; + auth_str = auth_str + "\u0000"; + auth_str = auth_str + connection.authcid; + auth_str = auth_str + "\u0000"; + auth_str = auth_str + connection.pass; + return utils.utf16to8(auth_str); }; Strophe.Connection.prototype.mechanisms[Strophe.SASLPlain.prototype.name] = Strophe.SASLPlain; @@ -22068,7 +22064,7 @@ Strophe.SASLSHA1 = function() {}; Strophe.SASLSHA1.prototype = new Strophe.SASLMechanism("SCRAM-SHA-1", true, 40); -Strophe.SASLSHA1.test = function(connection) { +Strophe.SASLSHA1.prototype.test = function(connection) { return connection.authcid !== null; }; @@ -22155,8 +22151,8 @@ Strophe.SASLMD5 = function() {}; Strophe.SASLMD5.prototype = new Strophe.SASLMechanism("DIGEST-MD5", false, 30); -Strophe.SASLMD5.test = function(connection) { - return connection.authcid !== null; +Strophe.SASLMD5.prototype.test = function(connection) { + return connection.authcid !== null; }; /** PrivateFunction: _quote @@ -22168,11 +22164,10 @@ Strophe.SASLMD5.test = function(connection) { * Returns: * quoted string */ -Strophe.SASLMD5.prototype._quote = function (str) - { +Strophe.SASLMD5.prototype._quote = function (str) { return '"' + str.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '"'; //" end string workaround for emacs - }; +}; Strophe.SASLMD5.prototype.onChallenge = function(connection, challenge, test_cnonce) { @@ -22229,7 +22224,7 @@ Strophe.SASLMD5.prototype.onChallenge = function(connection, challenge, test_cno this.onChallenge = function () { return ""; - }.bind(this); + }; return responseText; }; @@ -22241,27 +22236,51 @@ Strophe.Connection.prototype.mechanisms[Strophe.SASLMD5.prototype.name] = Stroph */ Strophe.SASLOAuthBearer = function() {}; -Strophe.SASLOAuthBearer.prototype = new Strophe.SASLMechanism("OAUTHBEARER", true, 80); +Strophe.SASLOAuthBearer.prototype = new Strophe.SASLMechanism("OAUTHBEARER", true, 50); -Strophe.SASLOAuthBearer.test = function(connection) { - return connection.authcid !== null; +Strophe.SASLOAuthBearer.prototype.test = function(connection) { + return connection.authcid !== null; }; Strophe.SASLOAuthBearer.prototype.onChallenge = function(connection) { - var auth_str = 'n,a='; - auth_str = auth_str + connection.authzid; - auth_str = auth_str + ','; - auth_str = auth_str + "\u0001"; - auth_str = auth_str + 'auth=Bearer '; - auth_str = auth_str + connection.pass; - auth_str = auth_str + "\u0001"; - auth_str = auth_str + "\u0001"; - - return utils.utf16to8(auth_str); + var auth_str = 'n,a='; + auth_str = auth_str + connection.authzid; + auth_str = auth_str + ','; + auth_str = auth_str + "\u0001"; + auth_str = auth_str + 'auth=Bearer '; + auth_str = auth_str + connection.pass; + auth_str = auth_str + "\u0001"; + auth_str = auth_str + "\u0001"; + return utils.utf16to8(auth_str); }; Strophe.Connection.prototype.mechanisms[Strophe.SASLOAuthBearer.prototype.name] = Strophe.SASLOAuthBearer; + +/** PrivateConstructor: SASLExternal + * SASL EXTERNAL authentication. + * + * The EXTERNAL mechanism allows a client to request the server to use + * credentials established by means external to the mechanism to + * authenticate the client. The external means may be, for instance, + * TLS services. + */ +Strophe.SASLExternal = function() {}; +Strophe.SASLExternal.prototype = new Strophe.SASLMechanism("EXTERNAL", true, 60); + +Strophe.SASLExternal.prototype.onChallenge = function(connection) { + /** According to XEP-178, an authzid SHOULD NOT be presented when the + * authcid contained or implied in the client certificate is the JID (i.e. + * authzid) with which the user wants to log in as. + * + * To NOT send the authzid, the user should therefore set the authcid equal + * to the JID when instantiating a new Strophe.Connection object. + */ + return connection.authcid === connection.authzid ? '' : connection.authzid; +}; + +Strophe.Connection.prototype.mechanisms[Strophe.SASLExternal.prototype.name] = Strophe.SASLExternal; + return { Strophe: Strophe, $build: $build, @@ -22994,8 +23013,9 @@ Strophe.Bosh.prototype = { "." + req.sends + " posting"); try { + var contentType = this._conn.options.contentType || "text/xml; charset=utf-8"; req.xhr.open("POST", this._conn.service, this._conn.options.sync ? false : true); - req.xhr.setRequestHeader("Content-Type", "text/xml; charset=utf-8"); + req.xhr.setRequestHeader("Content-Type", contentType); if (this._conn.options.withCredentials) { req.xhr.withCredentials = true; } @@ -24916,16 +24936,20 @@ __p+='\n