engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

downlaods: properly encode " in the filenames, and add RFC 5987 header for non-ascii files.

Browse source
This commit is contained in:
Marcin Kuzminski 2018-12-31 17:00:57 +01:00
parent de789db4d6
commit 966eb88577
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/apps/repository/tests/test_repo_files.py
View file

@ -428,7 +428,7 @@ class TestRawFileHandling(object):
repo_name=backend.repo_name,
commit_id=commit.raw_id, f_path='vcs/nodes.py'),)
assert response.content_disposition == "attachment; filename=nodes.py"
assert response.content_disposition == 'attachment; filename="nodes.py"; filename*=UTF-8\'\'nodes.py'
assert response.content_type == "text/x-python"
def test_download_file_wrong_cs(self, backend):

16
rhodecode/apps/repository/views/repo_files.py
View file

@ -24,6 +24,7 @@ import os
import shutil
import tempfile
import collections
import urllib
from pyramid.httpexceptions import HTTPNotFound, HTTPBadRequest, HTTPFound
from pyramid.view import view_config
@ -708,9 +709,14 @@ class RepoFilesView(RepoAppView):
return Response(html)
def _get_attachement_disposition(self, f_path):
return 'attachment; filename=%s' % \
safe_str(f_path.split(Repository.NAME_SEP)[-1])
def _get_attachement_headers(self, f_path):
f_name = safe_str(f_path.split(Repository.NAME_SEP)[-1])
safe_path = f_name.replace('"', '\\"')
encoded_path = urllib.quote(f_name)
return "attachment; " \
"filename=\"{}\"; " \
"filename*=UTF-8\'\'{}".format(safe_path, encoded_path)
@LoginRequired()
@HasRepoPermissionAnyDecorator(
@ -765,7 +771,7 @@ class RepoFilesView(RepoAppView):
mimetype, disposition = 'text/plain', 'inline'
if disposition == 'attachment':
disposition = self._get_attachement_disposition(f_path)
disposition = self._get_attachement_headers(f_path)
def stream_node():
yield file_node.raw_bytes
@ -804,7 +810,7 @@ class RepoFilesView(RepoAppView):
# overwrite our pointer with the REAL large-file
file_node = lf_node
disposition = self._get_attachement_disposition(f_path)
disposition = self._get_attachement_headers(f_path)
def stream_node():
yield file_node.raw_bytes