Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle spidered relative images correctly

This commit is contained in:
Matthew Hodgson 2016-03-31 23:52:58 +01:00
parent 72550c3803
commit 683e564815
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/http/client.py
View File

@ -282,7 +282,7 @@ class SimpleHttpClient(object):
logger.exception("Failed to download body") logger.exception("Failed to download body")
raise raise
defer.returnValue((length, headers)) defer.returnValue((length, headers, response.request.absoluteURI))
# XXX: FIXME: This is horribly copy-pasted from matrixfederationclient. # XXX: FIXME: This is horribly copy-pasted from matrixfederationclient.

14
synapse/rest/media/v1/preview_url_resource.py
View File

@ -18,6 +18,7 @@ from twisted.web.resource import Resource
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 lxml import html from lxml import html
from urlparse import urlparse, urlunparse
from synapse.util.stringutils import random_string from synapse.util.stringutils import random_string
from synapse.http.client import SpiderHttpClient from synapse.http.client import SpiderHttpClient
from synapse.http.server import request_handler, respond_with_json, respond_with_json_bytes from synapse.http.server import request_handler, respond_with_json, respond_with_json_bytes
@ -125,7 +126,14 @@ class PreviewUrlResource(BaseMediaResource):
images = big_images if big_images else images images = big_images if big_images else images
if images: if images:
og['og:image'] = images[0].attrib['src'] base = list(urlparse(media_info['uri']))
src = list(urlparse(images[0].attrib['src']))
if not src[0] and not src[1]:
src[0] = base[0]
src[1] = base[1]
if not src[2].startswith('/'):
src[2] = re.sub(r'/[^/]+$', '/', base[2]) + src[2]
og['og:image'] = urlunparse(src)
text_nodes = tree.xpath("//h1/text() | //h2/text() | //h3/text() | //p/text() | //div/text() | //span/text() | //a/text()") text_nodes = tree.xpath("//h1/text() | //h2/text() | //h3/text() | //p/text() | //div/text() | //span/text() | //a/text()")
# text_nodes = tree.xpath("//h1/text() | //h2/text() | //h3/text() | //p/text() | //div/text()") # text_nodes = tree.xpath("//h1/text() | //h2/text() | //h3/text() | //p/text() | //div/text()")
@ -140,6 +148,7 @@ class PreviewUrlResource(BaseMediaResource):
text = text.strip()[:1024] text = text.strip()[:1024]
og['og:description'] = text if text else None og['og:description'] = text if text else None
# TODO: extract a favicon?
# TODO: turn any OG media URLs into mxc URLs to capture and thumbnail them too # TODO: turn any OG media URLs into mxc URLs to capture and thumbnail them too
# TODO: store our OG details in a cache (and expire them when stale) # TODO: store our OG details in a cache (and expire them when stale)
# TODO: delete the content to stop diskfilling, as we only ever cared about its OG # TODO: delete the content to stop diskfilling, as we only ever cared about its OG
@ -180,7 +189,7 @@ class PreviewUrlResource(BaseMediaResource):
try: try:
with open(fname, "wb") as f: with open(fname, "wb") as f:
logger.debug("Trying to get url '%s'" % url) logger.debug("Trying to get url '%s'" % url)
length, headers = yield self.client.get_file( length, headers, uri = yield self.client.get_file(
url, output_stream=f, max_size=self.max_spider_size, url, output_stream=f, max_size=self.max_spider_size,
) )
# FIXME: handle 404s sanely - don't spider an error page # FIXME: handle 404s sanely - don't spider an error page
@ -233,6 +242,7 @@ class PreviewUrlResource(BaseMediaResource):
"created_ts": time_now_ms, "created_ts": time_now_ms,
"filesystem_id": file_id, "filesystem_id": file_id,
"filename": fname, "filename": fname,
"uri": uri,
}) })
def _is_media(self, content_type): def _is_media(self, content_type):