~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)
284
        if buffered_len:
285
            buffered = ''.join(buffered_data)
3686.1.7 by John Arbash Meinel
Purge the list buffer when we have a simple string buffer.
286
            del buffered_data[:]
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
287
            data_chunks.append((input_start, buffered))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
288
        if data_chunks:
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
289
            if 'sftp' in debug.debug_flags:
290
                mutter('SFTP readv left with %d out-of-order bytes',
291
                    sum(map(lambda x: len(x[1]), data_chunks)))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
292
            # We've processed all the readv data, at this point, anything we
293
            # couldn't process is in data_chunks. This doesn't happen often, so
294
            # this code path isn't optimized
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
295
            # We use an interesting process for data_chunks
296
            # Specifically if we have "bisect_left([(start, len, entries)],
297
            #                                       (qstart,)])
298
            # If start == qstart, then we get the specific node. Otherwise we
299
            # get the previous node
300
            while True:
301
                idx = bisect.bisect_left(data_chunks, (cur_offset,))
3815.2.4 by Martin Pool
merge fix for out-of-order SFTP readv
302
                if idx < len(data_chunks) and data_chunks[idx][0] == cur_offset:
303
                    # The data starts here
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
304
                    data = data_chunks[idx][1][:cur_size]
305
                elif idx > 0:
306
                    # The data is in a portion of a previous page
307
                    idx -= 1
308
                    sub_offset = cur_offset - data_chunks[idx][0]
309
                    data = data_chunks[idx][1]
310
                    data = data[sub_offset:sub_offset + cur_size]
311
                else:
312
                    # We are missing the page where the data should be found,
313
                    # something is wrong
314
                    data = ''
315
                if len(data) != cur_size:
316
                    raise AssertionError('We must have miscalulated.'
317
                        ' We expected %d bytes, but only found %d'
318
                        % (cur_size, len(data)))
319
                yield cur_offset, data
320
                cur_offset, cur_size = offset_iter.next()
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
321
322
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
323
class SFTPTransport(ConnectedTransport):
1752.2.40 by Andrew Bennetts
Merge from bzr.dev.
324
    """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
325
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.
326
    _do_prefetch = _default_do_prefetch
1864.5.6 by John Arbash Meinel
Setting defaults based on benchmarking data.
327
    # TODO: jam 20060717 Conceivably these could be configurable, either
328
    #       by auto-tuning at run-time, or by a configuration (per host??)
329
    #       but the performance curve is pretty flat, so just going with
330
    #       reasonable defaults.
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
331
    _max_readv_combine = 200
1864.5.6 by John Arbash Meinel
Setting defaults based on benchmarking data.
332
    # Having to round trip to the server means waiting for a response,
333
    # so it is better to download extra bytes.
334
    # 8KiB had good performance for both local and remote network operations
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
335
    _bytes_to_read_before_seek = 8192
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
336
1864.5.20 by John Arbash Meinel
Some small cleanups.
337
    # The sftp spec says that implementations SHOULD allow reads
338
    # to be at least 32K. paramiko.readv() does an async request
339
    # for the chunks. So we need to keep it within a single request
340
    # size for paramiko <= 1.6.1. paramiko 1.6.2 will probably chop
341
    # up the request itself, rather than us having to worry about it
342
    _max_request_size = 32768
1864.5.17 by John Arbash Meinel
A little cleanup, and restrict to 32K to conform better to sftp spec
343
2485.8.59 by Vincent Ladeuil
Update from review comments.
344
    def __init__(self, base, _from_transport=None):
345
        super(SFTPTransport, self).__init__(base,
346
                                            _from_transport=_from_transport)
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
347
348
    def _remote_path(self, relpath):
349
        """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
350
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
351
        :param relpath: is a urlencoded string.
352
        """
353
        relative = urlutils.unescape(relpath).encode('utf-8')
354
        remote_path = self._combine_paths(self._path, relative)
355
        # the initial slash should be removed from the path, and treated as a
356
        # homedir relative path (the path begins with a double slash if it is
357
        # absolute).  see draft-ietf-secsh-scp-sftp-ssh-uri-03.txt
358
        # RBC 20060118 we are not using this as its too user hostile. instead
359
        # we are following lftp and using /~/foo to mean '~/foo'
360
        # vila--20070602 and leave absolute paths begin with a single slash.
361
        if remote_path.startswith('/~/'):
362
            remote_path = remote_path[3:]
363
        elif remote_path == '/~':
364
            remote_path = ''
365
        return remote_path
366
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
367
    def _create_connection(self, credentials=None):
368
        """Create a new connection with the provided credentials.
