126
126
elif 'SSH Secure Shell' in version:
127
127
trace.mutter('ssh implementation is SSH Corp.')
128
128
vendor = SSHCorpSubprocessVendor()
129
elif 'lsh' in version:
130
trace.mutter('ssh implementation is GNU lsh.')
131
vendor = LSHSubprocessVendor()
129
132
# As plink user prompts are not handled currently, don't auto-detect
130
133
# it by inspection below, but keep this vendor detection for if a path
131
134
# is given in BZR_SSH. See https://bugs.launchpad.net/bugs/414743
132
135
elif 'plink' in version and progname == 'plink':
133
136
# Checking if "plink" was the executed argument as Windows
134
# sometimes reports 'ssh -V' incorrectly with 'plink' in it's
137
# sometimes reports 'ssh -V' incorrectly with 'plink' in its
135
138
# version. See https://bugs.launchpad.net/bzr/+bug/107155
136
139
trace.mutter("ssh implementation is Putty's plink.")
137
140
vendor = PLinkSubprocessVendor()
345
339
self._raise_connection_error(host, port=port, orig_error=e,
346
340
msg='Unable to invoke remote bzr')
342
_ssh_connection_errors = (EOFError, OSError, IOError, socket.error)
348
343
if paramiko is not None:
349
344
vendor = ParamikoVendor()
350
345
register_ssh_vendor('paramiko', vendor)
351
346
register_ssh_vendor('none', vendor)
352
347
register_default_ssh_vendor(vendor)
353
_sftp_connection_errors = (EOFError, paramiko.SSHException)
348
_ssh_connection_errors += (paramiko.SSHException,)
356
_sftp_connection_errors = (EOFError,)
359
352
class SubprocessVendor(SSHVendor):
360
353
"""Abstract base class for vendors that use pipes to a subprocess."""
362
355
def _connect(self, argv):
363
proc = subprocess.Popen(argv,
364
stdin=subprocess.PIPE,
365
stdout=subprocess.PIPE,
356
# Attempt to make a socketpair to use as stdin/stdout for the SSH
357
# subprocess. We prefer sockets to pipes because they support
358
# non-blocking short reads, allowing us to optimistically read 64k (or
361
my_sock, subproc_sock = socket.socketpair()
362
except (AttributeError, socket.error):
363
# This platform doesn't support socketpair(), so just use ordinary
365
stdin = stdout = subprocess.PIPE
366
my_sock, subproc_sock = None, None
368
stdin = stdout = subproc_sock
369
proc = subprocess.Popen(argv, stdin=stdin, stdout=stdout,
366
370
**os_specific_subprocess_params())
367
return SSHSubprocess(proc)
371
if subproc_sock is not None:
373
return SSHSubprocessConnection(proc, sock=my_sock)
369
375
def connect_sftp(self, username, password, host, port):
372
378
subsystem='sftp')
373
379
sock = self._connect(argv)
374
380
return SFTPClient(SocketAsChannelAdapter(sock))
375
except _sftp_connection_errors, e:
376
self._raise_connection_error(host, port=port, orig_error=e)
377
except (OSError, IOError), e:
378
# If the machine is fast enough, ssh can actually exit
379
# before we try and send it the sftp request, which
380
# raises a Broken Pipe
381
if e.errno not in (errno.EPIPE,):
381
except _ssh_connection_errors, e:
383
382
self._raise_connection_error(host, port=port, orig_error=e)
385
384
def connect_ssh(self, username, password, host, port, command):
387
386
argv = self._get_vendor_specific_argv(username, host, port,
389
388
return self._connect(argv)
390
except (EOFError), e:
391
self._raise_connection_error(host, port=port, orig_error=e)
392
except (OSError, IOError), e:
393
# If the machine is fast enough, ssh can actually exit
394
# before we try and send it the sftp request, which
395
# raises a Broken Pipe
396
if e.errno not in (errno.EPIPE,):
389
except _ssh_connection_errors, e:
398
390
self._raise_connection_error(host, port=port, orig_error=e)
400
392
def _get_vendor_specific_argv(self, username, host, port, subsystem=None,
451
443
register_ssh_vendor('sshcorp', SSHCorpSubprocessVendor())
446
class LSHSubprocessVendor(SubprocessVendor):
447
"""SSH vendor that uses the 'lsh' executable from GNU"""
449
executable_path = 'lsh'
451
def _get_vendor_specific_argv(self, username, host, port, subsystem=None,
453
args = [self.executable_path]
455
args.extend(['-p', str(port)])
456
if username is not None:
457
args.extend(['-l', username])
458
if subsystem is not None:
459
args.extend(['--subsystem', subsystem, host])
461
args.extend([host] + command)
464
register_ssh_vendor('lsh', LSHSubprocessVendor())
454
467
class PLinkSubprocessVendor(SubprocessVendor):
455
468
"""SSH vendor that uses the 'plink' executable from Putty."""
634
647
# Running it in a separate process group is not good because then it
635
648
# can't get non-echoed input of a password or passphrase.
636
649
# <https://launchpad.net/products/bzr/+bug/40508>
637
return {'preexec_fn': _ignore_sigint,
650
return {'preexec_fn': _ignore_signals,
638
651
'close_fds': True,
642
655
_subproc_weakrefs = set()
644
def _close_ssh_proc(proc):
645
for func in [proc.stdin.close, proc.stdout.close, proc.wait]:
657
def _close_ssh_proc(proc, sock):
658
"""Carefully close stdin/stdout and reap the SSH process.
660
If the pipes are already closed and/or the process has already been
661
wait()ed on, that's ok, and no error is raised. The goal is to do our best
662
to clean up (whether or not a clean up was already tried).
665
for closeable in (proc.stdin, proc.stdout, sock):
666
# We expect that either proc (a subprocess.Popen) will have stdin and
667
# stdout streams to close, or that we will have been passed a socket to
668
# close, with the option not in use being None.
669
if closeable is not None:
670
funcs.append(closeable.close)
671
funcs.append(proc.wait)
652
class SSHSubprocess(object):
653
"""A socket-like object that talks to an ssh subprocess via pipes."""
655
def __init__(self, proc):
676
# It's ok for the pipe to already be closed, or the process to
677
# already be finished.
681
class SSHConnection(object):
682
"""Abstract base class for SSH connections."""
684
def get_sock_or_pipes(self):
685
"""Returns a (kind, io_object) pair.
687
If kind == 'socket', then io_object is a socket.
689
If kind == 'pipes', then io_object is a pair of file-like objects
690
(read_from, write_to).
692
raise NotImplementedError(self.get_sock_or_pipes)
695
raise NotImplementedError(self.close)
698
class SSHSubprocessConnection(SSHConnection):
699
"""A connection to an ssh subprocess via pipes or a socket.
701
This class is also socket-like enough to be used with
702
SocketAsChannelAdapter (it has 'send' and 'recv' methods).
705
def __init__(self, proc, sock=None):
708
:param proc: a subprocess.Popen
709
:param sock: if proc.stdin/out is a socket from a socketpair, then sock
710
should bzrlib's half of that socketpair. If not passed, proc's
711
stdin/out is assumed to be ordinary pipes.
657
715
# Add a weakref to proc that will attempt to do the same as self.close
658
716
# to avoid leaving processes lingering indefinitely.
659
717
def terminate(ref):
660
718
_subproc_weakrefs.remove(ref)
661
_close_ssh_proc(proc)
719
_close_ssh_proc(proc, sock)
662
720
_subproc_weakrefs.add(weakref.ref(self, terminate))
664
722
def send(self, data):
665
return os.write(self.proc.stdin.fileno(), data)
723
if self._sock is not None:
724
return self._sock.send(data)
726
return os.write(self.proc.stdin.fileno(), data)
667
728
def recv(self, count):
668
return os.read(self.proc.stdout.fileno(), count)
671
_close_ssh_proc(self.proc)
673
def get_filelike_channels(self):
674
return (self.proc.stdout, self.proc.stdin)
729
if self._sock is not None:
730
return self._sock.recv(count)
732
return os.read(self.proc.stdout.fileno(), count)
735
_close_ssh_proc(self.proc, self._sock)
737
def get_sock_or_pipes(self):
738
if self._sock is not None:
739
return 'socket', self._sock
741
return 'pipes', (self.proc.stdout, self.proc.stdin)
744
class _ParamikoSSHConnection(SSHConnection):
745
"""An SSH connection via paramiko."""
747
def __init__(self, channel):
748
self.channel = channel
750
def get_sock_or_pipes(self):
751
return ('socket', self.channel)
754
return self.channel.close()
added
removed
bzrlib/transport/ssh.py
