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()
239
242
def connect_ssh(self, username, password, host, port, command):
240
243
"""Make an SSH connection.
242
:returns: something with a `close` method, and a `get_filelike_channels`
243
method that returns a pair of (read, write) filelike objects.
245
:returns: an SSHConnection.
245
247
raise NotImplementedError(self.connect_ssh)
269
271
register_ssh_vendor('loopback', LoopbackVendor())
272
class _ParamikoSSHConnection(object):
273
def __init__(self, channel):
274
self.channel = channel
276
def get_filelike_channels(self):
277
return self.channel.makefile('rb'), self.channel.makefile('wb')
280
return self.channel.close()
283
274
class ParamikoVendor(SSHVendor):
284
275
"""Vendor that uses paramiko."""
348
339
self._raise_connection_error(host, port=port, orig_error=e,
349
340
msg='Unable to invoke remote bzr')
342
_ssh_connection_errors = (EOFError, OSError, IOError, socket.error)
351
343
if paramiko is not None:
352
344
vendor = ParamikoVendor()
353
345
register_ssh_vendor('paramiko', vendor)
354
346
register_ssh_vendor('none', vendor)
355
347
register_default_ssh_vendor(vendor)
356
_sftp_connection_errors = (EOFError, paramiko.SSHException)
348
_ssh_connection_errors += (paramiko.SSHException,)
359
_sftp_connection_errors = (EOFError,)
362
352
class SubprocessVendor(SSHVendor):
363
353
"""Abstract base class for vendors that use pipes to a subprocess."""
365
355
def _connect(self, argv):
366
proc = subprocess.Popen(argv,
367
stdin=subprocess.PIPE,
368
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
368
stdin = stdout = subproc_sock
370
proc = subprocess.Popen(argv, stdin=stdin, stdout=stdout,
369
371
**os_specific_subprocess_params())
370
return SSHSubprocess(proc)
372
return SSHSubprocessConnection(proc, sock=sock)
372
374
def connect_sftp(self, username, password, host, port):
375
377
subsystem='sftp')
376
378
sock = self._connect(argv)
377
379
return SFTPClient(SocketAsChannelAdapter(sock))
378
except _sftp_connection_errors, e:
379
self._raise_connection_error(host, port=port, orig_error=e)
380
except (OSError, IOError), e:
381
# If the machine is fast enough, ssh can actually exit
382
# before we try and send it the sftp request, which
383
# raises a Broken Pipe
384
if e.errno not in (errno.EPIPE,):
380
except _ssh_connection_errors, e:
386
381
self._raise_connection_error(host, port=port, orig_error=e)
388
383
def connect_ssh(self, username, password, host, port, command):
390
385
argv = self._get_vendor_specific_argv(username, host, port,
392
387
return self._connect(argv)
393
except (EOFError), e:
394
self._raise_connection_error(host, port=port, orig_error=e)
395
except (OSError, IOError), e:
396
# If the machine is fast enough, ssh can actually exit
397
# before we try and send it the sftp request, which
398
# raises a Broken Pipe
399
if e.errno not in (errno.EPIPE,):
388
except _ssh_connection_errors, e:
401
389
self._raise_connection_error(host, port=port, orig_error=e)
403
391
def _get_vendor_specific_argv(self, username, host, port, subsystem=None,
419
407
args = [self.executable_path,
420
408
'-oForwardX11=no', '-oForwardAgent=no',
421
'-oClearAllForwardings=yes', '-oProtocol=2',
409
'-oClearAllForwardings=yes',
422
410
'-oNoHostAuthenticationForLocalhost=yes']
423
411
if port is not None:
424
412
args.extend(['-p', str(port)])
454
442
register_ssh_vendor('sshcorp', SSHCorpSubprocessVendor())
445
class LSHSubprocessVendor(SubprocessVendor):
446
"""SSH vendor that uses the 'lsh' executable from GNU"""
448
executable_path = 'lsh'
450
def _get_vendor_specific_argv(self, username, host, port, subsystem=None,
452
args = [self.executable_path]
454
args.extend(['-p', str(port)])
455
if username is not None:
456
args.extend(['-l', username])
457
if subsystem is not None:
458
args.extend(['--subsystem', subsystem, host])
460
args.extend([host] + command)
463
register_ssh_vendor('lsh', LSHSubprocessVendor())
457
466
class PLinkSubprocessVendor(SubprocessVendor):
458
467
"""SSH vendor that uses the 'plink' executable from Putty."""
645
654
_subproc_weakrefs = set()
647
656
def _close_ssh_proc(proc):
648
for func in [proc.stdin.close, proc.stdout.close, proc.wait]:
657
"""Carefully close stdin/stdout and reap the SSH process.
659
If the pipes are already closed and/or the process has already been
660
wait()ed on, that's ok, and no error is raised. The goal is to do our best
661
to clean up (whether or not a clean up was already tried).
663
dotted_names = ['stdin.close', 'stdout.close', 'wait']
664
for dotted_name in dotted_names:
665
attrs = dotted_name.split('.')
669
obj = getattr(obj, attr)
670
except AttributeError:
671
# It's ok for proc.stdin or proc.stdout to be None.
655
class SSHSubprocess(object):
656
"""A socket-like object that talks to an ssh subprocess via pipes."""
658
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.
660
715
# Add a weakref to proc that will attempt to do the same as self.close
661
716
# to avoid leaving processes lingering indefinitely.
662
717
def terminate(ref):
665
720
_subproc_weakrefs.add(weakref.ref(self, terminate))
667
722
def send(self, data):
668
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)
670
728
def recv(self, count):
671
return os.read(self.proc.stdout.fileno(), count)
729
if self._sock is not None:
730
return self._sock.recv(count)
732
return os.read(self.proc.stdout.fileno(), count)
674
735
_close_ssh_proc(self.proc)
676
def get_filelike_channels(self):
677
return (self.proc.stdout, self.proc.stdin)
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
