~bzr-pqm/bzr/bzr.dev

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