Emmanuel Gil Peyrot
04eaf52b1d
xep_0065: Remove an unused variable.
2015-08-23 16:06:01 +01:00
Emmanuel Gil Peyrot
dc7fef1064
xep_0065: Remove the last useless threading locks.
2015-08-23 16:06:01 +01:00
Emmanuel Gil Peyrot
9c5dd024b1
Fix the xep_0065 plugin, by rewriting its socks5 implementation.
2015-08-23 16:06:01 +01:00
Florent Le Coz
6e61adf3db
Fix the order in which <identity/> and <feature/> tags are sent on disco#info
...
The identities should all be at the start, and features at the end, so we
just prepend the identity on add_identity, and append features on
add_feature
2015-08-22 18:48:29 +02:00
Emmanuel Gil Peyrot
041bd63864
Add a function to convert a domain name to punycode.
2015-08-20 20:04:58 +01:00
Emmanuel Gil Peyrot
1b4187fa56
Add a format() method to XMPPError which returns a readable string.
2015-08-08 17:34:06 +02:00
Emmanuel Gil Peyrot
cf7a60705e
Fix docstring of unsubscribe method in the PubSub plugin.
2015-08-08 17:34:06 +02:00
Emmanuel Gil Peyrot
9fbacf377a
Strip strings after pygments, so we don’t include an needless newline.
2015-08-08 17:34:06 +02:00
mathieui
9efa909dfc
slixmpp v1.0
2015-08-08 17:34:06 +02:00
mathieui
7f21fdbe26
Fix the test suite
...
(mock transport class missing .close())
2015-08-08 17:34:06 +02:00
mathieui
f9c7fa92ea
Reset the connect future after a disconnect
2015-08-08 17:34:05 +02:00
Emmanuel Gil Peyrot
170bd51387
Properly answer an error instead of tracebacking on unknown command execution.
2015-08-08 17:33:59 +02:00
mathieui
2ce931cb7a
Add a waiting time before reconnecting automatically
...
Punishing a server for being down by sending more traffic is not a nice
thing to do. Taking 100% of the CPU is not nice either.
2015-07-21 00:58:52 +02:00
mathieui
84eddd2ed2
Fix components
...
(use_tls is useless since slixmpp will always try to use starttls
whenever possible)
2015-07-21 00:33:15 +02:00
mathieui
d0ad25745a
Merge branch 'jid' of http://git.linkmauve.fr/slixmpp
2015-06-22 23:56:05 +02:00
Emmanuel Gil Peyrot
75ba283572
Store None instead of '' for unset parts of a JID.
2015-06-22 01:12:56 +01:00
mathieui
f7164d35d2
Add a wrapper to get_info/get_items functions
...
(and fix caps in the process)
2015-06-21 16:23:47 +02:00
Emmanuel Gil Peyrot
4afbb0322b
Rework slixmpp.jid’s JID classes to make them more efficient.
2015-06-20 01:49:48 +01:00
Emmanuel Gil Peyrot
7bce1ecc8a
Add a Cython version of slixmpp.stringprep, using libidn.
...
This makes the validation of a JID a *lot* faster.
2015-06-20 01:14:46 +01:00
Emmanuel Gil Peyrot
bbce16d526
Move stringprep and idna support in a different module than slixmpp.jid.
2015-06-20 01:14:46 +01:00
Emmanuel Gil Peyrot
c29fc39ef1
Remove JID cache, to better test for performance.
2015-06-20 01:12:03 +01:00
Emmanuel Gil Peyrot
04bff00171
XEP-0030: return the iq.send() future when sending a disco#info or disco#items.
2015-06-14 15:11:24 +01:00
Emmanuel Gil Peyrot
f3e31baf04
Properly consider malformed IPv6 domains as invalid.
2015-06-12 11:52:48 +01:00
mathieui
a2852eb249
Allow the use of a custom loop instead of asyncio.get_event_loop()
2015-05-12 00:02:32 +02:00
mathieui
f1e6d6b0a9
Advertize the disco#info feature in our disco#info
...
Actually a MUST in XEP-0030
2015-05-08 13:41:20 +02:00
Emmanuel Gil Peyrot
116a33ba51
Make syntax highlighting for XML lazy, to only call pygments when debug logs are enabled.
...
Makes poezio about 11% faster when sending/receiving messages.
2015-05-06 13:03:47 +02:00
mathieui
0305ce66b7
Merge branch 'ibb' of http://linkmauve.fr/git/slixmpp
2015-04-19 20:53:35 +02:00
Emmanuel Gil Peyrot
4415d3be1a
XEP-0047: use coroutines for send(), sendall() and the new sendfile().
2015-04-19 20:48:02 +02:00
Emmanuel Gil Peyrot
058c530787
XEP-0047: prevent any unneededly large or useless bytes slice.
2015-04-19 20:48:01 +02:00
Emmanuel Gil Peyrot
766d0dfd40
XEP-0047: use asyncio’s Queue implementation, to prevent any possibility of deadlock.
2015-04-19 20:48:01 +02:00
Emmanuel Gil Peyrot
ac31913a65
XEP-0047: make open_stream() return a future that will be set to the stream object.
2015-04-14 19:14:56 +02:00
Emmanuel Gil Peyrot
d34ddf33db
XEP-0047: replace threading events with simple booleans.
2015-04-14 19:14:56 +02:00
Emmanuel Gil Peyrot
eb4e09b0ca
XEP-0047: allow only one window over the stream.
2015-04-14 19:14:56 +02:00
Emmanuel Gil Peyrot
ce085bf4f4
XEP-0047: announce the correct stanza type if message is selected.
2015-04-14 19:14:56 +02:00
Emmanuel Gil Peyrot
990113f8e7
XEP-0047: return the correct error type on not-acceptable (example 5).
2015-04-14 19:14:56 +02:00
Emmanuel Gil Peyrot
aa022204ee
XEP-0047: don’t answer with an unauthorized error when block-size is too big.
2015-04-14 19:14:56 +02:00
Emmanuel Gil Peyrot
c1f23b566b
XEP-0047: remove now-useless threading locks.
2015-04-14 19:14:56 +02:00
Emmanuel Gil Peyrot
45f7cb8bda
XEP-0047: prevent tracebacks in stanza reading.
2015-04-14 19:14:56 +02:00
mathieui
bdb1f66ac9
basexmpp: Add a message_error event
...
The "message" event only receives messages with a body, and error
messages don’t necessarily have it. Removing the body requirement from
the "message" event could lean to unhandled conditions in existing code.
2015-04-13 15:08:04 +02:00
Emmanuel Gil Peyrot
d5b1904ebb
Use a full JID for testing.
2015-04-04 16:56:26 +02:00
Emmanuel Gil Peyrot
b6b0e82dec
Iq.send: set the timeout even when no timeout_callback is set
2015-04-04 16:48:30 +02:00
Emmanuel Gil Peyrot
632b7b4afe
XMLStream: add a forever parameter to process(), defaulting to True, to select whether we want to stop the event loop after a disconnection
2015-04-04 16:48:30 +02:00
Emmanuel Gil Peyrot
0ef3fa2703
XMLStream: factorize the highlight function so it can be used in tests as well
2015-03-02 17:10:27 +01:00
mathieui
8da269de88
Set XMLStream.socket after the SSL connection is made too
...
Fixes SCRAM-SHA-1-PLUS.
2015-02-28 20:32:33 +01:00
mathieui
93ce318259
XEP-0325: Don’t use threading
2015-02-28 19:05:22 +01:00
mathieui
997928de91
Revert or edit most previous XEP plugin changes
...
In a single commit, because it isn’t that interesting to detail each
change.
List of reverts:
Revert "XEP-0030: allow get_info and get_items to return a coroutine"
This reverts commit 506ca69917e85fa4203e69da1c1d7cea5615f2363d243f7115fe95e68135f59f1e4944d47ecd7ff6854da870fd196e359482766e8235544cf795ac02e32ee05d96166fb3ecd41417464b10a418a4978456e034b31d6be112e86475
2015-02-28 19:02:49 +01:00
mathieui
bf5d7c83af
Change the API to make iq.send() always return a future
...
remove coroutine_wrapper, add a future_wrapper (which is only needed
when the result stanza can be cached).
Update the documentation as well.
2015-02-28 19:02:35 +01:00
mathieui
c66a4d4097
Update the documentation and examples
...
- update most of the examples with slixmpp
- change the help channels pointed out in the doc
- add a page listing differences from slixmpp and how to use asyncio
nicely with slixmpp
- fix some in-code rst documentation
2015-02-24 22:47:15 +01:00
mathieui
e112e86475
XEP-0279: wrap check_ip() with coroutine_wrapper
2015-02-24 22:46:08 +01:00
mathieui
e034b31d6b
XEP-0050: wrap send_command() and get_commands() with coroutine_wrapper
...
(if flow=True in send_command, the result will still be using the
default callbacks and the function will return None)
2015-02-24 22:46:07 +01:00
mathieui
18a4978456
XEP-0258: wrap get_catalog() with coroutine_wrapper
2015-02-24 22:46:07 +01:00
mathieui
17464b10a4
XEP-0231: wrap get_bob() with coroutine_wrapper
2015-02-24 22:46:07 +01:00
mathieui
6fb3ecd414
XEP-0202: wrap get_entity_time() with coroutine_wrapper
2015-02-24 22:46:07 +01:00
mathieui
c214e4f037
XEP-0084: fix setting and getting the Data value
...
get_value: return a bytes object
set_value: accept a bytes or a str object
2015-02-24 22:46:06 +01:00
mathieui
2ee05d9616
XEP-0012: wrap get_last_activity() with coroutine_wrapper
2015-02-24 22:46:06 +01:00
mathieui
f795ac02e3
XEP-0280: wrap functions with coroutine_wrapper
2015-02-24 22:46:06 +01:00
mathieui
6e8235544c
XEP-0191: wrap functions with coroutine_wrapper
2015-02-24 22:46:06 +01:00
mathieui
6e35948276
XEP-0092: wrap get_version() with coroutine_wrapper
2015-02-24 22:46:05 +01:00
mathieui
4da870fd19
XEP-0257: wrap functions with coroutine_wrapper
2015-02-24 22:46:05 +01:00
mathieui
cd7ff685fb
XEP-0199: wrap functions with coroutine_wrapper and make ping() a coroutine
2015-02-24 22:46:05 +01:00
mathieui
1e4944d47e
XEP-0077: wrap functions with coroutine_wrapper
2015-02-24 22:46:05 +01:00
mathieui
e68135f59f
XEP-0049: wrap functions with coroutine_wrapper
2015-02-24 22:46:04 +01:00
mathieui
6408c5a747
XEP-0115: fix a handler which expected an iq to block
2015-02-24 22:46:04 +01:00
mathieui
115fe954ac
XEP-0153: wrap functions with coroutine_wrapper
2015-02-24 22:46:04 +01:00
mathieui
3d243f7da5
XEP-0054: wrap functions with coroutine_wrapper
2015-02-24 22:46:04 +01:00
mathieui
ea5615f236
XEP-0084: wrap functions with coroutine_wrapper
2015-02-24 22:46:04 +01:00
mathieui
69da1c1d7c
XEP-0163: wrap publish() with coroutine_wrapper
2015-02-24 22:46:03 +01:00
mathieui
e85fa4203e
XEP-0060: wrap all iq-sending functions with coroutine_wrapper
2015-02-24 22:46:03 +01:00
mathieui
506ca69917
XEP-0030: allow get_info and get_items to return a coroutine
2015-02-24 22:46:03 +01:00
mathieui
8ac0ecdf40
Fix dns resolution without aiodns
...
(use loop.getaddrinfo instead of the blocking version)
2015-02-24 19:17:45 +01:00
mathieui
dbd8115557
Remove the filesocket shim (2.6 compatibility)
2015-02-24 19:08:12 +01:00
mathieui
74b4ea20bf
Add back stanza-specific exception handlers
...
(fixes the test suite too)
2015-02-23 17:43:35 +01:00
mathieui
11fbaa4241
Import xmlstream.asyncio and coroutine_wrapper at the top level
...
Since they will be used quite a lot in plugins.
2015-02-23 17:32:39 +01:00
mathieui
8fd0d7c993
Add a coroutine_wrapper decorator
...
This decorator checks for the coroutine=True keyword arg and wraps the
result of the function call in a coroutine if it isn’t.
This allows to have constructs like:
@coroutine_wrapper
def toto(xmpp, *, coroutine=False):
if xmpp.cached:
return xmpp.cached
else:
return xmpp.make_iq_get().send(coroutine=coroutine)
@asyncio.coroutine
def main(xmpp):
result = yield from toto(xmpp, coroutine=True)
xmpp.cached = result
result2 = yield from toto(xmpp, coroutine=True)
If the wrapper wasn’t there, the second fetch would fail. This decorator
does not do anything if the coroutine argument is False.
2015-02-23 17:32:31 +01:00
mathieui
1450d36377
Add a coroutine parameter to iq.send() to return a coroutine
...
(instead of exposing a different send_coroutine method)
2015-02-23 17:20:47 +01:00
mathieui
06358d0665
Use CallbackCoroutine with Iq callbacks too
2015-02-22 20:13:48 +01:00
mathieui
2b3b86e281
Allow event handlers to be coroutine functions
...
And do not copy data when running events with XMLStream.event()
2015-02-22 14:17:17 +01:00
mathieui
92e4bc752a
Add a “blocking” send_coroutine method to the Iq class
2015-02-21 23:45:30 +01:00
mathieui
ffb2e05f21
Check that ciphers have been initialized
...
(if not, python will use the system default)
2015-02-17 04:27:03 +01:00
mathieui
1e2665df19
Update the test suite.
...
- monkey-patch our own monkey-patched idle_call to run events immediatly
rather than adding them to the event queue, and add a fake transport
with a fake socket.
- remove the test file related to xep_0059 as it relies on blocking
behavior, and comment out one xep_0030 test uses xep_0059
- remove many instances of threading and sleep()s because they do
nothing except waste time and introduce race conditions.
- keep exactly two sleep() in IoT xeps because they rely on timeouts
2015-02-12 12:23:47 +01:00
mathieui
4d063e287e
Remove more threaded= and block= options from the plugins
...
(also, correct a typo)
2015-02-12 12:21:20 +01:00
mathieui
44f02fb3ab
Do the plugins post_init() upload loading
...
(the top_level boolean used to load them at this point wasn’t ever set
to true)
2015-02-12 12:18:32 +01:00
mathieui
f6b3a0c6cf
Fix the uses of stanza.reply()
...
This is relying on the stanzas being copied for each handler. We no
longer do that for performance reasons, so instead of editing the copy
in-place, stanza.reply() now returns a new stanza.
2015-02-12 12:17:01 +01:00
mathieui
8b36e918e8
Fix the componentxmpp interface
2015-02-12 12:11:50 +01:00
Florent Le Coz
957c635fb7
XMLStream must provide the BaseProtocol interface
2015-02-04 17:49:30 +01:00
mathieui
4027927c6e
Don’t set the msg['from'] and msg['id'] in receipt.ack()
...
setting msg['id'] is wrong, and setting msg['from'] might lead to
echoing back wrong input.
2015-02-04 16:49:39 +01:00
mathieui
62eefdbd6a
Expose MUC support in disco#info
...
http://xmpp.org/extensions/xep-0045.html#disco-client
2015-01-15 22:50:49 +01:00
Florent Le Coz
225e07eb64
Fix the call of iscoroutinefunction()
2015-01-05 11:36:24 +01:00
Florent Le Coz
1207c81ab5
Do not copy the stanza before calling each handler
2015-01-03 18:42:57 +01:00
Florent Le Coz
565da65ccd
Use a deque for the idle list
2015-01-03 16:13:39 +01:00
Florent Le Coz
47fbd4cead
Delay the handling of stanza for when the process is not busy
...
We use some dirty monkey-patching to add a idle_call() function to the
asyncio module. We then use that method to handle each received stanza only
when the event loop is not busy with some other IO (mainly, the standard
input)
2015-01-03 06:08:03 +01:00
mathieui
1b9b4199e8
Make the ca_certs option useful again (CA-based cert validation)
...
It was broken since the fork.
2014-12-17 19:03:49 +01:00
mathieui
b5930ca958
Bring back authentication through SASL EXTERNAL
...
(and only update the ssl context before it gets used)
2014-12-11 19:27:13 +01:00
mathieui
423974f90d
Fix xep-0257 for slixmpp, and fix an element name
2014-12-11 14:46:52 +01:00
Florent Le Coz
5fcf08a415
Lower the timeout for each DNS resolution attempt
2014-11-14 01:13:52 +01:00
mathieui
3c06568ed5
Let loop.create_connection do its getaddrinfo coroutine if there are no dns records left/available
2014-11-12 22:22:20 +01:00
Florent Le Coz
68e35e631a
Also work without SRV records
2014-11-05 01:11:44 +01:00
Florent Le Coz
b5c98ba99e
Fix default value of dns_answers to None (instead of [])
2014-11-02 17:44:41 +01:00
mathieui
711f8dc6af
Use aiodns instead of dnspython to query DNS records
2014-11-02 17:26:29 +01:00
mathieui
5b41fb98de
Add the ssl_cert and ssl_invalid_chain back
...
- hack the stdlib to get the peercert, remove that hack when http://bugs.python.org/issue22768 gets fixed
2014-10-30 19:51:30 +01:00
mathieui
6da625dbdb
Make the "ciphers" option work again
2014-10-30 19:51:00 +01:00
mathieui
e862c47b8b
Remove the ssl_version option, as the defaults in python3.4 are sane
2014-10-30 19:49:26 +01:00
Florent Le Coz
4a8fe56470
Something something get_stanza_values
...
Fix something that was broken by Link Mauve
2014-10-11 21:04:28 +02:00
Emmanuel Gil Peyrot
7c3e61950d
Remove all deprecated alias in the core of slixmpp, and wherever they were used.
2014-09-28 23:58:46 +02:00
Emmanuel Gil Peyrot
61f89eef2e
Remove the now useless Queue wrapper in slixmpp.util.
2014-09-28 23:58:46 +02:00
Emmanuel Gil Peyrot
06de587ed2
Don’t check for logging.NullHandler, it got added in Python 3.1.
2014-09-28 23:58:46 +02:00
Emmanuel Gil Peyrot
5a8881000c
Remove support for gevent, incompatible with python3.
2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot
70839368c1
Fix indentation in xep_0016.
2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot
9d8a2a1a7a
Remove all trailing semicolons.
2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot
17174016ec
Remove all trailing whitespaces.
2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot
ed37174a2b
Always use OrderedDict from collections, and remove its implementation in slixmpp.thirdparty.
2014-09-01 02:47:15 +02:00
Emmanuel Gil Peyrot
6175cbcd99
Reintroduce XMLStream.process, making it run the asyncio event loop.
2014-09-01 02:47:08 +02:00
Emmanuel Gil Peyrot
ad70ffba59
Add pygments support to debug output.
2014-09-01 02:42:45 +02:00
Emmanuel Gil Peyrot
0e95015410
Remove sys.version_info checks for python2 and clean some imports.
2014-09-01 02:42:45 +02:00
Florent Le Coz
b92dac72f3
Fix saslprep for non-ascii usernames
2014-08-25 00:59:23 +02:00
Florent Le Coz
cdb9a6ff7e
Remove deprecated xmlstream/jid.py
2014-08-16 11:27:18 +02:00
Florent Le Coz
07e46837d9
Fix some more blocking iq
2014-08-01 15:02:54 +02:00
Florent Le Coz
fa21e262c7
Add the 'connecting' event
2014-08-01 04:01:31 +02:00
Florent Le Coz
93934c7992
Improve the events triggered on failed authentication
...
Trigger failed_auth as before, once for each failed method
Trigger failed_all_auth once all method failed
Trigger no_auth only if we couldn’t even try one method
2014-08-01 03:16:22 +02:00
Florent Le Coz
73edd42774
Fix the connection (and a few minor things) in xmlstream
2014-07-30 17:57:57 +02:00
Florent Le Coz
ab03ad54aa
Fix the iq.send() function, and a bunch of places where it is called
...
This is a big-and-dirty commit with a bunch of cleanup, maybe breaking a few
things, and not fixing all iq.send() calls yet.
2014-07-30 17:52:59 +02:00
Florent Le Coz
2e571ac950
Remove all the google stuf
2014-07-24 01:57:20 +02:00
Florent Le Coz
6c15d65107
And that
2014-07-23 17:40:08 +02:00
Florent Le Coz
e5af0597a6
Forgot to remove that
2014-07-23 17:17:41 +02:00
Florent Le Coz
74117453b5
Cleanup how events are run, they are always direct by definition now
2014-07-23 17:01:17 +02:00
Emmanuel Gil Peyrot
5611b30022
Use ".remove()" instead of "is in" followed by ".pop()"
2014-07-22 11:16:06 +02:00
Florent Le Coz
ede9dcd18f
An other cleanup of xmlstream.py
...
Remove some useless things (like handling signals, managing the threads,
etc), add some comment to recently added/fixed methods…
2014-07-22 02:58:34 +02:00
Florent Le Coz
d3b56a5d94
Remove unused RestartStream exception
2014-07-22 02:18:48 +02:00
Florent Le Coz
f5d4334963
Remove the now useless state machine
2014-07-21 20:40:45 +02:00
Florent Le Coz
5c769632e8
Make connect(), abort() and reconnect() work
...
All the auto_reconnect, connect_retry logic and that kind of stuf has been
entirely removed.
2014-07-21 20:34:20 +02:00
Florent Le Coz
373505f483
Clean a new bunch of stuf
2014-07-21 20:32:09 +02:00
Florent Le Coz
a2cad40f91
Remove the send_thread() function, and the stop threading.event
2014-07-21 17:50:56 +02:00
Florent Le Coz
4328762076
Fix signature of init_plugins() function
2014-07-21 17:50:29 +02:00
Florent Le Coz
c2f6f07776
Make xmlstream use an asyncio loop
...
Scheduled events, connection, TLS handshake (with STARTTLS), read and write
on the socket are all done using only asyncio.
A lot of threads, and thread-related (and thus useless) things still remain.
This is only a first step.
2014-07-20 20:46:03 +02:00
Florent Le Coz
5ab77c7452
Rename to slixmpp
2014-07-17 14:19:04 +02:00
