maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix urlparse import thinko breaking tiny URLs

Browse source
This commit is contained in:
Matthew Hodgson 2016-04-14 15:23:48 +01:00
parent 4802f9cdb6
commit f78b479118
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
synapse/rest/media/v1/preview_url_resource.py
View file

@ -17,7 +17,6 @@ from .base_resource import BaseMediaResource
from twisted.web.server import NOT_DONE_YET from twisted.web.server import NOT_DONE_YET
from twisted.internet import defer from twisted.internet import defer
from urlparse import urlparse, urlsplit, urlunparse
from synapse.api.errors import ( from synapse.api.errors import (
SynapseError, Codes, SynapseError, Codes,
@ -36,6 +35,7 @@ import re
import fnmatch import fnmatch
import cgi import cgi
import ujson as json import ujson as json
import urlparse
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -79,7 +79,7 @@ class PreviewUrlResource(BaseMediaResource):
# impose the URL pattern blacklist # impose the URL pattern blacklist
if hasattr(self, "url_preview_url_blacklist"): if hasattr(self, "url_preview_url_blacklist"):
url_tuple = urlsplit(url) url_tuple = urlparse.urlsplit(url)
for entry in self.url_preview_url_blacklist: for entry in self.url_preview_url_blacklist:
match = True match = True
for attrib in entry: for attrib in entry:
@ -338,15 +338,15 @@ class PreviewUrlResource(BaseMediaResource):
defer.returnValue(og) defer.returnValue(og)
def _rebase_url(self, url, base): def _rebase_url(self, url, base):
base = list(urlparse(base)) base = list(urlparse.urlparse(base))
url = list(urlparse(url)) url = list(urlparse.urlparse(url))
if not url[0]: # fix up schema if not url[0]: # fix up schema
url[0] = base[0] or "http" url[0] = base[0] or "http"
if not url[1]: # fix up hostname if not url[1]: # fix up hostname
url[1] = base[1] url[1] = base[1]
if not url[2].startswith('/'): if not url[2].startswith('/'):
url[2] = re.sub(r'/[^/]+$', '/', base[2]) + url[2] url[2] = re.sub(r'/[^/]+$', '/', base[2]) + url[2]
return urlunparse(url) return urlparse.urlunparse(url)
@defer.inlineCallbacks @defer.inlineCallbacks
def _download_url(self, url, user): def _download_url(self, url, user):