369
370
        :param credentials: The credentials needed to establish the connection.
371
372
        :return: The created connection and its associated credentials.
373
374
        The credentials are only the password as it may have been entered
375
        interactively by the user and may be different from the one provided
376
        in base url at transport creation time.
377
        """
378
        if credentials is None:
379
            password = self._password
380
        else:
381
            password = credentials
382
383
        vendor = ssh._get_ssh_vendor()
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
384
        user = self._user
385
        if user is None:
386
            auth = config.AuthenticationConfig()
3777.1.4 by Aaron Bentley
bzr+ssh and sftp both use ssh scheme.
387
            user = auth.get_user('ssh', self._host, self._port)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
388
        connection = vendor.connect_sftp(self._user, password,
389
                                         self._host, self._port)
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
390
        return connection, (user, password)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
391
5247.2.12 by Vincent Ladeuil
Ensure that all transports close their underlying connection.
392
    def disconnect(self):
393
        connection = self._get_connection()
394
        if connection is not None:
395
            connection.close()
396
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
397
    def _get_sftp(self):
398
        """Ensures that a connection is established"""
399
        connection = self._get_connection()
400
        if connection is None:
401
            # First connection ever
402
            connection, credentials = self._create_connection()
403
            self._set_connection(connection, credentials)
404
        return connection
405
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
406
    def has(self, relpath):
407
        """
408
        Does the target location exist?
409
        """
410
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
411
            self._get_sftp().stat(self._remote_path(relpath))
4103.3.1 by Martin Pool
More sftp progress hooks
412
            # stat result is about 20 bytes, let's say
413
            self._report_activity(20, 'read')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
414
            return True
415
        except IOError:
416
            return False
417
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
418
    def get(self, relpath):
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
419
        """Get the file at the given relative path.
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
420
421
        :param relpath: The relative path to the file
422
        """
423
        try:
4103.3.1 by Martin Pool
More sftp progress hooks
424
            # FIXME: by returning the file directly, we don't pass this
425
            # through to report_activity.  We could try wrapping the object
426
            # before it's returned.  For readv and get_bytes it's handled in
427
            # the higher-level function.
428
            # -- mbp 20090126
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
429
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
430
            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.
431
            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
432
                f.prefetch()
433
            return f
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
434
        except (IOError, paramiko.SSHException), e:
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
435
            self._translate_io_exception(e, path, ': error retrieving',
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
436
                failure_exc=errors.ReadError)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
437
3882.7.4 by Martin Pool
SFTPTransport also sends activity from get()
438
    def get_bytes(self, relpath):
439
        # reimplement this here so that we can report how many bytes came back
440
        f = self.get(relpath)
441
        try:
442
            bytes = f.read()
443
            self._report_activity(len(bytes), 'read')
444
            return bytes
445
        finally:
446
            f.close()
447
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
448
    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.
449
        """See Transport.readv()"""
450
        # We overload the default readv() because we want to use a file
451
        # that does not have prefetch enabled.
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
452
        # 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.
453
        if not offsets:
454
            return
455
456
        try:
457
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
458
            fp = self._get_sftp().file(path, mode='rb')
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
459
            readv = getattr(fp, 'readv', None)
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
460
            if readv:
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
461
                return self._sftp_readv(fp, offsets, relpath)
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
462
            if 'sftp' in debug.debug_flags:
463
                mutter('seek and read %s offsets', len(offsets))
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
464
            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.
465
        except (IOError, paramiko.SSHException), e:
466
            self._translate_io_exception(e, path, ': error retrieving')
467
2671.3.1 by Robert Collins
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
468
    def recommended_page_size(self):
469
        """See Transport.recommended_page_size().
470
471
        For SFTP we suggest a large page size to reduce the overhead
472
        introduced by latency.
473
        """
474
        return 64 * 1024
475
3882.9.1 by Martin Pool
Fix strange default parameter to _sftp_readv
476
    def _sftp_readv(self, fp, offsets, relpath):
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
477
        """Use the readv() member of fp to do async readv.
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
478
3882.9.1 by Martin Pool
Fix strange default parameter to _sftp_readv
479
        Then read them using paramiko.readv(). paramiko.readv()
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
480
        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
