mirror of
https://github.com/correl/SleekXMPP.git
synced 2024-11-23 19:19:53 +00:00
SASL failure event now includes the failure stanza.
Broke SASL stanzas into separate files. Fixed typo in feature_bind.
This commit is contained in:
parent
540d749695
commit
0224d028e7
8 changed files with 158 additions and 56 deletions
|
@ -53,7 +53,7 @@ class feature_bind(base_plugin):
|
||||||
self.xmpp.set_jid(response['bind']['jid'])
|
self.xmpp.set_jid(response['bind']['jid'])
|
||||||
self.xmpp.bound = True
|
self.xmpp.bound = True
|
||||||
|
|
||||||
self.features.add('bind')
|
self.xmpp.features.add('bind')
|
||||||
|
|
||||||
log.info("Node set to: %s" % self.xmpp.boundjid.full)
|
log.info("Node set to: %s" % self.xmpp.boundjid.full)
|
||||||
|
|
||||||
|
|
|
@ -7,4 +7,7 @@
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from sleekxmpp.features.feature_mechanisms.mechanisms import feature_mechanisms
|
from sleekxmpp.features.feature_mechanisms.mechanisms import feature_mechanisms
|
||||||
from sleekxmpp.features.feature_mechanisms.stanza import *
|
from sleekxmpp.features.feature_mechanisms.stanza import Mechanisms
|
||||||
|
from sleekxmpp.features.feature_mechanisms.stanza import Auth
|
||||||
|
from sleekxmpp.features.feature_mechanisms.stanza import Success
|
||||||
|
from sleekxmpp.features.feature_mechanisms.stanza import Failure
|
||||||
|
|
|
@ -8,7 +8,8 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from sleekxmpp.xmlstream import RestartStream
|
from sleekxmpp.stanza import StreamFeatures
|
||||||
|
from sleekxmpp.xmlstream import RestartStream, register_stanza_plugin
|
||||||
from sleekxmpp.xmlstream.matcher import *
|
from sleekxmpp.xmlstream.matcher import *
|
||||||
from sleekxmpp.xmlstream.handler import *
|
from sleekxmpp.xmlstream.handler import *
|
||||||
from sleekxmpp.plugins.base import base_plugin
|
from sleekxmpp.plugins.base import base_plugin
|
||||||
|
@ -26,6 +27,7 @@ class feature_mechanisms(base_plugin):
|
||||||
self.description = "SASL Stream Feature"
|
self.description = "SASL Stream Feature"
|
||||||
self.stanza = stanza
|
self.stanza = stanza
|
||||||
|
|
||||||
|
register_stanza_plugin(StreamFeatures, stanza.Mechanisms)
|
||||||
self.xmpp.register_stanza(stanza.Success)
|
self.xmpp.register_stanza(stanza.Success)
|
||||||
self.xmpp.register_stanza(stanza.Failure)
|
self.xmpp.register_stanza(stanza.Failure)
|
||||||
self.xmpp.register_stanza(stanza.Auth)
|
self.xmpp.register_stanza(stanza.Auth)
|
||||||
|
@ -115,8 +117,7 @@ class feature_mechanisms(base_plugin):
|
||||||
|
|
||||||
def _handle_fail(self, stanza):
|
def _handle_fail(self, stanza):
|
||||||
"""SASL authentication failed. Disconnect and shutdown."""
|
"""SASL authentication failed. Disconnect and shutdown."""
|
||||||
log.info("Authentication failed.")
|
log.info("Authentication failed: %s" % stanza['condition'])
|
||||||
self.xmpp.event("failed_auth", direct=True)
|
self.xmpp.event("failed_auth", stanza, direct=True)
|
||||||
self.xmpp.disconnect()
|
self.xmpp.disconnect()
|
||||||
log.debug("Starting SASL Auth")
|
|
||||||
return True
|
return True
|
||||||
|
|
14
sleekxmpp/features/feature_mechanisms/stanza/__init__.py
Normal file
14
sleekxmpp/features/feature_mechanisms/stanza/__init__.py
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
"""
|
||||||
|
SleekXMPP: The Sleek XMPP Library
|
||||||
|
Copyright (C) 2011 Nathanael C. Fritz
|
||||||
|
This file is part of SleekXMPP.
|
||||||
|
|
||||||
|
See the file LICENSE for copying permission.
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
from sleekxmpp.features.feature_mechanisms.stanza.mechanisms import Mechanisms
|
||||||
|
from sleekxmpp.features.feature_mechanisms.stanza.auth import Auth
|
||||||
|
from sleekxmpp.features.feature_mechanisms.stanza.success import Success
|
||||||
|
from sleekxmpp.features.feature_mechanisms.stanza.failure import Failure
|
||||||
|
|
35
sleekxmpp/features/feature_mechanisms/stanza/auth.py
Normal file
35
sleekxmpp/features/feature_mechanisms/stanza/auth.py
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
"""
|
||||||
|
SleekXMPP: The Sleek XMPP Library
|
||||||
|
Copyright (C) 2011 Nathanael C. Fritz
|
||||||
|
This file is part of SleekXMPP.
|
||||||
|
|
||||||
|
See the file LICENSE for copying permission.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from sleekxmpp.stanza import StreamFeatures
|
||||||
|
from sleekxmpp.xmlstream import ElementBase, StanzaBase, ET
|
||||||
|
from sleekxmpp.xmlstream import register_stanza_plugin
|
||||||
|
|
||||||
|
|
||||||
|
class Auth(StanzaBase):
|
||||||
|
|
||||||
|
"""
|
||||||
|
"""
|
||||||
|
|
||||||
|
name = 'auth'
|
||||||
|
namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
|
||||||
|
interfaces = set(('mechanism', 'value'))
|
||||||
|
plugin_attrib = name
|
||||||
|
|
||||||
|
def setup(self, xml):
|
||||||
|
StanzaBase.setup(self, xml)
|
||||||
|
self.xml.tag = self.tag_name()
|
||||||
|
|
||||||
|
def set_value(self, value):
|
||||||
|
self.xml.text = value
|
||||||
|
|
||||||
|
def get_value(self):
|
||||||
|
return self.xml.text
|
||||||
|
|
||||||
|
def del_value(self):
|
||||||
|
self.xml.text = ''
|
76
sleekxmpp/features/feature_mechanisms/stanza/failure.py
Normal file
76
sleekxmpp/features/feature_mechanisms/stanza/failure.py
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
"""
|
||||||
|
SleekXMPP: The Sleek XMPP Library
|
||||||
|
Copyright (C) 2011 Nathanael C. Fritz
|
||||||
|
This file is part of SleekXMPP.
|
||||||
|
|
||||||
|
See the file LICENSE for copying permission.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from sleekxmpp.stanza import StreamFeatures
|
||||||
|
from sleekxmpp.xmlstream import ElementBase, StanzaBase, ET
|
||||||
|
from sleekxmpp.xmlstream import register_stanza_plugin
|
||||||
|
|
||||||
|
|
||||||
|
class Failure(StanzaBase):
|
||||||
|
|
||||||
|
"""
|
||||||
|
"""
|
||||||
|
|
||||||
|
name = 'failure'
|
||||||
|
namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
|
||||||
|
interfaces = set(('condition', 'text'))
|
||||||
|
plugin_attrib = name
|
||||||
|
sub_interfaces = set(('text',))
|
||||||
|
conditions = set(('aborted', 'account-disabled', 'credentials-expired',
|
||||||
|
'encryption-required', 'incorrect-encoding', 'invalid-authzid',
|
||||||
|
'invalid-mechanism', 'malformed-request', 'mechansism-too-weak',
|
||||||
|
'not-authorized', 'temporary-auth-failure'))
|
||||||
|
|
||||||
|
def setup(self, xml=None):
|
||||||
|
"""
|
||||||
|
Populate the stanza object using an optional XML object.
|
||||||
|
|
||||||
|
Overrides ElementBase.setup.
|
||||||
|
|
||||||
|
Sets a default error type and condition, and changes the
|
||||||
|
parent stanza's type to 'error'.
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
xml -- Use an existing XML object for the stanza's values.
|
||||||
|
"""
|
||||||
|
# StanzaBase overrides self.namespace
|
||||||
|
self.namespace = Failure.namespace
|
||||||
|
|
||||||
|
if StanzaBase.setup(self, xml):
|
||||||
|
#If we had to generate XML then set default values.
|
||||||
|
self['condition'] = 'not-authorized'
|
||||||
|
|
||||||
|
def get_condition(self):
|
||||||
|
"""Return the condition element's name."""
|
||||||
|
for child in self.xml.getchildren():
|
||||||
|
if "{%s}" % self.namespace in child.tag:
|
||||||
|
cond = child.tag.split('}', 1)[-1]
|
||||||
|
if cond in self.conditions:
|
||||||
|
return cond
|
||||||
|
return 'not-authorized'
|
||||||
|
|
||||||
|
def set_condition(self, value):
|
||||||
|
"""
|
||||||
|
Set the tag name of the condition element.
|
||||||
|
|
||||||
|
Arguments:
|
||||||
|
value -- The tag name of the condition element.
|
||||||
|
"""
|
||||||
|
if value in self.conditions:
|
||||||
|
del self['condition']
|
||||||
|
self.xml.append(ET.Element("{%s}%s" % (self.namespace, value)))
|
||||||
|
return self
|
||||||
|
|
||||||
|
def del_condition(self):
|
||||||
|
"""Remove the condition element."""
|
||||||
|
for child in self.xml.getchildren():
|
||||||
|
if "{%s}" % self.condition_ns in child.tag:
|
||||||
|
tag = child.tag.split('}', 1)[-1]
|
||||||
|
if tag in self.conditions:
|
||||||
|
self.xml.remove(child)
|
||||||
|
return self
|
|
@ -1,6 +1,6 @@
|
||||||
"""
|
"""
|
||||||
SleekXMPP: The Sleek XMPP Library
|
SleekXMPP: The Sleek XMPP Library
|
||||||
Copyright (C) 2010 Nathanael C. Fritz
|
Copyright (C) 2011 Nathanael C. Fritz
|
||||||
This file is part of SleekXMPP.
|
This file is part of SleekXMPP.
|
||||||
|
|
||||||
See the file LICENSE for copying permission.
|
See the file LICENSE for copying permission.
|
||||||
|
@ -53,52 +53,3 @@ class Mechanisms(ElementBase):
|
||||||
if mechs:
|
if mechs:
|
||||||
for mech in mechs:
|
for mech in mechs:
|
||||||
self.xml.remove(mech)
|
self.xml.remove(mech)
|
||||||
|
|
||||||
|
|
||||||
class Success(StanzaBase):
|
|
||||||
|
|
||||||
"""
|
|
||||||
"""
|
|
||||||
|
|
||||||
name = 'success'
|
|
||||||
namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
|
|
||||||
interfaces = set()
|
|
||||||
plugin_attrib = name
|
|
||||||
|
|
||||||
|
|
||||||
class Failure(StanzaBase):
|
|
||||||
|
|
||||||
"""
|
|
||||||
"""
|
|
||||||
|
|
||||||
name = 'failure'
|
|
||||||
namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
|
|
||||||
interfaces = set()
|
|
||||||
plugin_attrib = name
|
|
||||||
|
|
||||||
|
|
||||||
class Auth(StanzaBase):
|
|
||||||
|
|
||||||
"""
|
|
||||||
"""
|
|
||||||
|
|
||||||
name = 'auth'
|
|
||||||
namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
|
|
||||||
interfaces = set(('mechanism', 'value'))
|
|
||||||
plugin_attrib = name
|
|
||||||
|
|
||||||
def setup(self, xml):
|
|
||||||
StanzaBase.setup(self, xml)
|
|
||||||
self.xml.tag = self.tag_name()
|
|
||||||
|
|
||||||
def set_value(self, value):
|
|
||||||
self.xml.text = value
|
|
||||||
|
|
||||||
def get_value(self):
|
|
||||||
return self.xml.text
|
|
||||||
|
|
||||||
def del_value(self):
|
|
||||||
self.xml.text = ''
|
|
||||||
|
|
||||||
|
|
||||||
register_stanza_plugin(StreamFeatures, Mechanisms)
|
|
22
sleekxmpp/features/feature_mechanisms/stanza/success.py
Normal file
22
sleekxmpp/features/feature_mechanisms/stanza/success.py
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
"""
|
||||||
|
SleekXMPP: The Sleek XMPP Library
|
||||||
|
Copyright (C) 2011 Nathanael C. Fritz
|
||||||
|
This file is part of SleekXMPP.
|
||||||
|
|
||||||
|
See the file LICENSE for copying permission.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from sleekxmpp.stanza import StreamFeatures
|
||||||
|
from sleekxmpp.xmlstream import ElementBase, StanzaBase, ET
|
||||||
|
from sleekxmpp.xmlstream import register_stanza_plugin
|
||||||
|
|
||||||
|
|
||||||
|
class Success(StanzaBase):
|
||||||
|
|
||||||
|
"""
|
||||||
|
"""
|
||||||
|
|
||||||
|
name = 'success'
|
||||||
|
namespace = 'urn:ietf:params:xml:ns:xmpp-sasl'
|
||||||
|
interfaces = set()
|
||||||
|
plugin_attrib = name
|
Loading…
Reference in a new issue