From 413af63280c0485ed654a414813469d66668d27b Mon Sep 17 00:00:00 2001 From: Goffi Date: Thu, 25 Feb 2016 16:21:17 +0100 Subject: [PATCH] plugin XEP-0060: fixed bad xmpp: URI generation in getNodeURI --- src/plugins/plugin_xep_0060.py | 5 ++++- src/plugins/plugin_xep_0277.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/plugin_xep_0060.py b/src/plugins/plugin_xep_0060.py index 31dd9091..5cf9c606 100755 --- a/src/plugins/plugin_xep_0060.py +++ b/src/plugins/plugin_xep_0060.py @@ -410,10 +410,13 @@ class XEP_0060(object): @param node(unicode): node @return (unicode): URI of the node """ + # XXX: urllib.urlencode use "&" to separate value, while XMPP URL (cf. RFC 5122) + # use ";" as a separator. So if more than one value is used in query_data, + # urlencode MUST NOT BE USED. query_data = [('node', node.encode('utf-8'))] if item is not None: query_data.append(('item', item.encode('utf-8'))) - return "xmpp:{service}?{query}".format( + return "xmpp:{service}?;{query}".format( service=service.userhost(), query=urllib.urlencode(query_data) ).decode('utf-8') diff --git a/src/plugins/plugin_xep_0277.py b/src/plugins/plugin_xep_0277.py index c2200256..b486541b 100755 --- a/src/plugins/plugin_xep_0277.py +++ b/src/plugins/plugin_xep_0277.py @@ -611,7 +611,7 @@ class XEP_0277(object): Determine the fields comments_service and comments_node of a microblog data from the href attribute of an entry's link element. For example this input: - xmpp:sat-pubsub.libervia.org?node=urn%3Axmpp%3Acomments%3A_c5c4a142-2279-4b2a-ba4c-1bc33aa87634__urn%3Axmpp%3Agroupblog%3Asouliane%40libervia.org + xmpp:sat-pubsub.libervia.org?;node=urn%3Axmpp%3Acomments%3A_c5c4a142-2279-4b2a-ba4c-1bc33aa87634__urn%3Axmpp%3Agroupblog%3Asouliane%40libervia.org will return (JID(u'sat-pubsub.libervia.org'), 'urn:xmpp:comments:_c5c4a142-2279-4b2a-ba4c-1bc33aa87634__urn:xmpp:groupblog:souliane@libervia.org') @return: a tuple (JID, str) """