~bzr-pqm/bzr/bzr.dev

1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
1
# Copyright (C) 2005 Robey Pointer <robey@lag.net>
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
2
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
3
#
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
8
#
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
13
#
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
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
"""Implementation of Transport over SFTP, using paramiko."""
19
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
20
# TODO: Remove the transport-based lock_read and lock_write methods.  They'll
21
# then raise TransportNotPossible, which will break remote access to any
22
# formats which rely on OS-level locks.  That should be fine as those formats
23
# are pretty old, but these combinations may have to be removed from the test
1910.7.19 by Andrew Bennetts
Expand comment about lock_read/lock_write.
24
# suite.  Those formats all date back to 0.7; so we should be able to remove
25
# these methods when we officially drop support for those formats.
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
26
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
27
import bisect
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
28
import errno
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
29
import itertools
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
30
import os
1540.2.2 by Röbey Pointer
allow forcing the use of paramiko via environ var; use prefetch on paramiko >= 1.5.2
31
import random
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
32
import select
1806.1.1 by Robey Pointer
absorb a broken-pipe exception from paramiko when running the unit tests. it's okay for the client to vanish abruptly and paramiko really ought to mask the exception itself.
33
import socket
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
34
import stat
35
import sys
1540.2.2 by Röbey Pointer
allow forcing the use of paramiko via environ var; use prefetch on paramiko >= 1.5.2
36
import time
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
37
import urllib
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
38
import urlparse
2711.1.1 by Martin Pool
Suppress warning about Paramiko use of struct.pack
39
import warnings
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
40
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
41
from bzrlib import (
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
42
    config,
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
43
    errors,
44
    urlutils,
45
    )
1996.2.1 by Andrew Bennetts
Fix NameError reported by Alexander Belchenko.
46
from bzrlib.errors import (FileExists,
1951.1.6 by Andrew Bennetts
Tidy up some unused imports.
47
                           NoSuchFile, PathNotChild,
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
48
                           TransportError,
1996.2.1 by Andrew Bennetts
Fix NameError reported by Alexander Belchenko.
49
                           LockError,
1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
50
                           PathError,
51
                           ParamikoNotPresent,
1530.1.3 by Robert Collins
transport implementations now tested consistently.
52
                           )
1711.5.1 by John Arbash Meinel
Get most SFTP tests to pass. StubSFTPServer now talks the same path protocol that SFTPTransport talks. on win32
53
from bzrlib.osutils import pathjoin, fancy_rename, getcwd
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
54
from bzrlib.symbol_versioning import (
55
        deprecated_function,
56
        )
1951.1.6 by Andrew Bennetts
Tidy up some unused imports.
57
from bzrlib.trace import mutter, warning
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
58
from bzrlib.transport import (
2671.3.6 by Robert Collins
Review feedback.
59
    FileFileStream,
2671.3.2 by Robert Collins
Start open_file_stream logic.
60
    _file_streams,
2018.5.114 by Robert Collins
Commit current test pass improvements.
61
    local,
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
62
    Server,
1951.1.4 by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py
63
    ssh,
2485.8.16 by Vincent Ladeuil
Create a new, empty, ConnectedTransport class.
64
    ConnectedTransport,
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
65
    )
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
66
2711.1.1 by Martin Pool
Suppress warning about Paramiko use of struct.pack
67
# Disable one particular warning that comes from paramiko in Python2.5; if
68
# this is emitted at the wrong time it tends to cause spurious test failures
69
# or at least noise in the test case::
70
#
71
# [1770/7639 in 86s, 1 known failures, 50 skipped, 2 missing features]
72
# test_permissions.TestSftpPermissions.test_new_files
73
# /var/lib/python-support/python2.5/paramiko/message.py:226: DeprecationWarning: integer argument expected, got float
74
#  self.packet.write(struct.pack('>I', n))
75
warnings.filterwarnings('ignore',
76
        'integer argument expected, got float',
77
        category=DeprecationWarning,
78
        module='paramiko.message')
79
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
80
try:
81
    import paramiko
1185.62.24 by John Arbash Meinel
Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it.
82
except ImportError, e:
83
    raise ParamikoNotPresent(e)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
84
else:
85
    from paramiko.sftp import (SFTP_FLAG_WRITE, SFTP_FLAG_CREATE,
86
                               SFTP_FLAG_EXCL, SFTP_FLAG_TRUNC,
87
                               CMD_HANDLE, CMD_OPEN)
88
    from paramiko.sftp_attr import SFTPAttributes
89
    from paramiko.sftp_file import SFTPFile
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
90
1883.1.3 by Stefan (metze) Metzmacher
- fix typo
91
1711.6.2 by John Arbash Meinel
Clean up paramiko agent support.
92
_paramiko_version = getattr(paramiko, '__version_info__', (0, 0, 0))
93
# don't use prefetch unless paramiko version >= 1.5.5 (there were bugs earlier)
94
_default_do_prefetch = (_paramiko_version >= (1, 5, 5))
1540.2.3 by Robey Pointer
move the paramiko version check up to the top and use getattr instead of hasattr. use BZR_SSH instead of BZR_USE_PARAMIKO, to allow overriding the ssh vendor check in a general way.
95
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
96
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
97
class SFTPLock(object):
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
98
    """This fakes a lock in a remote location.
99
    
100
    A present lock is indicated just by the existence of a file.  This
101
    doesn't work well on all transports and they are only used in 
102
    deprecated storage formats.
103
    """
104
    
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
105
    __slots__ = ['path', 'lock_path', 'lock_file', 'transport']
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
106
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
107
    def __init__(self, path, transport):
108
        self.lock_file = None
109
        self.path = path
110
        self.lock_path = path + '.write-lock'
111
        self.transport = transport
112
        try:
1530.1.7 by Robert Collins
merge integration.
113
            # RBC 20060103 FIXME should we be using private methods here ?
114
            abspath = transport._remote_path(self.lock_path)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
115
            self.lock_file = transport._sftp_open_exclusive(abspath)
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
116
        except FileExists:
117
            raise LockError('File %r already locked' % (self.path,))
118
119
    def __del__(self):
120
        """Should this warn, or actually try to cleanup?"""
121
        if self.lock_file:
1547.1.3 by Robey Pointer
spell warning correctly :) and move recv_ready close to recv for readability
122
            warning("SFTPLock %r not explicitly unlocked" % (self.path,))
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
123
            self.unlock()
124
125
    def unlock(self):
126
        if not self.lock_file:
127
            return
128
        self.lock_file.close()
129
        self.lock_file = None
130
        try:
131
            self.transport.delete(self.lock_path)
132
        except (NoSuchFile,):
133
            # What specific errors should we catch here?
134
            pass
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
135
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
136
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
137
class _SFTPReadvHelper(object):
138
    """A class to help with managing the state of a readv request."""
139
140
    # See _get_requests for an explanation.
141
    _max_request_size = 32768
142
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
143
    def __init__(self, original_offsets, relpath, _report_activity):
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
144
        """Create a new readv helper.
145
146
        :param original_offsets: The original requests given by the caller of
147
            readv()
148
        :param relpath: The name of the file (if known)
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
149
        :param _report_activity: A Transport._report_activity bound method,
150
            to be called as data arrives.
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
151
        """
152
        self.original_offsets = list(original_offsets)
153
        self.relpath = relpath
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
154
        self._report_activity = _report_activity
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
155
156
    def _get_requests(self):
