jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed digest_auth_started (it was never set to 'True') and did a little error handling cleanup

Browse Source
This commit is contained in:
Tom Nichols 2010-07-12 12:55:53 -04:00
parent 4864197d46
commit a909731b03
1 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sleekxmpp/__init__.py
View File

@ -56,7 +56,6 @@ class ClientXMPP(basexmpp, XMLStream):
self.sessionstarted = False self.sessionstarted = False
self.bound = False self.bound = False
self.bindfail = False self.bindfail = False
self.digest_auth_started = False
XMLStream.registerHandler(self, Callback('Stream Features', MatchXPath('{http://etherx.jabber.org/streams}features'), self._handleStreamFeatures, thread=True)) XMLStream.registerHandler(self, Callback('Stream Features', MatchXPath('{http://etherx.jabber.org/streams}features'), self._handleStreamFeatures, thread=True))
XMLStream.registerHandler(self, Callback('Roster Update', MatchXPath('{%s}iq/{jabber:iq:roster}query' % self.default_ns), self._handleRoster, thread=True)) XMLStream.registerHandler(self, Callback('Roster Update', MatchXPath('{%s}iq/{jabber:iq:roster}query' % self.default_ns), self._handleRoster, thread=True))
#SASL Auth handlers #SASL Auth handlers
@ -218,14 +217,12 @@ class ClientXMPP(basexmpp, XMLStream):
% base64.b64encode(b'\x00' + bytes(self.username, 'utf-8') + b'\x00' + bytes(self.password, 'utf-8')).decode('utf-8'), % base64.b64encode(b'\x00' + bytes(self.username, 'utf-8') + b'\x00' + bytes(self.password, 'utf-8')).decode('utf-8'),
priority=1, init=True) priority=1, init=True)
else: else:
logging.error("No appropriate login method.") logging.error("No appropriate login method: %s", sasl_mechs)
self.disconnect() self.handler_auth_fail(xml)
#if 'sasl:DIGEST-MD5' in self.features: return False
# self._auth_digestmd5()
return True return True
def handler_sasl_digest_md5_auth(self, xml): def handler_sasl_digest_md5_auth(self, xml):
if self.digest_auth_started == False:
challenge = [item.split('=', 1) for item in base64.b64decode(xml.text).replace("\"", "").split(',', 6) ] challenge = [item.split('=', 1) for item in base64.b64decode(xml.text).replace("\"", "").split(',', 6) ]
challenge = dict(challenge) challenge = dict(challenge)
logging.debug("MD5 auth challenge: %s", challenge) logging.debug("MD5 auth challenge: %s", challenge)
@ -234,12 +231,11 @@ class ClientXMPP(basexmpp, XMLStream):
self.sendRaw("""<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'/>""", priority=1, init=True ) self.sendRaw("""<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'/>""", priority=1, init=True )
return return
#TODO: use realm is supplied by server, use default qop unless supplied by server #TODO: use realm if supplied by server, use default qop unless supplied by server
#Realm, nonce, qop should all be present #Realm, nonce, qop should all be present
if not challenge.get('qop') or not challenge.get('nonce'): if not challenge.get('qop') or not challenge.get('nonce'):
logging.error("Error during digest-md5 authentication. Challenge missing critical information. Challenge: %s" %base64.b64decode(xml.text)) logging.error("Error during digest-md5 authentication. Challenge missing critical information. Challenge: %s" %base64.b64decode(xml.text))
self.disconnect() self.handler_auth_fail(xml)
self.event("failed_auth")
return return
#TODO: charset can be either UTF-8 or if not present use ISO 8859-1 defaulting for UTF-8 for now #TODO: charset can be either UTF-8 or if not present use ISO 8859-1 defaulting for UTF-8 for now
#Compute the cnonce - a unique hex string only used in this request #Compute the cnonce - a unique hex string only used in this request
@ -254,11 +250,9 @@ class ClientXMPP(basexmpp, XMLStream):
% (self.username, self.domain, challenge["nonce"], cnonce, "xmpp/%s" % self.domain, responseHash, challenge["qop"]) % (self.username, self.domain, challenge["nonce"], cnonce, "xmpp/%s" % self.domain, responseHash, challenge["qop"])
self.sendRaw("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>%s</response>" % base64.encodestring(response)[:-1], self.sendRaw("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>%s</response>" % base64.encodestring(response)[:-1],
priority=1, init=True ) priority=1, init=True )
else:
logging.warn("handler_sasl_digest_md5_auth called while digest_auth_started is True (has already begun)")
def handler_sasl_digest_md5_auth_fail(self, xml): def handler_sasl_digest_md5_auth_fail(self, xml):
self.digest_auth_started = False self.authenticated = False
self.handler_auth_fail(xml) self.handler_auth_fail(xml)
def handler_auth_success(self, xml): def handler_auth_success(self, xml):
@ -275,10 +269,9 @@ class ClientXMPP(basexmpp, XMLStream):
def handler_bind_resource(self, xml): def handler_bind_resource(self, xml):
logging.debug("Requesting resource: %s" % self.resource) logging.debug("Requesting resource: %s" % self.resource)
iq = self.Iq(stype='set')
res = ET.Element('resource') res = ET.Element('resource')
res.text = self.resource res.text = self.resource
xml.append(res) iq = self.makeIqSet(res)
iq.append(xml) iq.append(xml)
response = iq.send(priority=2,init=True) response = iq.send(priority=2,init=True)
#response = self.send(iq, self.Iq(sid=iq['id'])) #response = self.send(iq, self.Iq(sid=iq['id']))