~bzr-pqm/bzr/bzr.dev

4988.10.5 by John Arbash Meinel
Merge bzr.dev 5021 to resolve NEWS
1
# Copyright (C) 2005-2010 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
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
31
import stat
32
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
33
import time
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
34
import urllib
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
35
import urlparse
2711.1.1 by Martin Pool
Suppress warning about Paramiko use of struct.pack
36
import warnings
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
37
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
38
from bzrlib import (
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
39
    config,
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
40
    debug,
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
41
    errors,
42
    urlutils,
43
    )
1996.2.1 by Andrew Bennetts
Fix NameError reported by Alexander Belchenko.
44
from bzrlib.errors import (FileExists,
1951.1.6 by Andrew Bennetts
Tidy up some unused imports.
45
                           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
46
                           TransportError,
1996.2.1 by Andrew Bennetts
Fix NameError reported by Alexander Belchenko.
47
                           LockError,
1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
48
                           PathError,
49
                           ParamikoNotPresent,
1530.1.3 by Robert Collins
transport implementations now tested consistently.
50
                           )
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
51
from bzrlib.osutils import pathjoin, fancy_rename, getcwd
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
52
from bzrlib.symbol_versioning import (
53
        deprecated_function,
54
        )
1951.1.6 by Andrew Bennetts
Tidy up some unused imports.
55
from bzrlib.trace import mutter, warning
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
56
from bzrlib.transport import (
2671.3.6 by Robert Collins
Review feedback.
57
    FileFileStream,
2671.3.2 by Robert Collins
Start open_file_stream logic.
58
    _file_streams,
2018.5.114 by Robert Collins
Commit current test pass improvements.
59
    local,
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
60
    Server,
1951.1.4 by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py
61
    ssh,
2485.8.16 by Vincent Ladeuil
Create a new, empty, ConnectedTransport class.
62
    ConnectedTransport,
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
63
    )
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
64
2711.1.1 by Martin Pool
Suppress warning about Paramiko use of struct.pack
65
# Disable one particular warning that comes from paramiko in Python2.5; if
66
# this is emitted at the wrong time it tends to cause spurious test failures
67
# or at least noise in the test case::
68
#
69
# [1770/7639 in 86s, 1 known failures, 50 skipped, 2 missing features]
70
# test_permissions.TestSftpPermissions.test_new_files
71
# /var/lib/python-support/python2.5/paramiko/message.py:226: DeprecationWarning: integer argument expected, got float
72
#  self.packet.write(struct.pack('>I', n))
73
warnings.filterwarnings('ignore',
74
        'integer argument expected, got float',
75
        category=DeprecationWarning,
76
        module='paramiko.message')
77
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
78
try:
79
    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.
80
except ImportError, e:
81
    raise ParamikoNotPresent(e)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
82
else:
83
    from paramiko.sftp import (SFTP_FLAG_WRITE, SFTP_FLAG_CREATE,
84
                               SFTP_FLAG_EXCL, SFTP_FLAG_TRUNC,
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
85
                               SFTP_OK, CMD_HANDLE, CMD_OPEN)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
86
    from paramiko.sftp_attr import SFTPAttributes