481
        just reads until it gets all the stuff it wants.
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
482
        """
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
483
        helper = _SFTPReadvHelper(offsets, relpath, self._report_activity)
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
484
        return helper.request_and_yield_offsets(fp)
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
485
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
486
    def put_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
487
        """
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
488
        Copy the file-like object into the location.
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
489
490
        :param relpath: Location to put the contents, relative to base.
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
491
        :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.
492
        :param mode: The final mode for the file
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
493
        """
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
494
        final_path = self._remote_path(relpath)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
495
        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.
496
497
    def _put(self, abspath, f, mode=None):
498
        """Helper function so both put() and copy_abspaths can reuse the code"""
499
        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
500
                        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.
501
        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.
502
        closed = False
1185.41.6 by Robey Pointer
modified version of john's patch to add atomic put and locking to the sftp transport
503
        try:
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
504
            try:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
505
                fout.set_pipelined(True)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
506
                length = self._pump(f, fout)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
507
            except (IOError, paramiko.SSHException), e:
508
                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
509
            # XXX: This doesn't truly help like we would like it to.
510
            #      The problem is that openssh strips sticky bits. So while we
511
            #      can properly set group write permission, we lose the group
512
            #      sticky bit. So it is probably best to stop chmodding, and
513
            #      just tell users that they need to set the umask correctly.
514
            #      The attr.st_mode = mode, in _sftp_open_exclusive
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
515
            #      will handle when the user wants the final mode to be more
516
            #      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
517
            #      paramiko decides to expose an async chmod()
518
519
            # This is designed to chmod() right before we close.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
520
            # 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
521
            # 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.
522
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
523
                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.
524
            fout.close()
525
            closed = True
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
526
            self._rename_and_overwrite(tmp_abspath, abspath)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
527
            return length
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
528
        except Exception, e:
529
            # If we fail, try to clean up the temporary file
530
            # before we throw the exception
531
            # 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.
532
            # Write out the traceback, because otherwise
533
            # 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.
534
            import traceback
535
            mutter(traceback.format_exc())
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
536
            try:
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
537
                if not closed:
538
                    fout.close()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
539
                self._get_sftp().remove(tmp_abspath)
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
540
            except:
1532 by Robert Collins
Merge in John Meinels integration branch.
541
                # raise the saved except
542
                raise e
543
            # raise the original with its traceback if we can.
544
            raise
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
545
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
546
    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
547
                               create_parent_dir=False,
548
                               dir_mode=None):
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
549
        abspath = self._remote_path(relpath)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
550
551
        # TODO: jam 20060816 paramiko doesn't publicly expose a way to
552
        #       set the file mode at create time. If it does, use it.
553
        #       But for now, we just chmod later anyway.
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
554
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
555
        def _open_and_write_file():
556
            """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.
557
            fout = None
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
558
            try:
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
559
                try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
560
                    fout = self._get_sftp().file(abspath, mode='wb')
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
561
                    fout.set_pipelined(True)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
562
                    writer(fout)
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
563
                except (paramiko.SSHException, IOError), e:
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
564
                    self._translate_io_exception(e, abspath,
565
                                                 ': unable to open')
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
566
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
567
                # This is designed to chmod() right before we close.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
568
                # Because we set_pipelined() earlier, theoretically we might
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
569
                # avoid the round trip for fout.close()
570
                if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
571
                    self._get_sftp().chmod(abspath, mode)
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
572
            finally:
573
                if fout is not None:
574
                    fout.close()
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
575
576
        if not create_parent_dir:
577
            _open_and_write_file()
578
            return
579
580
        # Try error handling to create the parent directory if we need to
581
        try:
582
            _open_and_write_file()
583
        except NoSuchFile:
584
            # Try to create the parent directory, and then go back to
585
            # writing the file
586
            parent_dir = os.path.dirname(abspath)
1946.2.15 by John Arbash Meinel
Fix the sftp mkdir mode code
587
            self._mkdir(parent_dir, dir_mode)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
588
            _open_and_write_file()
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
589
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
590
    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
591
                            create_parent_dir=False,
592
                            dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
593
        """Copy the file-like object into the target location.
594
595
        This function is not strictly safe to use. It is only meant to
596
        be used when you already know that the target does not exist.
597
        It is not safe, because it will open and truncate the remote
598
        file. So there may be a time when the file has invalid contents.
599
600
        :param relpath: The remote location to put the contents.
601
        :param f:       File-like object.
602
        :param mode:    Possible access permissions for new file.
603
                        None means do not set remote permissions.
604
        :param create_parent_dir: If we cannot create the target file because
605
                        the parent directory does not exist, go ahead and
606
                        create it, and then try again.
607
        """
608
        def writer(fout):
609
            self._pump(f, fout)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
610
        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
611
                                    create_parent_dir=create_parent_dir,
612
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
613
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
614
    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
615
                             create_parent_dir=False,
616
                             dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
617
        def writer(fout):
618
            fout.write(bytes)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
619
        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
620
                                    create_parent_dir=create_parent_dir,
621
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
622
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
623
    def iter_files_recursive(self):
624
        """Walk the relative paths of all files in this transport."""
4103.3.1 by Martin Pool
More sftp progress hooks
625
        # progress is handled by list_dir
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
626
        queue = list(self.list_dir('.'))
627
        while queue:
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
628
            relpath = queue.pop(0)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
629
            st = self.stat(relpath)
630
            if stat.S_ISDIR(st.st_mode):
631
                for i, basename in enumerate(self.list_dir(relpath)):
632
                    queue.insert(i, relpath+'/'+basename)
633
            else:
634
                yield relpath
635
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
636
    def _mkdir(self, abspath, mode=None):
637
        if mode is None:
638
            local_mode = 0777
639
        else:
640
            local_mode = mode
641
        try:
4103.3.1 by Martin Pool
More sftp progress hooks
642
            self._report_activity(len(abspath), 'write')
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
643
            self._get_sftp().mkdir(abspath, local_mode)
4103.3.1 by Martin Pool
More sftp progress hooks
644
            self._report_activity(1, 'read')
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
645
            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).
646
                # chmod a dir through sftp will erase any sgid bit set
647
                # on the server side.  So, if the bit mode are already
648
                # set, avoid the chmod.  If the mode is not fine but
649
                # the sgid bit is set, report a warning to the user
650
                # with the umask fix.
651
                stat = self._get_sftp().lstat(abspath)
652
                mode = mode & 0777 # can't set special bits anyway
653
                if mode != stat.st_mode & 0777:
3526.4.2 by Christophe Troestler
sftp: More informative warning message for chmod and suid/sgid bits problems.
654
                    if stat.st_mode & 06000:
655
                        warning('About to chmod %s over sftp, which will result'
656
                                ' in its suid or sgid bits being cleared.  If'
657
                                ' you want to preserve those bits, change your '
658
                                ' 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).
659
                                % (abspath, 0777 - mode))
660
                    self._get_sftp().chmod(abspath, mode=mode)
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
661
        except (paramiko.SSHException, IOError), e:
662
            self._translate_io_exception(e, abspath, ': unable to mkdir',
663
                failure_exc=FileExists)
