Hotfix for ANONYMOUS mech support.
Updates version to 1.0-Beta6.1
This commit is contained in:
@@ -15,5 +15,5 @@ from sleekxmpp.xmlstream import XMLStream, RestartStream
|
||||
from sleekxmpp.xmlstream.matcher import *
|
||||
from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET
|
||||
|
||||
__version__ = '1.0beta6'
|
||||
__version_info__ = (1, 0, 0, 'beta6', 0)
|
||||
__version__ = '1.0beta6.1'
|
||||
__version_info__ = (1, 0, 0, 'beta6', 1)
|
||||
|
||||
@@ -10,7 +10,7 @@ class ANONYMOUS(Mechanism):
|
||||
def __init__(self, sasl, name):
|
||||
"""
|
||||
"""
|
||||
super(ANONYMOUS, self).__init__(self, sasl, name, 0)
|
||||
super(ANONYMOUS, self).__init__(sasl, name, 0)
|
||||
|
||||
def get_values(self):
|
||||
"""
|
||||
|
||||
4
sleekxmpp/thirdparty/suelta/sasl.py
vendored
4
sleekxmpp/thirdparty/suelta/sasl.py
vendored
@@ -225,7 +225,7 @@ class SASL(object):
|
||||
requested_mech = 'ANONYMOUS'
|
||||
else:
|
||||
requested_mech = self.mech
|
||||
if requested_mech == '*' and self.user == 'anonymous':
|
||||
if requested_mech == '*' and self.user in ['', 'anonymous', None]:
|
||||
requested_mech = 'ANONYMOUS'
|
||||
|
||||
# If a specific mechanism was requested, try it
|
||||
@@ -243,7 +243,7 @@ class SASL(object):
|
||||
if MECH_SEC_SCORES[name] > best_score:
|
||||
best_score = MECH_SEC_SCORES[name]
|
||||
best_mech = name
|
||||
if best_mech != None:
|
||||
if best_mech is not None:
|
||||
best_mech = MECHANISMS[best_mech](self, best_mech)
|
||||
|
||||
return best_mech
|
||||
|
||||
Reference in New Issue
Block a user