87
    from paramiko.sftp_file import SFTPFile
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
88
1883.1.3 by Stefan (metze) Metzmacher
- fix typo
89
1711.6.2 by John Arbash Meinel
Clean up paramiko agent support.
90
_paramiko_version = getattr(paramiko, '__version_info__', (0, 0, 0))
91
# don't use prefetch unless paramiko version >= 1.5.5 (there were bugs earlier)
92
_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.
93
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
94
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
95
class SFTPLock(object):
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
96
    """This fakes a lock in a remote location.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
97
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
98
    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
99
    doesn't work well on all transports and they are only used in
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
100
    deprecated storage formats.
101
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
102
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
103
    __slots__ = ['path', 'lock_path', 'lock_file', 'transport']
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
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
    def __init__(self, path, transport):
106
        self.lock_file = None
107
        self.path = path
108
        self.lock_path = path + '.write-lock'
109
        self.transport = transport
110
        try:
1530.1.7 by Robert Collins
merge integration.
111
            # RBC 20060103 FIXME should we be using private methods here ?
112
            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.
113
            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
114
        except FileExists:
115
            raise LockError('File %r already locked' % (self.path,))
116
117
    def __del__(self):
118
        """Should this warn, or actually try to cleanup?"""
119
        if self.lock_file:
1547.1.3 by Robey Pointer
spell warning correctly :) and move recv_ready close to recv for readability
120
            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
121
            self.unlock()
122
123
    def unlock(self):
124
        if not self.lock_file:
125
            return
126
        self.lock_file.close()
127
        self.lock_file = None
128
        try:
129
            self.transport.delete(self.lock_path)
130
        except (NoSuchFile,):
131
            # What specific errors should we catch here?
132
            pass
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
133
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
134
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
135
class _SFTPReadvHelper(object):
136
    """A class to help with managing the state of a readv request."""
137
138
    # See _get_requests for an explanation.
139
    _max_request_size = 32768
140
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
141
    def __init__(self, original_offsets, relpath, _report_activity):
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
142
        """Create a new readv helper.
143
144
        :param original_offsets: The original requests given by the caller of
145
            readv()
146
        :param relpath: The name of the file (if known)
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
147
        :param _report_activity: A Transport._report_activity bound method,
148
            to be called as data arrives.
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
149
        """
150
        self.original_offsets = list(original_offsets)
151
        self.relpath = relpath
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
152
        self._report_activity = _report_activity
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
153
154
    def _get_requests(self):
155
        """Break up the offsets into individual requests over sftp.
156
157
        The SFTP spec only requires implementers to support 32kB requests. We
158
        could try something larger (openssh supports 64kB), but then we have to
159
        handle requests that fail.
160
        So instead, we just break up our maximum chunks into 32kB chunks, and
161
        asyncronously requests them.
162
        Newer versions of paramiko would do the chunking for us, but we want to
163
        start processing results right away, so we do it ourselves.
164
        """
165
        # TODO: Because we issue async requests, we don't 'fudge' any extra
166
        #       data.  I'm not 100% sure that is the best choice.
167
168
        # The first thing we do, is to collapse the individual requests as much
169
        # as possible, so we don't issues requests <32kB
170
        sorted_offsets = sorted(self.original_offsets)
171
        coalesced = list(ConnectedTransport._coalesce_offsets(sorted_offsets,
172
                                                        limit=0, fudge_factor=0))
173
        requests = []
174
        for c_offset in coalesced:
175
            start = c_offset.start
176
            size = c_offset.length
177
178
            # Break this up into 32kB requests
179
            while size > 0:
180
                next_size = min(size, self._max_request_size)
181
                requests.append((start, next_size))
182
                size -= next_size
183
                start += next_size
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
184
        if 'sftp' in debug.debug_flags:
185
            mutter('SFTP.readv(%s) %s offsets => %s coalesced => %s requests',
186
                self.relpath, len(sorted_offsets), len(coalesced),
187
                len(requests))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
188
        return requests
189
190
    def request_and_yield_offsets(self, fp):
191
        """Request the data from the remote machine, yielding the results.
192
193
        :param fp: A Paramiko SFTPFile object that supports readv.
194
        :return: Yield the data requested by the original readv caller, one by
195
            one.
