3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app: Fixed download for the files with non-ASCII characters in name. 

Replace non-ASCII characters with "?" and add escaped unicode version of the file name to the "Content-Disposition" header to fix problems with thumbnails and downloading for the gcode file with non-ASCII characters in filename.

Signed-off-by: Uladzimir Palekh <visor.rti@gmail.com>
This commit is contained in:
Vladimir Poleh 2021-05-19 23:36:46 +03:00 committed by Eric Callahan
parent 829b3a4ee8
commit 6b9a3c656d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
moonraker/app.py
View File

@ -11,6 +11,7 @@ import logging
import json import json
import datetime import datetime
import traceback import traceback
import urllib.parse
import tornado import tornado
import tornado.iostream import tornado.iostream
import tornado.httputil import tornado.httputil
@ -530,8 +531,11 @@ class FileRequestHandler(AuthorizedFileHandler):
# a file # a file
assert isinstance(self.absolute_path, str) assert isinstance(self.absolute_path, str)
basename = os.path.basename(self.absolute_path) basename = os.path.basename(self.absolute_path)
ascii_basename = self._escape_filename_to_ascii(basename)
utf8_basename = self._escape_filename_to_utf8(basename)
self.set_header( self.set_header(
"Content-Disposition", f"attachment; filename={basename}") "Content-Disposition", f"attachment; filename={ascii_basename}; "
f"filename*=UTF-8\'\'{utf8_basename}")
async def delete(self, path: str) -> None: async def delete(self, path: str) -> None:
path = self.request.path.lstrip("/").split("/", 2)[-1] path = self.request.path.lstrip("/").split("/", 2)[-1]
@ -633,6 +637,12 @@ class FileRequestHandler(AuthorizedFileHandler):
else: else:
assert self.request.method == "HEAD" assert self.request.method == "HEAD"
def _escape_filename_to_ascii(self, basename: str) -> str:
return basename.encode("ascii", "replace").decode()
def _escape_filename_to_utf8(self, basename: str) -> str:
return urllib.parse.quote(basename, encoding="utf-8")
@classmethod @classmethod
def _get_cached_version(cls, abs_path: str) -> Optional[str]: def _get_cached_version(cls, abs_path: str) -> Optional[str]:
with cls._lock: with cls._lock: