126
122
elif 'SSH Secure Shell' in version:
127
123
trace.mutter('ssh implementation is SSH Corp.')
128
124
vendor = SSHCorpSubprocessVendor()
129
# As plink user prompts are not handled currently, don't auto-detect
130
# it by inspection below, but keep this vendor detection for if a path
131
# is given in BZR_SSH. See https://bugs.launchpad.net/bugs/414743
132
elif 'plink' in version and progname == 'plink':
125
elif 'plink' in version and args[0] == 'plink':
133
126
# Checking if "plink" was the executed argument as Windows
134
127
# sometimes reports 'ssh -V' incorrectly with 'plink' in it's
135
128
# version. See https://bugs.launchpad.net/bzr/+bug/107155
140
133
def _get_vendor_by_inspection(self):
141
134
"""Return the vendor or None by checking for known SSH implementations."""
142
version = self._get_ssh_version_string(['ssh', '-V'])
143
return self._get_vendor_by_version_string(version, "ssh")
145
def _get_vendor_from_path(self, path):
146
"""Return the vendor or None using the program at the given path"""
147
version = self._get_ssh_version_string([path, '-V'])
148
return self._get_vendor_by_version_string(version,
149
os.path.splitext(os.path.basename(path))[0])
135
for args in (['ssh', '-V'], ['plink', '-V']):
136
version = self._get_ssh_version_string(args)
137
vendor = self._get_vendor_by_version_string(version, args)
138
if vendor is not None:
151
142
def get_vendor(self, environment=None):
152
143
"""Find out what version of SSH is on the system.
173
164
register_ssh_vendor = _ssh_vendor_manager.register_vendor
176
def _ignore_signals():
167
def _ignore_sigint():
177
168
# TODO: This should possibly ignore SIGHUP as well, but bzr currently
178
169
# doesn't handle it itself.
179
170
# <https://launchpad.net/products/bzr/+bug/41433/+index>
181
172
signal.signal(signal.SIGINT, signal.SIG_IGN)
182
# GZ 2010-02-19: Perhaps make this check if breakin is installed instead
183
if signal.getsignal(signal.SIGQUIT) != signal.SIG_DFL:
184
signal.signal(signal.SIGQUIT, signal.SIG_IGN)
187
class SocketAsChannelAdapter(object):
175
class LoopbackSFTP(object):
188
176
"""Simple wrapper for a socket that pretends to be a paramiko Channel."""
190
178
def __init__(self, sock):
191
179
self.__socket = sock
194
return "bzr SocketAsChannelAdapter"
196
181
def send(self, data):
197
182
return self.__socket.send(data)
199
184
def recv(self, n):
201
return self.__socket.recv(n)
202
except socket.error, e:
203
if e.args[0] in (errno.EPIPE, errno.ECONNRESET, errno.ECONNABORTED,
205
# Connection has closed. Paramiko expects an empty string in
206
# this case, not an exception.
185
return self.__socket.recv(n)
210
187
def recv_ready(self):
211
# TODO: jam 20051215 this function is necessary to support the
212
# pipelined() function. In reality, it probably should use
213
# poll() or select() to actually return if there is data
214
# available, otherwise we probably don't get any benefit
263
237
sock.connect((host, port))
264
238
except socket.error, e:
265
239
self._raise_connection_error(host, port=port, orig_error=e)
266
return SFTPClient(SocketAsChannelAdapter(sock))
240
return SFTPClient(LoopbackSFTP(sock))
268
242
register_ssh_vendor('loopback', LoopbackVendor())
245
class _ParamikoSSHConnection(object):
246
def __init__(self, channel):
247
self.channel = channel
249
def get_filelike_channels(self):
250
return self.channel.makefile('rb'), self.channel.makefile('wb')
253
return self.channel.close()
271
256
class ParamikoVendor(SSHVendor):
272
257
"""Vendor that uses paramiko."""
351
336
"""Abstract base class for vendors that use pipes to a subprocess."""
353
338
def _connect(self, argv):
354
# Attempt to make a socketpair to use as stdin/stdout for the SSH
355
# subprocess. We prefer sockets to pipes because they support
356
# non-blocking short reads, allowing us to optimistically read 64k (or
359
my_sock, subproc_sock = socket.socketpair()
360
except (AttributeError, socket.error):
361
# This platform doesn't support socketpair(), so just use ordinary
363
stdin = stdout = subprocess.PIPE
366
stdin = stdout = subproc_sock
368
proc = subprocess.Popen(argv, stdin=stdin, stdout=stdout,
339
proc = subprocess.Popen(argv,
340
stdin=subprocess.PIPE,
341
stdout=subprocess.PIPE,
369
342
**os_specific_subprocess_params())
370
return SSHSubprocessConnection(proc, sock=sock)
343
return SSHSubprocess(proc)
372
345
def connect_sftp(self, username, password, host, port):
374
347
argv = self._get_vendor_specific_argv(username, host, port,
375
348
subsystem='sftp')
376
349
sock = self._connect(argv)
377
return SFTPClient(SocketAsChannelAdapter(sock))
350
return SFTPClient(sock)
378
351
except _sftp_connection_errors, e:
379
352
self._raise_connection_error(host, port=port, orig_error=e)
380
353
except (OSError, IOError), e:
412
385
class OpenSSHSubprocessVendor(SubprocessVendor):
413
386
"""SSH vendor that uses the 'ssh' executable from OpenSSH."""
415
executable_path = 'ssh'
417
388
def _get_vendor_specific_argv(self, username, host, port, subsystem=None,
419
args = [self.executable_path,
390
assert subsystem is not None or command is not None, (
391
'Must specify a command or subsystem')
392
if subsystem is not None:
393
assert command is None, (
394
'subsystem and command are mutually exclusive')
420
396
'-oForwardX11=no', '-oForwardAgent=no',
421
397
'-oClearAllForwardings=yes', '-oProtocol=2',
422
398
'-oNoHostAuthenticationForLocalhost=yes']
436
412
class SSHCorpSubprocessVendor(SubprocessVendor):
437
413
"""SSH vendor that uses the 'ssh' executable from SSH Corporation."""
439
executable_path = 'ssh'
441
415
def _get_vendor_specific_argv(self, username, host, port, subsystem=None,
443
args = [self.executable_path, '-x']
417
assert subsystem is not None or command is not None, (
418
'Must specify a command or subsystem')
419
if subsystem is not None:
420
assert command is None, (
421
'subsystem and command are mutually exclusive')
444
423
if port is not None:
445
424
args.extend(['-p', str(port)])
446
425
if username is not None:
451
430
args.extend([host] + command)
454
register_ssh_vendor('sshcorp', SSHCorpSubprocessVendor())
433
register_ssh_vendor('ssh', SSHCorpSubprocessVendor())
457
436
class PLinkSubprocessVendor(SubprocessVendor):
458
437
"""SSH vendor that uses the 'plink' executable from Putty."""
460
executable_path = 'plink'
462
439
def _get_vendor_specific_argv(self, username, host, port, subsystem=None,
464
args = [self.executable_path, '-x', '-a', '-ssh', '-2', '-batch']
441
assert subsystem is not None or command is not None, (
442
'Must specify a command or subsystem')
443
if subsystem is not None:
444
assert command is None, (
445
'subsystem and command are mutually exclusive')
446
args = ['plink', '-x', '-a', '-ssh', '-2', '-batch']
465
447
if port is not None:
466
448
args.extend(['-P', str(port)])
467
449
if username is not None:
478
460
def _paramiko_auth(username, password, host, port, paramiko_transport):
461
# paramiko requires a username, but it might be none if nothing was supplied
462
# use the local username, just in case.
463
# We don't override username, because if we aren't using paramiko,
464
# the username might be specified in ~/.ssh/config and we don't want to
465
# force it to something else
466
# Also, it would mess up the self.relpath() functionality
479
467
auth = config.AuthenticationConfig()
480
# paramiko requires a username, but it might be none if nothing was
481
# supplied. If so, use the local username.
482
468
if username is None:
483
username = auth.get_user('ssh', host, port=port,
484
default=getpass.getuser())
469
username = auth.get_user('ssh', host, port=port)
471
# Default to local user
472
username = getpass.getuser()
485
474
if _use_ssh_agent:
486
475
agent = paramiko.Agent()
487
476
for key in agent.get_keys():
499
488
if _try_pkey_auth(paramiko_transport, paramiko.DSSKey, username, 'id_dsa'):
502
# If we have gotten this far, we are about to try for passwords, do an
503
# auth_none check to see if it is even supported.
504
supported_auth_types = []
506
# Note that with paramiko <1.7.5 this logs an INFO message:
507
# Authentication type (none) not permitted.
508
# So we explicitly disable the logging level for this action
509
old_level = paramiko_transport.logger.level
510
paramiko_transport.logger.setLevel(logging.WARNING)
512
paramiko_transport.auth_none(username)
514
paramiko_transport.logger.setLevel(old_level)
515
except paramiko.BadAuthenticationType, e:
516
# Supported methods are in the exception
517
supported_auth_types = e.allowed_types
518
except paramiko.SSHException, e:
519
# Don't know what happened, but just ignore it
521
# We treat 'keyboard-interactive' and 'password' auth methods identically,
522
# because Paramiko's auth_password method will automatically try
523
# 'keyboard-interactive' auth (using the password as the response) if
524
# 'password' auth is not available. Apparently some Debian and Gentoo
525
# OpenSSH servers require this.
526
# XXX: It's possible for a server to require keyboard-interactive auth that
527
# requires something other than a single password, but we currently don't
529
if ('password' not in supported_auth_types and
530
'keyboard-interactive' not in supported_auth_types):
531
raise errors.ConnectionError('Unable to authenticate to SSH host as'
532
'\n %s@%s\nsupported auth types: %s'
533
% (username, host, supported_auth_types))
537
493
paramiko_transport.auth_password(username, password)
542
498
# give up and ask for a password
543
499
password = auth.get_password('ssh', host, username, port=port)
544
# get_password can still return None, which means we should not prompt
545
if password is not None:
547
paramiko_transport.auth_password(username, password)
548
except paramiko.SSHException, e:
549
raise errors.ConnectionError(
550
'Unable to authenticate to SSH host as'
551
'\n %s@%s\n' % (username, host), e)
553
raise errors.ConnectionError('Unable to authenticate to SSH host as'
554
' %s@%s' % (username, host))
501
paramiko_transport.auth_password(username, password)
502
except paramiko.SSHException, e:
503
raise errors.ConnectionError(
504
'Unable to authenticate to SSH host as %s@%s' % (username, host), e)
557
507
def _try_pkey_auth(paramiko_transport, pkey_class, username, filename):
631
581
# this causes it to be seen only by bzr and not by ssh. Python will
632
582
# generate a KeyboardInterrupt in bzr, and we will then have a chance
633
583
# to release locks or do other cleanup over ssh before the connection
635
585
# <https://launchpad.net/products/bzr/+bug/5987>
637
587
# Running it in a separate process group is not good because then it
638
588
# can't get non-echoed input of a password or passphrase.
639
589
# <https://launchpad.net/products/bzr/+bug/40508>
640
return {'preexec_fn': _ignore_signals,
590
return {'preexec_fn': _ignore_sigint,
641
591
'close_fds': True,
645
_subproc_weakrefs = set()
647
def _close_ssh_proc(proc):
648
for func in [proc.stdin.close, proc.stdout.close, proc.wait]:
655
class SSHConnection(object):
656
"""Abstract base class for SSH connections."""
658
def get_sock_or_pipes(self):
659
"""Returns a (kind, io_object) pair.
661
If kind == 'socket', then io_object is a socket.
663
If kind == 'pipes', then io_object is a pair of file-like objects
664
(read_from, write_to).
666
raise NotImplementedError(self.get_sock_or_pipes)
669
raise NotImplementedError(self.close)
672
class SSHSubprocessConnection(SSHConnection):
673
"""A connection to an ssh subprocess via pipes or a socket.
675
This class is also socket-like enough to be used with
676
SocketAsChannelAdapter (it has 'send' and 'recv' methods).
679
def __init__(self, proc, sock=None):
682
:param proc: a subprocess.Popen
683
:param sock: if proc.stdin/out is a socket from a socketpair, then sock
684
should bzrlib's half of that socketpair. If not passed, proc's
685
stdin/out is assumed to be ordinary pipes.
595
class SSHSubprocess(object):
596
"""A socket-like object that talks to an ssh subprocess via pipes."""
598
def __init__(self, proc):
689
# Add a weakref to proc that will attempt to do the same as self.close
690
# to avoid leaving processes lingering indefinitely.
692
_subproc_weakrefs.remove(ref)
693
_close_ssh_proc(proc)
694
_subproc_weakrefs.add(weakref.ref(self, terminate))
696
601
def send(self, data):
697
if self._sock is not None:
698
return self._sock.send(data)
700
return os.write(self.proc.stdin.fileno(), data)
602
return os.write(self.proc.stdin.fileno(), data)
604
def recv_ready(self):
605
# TODO: jam 20051215 this function is necessary to support the
606
# pipelined() function. In reality, it probably should use
607
# poll() or select() to actually return if there is data
608
# available, otherwise we probably don't get any benefit
702
611
def recv(self, count):
703
if self._sock is not None:
704
return self._sock.recv(count)
706
return os.read(self.proc.stdout.fileno(), count)
709
_close_ssh_proc(self.proc)
711
def get_sock_or_pipes(self):
712
if self._sock is not None:
713
return 'socket', self._sock
715
return 'pipes', (self.proc.stdout, self.proc.stdin)
718
class _ParamikoSSHConnection(SSHConnection):
719
"""An SSH connection via paramiko."""
721
def __init__(self, channel):
722
self.channel = channel
724
def get_sock_or_pipes(self):
725
return ('socket', self.channel)
728
return self.channel.close()
612
return os.read(self.proc.stdout.fileno(), count)
615
self.proc.stdin.close()
616
self.proc.stdout.close()
619
def get_filelike_channels(self):
620
return (self.proc.stdout, self.proc.stdin)
added
removed
bzrlib/transport/ssh.py