196
        """
197
        requests = self._get_requests()
198
        offset_iter = iter(self.original_offsets)
199
        cur_offset, cur_size = offset_iter.next()
200
        # paramiko .readv() yields strings that are in the order of the requests
201
        # So we track the current request to know where the next data is
202
        # being returned from.
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
203
        input_start = None
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
204
        last_end = None
205
        buffered_data = []
206
        buffered_len = 0
207
208
        # This is used to buffer chunks which we couldn't process yet
209
        # It is (start, end, data) tuples.
210
        data_chunks = []
211
        # Create an 'unlimited' data stream, so we stop based on requests,
212
        # rather than just because the data stream ended. This lets us detect
213
        # short readv.
214
        data_stream = itertools.chain(fp.readv(requests),
215
                                      itertools.repeat(None))
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
216
        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.
217
            if data is None:
218
                if cur_coalesced is not None:
219
                    raise errors.ShortReadvError(self.relpath,
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
220
                        start, length, len(data))
221
            if len(data) != length:
222
                raise errors.ShortReadvError(self.relpath,
223
                    start, length, len(data))
3882.7.9 by Martin Pool
Move the point at which sftp issues transport activity (thanks vila)
224
            self._report_activity(length, 'read')
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
225
            if last_end is None:
226
                # This is the first request, just buffer it
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
227
                buffered_data = [data]
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
228
                buffered_len = length
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
229
                input_start = start
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
230
            elif start == last_end:
231
                # The data we are reading fits neatly on the previous
232
                # buffer, so this is all part of a larger coalesced range.
233
                buffered_data.append(data)
234
                buffered_len += length
235
            else:
236
                # We have an 'interrupt' in the data stream. So we know we are
237
                # at a request boundary.
238
                if buffered_len > 0:
239
                    # We haven't consumed the buffer so far, so put it into
240
                    # data_chunks, and continue.
241
                    buffered = ''.join(buffered_data)
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
242
                    data_chunks.append((input_start, buffered))
243
                input_start = start
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
244
                buffered_data = [data]
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
245
                buffered_len = length
246
            last_end = start + length
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
247
            if input_start == cur_offset and cur_size <= buffered_len:
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
248
                # Simplify the next steps a bit by transforming buffered_data
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
249
                # into a single string. We also have the nice property that
250
                # when there is only one string ''.join([x]) == x, so there is
251
                # no data copying.
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
252
                buffered = ''.join(buffered_data)
3686.1.7 by John Arbash Meinel
Purge the list buffer when we have a simple string buffer.
253
                # Clean out buffered data so that we keep memory
254
                # consumption low
255
                del buffered_data[:]
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
256
                buffered_offset = 0
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
257
                # TODO: We *could* also consider the case where cur_offset is in
258
                #       in the buffered range, even though it doesn't *start*
259
                #       the buffered range. But for packs we pretty much always
260
                #       read in order, so you won't get any extra data in the
261
                #       middle.
262
                while (input_start == cur_offset
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
263
                       and (buffered_offset + cur_size) <= buffered_len):
264
                    # We've buffered enough data to process this request, spit it
265
                    # out
266
                    cur_data = buffered[buffered_offset:buffered_offset + cur_size]
267
                    # move the direct pointer into our buffered data
268
                    buffered_offset += cur_size
269
                    # Move the start-of-buffer pointer
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
270
                    input_start += cur_size
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
271
                    # Yield the requested data
272
                    yield cur_offset, cur_data
273
                    cur_offset, cur_size = offset_iter.next()
274
                # at this point, we've consumed as much of buffered as we can,
275
                # so break off the portion that we consumed
276
                if buffered_offset == len(buffered_data):
277
                    # No tail to leave behind
278
                    buffered_data = []
279
                    buffered_len = 0
280
                else:
281
                    buffered = buffered[buffered_offset:]
282
                    buffered_data = [buffered]
283
                    buffered_len = len(buffered)
5807.5.1 by John Arbash Meinel
Fix bug #767177. Be more agressive with file.close() calls.
284
        # now that the data stream is done, close the handle
285
        fp.close()
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
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
5247.2.12 by Vincent Ladeuil
Ensure that all transports close their underlying connection.
394
    def disconnect(self):
395
        connection = self._get_connection()
396
        if connection is not None:
397
            connection.close()
398
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
399
    def _get_sftp(self):
400
        """Ensures that a connection is established"""
401
        connection = self._get_connection()
402
        if connection is None:
403
            # First connection ever
404
            connection, credentials = self._create_connection()
405
            self._set_connection(connection, credentials)
406
        return connection
407
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
408
    def has(self, relpath):
409
        """
410
        Does the target location exist?
