diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-07-02 23:09:29 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-07-02 23:09:29 -0700 |
| commit | 0224d028e76ba608400fe55602fdb84f8e70f13b (patch) | |
| tree | 3c256f3edcf66a2824cc4933f240ba932cea91be /sleekxmpp/features/feature_mechanisms/mechanisms.py | |
| parent | 540d7496954c38e5483205410662120ec9ccd8c8 (diff) | |
| download | slixmpp-0224d028e76ba608400fe55602fdb84f8e70f13b.tar.gz slixmpp-0224d028e76ba608400fe55602fdb84f8e70f13b.tar.bz2 slixmpp-0224d028e76ba608400fe55602fdb84f8e70f13b.tar.xz slixmpp-0224d028e76ba608400fe55602fdb84f8e70f13b.zip | |
SASL failure event now includes the failure stanza.
Broke SASL stanzas into separate files.
Fixed typo in feature_bind.
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms/mechanisms.py')
| -rw-r--r-- | sleekxmpp/features/feature_mechanisms/mechanisms.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py index 210267fa..7a877793 100644 --- a/sleekxmpp/features/feature_mechanisms/mechanisms.py +++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py @@ -8,7 +8,8 @@ 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.handler import * from sleekxmpp.plugins.base import base_plugin @@ -26,6 +27,7 @@ class feature_mechanisms(base_plugin): self.description = "SASL Stream Feature" self.stanza = stanza + register_stanza_plugin(StreamFeatures, stanza.Mechanisms) self.xmpp.register_stanza(stanza.Success) self.xmpp.register_stanza(stanza.Failure) self.xmpp.register_stanza(stanza.Auth) @@ -115,8 +117,7 @@ class feature_mechanisms(base_plugin): def _handle_fail(self, stanza): """SASL authentication failed. Disconnect and shutdown.""" - log.info("Authentication failed.") - self.xmpp.event("failed_auth", direct=True) + log.info("Authentication failed: %s" % stanza['condition']) + self.xmpp.event("failed_auth", stanza, direct=True) self.xmpp.disconnect() - log.debug("Starting SASL Auth") return True |