Brian Beggs
d763795b2c
Merge remote branch 'fritzy/master'
...
Conflicts:
sleekxmpp/__init__.py
sleekxmpp/basexmpp.py
sleekxmpp/stanza/error.py
2010-07-01 09:17:45 -04:00
Brian Beggs
fff54eaf2f
temporary removed future support for sleek to support digest-md5 auth
2010-07-01 08:44:39 -04:00
Brian Beggs
488d5b29d4
fixed typo
2010-06-30 14:48:45 -04:00
Brian Beggs
9bdb297fe2
basic checking for digest-md5 to make sure the necessary components are there to complete auth. If not a failed_auth event is dispatched and the socket disconnected.
2010-06-30 14:44:57 -04:00
Brian Beggs
fa7f72d0af
Fixed a defect where handlers for SASL authentication were being added multiple times. This caused issues when trying to reconnect. A handler for the auth mech would get added each reconnection attempt, causing digest-md5, success and failure to be called x times for each x number of retries.
...
Handlers for sasl authentication as well as success and failure are now added during the __init__ method.
2010-06-30 14:30:18 -04:00
Brian Beggs
c538ffae79
digest-md5 auth now works, had to remove from __future__ import unicode_literals to get it working correctly. Also some improvments for the prioroity message sending.
2010-06-30 13:54:53 -04:00
Brian Beggs
c0a6291fea
More digest-md5 changes
2010-06-21 09:23:56 -04:00
Brian Beggs
f5d0466462
working on digest-md5 authentication
2010-06-18 09:51:29 -04:00
Brian Beggs
f659e3081e
Merge remote branch 'tom/hacks'
2010-06-10 10:52:58 -04:00
Thom Nichols
bf2bf29fc6
fixed mis-named variable, doc typo and using conformant Condition methods.
2010-06-08 09:02:51 -04:00
Thom Nichols
34dc236126
added documentation for transition_ctx and removed some superfluous comment lines
2010-06-07 14:41:42 -04:00
Thom Nichols
9464736551
added __str__
2010-06-07 13:58:15 -04:00
Thom Nichols
47f1fb1690
context manager now returns a boolean 'result' as the context variable to indicate whether the transition timed out or if you are actually locked when entering the context body
2010-06-07 13:43:37 -04:00
Thom Nichols
66cf0c2021
context manager is working but there's a fatal flaw: inside the body of the 'with' statement, there's no way to tell whether or not the transition occurred or timed out.
2010-06-07 13:16:02 -04:00
Thom Nichols
e7c37c4ec5
connect uses the new function-on-state-transition so when the connect method returns you are guaranteed to be either in the 'connected' or 'disconnected' state. Could remove the 'connecting' state except uses it.
2010-06-04 17:00:51 -04:00
Brian Beggs
1aa34cb0fc
Merge remote branch 'tom/hacks'
2010-06-04 12:52:52 -04:00
Thom Nichols
919c8c5633
tweaked connectTCP call slightly to reduce possibility of 'connecting' state limbo
2010-06-03 15:21:26 -04:00
Thom Nichols
f54501a346
added function execution on transition, and more unit tests.
2010-06-03 14:12:06 -04:00
Thom Nichols
d20cd6b3e6
added function execution on transition, and more unit tests.
2010-06-03 13:51:11 -04:00
Brian Beggs
3f96226e29
Added additional logging when a plugin fails to import correctly.
2010-06-03 10:02:55 -04:00
Brian Beggs
71d72f431f
Merge remote branch 'tom/hacks'
2010-06-03 09:54:48 -04:00
Thom Nichols
da6e1e47dc
whups, somehow I lost the 'connecting' lock in connect()
2010-06-03 08:09:09 -04:00
Thom Nichols
2f0f18a8c6
added function to retrieve the current state
2010-06-03 08:07:56 -04:00
Thom Nichols
1c32668e18
fixed quiesce algorithm; state transition if connect fails; note about use_tls instance variable.
2010-06-03 07:47:27 -04:00
Thom Nichols
1f3cfb98f1
Merge branch 'master' into hacks
2010-06-02 14:18:46 -04:00
Thom Nichols
4295a66c70
reconnection quiesce logic
2010-06-02 14:18:09 -04:00
Thom Nichols
8227affd7f
removed unnecessary flags and arguments from disconnect method
2010-06-02 14:17:36 -04:00
Thom Nichols
3a2f989c5e
Merge branch 'master' into hacks
2010-06-02 14:15:07 -04:00
Nathan Fritz
85a2715c7d
hack fix for session before bind
2010-06-03 01:30:24 +08:00
Nathan Fritz
b03e6168a8
if binding and session are advertised in the same go, do session first
2010-06-03 01:30:23 +08:00
Brian Beggs
2a43f59a58
added try/catch block to plugin loading
2010-06-03 01:29:49 +08:00
Brian Beggs
184f7cb8a4
moddified plugin loading so plugins located outside of the plugins directory in sleek may be loaded. Added optional argument pluginModule that is a string that represents the module the desired plugin should be loaded from.
...
An exception on plugin loading now also will not cause the program to exit. The exception is caught and loading of other plugins contains.
2010-06-03 01:29:49 +08:00
Brian Beggs
e1aa4d0b93
Added .pydevproject to the .gitignore
2010-06-03 01:29:48 +08:00
Brian Beggs
db4989c66d
Merge remote branch 'tom/hacks'
2010-06-02 12:49:54 -04:00
Thom Nichols
7930ed22f2
overhauled state machine. Now allows for atomic transitions.
...
Next step: atomic function calls (and maybe 'handlers') on state transition.
2010-06-02 12:39:54 -04:00
Brian Beggs
b0066f3ef4
added try/catch block to plugin loading
2010-06-02 08:45:42 -04:00
Brian Beggs
c0457cf5d0
moddified plugin loading so plugins located outside of the plugins directory in sleek may be loaded. Added optional argument pluginModule that is a string that represents the module the desired plugin should be loaded from.
...
An exception on plugin loading now also will not cause the program to exit. The exception is caught and loading of other plugins contains.
2010-06-02 08:28:49 -04:00
Brian Beggs
59b8406573
Added .pydevproject to the .gitignore
2010-06-02 07:34:43 -04:00
Brian Beggs
686943a2ec
Merge remote branch 'tom/hacks'
2010-06-02 07:32:33 -04:00
Thom Nichols
060b4c3938
Merge branch 'hacks' of github.com:tomstrummer/SleekXMPP
2010-06-01 22:55:01 -04:00
Thom Nichols
49f5767aea
merged changes from fritzy
2010-06-01 22:54:30 -04:00
Thom Nichols
4eb210bff5
fixed some major reconnection errors
2010-06-01 22:51:49 -04:00
Thom Nichols
1780ca900a
merged a lot of fritzy's changes
2010-06-01 22:40:37 -04:00
Nathan Fritz
e6c2fde283
included jobs plugin
2010-06-01 22:07:53 +08:00
Nathan Fritz
ecf902bf16
Scheduler waits too longer, and pubsubstate registration was backwards
2010-06-01 22:07:53 +08:00
Lance stout
d76c0931ef
Added missing 'internal-server-error' condition to error stanza interface.
2010-06-01 22:07:53 +08:00
Lance stout
e18793152f
Touched up the style of creating an Iq stanza.
2010-06-01 22:07:53 +08:00
Lance stout
e388680269
Added 'resource-constraint' to the list of error conditions.
2010-06-01 22:07:53 +08:00
Lance Stout
bee42e4a2f
Added unit tests for the new XEP-0030 stanza objects. All pass.
...
(cherry picked from commit e1b814f27bf160f20bb30c315ca30769d217482d)
2010-06-01 22:07:53 +08:00
Lance Stout
8e3227ae5e
Updated the XEP-0030 plugin to work with stanza objects instead of manipulating XML directly.
...
Four new events have been added:
disco_info - A disco#info result has been received
disco_info_request - A disco#info request has been received
disco_items - A disco#items result has been received
disco_items_request - A disco#items request has been received
For disco_info_request and disco_items_request two default handlers are registered. These handlers will only run if they are the only handler for these two events so that multiple responses are not returned and cause errors.
In your own handlers for these two events, you can call the default handlers to preserve the static node behaviour as so:
self.plugin['xep_0030'].handle_disco_info(iq, True)
The forwarded=True will disable the check for other registered handlers.
Agents can now dynamically respond to disco requests by using these events.
(cherry picked from commit 0fc3381492a8bd75e6a9858539a972334881d8ff)
2010-06-01 22:07:53 +08:00
