open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement (and test) --output-file for receive-file

Browse Source
This commit is contained in:
Brian Warner 2015-11-29 01:40:25 -06:00
parent 143d6dbc74
commit 5b46df133f
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wormhole/scripts/cmd_receive.py
View File

@ -9,9 +9,12 @@ def accept_file(args, them_d, w):
from .progress import start_progress, update_progress, finish_progress
file_data = them_d["file"]
# the basename() is intended to protect us against
# "~/.ssh/authorized_keys" and other attacks
filename = os.path.basename(file_data["filename"]) # unicode
if args.output_file:
filename = args.output_file
else:
# the basename() is intended to protect us against
# "~/.ssh/authorized_keys" and other attacks
filename = os.path.basename(file_data["filename"]) # unicode
filesize = file_data["filesize"]
# get confirmation from the user before writing to the local directory

17
src/wormhole/test/test_scripts.py
View File

@ -119,6 +119,11 @@ class Scripts(ServerBase, ScriptsBase, unittest.TestCase):
return d1
def test_send_file_pre_generated_code(self):
return self._do_test_send_file_pre_generated_code(False)
def test_send_file_pre_generated_code_override(self):
return self._do_test_send_file_pre_generated_code(True)
def _do_test_send_file_pre_generated_code(self, override_filename):
self.maxDiff=None
code = u"1-abc"
filename = "testfile"
@ -136,22 +141,26 @@ class Scripts(ServerBase, ScriptsBase, unittest.TestCase):
"--code", code,
filename,
]
d1 = getProcessOutputAndValue(wormhole, send_args, path=send_dir)
receive_dir = self.mktemp()
os.mkdir(receive_dir)
receive_args = server_args + [
"receive", "--accept-file",
code,
]
if override_filename:
receive_args.extend(["-o", "outfile"])
filename = "outfile"
receive_args.append(code)
d1 = getProcessOutputAndValue(wormhole, send_args, path=send_dir)
d2 = getProcessOutputAndValue(wormhole, receive_args, path=receive_dir)
def _check_sender(res):
out, err, rc = res
out = out.decode("utf-8")
err = err.decode("utf-8")
self.failUnlessEqual(err, "")
self.failUnlessIn("Sending %d byte file named '%s'\n" %
(len(message), filename), out)
self.failUnlessIn("Sending %d byte file named 'testfile'\n" %
len(message), out)
self.failUnlessIn("On the other computer, please run: "
"wormhole receive\n"
"Wormhole code is: %s\n\n" % code,