664
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
665
    def mkdir(self, relpath, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
666
        """Create a directory at the given path."""
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
667
        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.
668
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
669
    def open_write_stream(self, relpath, mode=None):
670
        """See Transport.open_write_stream."""
2671.3.2 by Robert Collins
Start open_file_stream logic.
671
        # initialise the file to zero-length
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
672
        # this is three round trips, but we don't use this
673
        # api more than once per write_group at the moment so
2671.3.2 by Robert Collins
Start open_file_stream logic.
674
        # it is a tolerable overhead. Better would be to truncate
675
        # the file after opening. RBC 20070805
2671.3.3 by Robert Collins
Add mode parameter to Transport.open_file_stream.
676
        self.put_bytes_non_atomic(relpath, "", mode)
2671.3.2 by Robert Collins
Start open_file_stream logic.
677
        abspath = self._remote_path(relpath)
678
        # TODO: jam 20060816 paramiko doesn't publicly expose a way to
679
        #       set the file mode at create time. If it does, use it.
680
        #       But for now, we just chmod later anyway.
681
        handle = None
682
        try:
683
            handle = self._get_sftp().file(abspath, mode='wb')
684
            handle.set_pipelined(True)
685
        except (paramiko.SSHException, IOError), e:
686
            self._translate_io_exception(e, abspath,
687
                                         ': unable to open')
688
        _file_streams[self.abspath(relpath)] = handle
2671.3.6 by Robert Collins
Review feedback.
689
        return FileFileStream(self, relpath, handle)
2671.3.2 by Robert Collins
Start open_file_stream logic.
690
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
691
    def _translate_io_exception(self, e, path, more_info='',
692
                                failure_exc=PathError):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
693
        """Translate a paramiko or IOError into a friendlier exception.
694
695
        :param e: The original exception
696
        :param path: The path in question when the error is raised
697
        :param more_info: Extra information that can be included,
698
                          such as what was going on
699
        :param failure_exc: Paramiko has the super fun ability to raise completely
700
                           opaque errors that just set "e.args = ('Failure',)" with
701
                           no more information.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
702
                           If this parameter is set, it defines the exception
1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
703
                           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.
704
        """
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
705
        # 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.
706
        self._translate_error(e, path, raise_generic=False)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
707
        if getattr(e, 'args', None) is not None:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
708
            if (e.args == ('No such file or directory',) or
709
                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.
710
                raise NoSuchFile(path, str(e) + more_info)
3565.4.1 by Christophe Troestler
[Bug #123475] SFTPTransport._translate_io_exception: better detection
711
            if (e.args == ('mkdir failed',) or
712
                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.
713
                raise FileExists(path, str(e) + more_info)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
714
            # strange but true, for the paramiko server.
715
            if (e.args == ('Failure',)):
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
716
                raise failure_exc(path, str(e) + more_info)
4105.2.2 by Martin Pool
Clarify comment
717
            # Can be something like args = ('Directory not empty:
718
            # '/srv/bazaar.launchpad.net/blah...: '
719
            # [Errno 39] Directory not empty',)
4105.2.1 by Martin Pool
Correctly translate Paramiko ENOTEMPTY to DirectoryNotEmpty
720
            if (e.args[0].startswith('Directory not empty: ')
721
                or getattr(e, 'errno', None) == errno.ENOTEMPTY):
722
                raise errors.DirectoryNotEmpty(path, str(e))
5349.2.2 by Martin Pool
Better exception when sftp server doesn't support symlinks
723
            if e.args == ('Operation unsupported',):
724
                raise errors.TransportNotPossible()
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
725
            mutter('Raising exception with args %s', e.args)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
726
        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.
727
            mutter('Raising exception with errno %s', e.errno)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
728
        raise e
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
729
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
730
    def append_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
731
        """
732
        Append the text in the file-like object into the final
733
        location.
734
        """
735
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
736
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
737
            fout = self._get_sftp().file(path, 'ab')
1666.1.6 by Robert Collins
Make knit the default format.
738
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
739
                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.
740
            result = fout.tell()
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
741
            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.
742
            return result
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
743
        except (IOError, paramiko.SSHException), e:
744
            self._translate_io_exception(e, relpath, ': unable to append')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
745
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
746
    def rename(self, rel_from, rel_to):
747
        """Rename without special overwriting"""
748
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
749
            self._get_sftp().rename(self._remote_path(rel_from),
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
750
                              self._remote_path(rel_to))
751
        except (IOError, paramiko.SSHException), e:
752
            self._translate_io_exception(e, rel_from,
753
                    ': unable to rename to %r' % (rel_to))
754
755
    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.
756
        """Do a fancy rename on the remote server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
757
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
758
        Using the implementation provided by osutils.
759
        """
760
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
761
            sftp = self._get_sftp()
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
762
            fancy_rename(abs_from, abs_to,
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
763
                         rename_func=sftp.rename,
764
                         unlink_func=sftp.remove)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
765
        except (IOError, paramiko.SSHException), e:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
766
            self._translate_io_exception(e, abs_from,
767
                                         ': 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.
768
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
769
    def move(self, rel_from, rel_to):
770
        """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
771
        path_from = self._remote_path(rel_from)
772
        path_to = self._remote_path(rel_to)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
773
        self._rename_and_overwrite(path_from, path_to)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
774
775
    def delete(self, relpath):
776
        """Delete the item at relpath"""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
777
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
778
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
779
            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.
780
        except (IOError, paramiko.SSHException), e:
781
            self._translate_io_exception(e, path, ': unable to delete')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
782
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
783
    def external_url(self):
784
        """See bzrlib.transport.Transport.external_url."""
785
        # the external path for SFTP is the base
786
        return self.base
787
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
788
    def listable(self):
789
        """Return True if this store supports listing."""
790
        return True
791
792
    def list_dir(self, relpath):
793
        """
794
        Return a list of all files at the given location.
795
        """
796
        # does anything actually use this?
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
797
        # -- Unknown
798
        # This is at least used by copy_tree for remote upgrades.
799
        # -- David Allouche 2006-08-11
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
800
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
801
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
802
            entries = self._get_sftp().listdir(path)
4103.3.1 by Martin Pool
More sftp progress hooks
803
            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.
804
        except (IOError, paramiko.SSHException), e:
805
            self._translate_io_exception(e, path, ': failed to list_dir')
1959.2.2 by John Arbash Meinel
Apply Andrew Bennetts list_dir fixes
806
        return [urlutils.escape(entry) for entry in entries]
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
807
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
808
    def rmdir(self, relpath):
809
        """See Transport.rmdir."""
810
        path = self._remote_path(relpath)
811
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
812
            return self._get_sftp().rmdir(path)
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
813
        except (IOError, paramiko.SSHException), e:
814
            self._translate_io_exception(e, path, ': failed to rmdir')
815
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
816
    def stat(self, relpath):
817
        """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
818
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
819
        try:
5056.1.5 by Neil Santos
Removed separate lstat() and reverted LocalTransport and SFTPTransport's stat() methods to using lstat() internally.
820
            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.
821
        except (IOError, paramiko.SSHException), e:
822
            self._translate_io_exception(e, path, ': unable to stat')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
823
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
824
    def readlink(self, relpath):
825
        """See Transport.readlink."""
826
        path = self._remote_path(relpath)
827
        try:
828
            return self._get_sftp().readlink(path)
829
        except (IOError, paramiko.SSHException), e:
830
            self._translate_io_exception(e, path, ': unable to readlink')
831
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
832
    def symlink(self, source, link_name):
833
        """See Transport.symlink."""
834
        try:
835
            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.
836
            sftp_retval = conn.symlink(source, link_name)
837
            if SFTP_OK != sftp_retval:
838
                raise TransportError(
839
                    '%r: unable to create symlink to %r' % (link_name, source),
840
                    sftp_retval
841
                )
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
842
        except (IOError, paramiko.SSHException), e:
843
            self._translate_io_exception(e, link_name,
844
                                         ': unable to create symlink to %r' % (source))
845
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
846
    def lock_read(self, relpath):
847
        """
848
        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
849
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
850
        """
851
        # FIXME: there should be something clever i can do here...
852
        class BogusLock(object):
853
            def __init__(self, path):
854
                self.path = path
855
            def unlock(self):
856
                pass
857
        return BogusLock(relpath)
858
859
    def lock_write(self, relpath):
860
        """
861
        Lock the given file for exclusive (write) access.
862
        WARNING: many transports do not support this, so trying avoid using it
863
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
864
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
865
        """
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
866
        # This is a little bit bogus, but basically, we create a file
867
        # which should not already exist, and if it does, we assume
868
        # that there is a lock, and if it doesn't, the we assume
869
        # 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
870
        return SFTPLock(relpath, self)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
871
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
872
    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
873
        """Open a remote path exclusively.
874
875
        SFTP supports O_EXCL (SFTP_FLAG_EXCL), which fails if
876
        the file already exists. However it does not expose this
877
        at the higher level of SFTPClient.open(), so we have to
878
        sneak away with it.
879
880
        WARNING: This breaks the SFTPClient abstraction, so it
881
        could easily break against an updated version of paramiko.
882
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
883
        :param abspath: The remote absolute path where the file should be opened
884
        :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
885
        """
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
886
        # TODO: jam 20060816 Paramiko >= 1.6.2 (probably earlier) supports
887
        #       using the 'x' flag to indicate SFTP_FLAG_EXCL.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
888
        #       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
889
        #       time using the sftp_client.file() functionality.
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
890
        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
891
        # 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
892
        attr = SFTPAttributes()
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
893
        if mode is not None:
894
            attr.st_mode = mode
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
895
        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
896
                | SFTP_FLAG_TRUNC | SFTP_FLAG_EXCL)
897
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
898
            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
899
            if t != CMD_HANDLE:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
900
                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
901
            handle = msg.get_string()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
902
            return SFTPFile(self._get_sftp(), handle, 'wb', -1)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
903
        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.
904
            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.
905
                failure_exc=FileExists)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
906
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
907
    def _can_roundtrip_unix_modebits(self):
908
        if sys.platform == 'win32':
909
            # anyone else?
910
            return False
911
        else:
912
            return True
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
913
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.
914
915
def get_test_permutations():
916
    """Return the permutations to be used in testing."""
4797.11.2 by Vincent Ladeuil
Stop requiring testtools for sftp use.
917
    from bzrlib.tests import stub_sftp
918
    return [(SFTPTransport, stub_sftp.SFTPAbsoluteServer),
919
            (SFTPTransport, stub_sftp.SFTPHomeDirServer),
920
            (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.
921
            ]