erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugin XEP-0277: fixed encoding issue, specially with parseCommentUrl, which could lead to the impossibility to find comments node

Browse source
This commit is contained in:
Goffi 2016-01-22 20:24:17 +01:00
commit 333a43e824
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/plugins/plugin_xep_0277.py
View file

@ -619,11 +619,8 @@ class XEP_0277(object):
"""
parsed_url = urlparse.urlparse(node_url, 'xmpp')
service = jid.JID(parsed_url.path)
queries = parsed_url.query.split(';')
parsed_queries = dict()
for query in queries:
parsed_queries.update(urlparse.parse_qs(query))
node = parsed_queries.get('node', [''])[0]
parsed_queries = urlparse.parse_qs(parsed_url.query.encode('utf-8'))
node = parsed_queries.get('node', [''])[0].decode('utf-8')
if not node:
raise failure.Failure(exceptions.DataError('Invalid comments link'))
@ -956,13 +953,13 @@ class XEP_0277(object):
feed_elt.addElement('title', content=title)
link_feed_elt = feed_elt.addElement('link')
link_feed_elt['href'] = 'http://{host}/blog/{user}/atom.xml'.format(
host=urllib.quote(service_jid.host,''),
user=urllib.quote(service_jid.user,''))
host=urllib.quote(service_jid.host.encode('utf-8'),''),
user=urllib.quote(service_jid.user.encode('utf-8'),''))
link_feed_elt['rel'] = 'self'
link_blog_elt = feed_elt.addElement('link')
link_blog_elt['href'] = 'http://{host}/blog/{user}'.format(
host=urllib.quote(service_jid.host,''),
user=urllib.quote(service_jid.user,''))
host=urllib.quote(service_jid.host.encode('utf-8'),''),
user=urllib.quote(service_jid.user.encode('utf-8'),''))
feed_elt.addElement('id', content=node)
feed_elt.addElement('updated', rfc3339.timestamp_from_tf(rfc3339.tf_utc()))