411
        """
412
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
413
            self._get_sftp().stat(self._remote_path(relpath))
4103.3.1 by Martin Pool
More sftp progress hooks
414
            # stat result is about 20 bytes, let's say
415
            self._report_activity(20, 'read')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
416
            return True
417
        except IOError:
418
            return False
419
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
420
    def get(self, relpath):
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
421
        """Get the file at the given relative path.
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
422
423
        :param relpath: The relative path to the file
424
        """
425
        try:
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))
5349.2.2 by Martin Pool
Better exception when sftp server doesn't support symlinks
720
            if e.args == ('Operation unsupported',):
721
                raise errors.TransportNotPossible()
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 args %s', e.args)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
723
        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.
724
            mutter('Raising exception with errno %s', e.errno)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
725
        raise e
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
726
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
727
    def append_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
728
        """
729
        Append the text in the file-like object into the final
730
        location.
731
        """
732
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
733
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
734
            fout = self._get_sftp().file(path, 'ab')
1666.1.6 by Robert Collins
Make knit the default format.
735
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
736
                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.
737
            result = fout.tell()
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
738
            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.
739
            return result
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
740
        except (IOError, paramiko.SSHException), e:
741
            self._translate_io_exception(e, relpath, ': unable to append')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
742
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
743
    def rename(self, rel_from, rel_to):
744
        """Rename without special overwriting"""
745
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
746
            self._get_sftp().rename(self._remote_path(rel_from),
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
747
                              self._remote_path(rel_to))
748
        except (IOError, paramiko.SSHException), e:
749
            self._translate_io_exception(e, rel_from,
750
                    ': unable to rename to %r' % (rel_to))
751
752
    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.
753
        """Do a fancy rename on the remote server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
754
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
755
        Using the implementation provided by osutils.
756
        """
757
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
758
            sftp = self._get_sftp()
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
759
            fancy_rename(abs_from, abs_to,
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
760
                         rename_func=sftp.rename,
761
                         unlink_func=sftp.remove)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
762
        except (IOError, paramiko.SSHException), e:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
763
            self._translate_io_exception(e, abs_from,
764
                                         ': 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.
765
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
766
    def move(self, rel_from, rel_to):
767
        """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
768
        path_from = self._remote_path(rel_from)
769
        path_to = self._remote_path(rel_to)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
770
        self._rename_and_overwrite(path_from, path_to)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
771
772
    def delete(self, relpath):
773
        """Delete the item at relpath"""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
774
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
775
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
776
            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.
777
        except (IOError, paramiko.SSHException), e:
778
            self._translate_io_exception(e, path, ': unable to delete')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
779
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
780
    def external_url(self):
781
        """See bzrlib.transport.Transport.external_url."""
782
        # the external path for SFTP is the base
783
        return self.base
784
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
785
    def listable(self):
786
        """Return True if this store supports listing."""
787
        return True
788
789
    def list_dir(self, relpath):
790
        """
791
        Return a list of all files at the given location.
792
        """
793
        # does anything actually use this?
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
794
        # -- Unknown
795
        # This is at least used by copy_tree for remote upgrades.
796
        # -- David Allouche 2006-08-11
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
797
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
798
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
799
            entries = self._get_sftp().listdir(path)
4103.3.1 by Martin Pool
More sftp progress hooks
800
            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.
801
        except (IOError, paramiko.SSHException), e:
802
            self._translate_io_exception(e, path, ': failed to list_dir')
1959.2.2 by John Arbash Meinel
Apply Andrew Bennetts list_dir fixes
803
        return [urlutils.escape(entry) for entry in entries]
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
804
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
805
    def rmdir(self, relpath):
806
        """See Transport.rmdir."""
807
        path = self._remote_path(relpath)
808
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
809
            return self._get_sftp().rmdir(path)
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
810
        except (IOError, paramiko.SSHException), e:
811
            self._translate_io_exception(e, path, ': failed to rmdir')
812
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
813
    def stat(self, relpath):
814
        """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
815
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
816
        try:
5056.1.5 by Neil Santos
Removed separate lstat() and reverted LocalTransport and SFTPTransport's stat() methods to using lstat() internally.
817
            return self._get_sftp().lstat(path)
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
818
        except (IOError, paramiko.SSHException), e:
819
            self._translate_io_exception(e, path, ': unable to stat')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
820
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
821
    def readlink(self, relpath):
822
        """See Transport.readlink."""
823
        path = self._remote_path(relpath)
824
        try:
825
            return self._get_sftp().readlink(path)
826
        except (IOError, paramiko.SSHException), e:
827
            self._translate_io_exception(e, path, ': unable to readlink')
828
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
829
    def symlink(self, source, link_name):
830
        """See Transport.symlink."""
831
        try:
832
            conn = self._get_sftp()
5056.1.5 by Neil Santos
Removed separate lstat() and reverted LocalTransport and SFTPTransport's stat() methods to using lstat() internally.
833
            sftp_retval = conn.symlink(source, link_name)
834
            if SFTP_OK != sftp_retval:
835
                raise TransportError(
836
                    '%r: unable to create symlink to %r' % (link_name, source),
837
                    sftp_retval
838
                )
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
839
        except (IOError, paramiko.SSHException), e:
840
            self._translate_io_exception(e, link_name,
841
                                         ': unable to create symlink to %r' % (source))
842
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
843
    def lock_read(self, relpath):
844
        """
845
        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
846
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
847
        """
848
        # FIXME: there should be something clever i can do here...
849
        class BogusLock(object):
850
            def __init__(self, path):
851
                self.path = path
852
            def unlock(self):
853
                pass
854
        return BogusLock(relpath)
855
856
    def lock_write(self, relpath):
857
        """
858
        Lock the given file for exclusive (write) access.
859
        WARNING: many transports do not support this, so trying avoid using it
860
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
861
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
862
        """
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
863
        # This is a little bit bogus, but basically, we create a file
864
        # which should not already exist, and if it does, we assume
865
        # that there is a lock, and if it doesn't, the we assume
866
        # 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
867
        return SFTPLock(relpath, self)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
868
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
869
    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
870
        """Open a remote path exclusively.
871
872
        SFTP supports O_EXCL (SFTP_FLAG_EXCL), which fails if
873
        the file already exists. However it does not expose this
874
        at the higher level of SFTPClient.open(), so we have to
875
        sneak away with it.
876
877
        WARNING: This breaks the SFTPClient abstraction, so it
878
        could easily break against an updated version of paramiko.
879
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
880
        :param abspath: The remote absolute path where the file should be opened
881
        :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
882
        """
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
883
        # TODO: jam 20060816 Paramiko >= 1.6.2 (probably earlier) supports
884
        #       using the 'x' flag to indicate SFTP_FLAG_EXCL.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
885
        #       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
886
        #       time using the sftp_client.file() functionality.
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
887
        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
888
        # 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
889
        attr = SFTPAttributes()
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
890
        if mode is not None:
891
            attr.st_mode = mode
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
892
        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
893
                | SFTP_FLAG_TRUNC | SFTP_FLAG_EXCL)
894
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
895
            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
896
            if t != CMD_HANDLE:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
897
                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
898
            handle = msg.get_string()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
899
            return SFTPFile(self._get_sftp(), handle, 'wb', -1)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
900
        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.
901
            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.
902
                failure_exc=FileExists)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
903
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
904
    def _can_roundtrip_unix_modebits(self):
905
        if sys.platform == 'win32':
906
            # anyone else?
907
            return False
908
        else:
909
            return True
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
910
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.
911
912
def get_test_permutations():
913
    """Return the permutations to be used in testing."""
4797.11.2 by Vincent Ladeuil
Stop requiring testtools for sftp use.
914
    from bzrlib.tests import stub_sftp
915
    return [(SFTPTransport, stub_sftp.SFTPAbsoluteServer),
916
            (SFTPTransport, stub_sftp.SFTPHomeDirServer),
917
            (SFTPTransport, stub_sftp.SFTPSiblingAbsoluteServer),
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.
918
            ]