gaschz/ansible-qubes
1
0
Fork 0
mirror of https://github.com/Rudd-O/ansible-qubes.git synced 2025-03-01 14:22:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix SCP use case for qssh

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2015-12-07 10:28:35 +00:00
parent 54f0bb44fa
commit 5af01dc496
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bin/qssh
View File

@ -7,6 +7,24 @@ import socket
import urllib import urllib
def is_scp():
return os.path.basename(sys.argv[0]) in ("scp", "qscp")
def find_scp_hostname(parms):
host = None
while host is None:
if parms[-1].startswith("-"):
parms = parms[:-1]
continue
if any(parms[-2].startswith(x)
for x in ["-c", "-F", "-i", "-l", "-o", "-P", "-S"]):
parms = parms[:-2]
host = parms[-1]
host, _ = host.split(":", 1)
return host
def find_hostname_and_command(parms): def find_hostname_and_command(parms):
host = None host = None
rest = parms rest = parms
@ -50,17 +68,21 @@ def get_vmname_and_management_proxy(hostname):
parms = sys.argv[1:] parms = sys.argv[1:]
host, rest = find_hostname_and_command(parms)
# SCP execution path. # SCP execution path.
if os.path.basename(sys.argv[0]) in ("scp", "qscp"): if is_scp():
host = find_scp_hostname(parms)
if not is_qubes_host(host): if not is_qubes_host(host):
os.execv("/usr/bin/scp", ["/usr/bin/scp"] + parms) os.execv("/usr/bin/scp", ["/usr/bin/scp"] + parms)
path_to_this_file = os.path.dirname(__file__)
path_to_ssh = os.path.join(path_to_this_file, "qssh") path_to_ssh = os.path.join(path_to_this_file, "qssh")
scmd = ["/usr/bin/scp"] + ["-S", path_to_ssh] + parms scmd = ["/usr/bin/scp"] + ["-S", path_to_ssh] + parms
os.execvp(scmd[0], scmd) os.execvp(scmd[0], scmd)
host, rest = find_hostname_and_command(parms)
# SSH execution path. # SSH execution path.
if not is_qubes_host(host): if not is_qubes_host(host):
os.execv("/usr/bin/ssh", ["/usr/bin/ssh"] + parms) os.execv("/usr/bin/ssh", ["/usr/bin/ssh"] + parms)