157
        """Break up the offsets into individual requests over sftp.
158
159
        The SFTP spec only requires implementers to support 32kB requests. We
160
        could try something larger (openssh supports 64kB), but then we have to
161
        handle requests that fail.
162
        So instead, we just break up our maximum chunks into 32kB chunks, and
163
        asyncronously requests them.
164
        Newer versions of paramiko would do the chunking for us, but we want to
165
        start processing results right away, so we do it ourselves.
166
        """
167
        # TODO: Because we issue async requests, we don't 'fudge' any extra
168
        #       data.  I'm not 100% sure that is the best choice.
169
170
        # The first thing we do, is to collapse the individual requests as much
171
        # as possible, so we don't issues requests <32kB
172
        sorted_offsets = sorted(self.original_offsets)
173
        coalesced = list(ConnectedTransport._coalesce_offsets(sorted_offsets,
174
                                                        limit=0, fudge_factor=0))
175
        requests = []
176
        for c_offset in coalesced:
177
            start = c_offset.start
178
            size = c_offset.length
179
180
            # Break this up into 32kB requests
181
            while size > 0:
182
                next_size = min(size, self._max_request_size)
183
                requests.append((start, next_size))
184
                size -= next_size
185
                start += next_size
3686.1.5 by John Arbash Meinel
Include the filename in the debug logging.
186
        mutter('SFTP.readv(%s) %s offsets => %s coalesced => %s requests',
187
               self.relpath, len(sorted_offsets), len(coalesced),
188
               len(requests))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
189
        return requests
190
191
    def request_and_yield_offsets(self, fp):
192
        """Request the data from the remote machine, yielding the results.
193
194
        :param fp: A Paramiko SFTPFile object that supports readv.
195
        :return: Yield the data requested by the original readv caller, one by
196
            one.
197
        """
198
        requests = self._get_requests()
199
        offset_iter = iter(self.original_offsets)
200
        cur_offset, cur_size = offset_iter.next()
201
        # paramiko .readv() yields strings that are in the order of the requests
202
        # So we track the current request to know where the next data is
203
        # being returned from.
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
204
        input_start = None
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
205
        last_end = None
206
        buffered_data = []
207
        buffered_len = 0
208
209
        # This is used to buffer chunks which we couldn't process yet
210
        # It is (start, end, data) tuples.
211
        data_chunks = []
212
        # Create an 'unlimited' data stream, so we stop based on requests,
213
        # rather than just because the data stream ended. This lets us detect
214
        # short readv.
215
        data_stream = itertools.chain(fp.readv(requests),
216
                                      itertools.repeat(None))
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
217
        for (start, length), data in itertools.izip(requests, data_stream):
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
218
            if data is None:
219
                if cur_coalesced is not None:
220
                    raise errors.ShortReadvError(self.relpath,
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
221
                        start, length, len(data))
222
            if len(data) != length:
223
                raise errors.ShortReadvError(self.relpath,
224
                    start, length, len(data))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
225
            if last_end is None:
226
                # This is the first request, just buffer it
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
227
                buffered_data = [data]
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
228
                buffered_len = length
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
229
                input_start = start
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
230
            elif start == last_end:
231
                # The data we are reading fits neatly on the previous
232
                # buffer, so this is all part of a larger coalesced range.
233
                buffered_data.append(data)
234
                buffered_len += length
235
            else:
236
                # We have an 'interrupt' in the data stream. So we know we are
237
                # at a request boundary.
238
                if buffered_len > 0:
239
                    # We haven't consumed the buffer so far, so put it into
240
                    # data_chunks, and continue.
241
                    buffered = ''.join(buffered_data)
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
242
                    data_chunks.append((input_start, buffered))
243
                input_start = start
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
244
                buffered_data = [data]
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
245
                buffered_len = length
246
            last_end = start + length
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
247
            if input_start == cur_offset and cur_size <= buffered_len:
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
248
                # Simplify the next steps a bit by transforming buffered_data
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
249
                # into a single string. We also have the nice property that
250
                # when there is only one string ''.join([x]) == x, so there is
251
                # no data copying.
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
252
                buffered = ''.join(buffered_data)
3686.1.7 by John Arbash Meinel
Purge the list buffer when we have a simple string buffer.
253
                # Clean out buffered data so that we keep memory
254
                # consumption low
255
                del buffered_data[:]
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
256
                buffered_offset = 0
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
257
                # TODO: We *could* also consider the case where cur_offset is in
258
                #       in the buffered range, even though it doesn't *start*
259
                #       the buffered range. But for packs we pretty much always
260
                #       read in order, so you won't get any extra data in the
261
                #       middle.
262
                while (input_start == cur_offset
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
263
                       and (buffered_offset + cur_size) <= buffered_len):
264
                    # We've buffered enough data to process this request, spit it
265
                    # out
266
                    cur_data = buffered[buffered_offset:buffered_offset + cur_size]
267
                    # move the direct pointer into our buffered data
268
                    buffered_offset += cur_size
269
                    # Move the start-of-buffer pointer
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
270
                    input_start += cur_size
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
271
                    # Yield the requested data
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
272
                    self._report_activity(len(cur_data), 'read')
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
273
                    yield cur_offset, cur_data
274
                    cur_offset, cur_size = offset_iter.next()
275
                # at this point, we've consumed as much of buffered as we can,
276
                # so break off the portion that we consumed
277
                if buffered_offset == len(buffered_data):
278
                    # No tail to leave behind
279
                    buffered_data = []
280
                    buffered_len = 0
281
                else:
282
                    buffered = buffered[buffered_offset:]
283
                    buffered_data = [buffered]
284
                    buffered_len = len(buffered)
285
        if buffered_len:
286
            buffered = ''.join(buffered_data)
3686.1.7 by John Arbash Meinel
Purge the list buffer when we have a simple string buffer.
287
            del buffered_data[:]
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
288
            data_chunks.append((input_start, buffered))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
289
        if data_chunks:
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
290
            mutter('SFTP readv left with %d out-of-order bytes',
291
                   sum(map(lambda x: len(x[1]), data_chunks)))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
292
            # We've processed all the readv data, at this point, anything we
293
            # couldn't process is in data_chunks. This doesn't happen often, so
294
            # this code path isn't optimized
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
295
            # We use an interesting process for data_chunks
296
            # Specifically if we have "bisect_left([(start, len, entries)],
297
            #                                       (qstart,)])
298
            # If start == qstart, then we get the specific node. Otherwise we
299
            # get the previous node
300
            while True:
301
                idx = bisect.bisect_left(data_chunks, (cur_offset,))
3815.2.4 by Martin Pool
merge fix for out-of-order SFTP readv
302
                if idx < len(data_chunks) and data_chunks[idx][0] == cur_offset:
303
                    # The data starts here
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
304
                    data = data_chunks[idx][1][:cur_size]
305
                elif idx > 0:
306
                    # The data is in a portion of a previous page
307
                    idx -= 1
308
                    sub_offset = cur_offset - data_chunks[idx][0]
309
                    data = data_chunks[idx][1]
310
                    data = data[sub_offset:sub_offset + cur_size]
311
                else:
312
                    # We are missing the page where the data should be found,
313
                    # something is wrong
314
                    data = ''
315
                if len(data) != cur_size:
