Skip to content

Commit

Permalink
New release: 1.2.12
Browse files Browse the repository at this point in the history
  • Loading branch information
jcbrand committed Jan 15, 2017
1 parent c16f9d4 commit a79c329
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 30 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Strophe.js Change Log

## Version 1.2.12 - 2017-01-15

* Reduce the priority of the SASL-EXTERNAL auth mechanism. OpenFire 4.1.1
advertises support for SASL-EXTERNAL and the vast majority of Strophe.js
installs are not set up to support SASL-EXTERNAl, causing them to fail
logging users in.

## Version 1.2.11 - 2016-12-13
* 189 Strophe never reaches DISCONNECTED status after .connect(..) and
.disconnect(..) calls while offline.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "strophe.js",
"description": "Strophe.js is an XMPP library for JavaScript",
"version": "1.2.11",
"version": "1.2.12",
"license": "MIT",
"main": "strophe.js",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "strophe.js",
"description": "Strophe.js is an XMPP library for JavaScript",
"version": "1.2.11",
"version": "1.2.12",
"homepage": "http://strophe.im/strophejs",
"repository": {
"type": "git",
Expand Down
24 changes: 12 additions & 12 deletions src/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -1505,12 +1505,12 @@ Strophe.TimedHandler.prototype = {
* If nothing is specified, then the following mechanisms (and their
* priorities) are registered:
*
* EXTERNAL - 60
* OAUTHBEARER - 50
* SCRAM-SHA1 - 40
* DIGEST-MD5 - 30
* PLAIN - 20
* ANONYMOUS - 10
* OAUTHBEARER - 60
* SCRAM-SHA1 - 50
* DIGEST-MD5 - 40
* PLAIN - 30
* ANONYMOUS - 20
* EXTERNAL - 10
*
* WebSocket options:
* ------------------
Expand Down Expand Up @@ -3389,7 +3389,7 @@ Strophe.SASLMechanism.prototype = {
* SASL ANONYMOUS authentication.
*/
Strophe.SASLAnonymous = function() {};
Strophe.SASLAnonymous.prototype = new Strophe.SASLMechanism("ANONYMOUS", false, 10);
Strophe.SASLAnonymous.prototype = new Strophe.SASLMechanism("ANONYMOUS", false, 20);

Strophe.SASLAnonymous.prototype.test = function(connection) {
return connection.authcid === null;
Expand All @@ -3400,7 +3400,7 @@ Strophe.SASLAnonymous.prototype.test = function(connection) {
* SASL PLAIN authentication.
*/
Strophe.SASLPlain = function() {};
Strophe.SASLPlain.prototype = new Strophe.SASLMechanism("PLAIN", true, 20);
Strophe.SASLPlain.prototype = new Strophe.SASLMechanism("PLAIN", true, 30);

Strophe.SASLPlain.prototype.test = function(connection) {
return connection.authcid !== null;
Expand All @@ -3420,7 +3420,7 @@ Strophe.SASLPlain.prototype.onChallenge = function(connection) {
* SASL SCRAM SHA 1 authentication.
*/
Strophe.SASLSHA1 = function() {};
Strophe.SASLSHA1.prototype = new Strophe.SASLMechanism("SCRAM-SHA-1", true, 40);
Strophe.SASLSHA1.prototype = new Strophe.SASLMechanism("SCRAM-SHA-1", true, 50);

Strophe.SASLSHA1.prototype.test = function(connection) {
return connection.authcid !== null;
Expand Down Expand Up @@ -3504,7 +3504,7 @@ Strophe.SASLSHA1.prototype.onChallenge = function(connection, challenge, test_cn
* SASL DIGEST MD5 authentication.
*/
Strophe.SASLMD5 = function() {};
Strophe.SASLMD5.prototype = new Strophe.SASLMechanism("DIGEST-MD5", false, 30);
Strophe.SASLMD5.prototype = new Strophe.SASLMechanism("DIGEST-MD5", false, 40);

Strophe.SASLMD5.prototype.test = function(connection) {
return connection.authcid !== null;
Expand Down Expand Up @@ -3587,7 +3587,7 @@ Strophe.SASLMD5.prototype.onChallenge = function(connection, challenge, test_cno
* SASL OAuth Bearer authentication.
*/
Strophe.SASLOAuthBearer = function() {};
Strophe.SASLOAuthBearer.prototype = new Strophe.SASLMechanism("OAUTHBEARER", true, 50);
Strophe.SASLOAuthBearer.prototype = new Strophe.SASLMechanism("OAUTHBEARER", true, 60);

Strophe.SASLOAuthBearer.prototype.test = function(connection) {
return connection.authcid !== null;
Expand Down Expand Up @@ -3615,7 +3615,7 @@ Strophe.SASLOAuthBearer.prototype.onChallenge = function(connection) {
* TLS services.
*/
Strophe.SASLExternal = function() {};
Strophe.SASLExternal.prototype = new Strophe.SASLMechanism("EXTERNAL", true, 60);
Strophe.SASLExternal.prototype = new Strophe.SASLMechanism("EXTERNAL", true, 10);

Strophe.SASLExternal.prototype.onChallenge = function(connection) {
/** According to XEP-178, an authzid SHOULD NOT be presented when the
Expand Down
26 changes: 13 additions & 13 deletions strophe.js
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,7 @@ Strophe = {
* The version of the Strophe library. Unreleased builds will have
* a version of head-HASH where HASH is a partial revision.
*/
VERSION: "1.2.11",
VERSION: "1.2.12",

/** Constants: XMPP Namespace Constants
* Common namespace constants from the XMPP RFCs and XEPs.
Expand Down Expand Up @@ -2254,12 +2254,12 @@ Strophe.TimedHandler.prototype = {
* If nothing is specified, then the following mechanisms (and their
* priorities) are registered:
*
* EXTERNAL - 60
* OAUTHBEARER - 50
* SCRAM-SHA1 - 40
* DIGEST-MD5 - 30
* PLAIN - 20
* ANONYMOUS - 10
* OAUTHBEARER - 60
* SCRAM-SHA1 - 50
* DIGEST-MD5 - 40
* PLAIN - 30
* ANONYMOUS - 20
* EXTERNAL - 10
*
* WebSocket options:
* ------------------
Expand Down Expand Up @@ -4138,7 +4138,7 @@ Strophe.SASLMechanism.prototype = {
* SASL ANONYMOUS authentication.
*/
Strophe.SASLAnonymous = function() {};
Strophe.SASLAnonymous.prototype = new Strophe.SASLMechanism("ANONYMOUS", false, 10);
Strophe.SASLAnonymous.prototype = new Strophe.SASLMechanism("ANONYMOUS", false, 20);

Strophe.SASLAnonymous.prototype.test = function(connection) {
return connection.authcid === null;
Expand All @@ -4149,7 +4149,7 @@ Strophe.SASLAnonymous.prototype.test = function(connection) {
* SASL PLAIN authentication.
*/
Strophe.SASLPlain = function() {};
Strophe.SASLPlain.prototype = new Strophe.SASLMechanism("PLAIN", true, 20);
Strophe.SASLPlain.prototype = new Strophe.SASLMechanism("PLAIN", true, 30);

Strophe.SASLPlain.prototype.test = function(connection) {
return connection.authcid !== null;
Expand All @@ -4169,7 +4169,7 @@ Strophe.SASLPlain.prototype.onChallenge = function(connection) {
* SASL SCRAM SHA 1 authentication.
*/
Strophe.SASLSHA1 = function() {};
Strophe.SASLSHA1.prototype = new Strophe.SASLMechanism("SCRAM-SHA-1", true, 40);
Strophe.SASLSHA1.prototype = new Strophe.SASLMechanism("SCRAM-SHA-1", true, 50);

Strophe.SASLSHA1.prototype.test = function(connection) {
return connection.authcid !== null;
Expand Down Expand Up @@ -4253,7 +4253,7 @@ Strophe.SASLSHA1.prototype.onChallenge = function(connection, challenge, test_cn
* SASL DIGEST MD5 authentication.
*/
Strophe.SASLMD5 = function() {};
Strophe.SASLMD5.prototype = new Strophe.SASLMechanism("DIGEST-MD5", false, 30);
Strophe.SASLMD5.prototype = new Strophe.SASLMechanism("DIGEST-MD5", false, 40);

Strophe.SASLMD5.prototype.test = function(connection) {
return connection.authcid !== null;
Expand Down Expand Up @@ -4336,7 +4336,7 @@ Strophe.SASLMD5.prototype.onChallenge = function(connection, challenge, test_cno
* SASL OAuth Bearer authentication.
*/
Strophe.SASLOAuthBearer = function() {};
Strophe.SASLOAuthBearer.prototype = new Strophe.SASLMechanism("OAUTHBEARER", true, 50);
Strophe.SASLOAuthBearer.prototype = new Strophe.SASLMechanism("OAUTHBEARER", true, 60);

Strophe.SASLOAuthBearer.prototype.test = function(connection) {
return connection.authcid !== null;
Expand Down Expand Up @@ -4364,7 +4364,7 @@ Strophe.SASLOAuthBearer.prototype.onChallenge = function(connection) {
* TLS services.
*/
Strophe.SASLExternal = function() {};
Strophe.SASLExternal.prototype = new Strophe.SASLMechanism("EXTERNAL", true, 60);
Strophe.SASLExternal.prototype = new Strophe.SASLMechanism("EXTERNAL", true, 10);

Strophe.SASLExternal.prototype.onChallenge = function(connection) {
/** According to XEP-178, an authzid SHOULD NOT be presented when the
Expand Down
6 changes: 3 additions & 3 deletions strophe.min.js

Large diffs are not rendered by default.

0 comments on commit a79c329

Please sign in to comment.