mirror of
https://github.com/onionshare/onionshare.git
synced 2024-10-01 01:35:40 -04:00
Call secure_filename on the filename first thing, so we don't end up working with multiple versions of the same filename
This commit is contained in:
parent
9115ff89f3
commit
5901866200
@ -158,10 +158,11 @@ class ReceiveModeFile(object):
|
|||||||
self.onionshare_write_func = write_func
|
self.onionshare_write_func = write_func
|
||||||
self.onionshare_close_func = close_func
|
self.onionshare_close_func = close_func
|
||||||
|
|
||||||
self.filename = os.path.join(self.onionshare_request.receive_mode_dir, secure_filename(filename))
|
self.filename = os.path.join(self.onionshare_request.receive_mode_dir, filename)
|
||||||
self.filename_in_progress = '{}.part'.format(self.filename)
|
self.filename_in_progress = '{}.part'.format(self.filename)
|
||||||
|
|
||||||
# Open the file
|
# Open the file
|
||||||
|
self.upload_error = False
|
||||||
try:
|
try:
|
||||||
self.f = open(self.filename_in_progress, 'wb+')
|
self.f = open(self.filename_in_progress, 'wb+')
|
||||||
except:
|
except:
|
||||||
@ -316,6 +317,8 @@ class ReceiveModeRequest(Request):
|
|||||||
|
|
||||||
self.told_gui_about_request = True
|
self.told_gui_about_request = True
|
||||||
|
|
||||||
|
filename = secure_filename(filename)
|
||||||
|
|
||||||
self.progress[filename] = {
|
self.progress[filename] = {
|
||||||
'uploaded_bytes': 0,
|
'uploaded_bytes': 0,
|
||||||
'complete': False
|
'complete': False
|
||||||
|
Loading…
Reference in New Issue
Block a user