Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes content-length for the range requests logic

Browse Source
This commit is contained in:
Saptak S 2021-04-12 03:17:22 +05:30
parent 81700ecaea
commit 729cf2ef86
No known key found for this signature in database
GPG Key ID: 2D9B32E54C68A3FB
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cli/onionshare_cli/web/share_mode.py
View File

@ -186,15 +186,15 @@ class ShareModeWeb(SendBaseModeWeb):
use_gzip = self.should_use_gzip() use_gzip = self.should_use_gzip()
if use_gzip: if use_gzip:
file_to_download = self.gzip_filename file_to_download = self.gzip_filename
filesize = self.gzip_filesize self.filesize = self.gzip_filesize
etag = self.gzip_etag etag = self.gzip_etag
else: else:
file_to_download = self.download_filename file_to_download = self.download_filename
filesize = self.download_filesize self.filesize = self.download_filesize
etag = self.download_etag etag = self.download_etag
# for range requests # for range requests
range_, status_code = self.get_range_and_status_code(filesize, etag, self.last_modified) range_, status_code = self.get_range_and_status_code(self.filesize, etag, self.last_modified)
# Tell GUI the download started # Tell GUI the download started
history_id = self.cur_history_id history_id = self.cur_history_id
@ -210,20 +210,22 @@ class ShareModeWeb(SendBaseModeWeb):
else: else:
r = Response( r = Response(
self.generate(shutdown_func, range_, file_to_download, request_path, self.generate(shutdown_func, range_, file_to_download, request_path,
history_id, filesize)) history_id, self.filesize))
if use_gzip: if use_gzip:
r.headers.set('Content-Encoding', 'gzip') r.headers.set('Content-Encoding', 'gzip')
r.headers.set('Content-Length', range_[1] - range_[0]) r.headers.set('Content-Length', range_[1] - range_[0] + 1)
r.headers.set('Content-Disposition', 'attachment', filename=basename) filename_dict = {
"filename": unidecode(basename),
"filename*": "UTF-8''%s" % url_quote(basename),
}
r.headers.set('Content-Disposition', 'attachment', **filename_dict)
r = self.web.add_security_headers(r) r = self.web.add_security_headers(r)
# guess content type # guess content type
(content_type, _) = mimetypes.guess_type(basename, strict=False) (content_type, _) = mimetypes.guess_type(basename, strict=False)
if content_type is not None: if content_type is not None:
r.headers.set('Content-Type', content_type) r.headers.set('Content-Type', content_type)
r.headers.set('Content-Length', range_[1] - range_[0])
r.headers.set('Accept-Ranges', 'bytes') r.headers.set('Accept-Ranges', 'bytes')
r.headers.set('ETag', etag) r.headers.set('ETag', etag)
r.headers.set('Last-Modified', http_date(self.last_modified)) r.headers.set('Last-Modified', http_date(self.last_modified))
@ -232,7 +234,7 @@ class ShareModeWeb(SendBaseModeWeb):
if status_code == 206: if status_code == 206:
r.headers.set('Content-Range', r.headers.set('Content-Range',
'bytes {}-{}/{}'.format(range_[0], range_[1], filesize)) 'bytes {}-{}/{}'.format(range_[0], range_[1], self.filesize))
r.status_code = status_code r.status_code = status_code