316
                    raise AssertionError('We must have miscalulated.'
317
                        ' We expected %d bytes, but only found %d'
318
                        % (cur_size, len(data)))
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
319
                self._report_activity(len(data), 'read')
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
320
                yield cur_offset, data
321
                cur_offset, cur_size = offset_iter.next()
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
322
323
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
324
class SFTPTransport(ConnectedTransport):
1752.2.40 by Andrew Bennetts
Merge from bzr.dev.
325
    """Transport implementation for SFTP access."""
1864.5.2 by John Arbash Meinel
always read in sorted order, and return in requested order, but only cache what is currently out of order
326
1540.2.3 by Robey Pointer
move the paramiko version check up to the top and use getattr instead of hasattr. use BZR_SSH instead of BZR_USE_PARAMIKO, to allow overriding the ssh vendor check in a general way.
327
    _do_prefetch = _default_do_prefetch
1864.5.6 by John Arbash Meinel
Setting defaults based on benchmarking data.
328
    # TODO: jam 20060717 Conceivably these could be configurable, either
329
    #       by auto-tuning at run-time, or by a configuration (per host??)
330
    #       but the performance curve is pretty flat, so just going with
331
    #       reasonable defaults.
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
332
    _max_readv_combine = 200
1864.5.6 by John Arbash Meinel
Setting defaults based on benchmarking data.
333
    # Having to round trip to the server means waiting for a response,
334
    # so it is better to download extra bytes.
335
    # 8KiB had good performance for both local and remote network operations
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
336
    _bytes_to_read_before_seek = 8192
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
337
1864.5.20 by John Arbash Meinel
Some small cleanups.
338
    # The sftp spec says that implementations SHOULD allow reads
339
    # to be at least 32K. paramiko.readv() does an async request
340
    # for the chunks. So we need to keep it within a single request
341
    # size for paramiko <= 1.6.1. paramiko 1.6.2 will probably chop
342
    # up the request itself, rather than us having to worry about it
343
    _max_request_size = 32768
1864.5.17 by John Arbash Meinel
A little cleanup, and restrict to 32K to conform better to sftp spec
344
2485.8.59 by Vincent Ladeuil
Update from review comments.
345
    def __init__(self, base, _from_transport=None):
346
        super(SFTPTransport, self).__init__(base,
347
                                            _from_transport=_from_transport)
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
348
349
    def _remote_path(self, relpath):
350
        """Return the path to be passed along the sftp protocol for relpath.
351
        
352
        :param relpath: is a urlencoded string.
353
        """
354
        relative = urlutils.unescape(relpath).encode('utf-8')
355
        remote_path = self._combine_paths(self._path, relative)
356
        # the initial slash should be removed from the path, and treated as a
357
        # homedir relative path (the path begins with a double slash if it is
358
        # absolute).  see draft-ietf-secsh-scp-sftp-ssh-uri-03.txt
359
        # RBC 20060118 we are not using this as its too user hostile. instead
360
        # we are following lftp and using /~/foo to mean '~/foo'
361
        # vila--20070602 and leave absolute paths begin with a single slash.
362
        if remote_path.startswith('/~/'):
363
            remote_path = remote_path[3:]
364
        elif remote_path == '/~':
365
            remote_path = ''
366
        return remote_path
367
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
368
    def _create_connection(self, credentials=None):
369
        """Create a new connection with the provided credentials.
370
371
        :param credentials: The credentials needed to establish the connection.
372
373
        :return: The created connection and its associated credentials.
374
375
        The credentials are only the password as it may have been entered
376
        interactively by the user and may be different from the one provided
377
        in base url at transport creation time.
378
        """
379
        if credentials is None:
380
            password = self._password
381
        else:
382
            password = credentials
383
384
        vendor = ssh._get_ssh_vendor()
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
385
        user = self._user
386
        if user is None:
387
            auth = config.AuthenticationConfig()
3777.1.4 by Aaron Bentley
bzr+ssh and sftp both use ssh scheme.
388
            user = auth.get_user('ssh', self._host, self._port)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
389
        connection = vendor.connect_sftp(self._user, password,
390
                                         self._host, self._port)
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
391
        return connection, (user, password)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
392
393
    def _get_sftp(self):
394
        """Ensures that a connection is established"""
395
        connection = self._get_connection()
396
        if connection is None:
397
            # First connection ever
398
            connection, credentials = self._create_connection()
399
            self._set_connection(connection, credentials)
400
        return connection
401
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
402
    def has(self, relpath):
403
        """
404
        Does the target location exist?
405
        """
406
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
407
            self._get_sftp().stat(self._remote_path(relpath))
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
408
            return True
409
        except IOError:
410
            return False
411
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
412
    def get(self, relpath):
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
413
        """Get the file at the given relative path.
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
414
415
        :param relpath: The relative path to the file
416
        """
417
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
418
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
419
            f = self._get_sftp().file(path, mode='rb')
1540.2.3 by Robey Pointer
move the paramiko version check up to the top and use getattr instead of hasattr. use BZR_SSH instead of BZR_USE_PARAMIKO, to allow overriding the ssh vendor check in a general way.
420
            if self._do_prefetch and (getattr(f, 'prefetch', None) is not None):
1185.40.1 by Robey Pointer
prefetch files under paramiko 1.5.1 for improved speed
421
                f.prefetch()
422
            return f
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
423
        except (IOError, paramiko.SSHException), e:
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
424
            self._translate_io_exception(e, path, ': error retrieving',
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
425
                failure_exc=errors.ReadError)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
426
3882.7.4 by Martin Pool
SFTPTransport also sends activity from get()
427
    def get_bytes(self, relpath):
428
        # reimplement this here so that we can report how many bytes came back
429
        f = self.get(relpath)
430
        try:
431
            bytes = f.read()
432
            self._report_activity(len(bytes), 'read')
433
            return bytes
434
        finally:
435
            f.close()
436
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
437
    def _readv(self, relpath, offsets):
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
438
        """See Transport.readv()"""
439
        # We overload the default readv() because we want to use a file
440
        # that does not have prefetch enabled.
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
441
        # Also, if we have a new paramiko, it implements an async readv()
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
442
        if not offsets:
443
            return
444
445
        try:
446
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
447
            fp = self._get_sftp().file(path, mode='rb')
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
448
            readv = getattr(fp, 'readv', None)
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
449
            if readv:
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
450
                return self._sftp_readv(fp, offsets, relpath)
1864.5.16 by John Arbash Meinel
instrument to enable/disable readv support for testing
451
            mutter('seek and read %s offsets', len(offsets))
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
452
            return self._seek_and_read(fp, offsets, relpath)
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
453
        except (IOError, paramiko.SSHException), e:
454
            self._translate_io_exception(e, path, ': error retrieving')
455
2671.3.1 by Robert Collins
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
456
    def recommended_page_size(self):
457
        """See Transport.recommended_page_size().
458
459
        For SFTP we suggest a large page size to reduce the overhead
460
        introduced by latency.
461
        """
462
        return 64 * 1024
463
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
464
    def _sftp_readv(self, fp, offsets, relpath='<unknown>'):
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
465
        """Use the readv() member of fp to do async readv.
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
466
467
        And then read them using paramiko.readv(). paramiko.readv()
468
        does not support ranges > 64K, so it caps the request size, and
469
        just reads until it gets all the stuff it wants
470
        """
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
471
        helper = _SFTPReadvHelper(offsets, relpath, self._report_activity)
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
472
        return helper.request_and_yield_offsets(fp)
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
473
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
474
    def put_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
