From 6645a3be40e573459d048937bf21bf40a19e4974 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 27 Jul 2012 11:24:01 -0700 Subject: Compile JID pattern regex. --- sleekxmpp/jid.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sleekxmpp/jid.py b/sleekxmpp/jid.py index 9e9c0d0b..015d95f8 100644 --- a/sleekxmpp/jid.py +++ b/sleekxmpp/jid.py @@ -29,7 +29,9 @@ ILLEGAL_CHARS = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r' + \ #: The basic regex pattern that a JID must match in order to determine #: the local, domain, and resource parts. This regex does NOT do any #: validation, which requires application of nodeprep, resourceprep, etc. -JID_PATTERN = "^(?:([^\"&'/:<>@]{1,1023})@)?([^/@]{1,1023})(?:/(.{1,1023}))?$" +JID_PATTERN = re.compile( + "^(?:([^\"&'/:<>@]{1,1023})@)?([^/@]{1,1023})(?:/(.{1,1023}))?$" +) #: The set of escape sequences for the characters not allowed by nodeprep. JID_ESCAPE_SEQUENCES = set(['\\20', '\\22', '\\26', '\\27', '\\2f', @@ -118,7 +120,7 @@ def _parse_jid(data): :returns: tuple of the validated local, domain, and resource strings """ - match = re.match(JID_PATTERN, data) + match = JID_PATTERN.match(data) if not match: raise InvalidJID('JID could not be parsed') -- cgit v1.2.3 From 9047b627a4f165986af5d0f42f3379b198833802 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 27 Jul 2012 15:48:15 -0700 Subject: Only broadcast vCard hashes for available presences (not subscriptions, etc). --- sleekxmpp/plugins/xep_0153/vcard_avatar.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sleekxmpp/plugins/xep_0153/vcard_avatar.py b/sleekxmpp/plugins/xep_0153/vcard_avatar.py index da90fdc5..d940ead1 100644 --- a/sleekxmpp/plugins/xep_0153/vcard_avatar.py +++ b/sleekxmpp/plugins/xep_0153/vcard_avatar.py @@ -87,6 +87,9 @@ class XEP_0153(BasePlugin): if not isinstance(stanza, Presence): return stanza + if stanza['type'] not in ('available', 'dnd', 'chat', 'away', 'xa'): + return stanza + current_hash = self.api['get_hash'](stanza['from']) stanza['vcard_temp_update']['photo'] = current_hash return stanza -- cgit v1.2.3 From 54656b331a48b6bac140fcd90b88ab21e3bd67a4 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 27 Jul 2012 15:51:35 -0700 Subject: Restrict caps updates to available presences (not subscriptions, etc). --- sleekxmpp/plugins/xep_0115/caps.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sleekxmpp/plugins/xep_0115/caps.py b/sleekxmpp/plugins/xep_0115/caps.py index 15ddb283..5130cc98 100644 --- a/sleekxmpp/plugins/xep_0115/caps.py +++ b/sleekxmpp/plugins/xep_0115/caps.py @@ -104,12 +104,17 @@ class XEP_0115(BasePlugin): self.xmpp['xep_0030'].add_feature(stanza.Capabilities.namespace) def _filter_add_caps(self, stanza): - if isinstance(stanza, Presence) and self.broadcast: - ver = self.get_verstring(stanza['from']) - if ver: - stanza['caps']['node'] = self.caps_node - stanza['caps']['hash'] = self.hash - stanza['caps']['ver'] = ver + if not isinstance(stanza, Presence) or not self.broadcast: + return stanza + + if stanza['type'] not in ('available', 'chat', 'away', 'dnd', 'xa'): + return stanza + + ver = self.get_verstring(stanza['from']) + if ver: + stanza['caps']['node'] = self.caps_node + stanza['caps']['hash'] = self.hash + stanza['caps']['ver'] = ver return stanza def _handle_caps(self, presence): -- cgit v1.2.3 From 5ae6c8f8faefef3bd0c7d8e4caf0a2071d76382d Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Sat, 28 Jul 2012 01:06:21 -0700 Subject: Add support for XEP-0131: Standard Headers and Internet Metadata --- setup.py | 1 + sleekxmpp/plugins/__init__.py | 1 + sleekxmpp/plugins/xep_0060/pubsub.py | 4 ++- sleekxmpp/plugins/xep_0131/__init__.py | 16 +++++++++++ sleekxmpp/plugins/xep_0131/headers.py | 41 +++++++++++++++++++++++++++ sleekxmpp/plugins/xep_0131/stanza.py | 51 ++++++++++++++++++++++++++++++++++ 6 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 sleekxmpp/plugins/xep_0131/__init__.py create mode 100644 sleekxmpp/plugins/xep_0131/headers.py create mode 100644 sleekxmpp/plugins/xep_0131/stanza.py diff --git a/setup.py b/setup.py index 99b060f2..34d02178 100755 --- a/setup.py +++ b/setup.py @@ -82,6 +82,7 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0115', 'sleekxmpp/plugins/xep_0118', 'sleekxmpp/plugins/xep_0128', + 'sleekxmpp/plugins/xep_0131', 'sleekxmpp/plugins/xep_0153', 'sleekxmpp/plugins/xep_0172', 'sleekxmpp/plugins/xep_0184', diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py index 615ef7eb..ce64e152 100644 --- a/sleekxmpp/plugins/__init__.py +++ b/sleekxmpp/plugins/__init__.py @@ -42,6 +42,7 @@ __all__ = [ 'xep_0115', # Entity Capabilities 'xep_0118', # User Tune 'xep_0128', # Extended Service Discovery + 'xep_0131', # Standard Headers and Internet Metadata 'xep_0133', # Service Administration 'xep_0153', # vCard-Based Avatars 'xep_0163', # Personal Eventing Protocol diff --git a/sleekxmpp/plugins/xep_0060/pubsub.py b/sleekxmpp/plugins/xep_0060/pubsub.py index 387c5a0f..952cad85 100644 --- a/sleekxmpp/plugins/xep_0060/pubsub.py +++ b/sleekxmpp/plugins/xep_0060/pubsub.py @@ -26,7 +26,7 @@ class XEP_0060(BasePlugin): name = 'xep_0060' description = 'XEP-0060: Publish-Subscribe' - dependencies = set(['xep_0030', 'xep_0004']) + dependencies = set(['xep_0030', 'xep_0004', 'xep_0082', 'xep_0131']) stanza = stanza def plugin_init(self): @@ -53,6 +53,8 @@ class XEP_0060(BasePlugin): StanzaPath('message/pubsub_event/subscription'), self._handle_event_subscription)) + self.xmpp['xep_0131'].supported_headers.add('SubID') + def plugin_end(self): self.xmpp.remove_handler('Pubsub Event: Items') self.xmpp.remove_handler('Pubsub Event: Purge') diff --git a/sleekxmpp/plugins/xep_0131/__init__.py b/sleekxmpp/plugins/xep_0131/__init__.py new file mode 100644 index 00000000..ec71c98d --- /dev/null +++ b/sleekxmpp/plugins/xep_0131/__init__.py @@ -0,0 +1,16 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout + This file is part of SleekXMPP. + + See the file LICENSE for copying permission. +""" + +from sleekxmpp.plugins.base import register_plugin + +from sleekxmpp.plugins.xep_0131 import stanza +from sleekxmpp.plugins.xep_0131.stanza import Headers +from sleekxmpp.plugins.xep_0131.headers import XEP_0131 + + +register_plugin(XEP_0131) diff --git a/sleekxmpp/plugins/xep_0131/headers.py b/sleekxmpp/plugins/xep_0131/headers.py new file mode 100644 index 00000000..3e47541a --- /dev/null +++ b/sleekxmpp/plugins/xep_0131/headers.py @@ -0,0 +1,41 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout + This file is part of SleekXMPP. + + See the file LICENSE for copying permission. +""" + +from sleekxmpp import Message, Presence +from sleekxmpp.xmlstream import register_stanza_plugin +from sleekxmpp.plugins import BasePlugin +from sleekxmpp.plugins.xep_0131 import stanza +from sleekxmpp.plugins.xep_0131.stanza import Headers + + +class XEP_0131(BasePlugin): + + name = 'xep_0131' + description = 'XEP-0131: Stanza Headers and Internet Metadata' + dependencies = set(['xep_0030']) + stanza = stanza + default_config = { + 'supported_headers': set() + } + + def plugin_init(self): + register_stanza_plugin(Message, Headers) + register_stanza_plugin(Presence, Headers) + + def plugin_end(self): + self.xmpp['xep_0030'].del_feature(feature=Headers.namespace) + for header in self.supported_headers: + self.xmpp['xep_0030'].del_feature( + feature='%s#%s' % (Headers.namespace, header)) + + def session_bind(self, jid): + self.xmpp['xep_0030'].add_feature(Headers.namespace) + for header in self.supported_headers: + self.xmpp['xep_0030'].add_feature('%s#%s' % ( + Headers.namespace, + header)) diff --git a/sleekxmpp/plugins/xep_0131/stanza.py b/sleekxmpp/plugins/xep_0131/stanza.py new file mode 100644 index 00000000..347adf96 --- /dev/null +++ b/sleekxmpp/plugins/xep_0131/stanza.py @@ -0,0 +1,51 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout + This file is part of SleekXMPP. + + See the file LICENSE for copying permission. +""" + +from sleekxmpp.thirdparty import OrderedDict +from sleekxmpp.xmlstream import ET, ElementBase + + +class Headers(ElementBase): + name = 'headers' + namespace = 'http://jabber.org/protocol/shim' + plugin_attrib = 'headers' + interfaces = set(['headers']) + is_extension = True + + def get_headers(self): + result = OrderedDict() + headers = self.xml.findall('{%s}header' % self.namespace) + for header in headers: + name = header.attrib.get('name', '') + value = header.text + if name in result: + if not isinstance(result[name], set): + result[name] = [result[name]] + else: + result[name] = [] + result[name].add(value) + else: + result[name] = value + return result + + def set_headers(self, values): + self.del_headers() + for name in values: + vals = values[name] + if not isinstance(vals, (list, set)): + vals = [values[name]] + for value in vals: + header = ET.Element('{%s}header' % self.namespace) + header.attrib['name'] = name + header.text = value + self.xml.append(header) + + def del_headers(self): + headers = self.xml.findall('{%s}header' % self.namespace) + for header in headers: + self.xml.remove(header) -- cgit v1.2.3 From 422e77ae40b0e0d263e437b3fde0c1b2f5821217 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Sun, 29 Jul 2012 17:26:04 -0700 Subject: Don't wait to retry connection if out of DNS records. --- sleekxmpp/xmlstream/xmlstream.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index a0b6e4c2..4cc9e169 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -468,7 +468,7 @@ class XMLStream(object): log.debug("No remaining DNS records to try.") self.dns_answers = None if reattempt: - self.reconnect_delay = delay + self.reconnect_delay = None return False af = Socket.AF_INET -- cgit v1.2.3 From e4b4c676379df30d268d28341b643cd9cd10eb22 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Mon, 30 Jul 2012 09:04:15 -0700 Subject: Bump version to 1.1.10 --- README.rst | 4 +--- sleekxmpp/version.py | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index a12f441d..31bd7c7b 100644 --- a/README.rst +++ b/README.rst @@ -45,13 +45,11 @@ The latest source code for SleekXMPP may be found on `Github ``develop`` branch. **Latest Release** - - `1.1.9 `_ + - `1.1.10 `_ **Develop Releases** - `Latest Develop Version `_ -**Older Stable Releases** - - `1.0 `_ Installing DNSPython --------------------- diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py index f03e5c1f..010f425b 100644 --- a/sleekxmpp/version.py +++ b/sleekxmpp/version.py @@ -9,5 +9,5 @@ # We don't want to have to import the entire library # just to get the version info for setup.py -__version__ = '1.1.9' -__version_info__ = (1, 1, 9, '', 0) +__version__ = '1.1.10' +__version_info__ = (1, 1, 10, '', 0) -- cgit v1.2.3