Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-30 18:26:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add Content-Disposition headers to media repo v1 downloads

Browse Source
This commit is contained in:
Erik Johnston 2015-06-30 09:33:48 +01:00
parent 6825eef955
commit 2124f668db
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
synapse/rest/media/v1/base_resource.py
View File

@ -30,6 +30,7 @@ from synapse.util.async import ObservableDeferred
import os import os
import cgi
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -37,7 +38,9 @@ logger = logging.getLogger(__name__)
def parse_media_id(request): def parse_media_id(request):
try: try:
server_name, media_id = request.postpath # This allows users to append e.g. /test.png to the URL. Useful for
# clients that parse the URL to see content type.
server_name, media_id = request.postpath[:2]
return (server_name, media_id) return (server_name, media_id)
except: except:
raise SynapseError( raise SynapseError(
@ -128,12 +131,19 @@ class BaseMediaResource(Resource):
media_type = headers["Content-Type"][0] media_type = headers["Content-Type"][0]
time_now_ms = self.clock.time_msec() time_now_ms = self.clock.time_msec()
content_disposition = headers.get("Content-Disposition", None)
if content_disposition:
_, params = cgi.parse_header(content_disposition[0],)
upload_name = params.get("filename", None)
else:
upload_name = None
yield self.store.store_cached_remote_media( yield self.store.store_cached_remote_media(
origin=server_name, origin=server_name,
media_id=media_id, media_id=media_id,
media_type=media_type, media_type=media_type,
time_now_ms=self.clock.time_msec(), time_now_ms=self.clock.time_msec(),
upload_name=None, upload_name=upload_name,
media_length=length, media_length=length,
filesystem_id=file_id, filesystem_id=file_id,
) )
@ -144,7 +154,7 @@ class BaseMediaResource(Resource):
media_info = { media_info = {
"media_type": media_type, "media_type": media_type,
"media_length": length, "media_length": length,
"upload_name": None, "upload_name": upload_name,
"created_ts": time_now_ms, "created_ts": time_now_ms,
"filesystem_id": file_id, "filesystem_id": file_id,
} }
@ -157,11 +167,16 @@ class BaseMediaResource(Resource):
@defer.inlineCallbacks @defer.inlineCallbacks
def _respond_with_file(self, request, media_type, file_path, def _respond_with_file(self, request, media_type, file_path,
file_size=None): file_size=None, upload_name=None):
logger.debug("Responding with %r", file_path) logger.debug("Responding with %r", file_path)
if os.path.isfile(file_path): if os.path.isfile(file_path):
request.setHeader(b"Content-Type", media_type.encode("UTF-8")) request.setHeader(b"Content-Type", media_type.encode("UTF-8"))
if upload_name:
request.setHeader(
b"Content-Disposition",
b"inline; filename=%s" % (upload_name.encode("utf-8"),),
)
# cache for at least a day. # cache for at least a day.
# XXX: we might want to turn this off for data we don't want to # XXX: we might want to turn this off for data we don't want to

8
synapse/rest/media/v1/download_resource.py
View File

@ -47,10 +47,12 @@ class DownloadResource(BaseMediaResource):
media_type = media_info["media_type"] media_type = media_info["media_type"]
media_length = media_info["media_length"] media_length = media_info["media_length"]
upload_name = media_info["upload_name"]
file_path = self.filepaths.local_media_filepath(media_id) file_path = self.filepaths.local_media_filepath(media_id)
yield self._respond_with_file( yield self._respond_with_file(
request, media_type, file_path, media_length request, media_type, file_path, media_length,
upload_name=upload_name,
) )
@defer.inlineCallbacks @defer.inlineCallbacks
@ -60,11 +62,13 @@ class DownloadResource(BaseMediaResource):
media_type = media_info["media_type"] media_type = media_info["media_type"]
media_length = media_info["media_length"] media_length = media_info["media_length"]
filesystem_id = media_info["filesystem_id"] filesystem_id = media_info["filesystem_id"]
upload_name = media_info["upload_name"]
file_path = self.filepaths.remote_media_filepath( file_path = self.filepaths.remote_media_filepath(
server_name, filesystem_id server_name, filesystem_id
) )
yield self._respond_with_file( yield self._respond_with_file(
request, media_type, file_path, media_length request, media_type, file_path, media_length,
upload_name=upload_name,
) )

6
synapse/rest/media/v1/upload_resource.py
View File

@ -84,6 +84,10 @@ class UploadResource(BaseMediaResource):
code=413, code=413,
) )
upload_name = request.args.get("filename", None)
if upload_name:
upload_name = upload_name[0]
headers = request.requestHeaders headers = request.requestHeaders
if headers.hasHeader("Content-Type"): if headers.hasHeader("Content-Type"):
@ -99,7 +103,7 @@ class UploadResource(BaseMediaResource):
# TODO(markjh): parse content-dispostion # TODO(markjh): parse content-dispostion
content_uri = yield self.create_content( content_uri = yield self.create_content(
media_type, None, request.content.read(), media_type, upload_name, request.content.read(),
content_length, auth_user content_length, auth_user
) )