475
        """
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
476
        Copy the file-like object into the location.
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
477
478
        :param relpath: Location to put the contents, relative to base.
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
479
        :param f:       File-like object.
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
480
        :param mode: The final mode for the file
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
481
        """
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
482
        final_path = self._remote_path(relpath)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
483
        return self._put(final_path, f, mode=mode)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
484
485
    def _put(self, abspath, f, mode=None):
486
        """Helper function so both put() and copy_abspaths can reuse the code"""
487
        tmp_abspath = '%s.tmp.%.9f.%d.%d' % (abspath, time.time(),
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
488
                        os.getpid(), random.randint(0,0x7FFFFFFF))
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
489
        fout = self._sftp_open_exclusive(tmp_abspath, mode=mode)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
490
        closed = False
1185.41.6 by Robey Pointer
modified version of john's patch to add atomic put and locking to the sftp transport
491
        try:
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
492
            try:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
493
                fout.set_pipelined(True)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
494
                length = self._pump(f, fout)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
495
            except (IOError, paramiko.SSHException), e:
496
                self._translate_io_exception(e, tmp_abspath)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
497
            # XXX: This doesn't truly help like we would like it to.
498
            #      The problem is that openssh strips sticky bits. So while we
499
            #      can properly set group write permission, we lose the group
500
            #      sticky bit. So it is probably best to stop chmodding, and
501
            #      just tell users that they need to set the umask correctly.
502
            #      The attr.st_mode = mode, in _sftp_open_exclusive
503
            #      will handle when the user wants the final mode to be more 
504
            #      restrictive. And then we avoid a round trip. Unless 
505
            #      paramiko decides to expose an async chmod()
506
507
            # This is designed to chmod() right before we close.
508
            # Because we set_pipelined() earlier, theoretically we might 
509
            # avoid the round trip for fout.close()
1185.50.20 by John Arbash Meinel
merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.
510
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
511
                self._get_sftp().chmod(tmp_abspath, mode)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
512
            fout.close()
513
            closed = True
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
514
            self._rename_and_overwrite(tmp_abspath, abspath)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
515
            return length
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
516
        except Exception, e:
517
            # If we fail, try to clean up the temporary file
518
            # before we throw the exception
519
            # but don't let another exception mess things up
1185.50.20 by John Arbash Meinel
merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.
520
            # Write out the traceback, because otherwise
521
            # the catch and throw destroys it
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
522
            import traceback
523
            mutter(traceback.format_exc())
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
524
            try:
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
525
                if not closed:
526
                    fout.close()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
527
                self._get_sftp().remove(tmp_abspath)
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
528
            except:
1532 by Robert Collins
Merge in John Meinels integration branch.
529
                # raise the saved except
530
                raise e
531
            # raise the original with its traceback if we can.
532
            raise
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
533
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
534
    def _put_non_atomic_helper(self, relpath, writer, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
535
                               create_parent_dir=False,
536
                               dir_mode=None):
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
537
        abspath = self._remote_path(relpath)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
538
539
        # TODO: jam 20060816 paramiko doesn't publicly expose a way to
540
        #       set the file mode at create time. If it does, use it.
541
        #       But for now, we just chmod later anyway.
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
542
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
543
        def _open_and_write_file():
544
            """Try to open the target file, raise error on failure"""
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
545
            fout = None
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
546
            try:
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
547
                try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
548
                    fout = self._get_sftp().file(abspath, mode='wb')
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
549
                    fout.set_pipelined(True)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
550
                    writer(fout)
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
551
                except (paramiko.SSHException, IOError), e:
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
552
                    self._translate_io_exception(e, abspath,
553
                                                 ': unable to open')
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
554
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
555
                # This is designed to chmod() right before we close.
556
                # Because we set_pipelined() earlier, theoretically we might 
557
                # avoid the round trip for fout.close()
558
                if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
559
                    self._get_sftp().chmod(abspath, mode)
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
560
            finally:
561
                if fout is not None:
562
                    fout.close()
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
563
564
        if not create_parent_dir:
565
            _open_and_write_file()
566
            return
567
568
        # Try error handling to create the parent directory if we need to
569
        try:
570
            _open_and_write_file()
571
        except NoSuchFile:
572
            # Try to create the parent directory, and then go back to
573
            # writing the file
574
            parent_dir = os.path.dirname(abspath)
1946.2.15 by John Arbash Meinel
Fix the sftp mkdir mode code
575
            self._mkdir(parent_dir, dir_mode)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
