1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
1 |
# Copyright (C) 2005 Robey Pointer <robey@lag.net>
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
2 |
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
3 |
#
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
17 |
||
18 |
"""Foundation SSH support for SFTP and smart server."""
|
|
19 |
||
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
20 |
import errno |
1951.1.5
by Andrew Bennetts
Fix some missing imports with a bit of help from pyflakes. |
21 |
import getpass |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
22 |
import os |
23 |
import socket |
|
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
24 |
import subprocess |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
25 |
import sys |
26 |
||
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
27 |
from bzrlib import ( |
28 |
config, |
|
29 |
errors, |
|
30 |
osutils, |
|
31 |
trace, |
|
32 |
ui, |
|
33 |
)
|
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
34 |
|
35 |
try: |
|
36 |
import paramiko |
|
37 |
except ImportError, e: |
|
2104.5.1
by John Arbash Meinel
Remove the strict dependency on paramiko for ssh access |
38 |
# If we have an ssh subprocess, we don't strictly need paramiko for all ssh
|
39 |
# access
|
|
40 |
paramiko = None |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
41 |
else: |
42 |
from paramiko.sftp_client import SFTPClient |
|
43 |
||
44 |
||
45 |
SYSTEM_HOSTKEYS = {} |
|
46 |
BZR_HOSTKEYS = {} |
|
47 |
||
48 |
||
1951.1.5
by Andrew Bennetts
Fix some missing imports with a bit of help from pyflakes. |
49 |
_paramiko_version = getattr(paramiko, '__version_info__', (0, 0, 0)) |
50 |
||
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
51 |
# Paramiko 1.5 tries to open a socket.AF_UNIX in order to connect
|
52 |
# to ssh-agent. That attribute doesn't exist on win32 (it does in cygwin)
|
|
53 |
# so we get an AttributeError exception. So we will not try to
|
|
54 |
# connect to an agent if we are on win32 and using Paramiko older than 1.6
|
|
55 |
_use_ssh_agent = (sys.platform != 'win32' or _paramiko_version >= (1, 6, 0)) |
|
56 |
||
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
57 |
|
58 |
class SSHVendorManager(object): |
|
59 |
"""Manager for manage SSH vendors."""
|
|
60 |
||
2221.5.15
by Dmitry Vasiliev
Added docstrings for all SSHVendorManager's methods |
61 |
# Note, although at first sign the class interface seems similar to
|
2221.5.22
by Dmitry Vasiliev
Updated note about registry.Registry |
62 |
# bzrlib.registry.Registry it is not possible/convenient to directly use
|
63 |
# the Registry because the class just has "get()" interface instead of the
|
|
64 |
# Registry's "get(key)".
|
|
2221.5.15
by Dmitry Vasiliev
Added docstrings for all SSHVendorManager's methods |
65 |
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
66 |
def __init__(self): |
67 |
self._ssh_vendors = {} |
|
2221.5.8
by Dmitry Vasiliev
Added SSHVendorManager.clear_cache() method |
68 |
self._cached_ssh_vendor = None |
2221.5.5
by Dmitry Vasiliev
Added 'register_default_vendor' method to the SSHVendorManager |
69 |
self._default_ssh_vendor = None |
70 |
||
71 |
def register_default_vendor(self, vendor): |
|
72 |
"""Register default SSH vendor."""
|
|
73 |
self._default_ssh_vendor = vendor |
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
74 |
|
75 |
def register_vendor(self, name, vendor): |
|
2221.5.5
by Dmitry Vasiliev
Added 'register_default_vendor' method to the SSHVendorManager |
76 |
"""Register new SSH vendor by name."""
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
77 |
self._ssh_vendors[name] = vendor |
78 |
||
2221.5.8
by Dmitry Vasiliev
Added SSHVendorManager.clear_cache() method |
79 |
def clear_cache(self): |
2221.5.15
by Dmitry Vasiliev
Added docstrings for all SSHVendorManager's methods |
80 |
"""Clear previously cached lookup result."""
|
2221.5.8
by Dmitry Vasiliev
Added SSHVendorManager.clear_cache() method |
81 |
self._cached_ssh_vendor = None |
82 |
||
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
83 |
def _get_vendor_by_environment(self, environment=None): |
2221.5.15
by Dmitry Vasiliev
Added docstrings for all SSHVendorManager's methods |
84 |
"""Return the vendor or None based on BZR_SSH environment variable.
|
85 |
||
86 |
:raises UnknownSSH: if the BZR_SSH environment variable contains
|
|
87 |
unknown vendor name
|
|
88 |
"""
|
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
89 |
if environment is None: |
90 |
environment = os.environ |
|
91 |
if 'BZR_SSH' in environment: |
|
92 |
vendor_name = environment['BZR_SSH'] |
|
93 |
try: |
|
94 |
vendor = self._ssh_vendors[vendor_name] |
|
95 |
except KeyError: |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
96 |
raise errors.UnknownSSH(vendor_name) |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
97 |
return vendor |
98 |
return None |
|
99 |
||
100 |
def _get_ssh_version_string(self, args): |
|
2221.5.15
by Dmitry Vasiliev
Added docstrings for all SSHVendorManager's methods |
101 |
"""Return SSH version string from the subprocess."""
|
1951.1.10
by Andrew Bennetts
Move register_ssh_vendor, _ssh_vendor and _get_ssh_vendor into ssh.py |
102 |
try: |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
103 |
p = subprocess.Popen(args, |
104 |
stdout=subprocess.PIPE, |
|
105 |
stderr=subprocess.PIPE, |
|
106 |
**os_specific_subprocess_params()) |
|
107 |
stdout, stderr = p.communicate() |
|
108 |
except OSError: |
|
109 |
stdout = stderr = '' |
|
110 |
return stdout + stderr |
|
111 |
||
2772.3.1
by Martin Pool
Fix detection of ssh implementation on Windows |
112 |
def _get_vendor_by_version_string(self, version, args): |
2221.5.15
by Dmitry Vasiliev
Added docstrings for all SSHVendorManager's methods |
113 |
"""Return the vendor or None based on output from the subprocess.
|
114 |
||
115 |
:param version: The output of 'ssh -V' like command.
|
|
2772.3.1
by Martin Pool
Fix detection of ssh implementation on Windows |
116 |
:param args: Command line that was run.
|
2221.5.15
by Dmitry Vasiliev
Added docstrings for all SSHVendorManager's methods |
117 |
"""
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
118 |
vendor = None |
119 |
if 'OpenSSH' in version: |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
120 |
trace.mutter('ssh implementation is OpenSSH') |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
121 |
vendor = OpenSSHSubprocessVendor() |
122 |
elif 'SSH Secure Shell' in version: |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
123 |
trace.mutter('ssh implementation is SSH Corp.') |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
124 |
vendor = SSHCorpSubprocessVendor() |
2772.3.1
by Martin Pool
Fix detection of ssh implementation on Windows |
125 |
elif 'plink' in version and args[0] == 'plink': |
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
126 |
# Checking if "plink" was the executed argument as Windows
|
127 |
# sometimes reports 'ssh -V' incorrectly with 'plink' in it's
|
|
128 |
# version. See https://bugs.launchpad.net/bzr/+bug/107155
|
|
129 |
trace.mutter("ssh implementation is Putty's plink.") |
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
130 |
vendor = PLinkSubprocessVendor() |
131 |
return vendor |
|
132 |
||
133 |
def _get_vendor_by_inspection(self): |
|
2221.5.15
by Dmitry Vasiliev
Added docstrings for all SSHVendorManager's methods |
134 |
"""Return the vendor or None by checking for known SSH implementations."""
|
3220.1.2
by Dmitry Vasiliev
Re-enabled auto-detection of plink vendor and fixed tests |
135 |
for args in (['ssh', '-V'], ['plink', '-V']): |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
136 |
version = self._get_ssh_version_string(args) |
2767.3.1
by Martin Albisetti
Fixed bug #107155 |
137 |
vendor = self._get_vendor_by_version_string(version, args) |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
138 |
if vendor is not None: |
139 |
return vendor |
|
140 |
return None |
|
141 |
||
142 |
def get_vendor(self, environment=None): |
|
2221.5.15
by Dmitry Vasiliev
Added docstrings for all SSHVendorManager's methods |
143 |
"""Find out what version of SSH is on the system.
|
144 |
||
145 |
:raises SSHVendorNotFound: if no any SSH vendor is found
|
|
146 |
:raises UnknownSSH: if the BZR_SSH environment variable contains
|
|
147 |
unknown vendor name
|
|
148 |
"""
|
|
2221.5.8
by Dmitry Vasiliev
Added SSHVendorManager.clear_cache() method |
149 |
if self._cached_ssh_vendor is None: |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
150 |
vendor = self._get_vendor_by_environment(environment) |
151 |
if vendor is None: |
|
152 |
vendor = self._get_vendor_by_inspection() |
|
153 |
if vendor is None: |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
154 |
trace.mutter('falling back to default implementation') |
2221.5.5
by Dmitry Vasiliev
Added 'register_default_vendor' method to the SSHVendorManager |
155 |
vendor = self._default_ssh_vendor |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
156 |
if vendor is None: |
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
157 |
raise errors.SSHVendorNotFound() |
2221.5.8
by Dmitry Vasiliev
Added SSHVendorManager.clear_cache() method |
158 |
self._cached_ssh_vendor = vendor |
159 |
return self._cached_ssh_vendor |
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
160 |
|
161 |
_ssh_vendor_manager = SSHVendorManager() |
|
162 |
_get_ssh_vendor = _ssh_vendor_manager.get_vendor |
|
2221.5.5
by Dmitry Vasiliev
Added 'register_default_vendor' method to the SSHVendorManager |
163 |
register_default_ssh_vendor = _ssh_vendor_manager.register_default_vendor |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
164 |
register_ssh_vendor = _ssh_vendor_manager.register_vendor |
1951.1.10
by Andrew Bennetts
Move register_ssh_vendor, _ssh_vendor and _get_ssh_vendor into ssh.py |
165 |
|
166 |
||
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
167 |
def _ignore_sigint(): |
168 |
# TODO: This should possibly ignore SIGHUP as well, but bzr currently
|
|
169 |
# doesn't handle it itself.
|
|
170 |
# <https://launchpad.net/products/bzr/+bug/41433/+index>
|
|
171 |
import signal |
|
172 |
signal.signal(signal.SIGINT, signal.SIG_IGN) |
|
173 |
||
174 |
||
3353.1.3
by Andrew Bennetts
Always adapt sockets to look like paramiko Channels before passing them to paramiko's SFTPClient. |
175 |
class SocketAsChannelAdapter(object): |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
176 |
"""Simple wrapper for a socket that pretends to be a paramiko Channel."""
|
177 |
||
178 |
def __init__(self, sock): |
|
179 |
self.__socket = sock |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
180 |
|
3353.1.2
by Andrew Bennetts
Add get_name to LoopbackSFTP. Makes the current tests pass with current paramiko. |
181 |
def get_name(self): |
3353.1.3
by Andrew Bennetts
Always adapt sockets to look like paramiko Channels before passing them to paramiko's SFTPClient. |
182 |
return "bzr SocketAsChannelAdapter" |
3353.1.2
by Andrew Bennetts
Add get_name to LoopbackSFTP. Makes the current tests pass with current paramiko. |
183 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
184 |
def send(self, data): |
185 |
return self.__socket.send(data) |
|
186 |
||
187 |
def recv(self, n): |
|
3353.1.3
by Andrew Bennetts
Always adapt sockets to look like paramiko Channels before passing them to paramiko's SFTPClient. |
188 |
try: |
189 |
return self.__socket.recv(n) |
|
190 |
except socket.error, e: |
|
191 |
if e.args[0] in (errno.EPIPE, errno.ECONNRESET, errno.ECONNABORTED, |
|
192 |
errno.EBADF): |
|
193 |
# Connection has closed. Paramiko expects an empty string in
|
|
194 |
# this case, not an exception.
|
|
195 |
return '' |
|
196 |
raise
|
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
197 |
|
198 |
def recv_ready(self): |
|
3353.1.3
by Andrew Bennetts
Always adapt sockets to look like paramiko Channels before passing them to paramiko's SFTPClient. |
199 |
# TODO: jam 20051215 this function is necessary to support the
|
200 |
# pipelined() function. In reality, it probably should use
|
|
201 |
# poll() or select() to actually return if there is data
|
|
202 |
# available, otherwise we probably don't get any benefit
|
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
203 |
return True |
204 |
||
205 |
def close(self): |
|
206 |
self.__socket.close() |
|
207 |
||
208 |
||
209 |
class SSHVendor(object): |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
210 |
"""Abstract base class for SSH vendor implementations."""
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
211 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
212 |
def connect_sftp(self, username, password, host, port): |
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
213 |
"""Make an SSH connection, and return an SFTPClient.
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
214 |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
215 |
:param username: an ascii string
|
216 |
:param password: an ascii string
|
|
217 |
:param host: a host name as an ascii string
|
|
218 |
:param port: a port number
|
|
219 |
:type port: int
|
|
220 |
||
221 |
:raises: ConnectionError if it cannot connect.
|
|
222 |
||
223 |
:rtype: paramiko.sftp_client.SFTPClient
|
|
224 |
"""
|
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
225 |
raise NotImplementedError(self.connect_sftp) |
226 |
||
227 |
def connect_ssh(self, username, password, host, port, command): |
|
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
228 |
"""Make an SSH connection.
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
229 |
|
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
230 |
:returns: something with a `close` method, and a `get_filelike_channels`
|
231 |
method that returns a pair of (read, write) filelike objects.
|
|
1951.1.12
by Andrew Bennetts
Cosmetic tweaks. |
232 |
"""
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
233 |
raise NotImplementedError(self.connect_ssh) |
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
234 |
|
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
235 |
def _raise_connection_error(self, host, port=None, orig_error=None, |
2052.4.4
by John Arbash Meinel
Create a SocketConnectionError to make creating nice errors easier |
236 |
msg='Unable to connect to SSH host'): |
237 |
"""Raise a SocketConnectionError with properly formatted host.
|
|
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
238 |
|
239 |
This just unifies all the locations that try to raise ConnectionError,
|
|
240 |
so that they format things properly.
|
|
241 |
"""
|
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
242 |
raise errors.SocketConnectionError(host=host, port=port, msg=msg, |
243 |
orig_error=orig_error) |
|
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
244 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
245 |
|
246 |
class LoopbackVendor(SSHVendor): |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
247 |
"""SSH "vendor" that connects over a plain TCP socket, not SSH."""
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
248 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
249 |
def connect_sftp(self, username, password, host, port): |
250 |
sock = socket.socket() |
|
251 |
try: |
|
252 |
sock.connect((host, port)) |
|
253 |
except socket.error, e: |
|
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
254 |
self._raise_connection_error(host, port=port, orig_error=e) |
3353.1.3
by Andrew Bennetts
Always adapt sockets to look like paramiko Channels before passing them to paramiko's SFTPClient. |
255 |
return SFTPClient(SocketAsChannelAdapter(sock)) |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
256 |
|
1951.1.11
by Andrew Bennetts
Change register_ssh_vendor to take an instance rather than a class. |
257 |
register_ssh_vendor('loopback', LoopbackVendor()) |
1951.1.10
by Andrew Bennetts
Move register_ssh_vendor, _ssh_vendor and _get_ssh_vendor into ssh.py |
258 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
259 |
|
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
260 |
class _ParamikoSSHConnection(object): |
261 |
def __init__(self, channel): |
|
262 |
self.channel = channel |
|
263 |
||
264 |
def get_filelike_channels(self): |
|
265 |
return self.channel.makefile('rb'), self.channel.makefile('wb') |
|
266 |
||
267 |
def close(self): |
|
268 |
return self.channel.close() |
|
269 |
||
270 |
||
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
271 |
class ParamikoVendor(SSHVendor): |
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
272 |
"""Vendor that uses paramiko."""
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
273 |
|
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
274 |
def _connect(self, username, password, host, port): |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
275 |
global SYSTEM_HOSTKEYS, BZR_HOSTKEYS |
2900.2.8
by Vincent Ladeuil
Make sftp and bzr+ssh aware of authentication config. |
276 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
277 |
load_host_keys() |
278 |
||
279 |
try: |
|
280 |
t = paramiko.Transport((host, port or 22)) |
|
281 |
t.set_log_channel('bzr.paramiko') |
|
282 |
t.start_client() |
|
283 |
except (paramiko.SSHException, socket.error), e: |
|
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
284 |
self._raise_connection_error(host, port=port, orig_error=e) |
2900.2.8
by Vincent Ladeuil
Make sftp and bzr+ssh aware of authentication config. |
285 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
286 |
server_key = t.get_remote_server_key() |
287 |
server_key_hex = paramiko.util.hexify(server_key.get_fingerprint()) |
|
288 |
keytype = server_key.get_name() |
|
1711.9.10
by John Arbash Meinel
Update transport/ssh.py to remove has_key usage |
289 |
if host in SYSTEM_HOSTKEYS and keytype in SYSTEM_HOSTKEYS[host]: |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
290 |
our_server_key = SYSTEM_HOSTKEYS[host][keytype] |
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
291 |
our_server_key_hex = paramiko.util.hexify( |
292 |
our_server_key.get_fingerprint()) |
|
1711.9.10
by John Arbash Meinel
Update transport/ssh.py to remove has_key usage |
293 |
elif host in BZR_HOSTKEYS and keytype in BZR_HOSTKEYS[host]: |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
294 |
our_server_key = BZR_HOSTKEYS[host][keytype] |
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
295 |
our_server_key_hex = paramiko.util.hexify( |
296 |
our_server_key.get_fingerprint()) |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
297 |
else: |
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
298 |
trace.warning('Adding %s host key for %s: %s' |
299 |
% (keytype, host, server_key_hex)) |
|
2127.3.1
by Alexander Belchenko
Use BZR_HOSTKEYS.add instead of deprecated dict-like paramiko interface |
300 |
add = getattr(BZR_HOSTKEYS, 'add', None) |
301 |
if add is not None: # paramiko >= 1.X.X |
|
302 |
BZR_HOSTKEYS.add(host, keytype, server_key) |
|
303 |
else: |
|
1551.9.2
by Aaron Bentley
Bugfix for paramiko connections |
304 |
BZR_HOSTKEYS.setdefault(host, {})[keytype] = server_key |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
305 |
our_server_key = server_key |
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
306 |
our_server_key_hex = paramiko.util.hexify( |
307 |
our_server_key.get_fingerprint()) |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
308 |
save_host_keys() |
309 |
if server_key != our_server_key: |
|
310 |
filename1 = os.path.expanduser('~/.ssh/known_hosts') |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
311 |
filename2 = osutils.pathjoin(config.config_dir(), 'ssh_host_keys') |
312 |
raise errors.TransportError( |
|
313 |
'Host keys for %s do not match! %s != %s' % |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
314 |
(host, our_server_key_hex, server_key_hex), |
315 |
['Try editing %s or %s' % (filename1, filename2)]) |
|
316 |
||
2900.2.8
by Vincent Ladeuil
Make sftp and bzr+ssh aware of authentication config. |
317 |
_paramiko_auth(username, password, host, port, t) |
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
318 |
return t |
2900.2.8
by Vincent Ladeuil
Make sftp and bzr+ssh aware of authentication config. |
319 |
|
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
320 |
def connect_sftp(self, username, password, host, port): |
321 |
t = self._connect(username, password, host, port) |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
322 |
try: |
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
323 |
return t.open_sftp_client() |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
324 |
except paramiko.SSHException, e: |
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
325 |
self._raise_connection_error(host, port=port, orig_error=e, |
2052.4.4
by John Arbash Meinel
Create a SocketConnectionError to make creating nice errors easier |
326 |
msg='Unable to start sftp client') |
2018.1.9
by Andrew Bennetts
Implement ParamikoVendor.connect_ssh |
327 |
|
328 |
def connect_ssh(self, username, password, host, port, command): |
|
329 |
t = self._connect(username, password, host, port) |
|
330 |
try: |
|
331 |
channel = t.open_session() |
|
332 |
cmdline = ' '.join(command) |
|
333 |
channel.exec_command(cmdline) |
|
334 |
return _ParamikoSSHConnection(channel) |
|
335 |
except paramiko.SSHException, e: |
|
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
336 |
self._raise_connection_error(host, port=port, orig_error=e, |
2052.4.4
by John Arbash Meinel
Create a SocketConnectionError to make creating nice errors easier |
337 |
msg='Unable to invoke remote bzr') |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
338 |
|
2104.5.1
by John Arbash Meinel
Remove the strict dependency on paramiko for ssh access |
339 |
if paramiko is not None: |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
340 |
vendor = ParamikoVendor() |
341 |
register_ssh_vendor('paramiko', vendor) |
|
342 |
register_ssh_vendor('none', vendor) |
|
2221.5.5
by Dmitry Vasiliev
Added 'register_default_vendor' method to the SSHVendorManager |
343 |
register_default_ssh_vendor(vendor) |
3066.2.1
by John Arbash Meinel
We don't require paramiko for bzr+ssh. |
344 |
_sftp_connection_errors = (EOFError, paramiko.SSHException) |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
345 |
del vendor |
3066.2.1
by John Arbash Meinel
We don't require paramiko for bzr+ssh. |
346 |
else: |
347 |
_sftp_connection_errors = (EOFError,) |
|
1951.1.10
by Andrew Bennetts
Move register_ssh_vendor, _ssh_vendor and _get_ssh_vendor into ssh.py |
348 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
349 |
|
350 |
class SubprocessVendor(SSHVendor): |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
351 |
"""Abstract base class for vendors that use pipes to a subprocess."""
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
352 |
|
2018.1.6
by Andrew Bennetts
Remove a little bit of duplication in ssh.py |
353 |
def _connect(self, argv): |
354 |
proc = subprocess.Popen(argv, |
|
355 |
stdin=subprocess.PIPE, |
|
356 |
stdout=subprocess.PIPE, |
|
357 |
**os_specific_subprocess_params()) |
|
358 |
return SSHSubprocess(proc) |
|
359 |
||
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
360 |
def connect_sftp(self, username, password, host, port): |
361 |
try: |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
362 |
argv = self._get_vendor_specific_argv(username, host, port, |
363 |
subsystem='sftp') |
|
2018.1.6
by Andrew Bennetts
Remove a little bit of duplication in ssh.py |
364 |
sock = self._connect(argv) |
3353.1.3
by Andrew Bennetts
Always adapt sockets to look like paramiko Channels before passing them to paramiko's SFTPClient. |
365 |
return SFTPClient(SocketAsChannelAdapter(sock)) |
3066.2.1
by John Arbash Meinel
We don't require paramiko for bzr+ssh. |
366 |
except _sftp_connection_errors, e: |
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
367 |
self._raise_connection_error(host, port=port, orig_error=e) |
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
368 |
except (OSError, IOError), e: |
369 |
# If the machine is fast enough, ssh can actually exit
|
|
370 |
# before we try and send it the sftp request, which
|
|
371 |
# raises a Broken Pipe
|
|
372 |
if e.errno not in (errno.EPIPE,): |
|
373 |
raise
|
|
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
374 |
self._raise_connection_error(host, port=port, orig_error=e) |
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
375 |
|
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
376 |
def connect_ssh(self, username, password, host, port, command): |
377 |
try: |
|
378 |
argv = self._get_vendor_specific_argv(username, host, port, |
|
379 |
command=command) |
|
2018.1.6
by Andrew Bennetts
Remove a little bit of duplication in ssh.py |
380 |
return self._connect(argv) |
381 |
except (EOFError), e: |
|
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
382 |
self._raise_connection_error(host, port=port, orig_error=e) |
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
383 |
except (OSError, IOError), e: |
384 |
# If the machine is fast enough, ssh can actually exit
|
|
385 |
# before we try and send it the sftp request, which
|
|
386 |
# raises a Broken Pipe
|
|
387 |
if e.errno not in (errno.EPIPE,): |
|
388 |
raise
|
|
2052.4.2
by John Arbash Meinel
Refactor all 'raise ConnectionError' into a helper function |
389 |
self._raise_connection_error(host, port=port, orig_error=e) |
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
390 |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
391 |
def _get_vendor_specific_argv(self, username, host, port, subsystem=None, |
392 |
command=None): |
|
393 |
"""Returns the argument list to run the subprocess with.
|
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
394 |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
395 |
Exactly one of 'subsystem' and 'command' must be specified.
|
396 |
"""
|
|
397 |
raise NotImplementedError(self._get_vendor_specific_argv) |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
398 |
|
399 |
||
400 |
class OpenSSHSubprocessVendor(SubprocessVendor): |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
401 |
"""SSH vendor that uses the 'ssh' executable from OpenSSH."""
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
402 |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
403 |
def _get_vendor_specific_argv(self, username, host, port, subsystem=None, |
404 |
command=None): |
|
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
405 |
args = ['ssh', |
406 |
'-oForwardX11=no', '-oForwardAgent=no', |
|
407 |
'-oClearAllForwardings=yes', '-oProtocol=2', |
|
408 |
'-oNoHostAuthenticationForLocalhost=yes'] |
|
409 |
if port is not None: |
|
410 |
args.extend(['-p', str(port)]) |
|
411 |
if username is not None: |
|
412 |
args.extend(['-l', username]) |
|
413 |
if subsystem is not None: |
|
414 |
args.extend(['-s', host, subsystem]) |
|
415 |
else: |
|
416 |
args.extend([host] + command) |
|
417 |
return args |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
418 |
|
1951.1.11
by Andrew Bennetts
Change register_ssh_vendor to take an instance rather than a class. |
419 |
register_ssh_vendor('openssh', OpenSSHSubprocessVendor()) |
1951.1.10
by Andrew Bennetts
Move register_ssh_vendor, _ssh_vendor and _get_ssh_vendor into ssh.py |
420 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
421 |
|
422 |
class SSHCorpSubprocessVendor(SubprocessVendor): |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
423 |
"""SSH vendor that uses the 'ssh' executable from SSH Corporation."""
|
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
424 |
|
1951.1.9
by Andrew Bennetts
Add docstrings and tweak method names in ssh.py |
425 |
def _get_vendor_specific_argv(self, username, host, port, subsystem=None, |
426 |
command=None): |
|
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
427 |
args = ['ssh', '-x'] |
428 |
if port is not None: |
|
429 |
args.extend(['-p', str(port)]) |
|
430 |
if username is not None: |
|
431 |
args.extend(['-l', username]) |
|
432 |
if subsystem is not None: |
|
433 |
args.extend(['-s', subsystem, host]) |
|
434 |
else: |
|
435 |
args.extend([host] + command) |
|
436 |
return args |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
437 |
|
1951.1.11
by Andrew Bennetts
Change register_ssh_vendor to take an instance rather than a class. |
438 |
register_ssh_vendor('ssh', SSHCorpSubprocessVendor()) |
1951.1.10
by Andrew Bennetts
Move register_ssh_vendor, _ssh_vendor and _get_ssh_vendor into ssh.py |
439 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
440 |
|
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
441 |
class PLinkSubprocessVendor(SubprocessVendor): |
442 |
"""SSH vendor that uses the 'plink' executable from Putty."""
|
|
443 |
||
444 |
def _get_vendor_specific_argv(self, username, host, port, subsystem=None, |
|
445 |
command=None): |
|
3220.1.1
by Dmitry Vasiliev
Now plink closes the pipe if unable to open ssh connection and connection error can be reported |
446 |
args = ['plink', '-x', '-a', '-ssh', '-2', '-batch'] |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
447 |
if port is not None: |
448 |
args.extend(['-P', str(port)]) |
|
449 |
if username is not None: |
|
450 |
args.extend(['-l', username]) |
|
451 |
if subsystem is not None: |
|
2221.5.3
by Dmitry Vasiliev
Fixed plink's arguments order. Added tests for such a case. |
452 |
args.extend(['-s', host, subsystem]) |
2221.5.1
by Dmitry Vasiliev
Added support for Putty's SSH implementation |
453 |
else: |
454 |
args.extend([host] + command) |
|
455 |
return args |
|
456 |
||
457 |
register_ssh_vendor('plink', PLinkSubprocessVendor()) |
|
458 |
||
459 |
||
2900.2.8
by Vincent Ladeuil
Make sftp and bzr+ssh aware of authentication config. |
460 |
def _paramiko_auth(username, password, host, port, paramiko_transport): |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
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
|
|
2900.2.15
by Vincent Ladeuil
AuthenticationConfig can be queried for logins too (first step). |
467 |
auth = config.AuthenticationConfig() |
468 |
if username is None: |
|
469 |
username = auth.get_user('ssh', host, port=port) |
|
470 |
if username is None: |
|
471 |
# Default to local user
|
|
472 |
username = getpass.getuser() |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
473 |
|
474 |
if _use_ssh_agent: |
|
475 |
agent = paramiko.Agent() |
|
476 |
for key in agent.get_keys(): |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
477 |
trace.mutter('Trying SSH agent key %s' |
478 |
% paramiko.util.hexify(key.get_fingerprint())) |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
479 |
try: |
480 |
paramiko_transport.auth_publickey(username, key) |
|
481 |
return
|
|
482 |
except paramiko.SSHException, e: |
|
483 |
pass
|
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
484 |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
485 |
# okay, try finding id_rsa or id_dss? (posix only)
|
486 |
if _try_pkey_auth(paramiko_transport, paramiko.RSAKey, username, 'id_rsa'): |
|
487 |
return
|
|
488 |
if _try_pkey_auth(paramiko_transport, paramiko.DSSKey, username, 'id_dsa'): |
|
489 |
return
|
|
490 |
||
491 |
if password: |
|
492 |
try: |
|
493 |
paramiko_transport.auth_password(username, password) |
|
494 |
return
|
|
495 |
except paramiko.SSHException, e: |
|
496 |
pass
|
|
497 |
||
498 |
# give up and ask for a password
|
|
2900.2.12
by Vincent Ladeuil
Since all schemes query AuthenticationConfig then prompt user, make that |
499 |
password = auth.get_password('ssh', host, username, port=port) |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
500 |
try: |
501 |
paramiko_transport.auth_password(username, password) |
|
502 |
except paramiko.SSHException, e: |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
503 |
raise errors.ConnectionError( |
504 |
'Unable to authenticate to SSH host as %s@%s' % (username, host), e) |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
505 |
|
506 |
||
507 |
def _try_pkey_auth(paramiko_transport, pkey_class, username, filename): |
|
508 |
filename = os.path.expanduser('~/.ssh/' + filename) |
|
509 |
try: |
|
510 |
key = pkey_class.from_private_key_file(filename) |
|
511 |
paramiko_transport.auth_publickey(username, key) |
|
512 |
return True |
|
513 |
except paramiko.PasswordRequiredException: |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
514 |
password = ui.ui_factory.get_password( |
515 |
prompt='SSH %(filename)s password', filename=filename) |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
516 |
try: |
517 |
key = pkey_class.from_private_key_file(filename, password) |
|
518 |
paramiko_transport.auth_publickey(username, key) |
|
519 |
return True |
|
520 |
except paramiko.SSHException: |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
521 |
trace.mutter('SSH authentication via %s key failed.' |
522 |
% (os.path.basename(filename),)) |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
523 |
except paramiko.SSHException: |
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
524 |
trace.mutter('SSH authentication via %s key failed.' |
525 |
% (os.path.basename(filename),)) |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
526 |
except IOError: |
527 |
pass
|
|
528 |
return False |
|
529 |
||
530 |
||
531 |
def load_host_keys(): |
|
532 |
"""
|
|
533 |
Load system host keys (probably doesn't work on windows) and any
|
|
534 |
"discovered" keys from previous sessions.
|
|
535 |
"""
|
|
536 |
global SYSTEM_HOSTKEYS, BZR_HOSTKEYS |
|
537 |
try: |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
538 |
SYSTEM_HOSTKEYS = paramiko.util.load_host_keys( |
539 |
os.path.expanduser('~/.ssh/known_hosts')) |
|
2358.3.1
by Martin Pool
Update some too-general exception blocks |
540 |
except IOError, e: |
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
541 |
trace.mutter('failed to load system host keys: ' + str(e)) |
542 |
bzr_hostkey_path = osutils.pathjoin(config.config_dir(), 'ssh_host_keys') |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
543 |
try: |
544 |
BZR_HOSTKEYS = paramiko.util.load_host_keys(bzr_hostkey_path) |
|
2358.3.1
by Martin Pool
Update some too-general exception blocks |
545 |
except IOError, e: |
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
546 |
trace.mutter('failed to load bzr host keys: ' + str(e)) |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
547 |
save_host_keys() |
548 |
||
549 |
||
550 |
def save_host_keys(): |
|
551 |
"""
|
|
552 |
Save "discovered" host keys in $(config)/ssh_host_keys/.
|
|
553 |
"""
|
|
554 |
global SYSTEM_HOSTKEYS, BZR_HOSTKEYS |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
555 |
bzr_hostkey_path = osutils.pathjoin(config.config_dir(), 'ssh_host_keys') |
556 |
config.ensure_config_dir_exists() |
|
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
557 |
|
558 |
try: |
|
559 |
f = open(bzr_hostkey_path, 'w') |
|
560 |
f.write('# SSH host keys collected by bzr\n') |
|
561 |
for hostname, keys in BZR_HOSTKEYS.iteritems(): |
|
562 |
for keytype, key in keys.iteritems(): |
|
563 |
f.write('%s %s %s\n' % (hostname, keytype, key.get_base64())) |
|
564 |
f.close() |
|
565 |
except IOError, e: |
|
2900.2.18
by Vincent Ladeuil
Previous commits didn't check the test suite enough. |
566 |
trace.mutter('failed to save bzr host keys: ' + str(e)) |
1951.1.4
by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py |
567 |
|
568 |
||
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
569 |
def os_specific_subprocess_params(): |
570 |
"""Get O/S specific subprocess parameters."""
|
|
571 |
if sys.platform == 'win32': |
|
572 |
# setting the process group and closing fds is not supported on
|
|
573 |
# win32
|
|
574 |
return {} |
|
575 |
else: |
|
576 |
# We close fds other than the pipes as the child process does not need
|
|
577 |
# them to be open.
|
|
578 |
#
|
|
579 |
# We also set the child process to ignore SIGINT. Normally the signal
|
|
580 |
# would be sent to every process in the foreground process group, but
|
|
581 |
# this causes it to be seen only by bzr and not by ssh. Python will
|
|
582 |
# generate a KeyboardInterrupt in bzr, and we will then have a chance
|
|
583 |
# to release locks or do other cleanup over ssh before the connection
|
|
584 |
# goes away.
|
|
585 |
# <https://launchpad.net/products/bzr/+bug/5987>
|
|
586 |
#
|
|
587 |
# Running it in a separate process group is not good because then it
|
|
588 |
# can't get non-echoed input of a password or passphrase.
|
|
589 |
# <https://launchpad.net/products/bzr/+bug/40508>
|
|
590 |
return {'preexec_fn': _ignore_sigint, |
|
591 |
'close_fds': True, |
|
592 |
}
|
|
593 |
||
1951.1.12
by Andrew Bennetts
Cosmetic tweaks. |
594 |
|
1951.1.7
by Andrew Bennetts
Move more generic SSH code from sftp.py into ssh.py, and start unifying the connection establishing logic. |
595 |
class SSHSubprocess(object): |
596 |
"""A socket-like object that talks to an ssh subprocess via pipes."""
|
|
597 |
||
598 |
def __init__(self, proc): |
|
599 |
self.proc = proc |
|
600 |
||
601 |
def send(self, data): |
|
602 |
return os.write(self.proc.stdin.fileno(), data) |
|
603 |
||
604 |
def recv(self, count): |
|
605 |
return os.read(self.proc.stdout.fileno(), count) |
|
606 |
||
607 |
def close(self): |
|
608 |
self.proc.stdin.close() |
|
609 |
self.proc.stdout.close() |
|
610 |
self.proc.wait() |
|
611 |
||
2018.1.1
by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths). |
612 |
def get_filelike_channels(self): |
613 |
return (self.proc.stdout, self.proc.stdin) |
|
2221.5.21
by Dmitry Vasiliev
Reverted trailing whitespace removal |
614 |