Skip to content

Commit a79c329

Browse files
jcbrandjcbrand
committed
New release: 1.2.12
1 parent c16f9d4 commit a79c329

File tree

6 files changed

+37
-30
lines changed

6 files changed

+37
-30
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Strophe.js Change Log
22

3+
## Version 1.2.12 - 2017-01-15
4+
5+
* Reduce the priority of the SASL-EXTERNAL auth mechanism. OpenFire 4.1.1
6+
advertises support for SASL-EXTERNAL and the vast majority of Strophe.js
7+
installs are not set up to support SASL-EXTERNAl, causing them to fail
8+
logging users in.
9+
310
## Version 1.2.11 - 2016-12-13
411
* 189 Strophe never reaches DISCONNECTED status after .connect(..) and
512
.disconnect(..) calls while offline.

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "strophe.js",
33
"description": "Strophe.js is an XMPP library for JavaScript",
4-
"version": "1.2.11",
4+
"version": "1.2.12",
55
"license": "MIT",
66
"main": "strophe.js",
77
"authors": [

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "strophe.js",
33
"description": "Strophe.js is an XMPP library for JavaScript",
4-
"version": "1.2.11",
4+
"version": "1.2.12",
55
"homepage": "http://strophe.im/strophejs",
66
"repository": {
77
"type": "git",

‎src/core.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,12 +1505,12 @@ Strophe.TimedHandler.prototype = {
15051505
* If nothing is specified, then the following mechanisms (and their
15061506
* priorities) are registered:
15071507
*
1508-
* EXTERNAL - 60
1509-
* OAUTHBEARER - 50
1510-
* SCRAM-SHA1 - 40
1511-
* DIGEST-MD5 - 30
1512-
* PLAIN - 20
1513-
* ANONYMOUS - 10
1508+
* OAUTHBEARER - 60
1509+
* SCRAM-SHA1 - 50
1510+
* DIGEST-MD5 - 40
1511+
* PLAIN - 30
1512+
* ANONYMOUS - 20
1513+
* EXTERNAL - 10
15141514
*
15151515
* WebSocket options:
15161516
* ------------------
@@ -3389,7 +3389,7 @@ Strophe.SASLMechanism.prototype = {
33893389
* SASL ANONYMOUS authentication.
33903390
*/
33913391
Strophe.SASLAnonymous = function() {};
3392-
Strophe.SASLAnonymous.prototype = new Strophe.SASLMechanism("ANONYMOUS", false, 10);
3392+
Strophe.SASLAnonymous.prototype = new Strophe.SASLMechanism("ANONYMOUS", false, 20);
33933393

33943394
Strophe.SASLAnonymous.prototype.test = function(connection) {
33953395
return connection.authcid === null;
@@ -3400,7 +3400,7 @@ Strophe.SASLAnonymous.prototype.test = function(connection) {
34003400
* SASL PLAIN authentication.
34013401
*/
34023402
Strophe.SASLPlain = function() {};
3403-
Strophe.SASLPlain.prototype = new Strophe.SASLMechanism("PLAIN", true, 20);
3403+
Strophe.SASLPlain.prototype = new Strophe.SASLMechanism("PLAIN", true, 30);
34043404

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

34253425
Strophe.SASLSHA1.prototype.test = function(connection) {
34263426
return connection.authcid !== null;
@@ -3504,7 +3504,7 @@ Strophe.SASLSHA1.prototype.onChallenge = function(connection, challenge, test_cn
35043504
* SASL DIGEST MD5 authentication.
35053505
*/
35063506
Strophe.SASLMD5 = function() {};
3507-
Strophe.SASLMD5.prototype = new Strophe.SASLMechanism("DIGEST-MD5", false, 30);
3507+
Strophe.SASLMD5.prototype = new Strophe.SASLMechanism("DIGEST-MD5", false, 40);
35083508

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

35923592
Strophe.SASLOAuthBearer.prototype.test = function(connection) {
35933593
return connection.authcid !== null;
@@ -3615,7 +3615,7 @@ Strophe.SASLOAuthBearer.prototype.onChallenge = function(connection) {
36153615
* TLS services.
36163616
*/
36173617
Strophe.SASLExternal = function() {};
3618-
Strophe.SASLExternal.prototype = new Strophe.SASLMechanism("EXTERNAL", true, 60);
3618+
Strophe.SASLExternal.prototype = new Strophe.SASLMechanism("EXTERNAL", true, 10);
36193619

36203620
Strophe.SASLExternal.prototype.onChallenge = function(connection) {
36213621
/** According to XEP-178, an authzid SHOULD NOT be presented when the

‎strophe.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ Strophe = {
846846
* The version of the Strophe library. Unreleased builds will have
847847
* a version of head-HASH where HASH is a partial revision.
848848
*/
849-
VERSION: "1.2.11",
849+
VERSION: "1.2.12",
850850

851851
/** Constants: XMPP Namespace Constants
852852
* Common namespace constants from the XMPP RFCs and XEPs.
@@ -2254,12 +2254,12 @@ Strophe.TimedHandler.prototype = {
22542254
* If nothing is specified, then the following mechanisms (and their
22552255
* priorities) are registered:
22562256
*
2257-
* EXTERNAL - 60
2258-
* OAUTHBEARER - 50
2259-
* SCRAM-SHA1 - 40
2260-
* DIGEST-MD5 - 30
2261-
* PLAIN - 20
2262-
* ANONYMOUS - 10
2257+
* OAUTHBEARER - 60
2258+
* SCRAM-SHA1 - 50
2259+
* DIGEST-MD5 - 40
2260+
* PLAIN - 30
2261+
* ANONYMOUS - 20
2262+
* EXTERNAL - 10
22632263
*
22642264
* WebSocket options:
22652265
* ------------------
@@ -4138,7 +4138,7 @@ Strophe.SASLMechanism.prototype = {
41384138
* SASL ANONYMOUS authentication.
41394139
*/
41404140
Strophe.SASLAnonymous = function() {};
4141-
Strophe.SASLAnonymous.prototype = new Strophe.SASLMechanism("ANONYMOUS", false, 10);
4141+
Strophe.SASLAnonymous.prototype = new Strophe.SASLMechanism("ANONYMOUS", false, 20);
41424142

41434143
Strophe.SASLAnonymous.prototype.test = function(connection) {
41444144
return connection.authcid === null;
@@ -4149,7 +4149,7 @@ Strophe.SASLAnonymous.prototype.test = function(connection) {
41494149
* SASL PLAIN authentication.
41504150
*/
41514151
Strophe.SASLPlain = function() {};
4152-
Strophe.SASLPlain.prototype = new Strophe.SASLMechanism("PLAIN", true, 20);
4152+
Strophe.SASLPlain.prototype = new Strophe.SASLMechanism("PLAIN", true, 30);
41534153

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

41744174
Strophe.SASLSHA1.prototype.test = function(connection) {
41754175
return connection.authcid !== null;
@@ -4253,7 +4253,7 @@ Strophe.SASLSHA1.prototype.onChallenge = function(connection, challenge, test_cn
42534253
* SASL DIGEST MD5 authentication.
42544254
*/
42554255
Strophe.SASLMD5 = function() {};
4256-
Strophe.SASLMD5.prototype = new Strophe.SASLMechanism("DIGEST-MD5", false, 30);
4256+
Strophe.SASLMD5.prototype = new Strophe.SASLMechanism("DIGEST-MD5", false, 40);
42574257

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

43414341
Strophe.SASLOAuthBearer.prototype.test = function(connection) {
43424342
return connection.authcid !== null;
@@ -4364,7 +4364,7 @@ Strophe.SASLOAuthBearer.prototype.onChallenge = function(connection) {
43644364
* TLS services.
43654365
*/
43664366
Strophe.SASLExternal = function() {};
4367-
Strophe.SASLExternal.prototype = new Strophe.SASLMechanism("EXTERNAL", true, 60);
4367+
Strophe.SASLExternal.prototype = new Strophe.SASLMechanism("EXTERNAL", true, 10);
43684368

43694369
Strophe.SASLExternal.prototype.onChallenge = function(connection) {
43704370
/** According to XEP-178, an authzid SHOULD NOT be presented when the

‎strophe.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)