576
            _open_and_write_file()
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
577
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
578
    def put_file_non_atomic(self, relpath, f, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
579
                            create_parent_dir=False,
580
                            dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
581
        """Copy the file-like object into the target location.
582
583
        This function is not strictly safe to use. It is only meant to
584
        be used when you already know that the target does not exist.
585
        It is not safe, because it will open and truncate the remote
586
        file. So there may be a time when the file has invalid contents.
587
588
        :param relpath: The remote location to put the contents.
589
        :param f:       File-like object.
590
        :param mode:    Possible access permissions for new file.
591
                        None means do not set remote permissions.
592
        :param create_parent_dir: If we cannot create the target file because
593
                        the parent directory does not exist, go ahead and
594
                        create it, and then try again.
595
        """
596
        def writer(fout):
597
            self._pump(f, fout)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
598
        self._put_non_atomic_helper(relpath, writer, mode=mode,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
599
                                    create_parent_dir=create_parent_dir,
600
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
601
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
602
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
603
                             create_parent_dir=False,
604
                             dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
605
        def writer(fout):
606
            fout.write(bytes)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
607
        self._put_non_atomic_helper(relpath, writer, mode=mode,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
608
                                    create_parent_dir=create_parent_dir,
609
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
610
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
611
    def iter_files_recursive(self):
612
        """Walk the relative paths of all files in this transport."""
613
        queue = list(self.list_dir('.'))
614
        while queue:
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
615
            relpath = queue.pop(0)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
616
            st = self.stat(relpath)
617
            if stat.S_ISDIR(st.st_mode):
618
                for i, basename in enumerate(self.list_dir(relpath)):
619
                    queue.insert(i, relpath+'/'+basename)
620
            else:
621
                yield relpath
622
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
623
    def _mkdir(self, abspath, mode=None):
624
        if mode is None:
625
            local_mode = 0777
626
        else:
627
            local_mode = mode
628
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
629
            self._get_sftp().mkdir(abspath, local_mode)
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
630
            if mode is not None:
3526.4.1 by Christophe Troestler
sftp transport: do not chmod a dir when unecessary (fix suid and sgid problems).
631
                # chmod a dir through sftp will erase any sgid bit set
632
                # on the server side.  So, if the bit mode are already
633
                # set, avoid the chmod.  If the mode is not fine but
634
                # the sgid bit is set, report a warning to the user
635
                # with the umask fix.
636
                stat = self._get_sftp().lstat(abspath)
637
                mode = mode & 0777 # can't set special bits anyway
638
                if mode != stat.st_mode & 0777:
3526.4.2 by Christophe Troestler
sftp: More informative warning message for chmod and suid/sgid bits problems.
639
                    if stat.st_mode & 06000:
640
                        warning('About to chmod %s over sftp, which will result'
641
                                ' in its suid or sgid bits being cleared.  If'
642
                                ' you want to preserve those bits, change your '
643
                                ' environment on the server to use umask 0%03o.'
3526.4.1 by Christophe Troestler
sftp transport: do not chmod a dir when unecessary (fix suid and sgid problems).
644
                                % (abspath, 0777 - mode))
645
                    self._get_sftp().chmod(abspath, mode=mode)
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
646
        except (paramiko.SSHException, IOError), e:
647
            self._translate_io_exception(e, abspath, ': unable to mkdir',
648
                failure_exc=FileExists)
649
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
650
    def mkdir(self, relpath, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
651
        """Create a directory at the given path."""
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
652
        self._mkdir(self._remote_path(relpath), mode=mode)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
653
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
654
    def open_write_stream(self, relpath, mode=None):
655
        """See Transport.open_write_stream."""
2671.3.2 by Robert Collins
Start open_file_stream logic.
656
        # initialise the file to zero-length
657
        # this is three round trips, but we don't use this 
658
        # api more than once per write_group at the moment so 
659
        # it is a tolerable overhead. Better would be to truncate
660
        # the file after opening. RBC 20070805
2671.3.3 by Robert Collins
Add mode parameter to Transport.open_file_stream.
661
        self.put_bytes_non_atomic(relpath, "", mode)
2671.3.2 by Robert Collins
Start open_file_stream logic.
662
        abspath = self._remote_path(relpath)
663
        # TODO: jam 20060816 paramiko doesn't publicly expose a way to
664
        #       set the file mode at create time. If it does, use it.
665
        #       But for now, we just chmod later anyway.
666
        handle = None
667
        try:
668
            handle = self._get_sftp().file(abspath, mode='wb')
669
            handle.set_pipelined(True)
670
        except (paramiko.SSHException, IOError), e:
671
            self._translate_io_exception(e, abspath,
672
                                         ': unable to open')
673
        _file_streams[self.abspath(relpath)] = handle
2671.3.6 by Robert Collins
Review feedback.
674
        return FileFileStream(self, relpath, handle)
2671.3.2 by Robert Collins
Start open_file_stream logic.
675
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
676
    def _translate_io_exception(self, e, path, more_info='',
677
                                failure_exc=PathError):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
678
        """Translate a paramiko or IOError into a friendlier exception.
679
680
        :param e: The original exception
681
        :param path: The path in question when the error is raised
682
        :param more_info: Extra information that can be included,
683
                          such as what was going on
684
        :param failure_exc: Paramiko has the super fun ability to raise completely
685
                           opaque errors that just set "e.args = ('Failure',)" with
686
                           no more information.
1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
687
                           If this parameter is set, it defines the exception 
688
                           to raise in these cases.
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
689
        """
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
690
        # paramiko seems to generate detailless errors.
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
691
        self._translate_error(e, path, raise_generic=False)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
692
        if getattr(e, 'args', None) is not None:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
693
            if (e.args == ('No such file or directory',) or
694
                e.args == ('No such file',)):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
695
                raise NoSuchFile(path, str(e) + more_info)
3565.4.1 by Christophe Troestler
[Bug #123475] SFTPTransport._translate_io_exception: better detection
696
            if (e.args == ('mkdir failed',) or
697
                e.args[0].startswith('syserr: File exists')):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
698
                raise FileExists(path, str(e) + more_info)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
699
            # strange but true, for the paramiko server.
700
            if (e.args == ('Failure',)):
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
701
                raise failure_exc(path, str(e) + more_info)
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
702
            mutter('Raising exception with args %s', e.args)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
703
        if getattr(e, 'errno', None) is not None:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
704
            mutter('Raising exception with errno %s', e.errno)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
705
        raise e
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
706
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
707
    def append_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
708
        """
709
        Append the text in the file-like object into the final
710
        location.
711
        """
712
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
713
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
714
            fout = self._get_sftp().file(path, 'ab')
1666.1.6 by Robert Collins
Make knit the default format.
715
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
716
                self._get_sftp().chmod(path, mode)
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
717
            result = fout.tell()
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
718
            self._pump(f, fout)
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
719
            return result
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
720
        except (IOError, paramiko.SSHException), e:
721
            self._translate_io_exception(e, relpath, ': unable to append')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
722
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
723
    def rename(self, rel_from, rel_to):
724
        """Rename without special overwriting"""
725
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
726
            self._get_sftp().rename(self._remote_path(rel_from),
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
727
                              self._remote_path(rel_to))
728
        except (IOError, paramiko.SSHException), e:
729
            self._translate_io_exception(e, rel_from,
730
                    ': unable to rename to %r' % (rel_to))
731
732
    def _rename_and_overwrite(self, abs_from, abs_to):
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
733
        """Do a fancy rename on the remote server.
734
        
735
        Using the implementation provided by osutils.
736
        """
737
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
738
            sftp = self._get_sftp()
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
739
            fancy_rename(abs_from, abs_to,
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
740
                         rename_func=sftp.rename,
741
                         unlink_func=sftp.remove)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
742
        except (IOError, paramiko.SSHException), e:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
743
            self._translate_io_exception(e, abs_from,
744
                                         ': unable to rename to %r' % (abs_to))
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
745
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
746
    def move(self, rel_from, rel_to):
747
        """Move the item at rel_from to the location at rel_to"""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
748
        path_from = self._remote_path(rel_from)
749
        path_to = self._remote_path(rel_to)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
750
        self._rename_and_overwrite(path_from, path_to)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
751
752
    def delete(self, relpath):
753
        """Delete the item at relpath"""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
754
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
755
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
756
            self._get_sftp().remove(path)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
757
        except (IOError, paramiko.SSHException), e:
758
            self._translate_io_exception(e, path, ': unable to delete')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
759
            
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
760
    def external_url(self):
761
        """See bzrlib.transport.Transport.external_url."""
762
        # the external path for SFTP is the base
763
        return self.base
764
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
765
    def listable(self):
766
        """Return True if this store supports listing."""
767
        return True
768
769
    def list_dir(self, relpath):
770
        """
771
        Return a list of all files at the given location.
772
        """
773
        # does anything actually use this?
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
774
        # -- Unknown
775
        # This is at least used by copy_tree for remote upgrades.
776
        # -- David Allouche 2006-08-11
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
777
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
778
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
779
            entries = self._get_sftp().listdir(path)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
780
        except (IOError, paramiko.SSHException), e:
781
            self._translate_io_exception(e, path, ': failed to list_dir')
1959.2.2 by John Arbash Meinel
Apply Andrew Bennetts list_dir fixes
782
        return [urlutils.escape(entry) for entry in entries]
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
783
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
784
    def rmdir(self, relpath):
785
        """See Transport.rmdir."""
786
        path = self._remote_path(relpath)
787
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
788
            return self._get_sftp().rmdir(path)
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
789
        except (IOError, paramiko.SSHException), e:
790
            self._translate_io_exception(e, path, ': failed to rmdir')
791
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
792
    def stat(self, relpath):
793
        """Return the stat information for a file."""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
794
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
795
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
796
            return self._get_sftp().stat(path)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
797
        except (IOError, paramiko.SSHException), e:
798
            self._translate_io_exception(e, path, ': unable to stat')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
799
800
    def lock_read(self, relpath):
801
        """
802
        Lock the given file for shared (read) access.
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
803
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
804
        """
805
        # FIXME: there should be something clever i can do here...
806
        class BogusLock(object):
807
            def __init__(self, path):
808
                self.path = path
809
            def unlock(self):
810
                pass
811
        return BogusLock(relpath)
812
813
    def lock_write(self, relpath):
814
        """
815
        Lock the given file for exclusive (write) access.
816
        WARNING: many transports do not support this, so trying avoid using it
817
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
818
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
819
        """
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
820
        # This is a little bit bogus, but basically, we create a file
821
        # which should not already exist, and if it does, we assume
822
        # that there is a lock, and if it doesn't, the we assume
823
        # that we have taken the lock.
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
824
        return SFTPLock(relpath, self)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
825
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
826
    def _sftp_open_exclusive(self, abspath, mode=None):
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
827
        """Open a remote path exclusively.
828
829
        SFTP supports O_EXCL (SFTP_FLAG_EXCL), which fails if
830
        the file already exists. However it does not expose this
831
        at the higher level of SFTPClient.open(), so we have to
832
        sneak away with it.
833
834
        WARNING: This breaks the SFTPClient abstraction, so it
835
        could easily break against an updated version of paramiko.
836
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
837
        :param abspath: The remote absolute path where the file should be opened
838
        :param mode: The mode permissions bits for the new file
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
839
        """
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
840
        # TODO: jam 20060816 Paramiko >= 1.6.2 (probably earlier) supports
841
        #       using the 'x' flag to indicate SFTP_FLAG_EXCL.
842
        #       However, there is no way to set the permission mode at open 
843
        #       time using the sftp_client.file() functionality.
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
844
        path = self._get_sftp()._adjust_cwd(abspath)
1711.5.1 by John Arbash Meinel
Get most SFTP tests to pass. StubSFTPServer now talks the same path protocol that SFTPTransport talks. on win32
845
        # mutter('sftp abspath %s => %s', abspath, path)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
846
        attr = SFTPAttributes()
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
847
        if mode is not None:
848
            attr.st_mode = mode
849
        omode = (SFTP_FLAG_WRITE | SFTP_FLAG_CREATE 
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
850
                | SFTP_FLAG_TRUNC | SFTP_FLAG_EXCL)
851
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
852
            t, msg = self._get_sftp()._request(CMD_OPEN, path, omode, attr)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
853
            if t != CMD_HANDLE:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
854
                raise TransportError('Expected an SFTP handle')
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
855
            handle = msg.get_string()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
856
            return SFTPFile(self._get_sftp(), handle, 'wb', -1)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
857
        except (paramiko.SSHException, IOError), e:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
858
            self._translate_io_exception(e, abspath, ': unable to open',
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
859
                failure_exc=FileExists)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
860
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
861
    def _can_roundtrip_unix_modebits(self):
862
        if sys.platform == 'win32':
863
            # anyone else?
864
            return False
865
        else:
866
            return True
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
867
1530.1.3 by Robert Collins
transport implementations now tested consistently.
868
# ------------- server test implementation --------------
869
import threading
870
871
from bzrlib.tests.stub_sftp import StubServer, StubSFTPServer
872
873
STUB_SERVER_KEY = """
874
-----BEGIN RSA PRIVATE KEY-----
875
MIICWgIBAAKBgQDTj1bqB4WmayWNPB+8jVSYpZYk80Ujvj680pOTh2bORBjbIAyz
876
oWGW+GUjzKxTiiPvVmxFgx5wdsFvF03v34lEVVhMpouqPAYQ15N37K/ir5XY+9m/
877
d8ufMCkjeXsQkKqFbAlQcnWMCRnOoPHS3I4vi6hmnDDeeYTSRvfLbW0fhwIBIwKB
878
gBIiOqZYaoqbeD9OS9z2K9KR2atlTxGxOJPXiP4ESqP3NVScWNwyZ3NXHpyrJLa0
879
EbVtzsQhLn6rF+TzXnOlcipFvjsem3iYzCpuChfGQ6SovTcOjHV9z+hnpXvQ/fon
880
soVRZY65wKnF7IAoUwTmJS9opqgrN6kRgCd3DASAMd1bAkEA96SBVWFt/fJBNJ9H
881
tYnBKZGw0VeHOYmVYbvMSstssn8un+pQpUm9vlG/bp7Oxd/m+b9KWEh2xPfv6zqU
882
avNwHwJBANqzGZa/EpzF4J8pGti7oIAPUIDGMtfIcmqNXVMckrmzQ2vTfqtkEZsA
883
4rE1IERRyiJQx6EJsz21wJmGV9WJQ5kCQQDwkS0uXqVdFzgHO6S++tjmjYcxwr3g
884
H0CoFYSgbddOT6miqRskOQF3DZVkJT3kyuBgU2zKygz52ukQZMqxCb1fAkASvuTv
885
qfpH87Qq5kQhNKdbbwbmd2NxlNabazPijWuphGTdW0VfJdWfklyS2Kr+iqrs/5wV
886
HhathJt636Eg7oIjAkA8ht3MQ+XSl9yIJIS8gVpbPxSw5OMfw0PjVE7tBdQruiSc
887
nvuQES5C9BMHjF39LZiGH1iLQy7FgdHyoP+eodI7
888
-----END RSA PRIVATE KEY-----
889
"""
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
890
891
892
class SocketListener(threading.Thread):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
893
894
    def __init__(self, callback):
895
        threading.Thread.__init__(self)
896
        self._callback = callback
897
        self._socket = socket.socket()
898
        self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
899
        self._socket.bind(('localhost', 0))
900
        self._socket.listen(1)
901
        self.port = self._socket.getsockname()[1]
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
902
        self._stop_event = threading.Event()
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
903
1530.1.3 by Robert Collins
transport implementations now tested consistently.
904
    def stop(self):
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
905
        # called from outside this thread
906
        self._stop_event.set()
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
907
        # use a timeout here, because if the test fails, the server thread may
908
        # never notice the stop_event.
909
        self.join(5.0)
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
910
        self._socket.close()
911
912
    def run(self):
913
        while True:
1551.6.40 by Aaron Bentley
Wrapped long lines in Robey's patch
914
            readable, writable_unused, exception_unused = \
915
                select.select([self._socket], [], [], 0.1)
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
916
            if self._stop_event.isSet():
917
                return
918
            if len(readable) == 0:
919
                continue
920
            try:
921
                s, addr_unused = self._socket.accept()
922
                # because the loopback socket is inline, and transports are
923
                # never explicitly closed, best to launch a new thread.
924
                threading.Thread(target=self._callback, args=(s,)).start()
925
            except socket.error, x:
926
                sys.excepthook(*sys.exc_info())
1551.6.40 by Aaron Bentley
Wrapped long lines in Robey's patch
927
                warning('Socket error during accept() within unit test server'
928
                        ' thread: %r' % x)
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
929
            except Exception, x:
1551.6.40 by Aaron Bentley
Wrapped long lines in Robey's patch
930
                # probably a failed test; unit test thread will log the
931
                # failure/error
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
932
                sys.excepthook(*sys.exc_info())
1551.6.40 by Aaron Bentley
Wrapped long lines in Robey's patch
933
                warning('Exception from within unit test server thread: %r' % 
934
                        x)
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
935
936
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
937
class SocketDelay(object):
938
    """A socket decorator to make TCP appear slower.
939
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
940
    This changes recv, send, and sendall to add a fixed latency to each python
941
    call if a new roundtrip is detected. That is, when a recv is called and the
942
    flag new_roundtrip is set, latency is charged. Every send and send_all
943
    sets this flag.
944
945
    In addition every send, sendall and recv sleeps a bit per character send to
946
    simulate bandwidth.
947
948
    Not all methods are implemented, this is deliberate as this class is not a
949
    replacement for the builtin sockets layer. fileno is not implemented to
950
    prevent the proxy being bypassed. 
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
951
    """
952
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
953
    simulated_time = 0
1874.1.9 by Carl Friedrich Bolz
Try to fix all the issues outline by john and Robert.
954
    _proxied_arguments = dict.fromkeys([
955
        "close", "getpeername", "getsockname", "getsockopt", "gettimeout",
956
        "setblocking", "setsockopt", "settimeout", "shutdown"])
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
957
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
958
    def __init__(self, sock, latency, bandwidth=1.0, 
1874.1.9 by Carl Friedrich Bolz
Try to fix all the issues outline by john and Robert.
959
                 really_sleep=True):
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
960
        """ 
961
        :param bandwith: simulated bandwith (MegaBit)
1874.1.9 by Carl Friedrich Bolz
Try to fix all the issues outline by john and Robert.
962
        :param really_sleep: If set to false, the SocketDelay will just
963
        increase a counter, instead of calling time.sleep. This is useful for
964
        unittesting the SocketDelay.
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
965
        """
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
966
        self.sock = sock
967
        self.latency = latency
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
968
        self.really_sleep = really_sleep
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
969
        self.time_per_byte = 1 / (bandwidth / 8.0 * 1024 * 1024) 
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
970
        self.new_roundtrip = False
971
972
    def sleep(self, s):
973
        if self.really_sleep:
974
            time.sleep(s)
1874.1.9 by Carl Friedrich Bolz
Try to fix all the issues outline by john and Robert.
975
        else:
976
            SocketDelay.simulated_time += s
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
977
1874.1.9 by Carl Friedrich Bolz
Try to fix all the issues outline by john and Robert.
978
    def __getattr__(self, attr):
979
        if attr in SocketDelay._proxied_arguments:
980
            return getattr(self.sock, attr)
981
        raise AttributeError("'SocketDelay' object has no attribute %r" %
982
                             attr)
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
983
984
    def dup(self):
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
985
        return SocketDelay(self.sock.dup(), self.latency, self.time_per_byte,
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
986
                           self._sleep)
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
987
988
    def recv(self, *args):
989
        data = self.sock.recv(*args)
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
990
        if data and self.new_roundtrip:
991
            self.new_roundtrip = False
992
            self.sleep(self.latency)
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
993
        self.sleep(len(data) * self.time_per_byte)
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
994
        return data
995
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
996
    def sendall(self, data, flags=0):
997
        if not self.new_roundtrip:
998
            self.new_roundtrip = True
999
            self.sleep(self.latency)
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
1000
        self.sleep(len(data) * self.time_per_byte)
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
1001
        return self.sock.sendall(data, flags)
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
1002
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
1003
    def send(self, data, flags=0):
1004
        if not self.new_roundtrip:
1005
            self.new_roundtrip = True
1006
            self.sleep(self.latency)
1007
        bytes_sent = self.sock.send(data, flags)
1874.1.5 by holger krekel
(cfbolz, hpk) Refactored bandwidth parameter. Fixed indentation bug in 'send'.
1008
        self.sleep(bytes_sent * self.time_per_byte)
1874.1.2 by Carl Friedrich Bolz
Refined the SocketDelay to charge latency only once per round-trip and to
1009
        return bytes_sent
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
1010
1011
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1012
class SFTPServer(Server):
1013
    """Common code for SFTP server facilities."""
1014
2018.1.1 by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths).
1015
    def __init__(self, server_interface=StubServer):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1016
        self._original_vendor = None
1017
        self._homedir = None
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
1018
        self._server_homedir = None
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1019
        self._listener = None
1020
        self._root = None
1951.1.8 by Andrew Bennetts
Make _get_ssh_vendor return the vendor object, rather than just a string.
1021
        self._vendor = ssh.ParamikoVendor()
2018.1.1 by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths).
1022
        self._server_interface = server_interface
1530.1.6 by Robert Collins
Trim duplicate sftp tests.
1023
        # sftp server logs
1024
        self.logs = []
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
1025
        self.add_latency = 0
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1026
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
1027
    def _get_sftp_url(self, path):
1028
        """Calculate an sftp url to this server for path."""
1029
        return 'sftp://foo:bar@localhost:%d/%s' % (self._listener.port, path)
1030
1530.1.6 by Robert Collins
Trim duplicate sftp tests.
1031
    def log(self, message):
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
1032
        """StubServer uses this to log when a new server is created."""
1530.1.6 by Robert Collins
Trim duplicate sftp tests.
1033
        self.logs.append(message)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1034
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
1035
    def _run_server_entry(self, sock):
1036
        """Entry point for all implementations of _run_server.
1037
        
1038
        If self.add_latency is > 0.000001 then sock is given a latency adding
1039
        decorator.
1040
        """
1041
        if self.add_latency > 0.000001:
1042
            sock = SocketDelay(sock, self.add_latency)
1043
        return self._run_server(sock)
1044
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
1045
    def _run_server(self, s):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1046
        ssh_server = paramiko.Transport(s)
1711.5.1 by John Arbash Meinel
Get most SFTP tests to pass. StubSFTPServer now talks the same path protocol that SFTPTransport talks. on win32
1047
        key_file = pathjoin(self._homedir, 'test_rsa.key')
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
1048
        f = open(key_file, 'w')
1049
        f.write(STUB_SERVER_KEY)
1050
        f.close()
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1051
        host_key = paramiko.RSAKey.from_private_key_file(key_file)
1052
        ssh_server.add_server_key(host_key)
2018.1.1 by Andrew Bennetts
Make bzr+ssh:// actually work (at least with absolute paths).
1053
        server = self._server_interface(self)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1054
        ssh_server.set_subsystem_handler('sftp', paramiko.SFTPServer,
1055
                                         StubSFTPServer, root=self._root,
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
1056
                                         home=self._server_homedir)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1057
        event = threading.Event()
1058
        ssh_server.start_server(event, server)
1059
        event.wait(5.0)
2221.5.21 by Dmitry Vasiliev
Reverted trailing whitespace removal
1060
    
2018.5.114 by Robert Collins
Commit current test pass improvements.
1061
    def setUp(self, backing_server=None):
1062
        # XXX: TODO: make sftpserver back onto backing_server rather than local
1063
        # disk.
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1064
        if not (backing_server is None or
1065
                isinstance(backing_server, local.LocalURLServer)):
1066
            raise AssertionError(
1067
                "backing_server should not be %r, because this can only serve the "
1068
                "local current working directory." % (backing_server,))
2221.5.18 by Dmitry Vasiliev
Fixed variable name
1069
        self._original_vendor = ssh._ssh_vendor_manager._cached_ssh_vendor
1070
        ssh._ssh_vendor_manager._cached_ssh_vendor = self._vendor
1711.6.3 by John Arbash Meinel
Fix regression on unicode tests for SFTP under Linux
1071
        if sys.platform == 'win32':
1072
            # Win32 needs to use the UNICODE api
1073
            self._homedir = getcwd()
1074
        else:
1075
            # But Linux SFTP servers should just deal in bytestreams
1076
            self._homedir = os.getcwd()
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
1077
        if self._server_homedir is None:
1078
            self._server_homedir = self._homedir
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1079
        self._root = '/'
1711.5.1 by John Arbash Meinel
Get most SFTP tests to pass. StubSFTPServer now talks the same path protocol that SFTPTransport talks. on win32
1080
        if sys.platform == 'win32':
1081
            self._root = ''
1871.1.3 by Robert Collins
proof of concept slowsocket wrapper.
1082
        self._listener = SocketListener(self._run_server_entry)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1083
        self._listener.setDaemon(True)
1084
        self._listener.start()
1085
1086
    def tearDown(self):
1087
        """See bzrlib.transport.Server.tearDown."""
1088
        self._listener.stop()
2221.5.18 by Dmitry Vasiliev
Fixed variable name
1089
        ssh._ssh_vendor_manager._cached_ssh_vendor = self._original_vendor
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1090
1711.2.42 by John Arbash Meinel
enable bogus_url support for SFTP tests
1091
    def get_bogus_url(self):
1092
        """See bzrlib.transport.Server.get_bogus_url."""
1185.49.35 by John Arbash Meinel
Update tests to use a truly unused port
1093
        # this is chosen to try to prevent trouble with proxies, wierd dns, etc
1094
        # we bind a random socket, so that we get a guaranteed unused port
1095
        # we just never listen on that port
1096
        s = socket.socket()
1097
        s.bind(('localhost', 0))
1098
        return 'sftp://%s:%s/' % s.getsockname()
1711.2.42 by John Arbash Meinel
enable bogus_url support for SFTP tests
1099
1100
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1101
class SFTPFullAbsoluteServer(SFTPServer):
1102
    """A test server for sftp transports, using absolute urls and ssh."""
1103
1104
    def get_url(self):
1105
        """See bzrlib.transport.Server.get_url."""
2321.3.7 by Alexander Belchenko
fixes for passing test_sftp_transport on win32 (thankyou John)
1106
        homedir = self._homedir
1107
        if sys.platform != 'win32':
1108
            # Remove the initial '/' on all platforms but win32
1109
            homedir = homedir[1:]
1110
        return self._get_sftp_url(urlutils.escape(homedir))
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1111
1112
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
1113
class SFTPServerWithoutSSH(SFTPServer):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1114
    """An SFTP server that uses a simple TCP socket pair rather than SSH."""
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
1115
1116
    def __init__(self):
1117
        super(SFTPServerWithoutSSH, self).__init__()
1951.1.8 by Andrew Bennetts
Make _get_ssh_vendor return the vendor object, rather than just a string.
1118
        self._vendor = ssh.LoopbackVendor()
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
1119
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
1120
    def _run_server(self, sock):
1951.1.10 by Andrew Bennetts
Move register_ssh_vendor, _ssh_vendor and _get_ssh_vendor into ssh.py
1121
        # Re-import these as locals, so that they're still accessible during
1122
        # interpreter shutdown (when all module globals get set to None, leading
1123
        # to confusing errors like "'NoneType' object has no attribute 'error'".
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
1124
        class FakeChannel(object):
1125
            def get_transport(self):
1126
                return self
1127
            def get_log_channel(self):
1128
                return 'paramiko'
1129
            def get_name(self):
1130
                return '1'
1131
            def get_hexdump(self):
1132
                return False
1711.2.1 by John Arbash Meinel
[patch] Marien Zwart: paramiko-1.6 compatibility fix
1133
            def close(self):
1134
                pass
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
1135
3353.1.1 by Andrew Bennetts
Stop the test suite hanging with current paramiko. (It doesn't pass yet, though.)
1136
        server = paramiko.SFTPServer(
1137
            FakeChannel(), 'sftp', StubServer(self), StubSFTPServer,
1138
            root=self._root, home=self._server_homedir)
1806.1.1 by Robey Pointer
absorb a broken-pipe exception from paramiko when running the unit tests. it's okay for the client to vanish abruptly and paramiko really ought to mask the exception itself.
1139
        try:
3353.1.3 by Andrew Bennetts
Always adapt sockets to look like paramiko Channels before passing them to paramiko's SFTPClient.
1140
            server.start_subsystem(
1141
                'sftp', None, ssh.SocketAsChannelAdapter(sock))
1806.1.1 by Robey Pointer
absorb a broken-pipe exception from paramiko when running the unit tests. it's okay for the client to vanish abruptly and paramiko really ought to mask the exception itself.
1142
        except socket.error, e:
1143
            if (len(e.args) > 0) and (e.args[0] == errno.EPIPE):
1144
                # it's okay for the client to disconnect abruptly
1145
                # (bug in paramiko 1.6: it should absorb this exception)
1146
                pass
1147
            else:
1148
                raise
1149
        except Exception, e:
2018.11.2 by Andrew Bennetts
Hookup RemoteBranch for testing by bzrlib/tests/branch_implementations tests.
1150
            # This typically seems to happen during interpreter shutdown, so
1151
            # most of the useful ways to report this error are won't work.
1152
            # Writing the exception type, and then the text of the exception,
1153
            # seems to be the best we can do.
1154
            import sys
1155
            sys.stderr.write('\nEXCEPTION %r: ' % (e.__class__,))
1156
            sys.stderr.write('%s\n\n' % (e,))
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
1157
        server.finish_subsystem()
1158
1159
1160
class SFTPAbsoluteServer(SFTPServerWithoutSSH):
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
1161
    """A test server for sftp transports, using absolute urls."""
1162
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1163
    def get_url(self):
1164
        """See bzrlib.transport.Server.get_url."""
2321.3.7 by Alexander Belchenko
fixes for passing test_sftp_transport on win32 (thankyou John)
1165
        homedir = self._homedir
1166
        if sys.platform != 'win32':
1167
            # Remove the initial '/' on all platforms but win32
1168
            homedir = homedir[1:]
1169
        return self._get_sftp_url(urlutils.escape(homedir))
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1170
1171
1547.1.1 by Robey Pointer
modify the sftp unit tests to perform sftp over a direct localhost socket instead of over an actual ssh2 transport
1172
class SFTPHomeDirServer(SFTPServerWithoutSSH):
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
1173
    """A test server for sftp transports, using homedir relative urls."""
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1174
1175
    def get_url(self):
1176
        """See bzrlib.transport.Server.get_url."""
1534.1.8 by Robert Collins
Update SFTP Urls as per mailing list thread.
1177
        return self._get_sftp_url("~/")
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
1178
1179
1180
class SFTPSiblingAbsoluteServer(SFTPAbsoluteServer):
2018.5.114 by Robert Collins
Commit current test pass improvements.
1181
    """A test server for sftp transports where only absolute paths will work.
1182
1183
    It does this by serving from a deeply-nested directory that doesn't exist.
1184
    """
1185
1186
    def setUp(self, backing_server=None):
1530.1.8 by Robert Collins
More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.
1187
        self._server_homedir = '/dev/noone/runs/tests/here'
2018.5.114 by Robert Collins
Commit current test pass improvements.
1188
        super(SFTPSiblingAbsoluteServer, self).setUp(backing_server)
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
1189
1190
1191
def get_test_permutations():
1192
    """Return the permutations to be used in testing."""
1193
    return [(SFTPTransport, SFTPAbsoluteServer),
1194
            (SFTPTransport, SFTPHomeDirServer),
1195
            (SFTPTransport, SFTPSiblingAbsoluteServer),
1196
            ]