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

cli: handle tor args in 'ssh' subcommands

Browse Source
This commit is contained in:
Brian Warner 2017-01-16 11:29:20 -05:00
parent c6ac04433f
commit df62e16462
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wormhole/cli/cli.py
View File

@ -258,10 +258,12 @@ def ssh():
) )
@TorArgs @TorArgs
@click.pass_context @click.pass_context
def ssh_invite(ctx, code_length, user): def ssh_invite(ctx, code_length, user, **kwargs):
""" """
Add a public-key to a ~/.ssh/authorized_keys file Add a public-key to a ~/.ssh/authorized_keys file
""" """
for name, value in kwargs.items():
setattr(ctx.obj, name, value)
from . import cmd_ssh from . import cmd_ssh
ctx.obj.code_length = code_length ctx.obj.code_length = code_length
ctx.obj.ssh_user = user ctx.obj.ssh_user = user
@ -283,7 +285,7 @@ def ssh_invite(ctx, code_length, user):
) )
@TorArgs @TorArgs
@click.pass_obj @click.pass_obj
def ssh_accept(cfg, code, key_file, yes): def ssh_accept(cfg, code, key_file, yes, **kwargs):
""" """
Send your SSH public-key Send your SSH public-key
@ -291,6 +293,8 @@ def ssh_accept(cfg, code, key_file, yes):
you specify (if there's only one in ~/.ssh/* that will be sent). you specify (if there's only one in ~/.ssh/* that will be sent).
""" """
for name, value in kwargs.items():
setattr(cfg.obj, name, value)
from . import cmd_ssh from . import cmd_ssh
kind, keyid, pubkey = cmd_ssh.find_public_key(key_file) kind, keyid, pubkey = cmd_ssh.find_public_key(key_file)
print("Sending public key type='{}' keyid='{}'".format(kind, keyid)) print("Sending public key type='{}' keyid='{}'".format(kind, keyid))