~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
2711.1.1 by Martin Pool
Suppress warning about Paramiko use of struct.pack
34
import warnings
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
35
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
36
from bzrlib import (
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
37
    config,
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
38
    debug,
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
39
    errors,
40
    urlutils,
41
    )
1996.2.1 by Andrew Bennetts
Fix NameError reported by Alexander Belchenko.
42
from bzrlib.errors import (FileExists,
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
43
                           NoSuchFile,
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
44
                           TransportError,
1996.2.1 by Andrew Bennetts
Fix NameError reported by Alexander Belchenko.
45
                           LockError,
1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
46
                           PathError,
47
                           ParamikoNotPresent,
1530.1.3 by Robert Collins
transport implementations now tested consistently.
48
                           )
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
49
from bzrlib.osutils import fancy_rename
1951.1.6 by Andrew Bennetts
Tidy up some unused imports.
50
from bzrlib.trace import mutter, warning
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
51
from bzrlib.transport import (
2671.3.6 by Robert Collins
Review feedback.
52
    FileFileStream,
2671.3.2 by Robert Collins
Start open_file_stream logic.
53
    _file_streams,
1951.1.4 by Andrew Bennetts
Start moving SSH connection code into bzrlib/transport/ssh.py
54
    ssh,
2485.8.16 by Vincent Ladeuil
Create a new, empty, ConnectedTransport class.
55
    ConnectedTransport,
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
56
    )
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
57
2711.1.1 by Martin Pool
Suppress warning about Paramiko use of struct.pack
58
# Disable one particular warning that comes from paramiko in Python2.5; if
59
# this is emitted at the wrong time it tends to cause spurious test failures
60
# or at least noise in the test case::
61
#
62
# [1770/7639 in 86s, 1 known failures, 50 skipped, 2 missing features]
63
# test_permissions.TestSftpPermissions.test_new_files
64
# /var/lib/python-support/python2.5/paramiko/message.py:226: DeprecationWarning: integer argument expected, got float
65
#  self.packet.write(struct.pack('>I', n))
66
warnings.filterwarnings('ignore',
67
        'integer argument expected, got float',
68
        category=DeprecationWarning,
69
        module='paramiko.message')
70
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
71
try:
72
    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.
73
except ImportError, e:
74
    raise ParamikoNotPresent(e)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
75
else:
76
    from paramiko.sftp import (SFTP_FLAG_WRITE, SFTP_FLAG_CREATE,
77
                               SFTP_FLAG_EXCL, SFTP_FLAG_TRUNC,
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
78
                               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
79
    from paramiko.sftp_attr import SFTPAttributes
80
    from paramiko.sftp_file import SFTPFile
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
81
1883.1.3 by Stefan (metze) Metzmacher
- fix typo
82
1711.6.2 by John Arbash Meinel
Clean up paramiko agent support.
83
_paramiko_version = getattr(paramiko, '__version_info__', (0, 0, 0))
84
# don't use prefetch unless paramiko version >= 1.5.5 (there were bugs earlier)
85
_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.
86
1185.48.1 by James Henstridge
Use /usr/bin/ssh if we can.
87
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
88
class SFTPLock(object):
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
89
    """This fakes a lock in a remote location.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
90
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
91
    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
92
    doesn't work well on all transports and they are only used in
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
93
    deprecated storage formats.
94
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
95
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
96
    __slots__ = ['path', 'lock_path', 'lock_file', 'transport']
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
97
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
98
    def __init__(self, path, transport):
99
        self.lock_file = None
100
        self.path = path
101
        self.lock_path = path + '.write-lock'
102
        self.transport = transport
103
        try:
1530.1.7 by Robert Collins
merge integration.
104
            # RBC 20060103 FIXME should we be using private methods here ?
105
            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.
106
            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
107
        except FileExists:
108
            raise LockError('File %r already locked' % (self.path,))
109
110
    def unlock(self):
111
        if not self.lock_file:
112
            return
113
        self.lock_file.close()
114
        self.lock_file = None
115
        try:
116
            self.transport.delete(self.lock_path)
117
        except (NoSuchFile,):
118
            # What specific errors should we catch here?
119
            pass
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
120
1551.6.39 by Aaron Bentley
Apply Robey Pointer's listener patch
121
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
122
class _SFTPReadvHelper(object):
123
    """A class to help with managing the state of a readv request."""
124
125
    # See _get_requests for an explanation.
126
    _max_request_size = 32768
127
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
128
    def __init__(self, original_offsets, relpath, _report_activity):
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
129
        """Create a new readv helper.
130
131
        :param original_offsets: The original requests given by the caller of
132
            readv()
133
        :param relpath: The name of the file (if known)
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
134
        :param _report_activity: A Transport._report_activity bound method,
135
            to be called as data arrives.
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
136
        """
137
        self.original_offsets = list(original_offsets)
138
        self.relpath = relpath
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
139
        self._report_activity = _report_activity
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
140
141
    def _get_requests(self):
142
        """Break up the offsets into individual requests over sftp.
143
144
        The SFTP spec only requires implementers to support 32kB requests. We
145
        could try something larger (openssh supports 64kB), but then we have to
146
        handle requests that fail.
147
        So instead, we just break up our maximum chunks into 32kB chunks, and
148
        asyncronously requests them.
149
        Newer versions of paramiko would do the chunking for us, but we want to
150
        start processing results right away, so we do it ourselves.
151
        """
152
        # TODO: Because we issue async requests, we don't 'fudge' any extra
153
        #       data.  I'm not 100% sure that is the best choice.
154
155
        # The first thing we do, is to collapse the individual requests as much
156
        # as possible, so we don't issues requests <32kB
157
        sorted_offsets = sorted(self.original_offsets)
158
        coalesced = list(ConnectedTransport._coalesce_offsets(sorted_offsets,
159
                                                        limit=0, fudge_factor=0))
160
        requests = []
161
        for c_offset in coalesced:
162
            start = c_offset.start
163
            size = c_offset.length
164
165
            # Break this up into 32kB requests
166
            while size > 0:
167
                next_size = min(size, self._max_request_size)
168
                requests.append((start, next_size))
169
                size -= next_size
170
                start += next_size
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
171
        if 'sftp' in debug.debug_flags:
172
            mutter('SFTP.readv(%s) %s offsets => %s coalesced => %s requests',
173
                self.relpath, len(sorted_offsets), len(coalesced),
174
                len(requests))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
175
        return requests
176
177
    def request_and_yield_offsets(self, fp):
178
        """Request the data from the remote machine, yielding the results.
179
180
        :param fp: A Paramiko SFTPFile object that supports readv.
181
        :return: Yield the data requested by the original readv caller, one by
182
            one.
183
        """
184
        requests = self._get_requests()
185
        offset_iter = iter(self.original_offsets)
186
        cur_offset, cur_size = offset_iter.next()
187
        # paramiko .readv() yields strings that are in the order of the requests
188
        # So we track the current request to know where the next data is
189
        # being returned from.
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
190
        input_start = None
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
191
        last_end = None
192
        buffered_data = []
193
        buffered_len = 0
194
195
        # This is used to buffer chunks which we couldn't process yet
196
        # It is (start, end, data) tuples.
197
        data_chunks = []
198
        # Create an 'unlimited' data stream, so we stop based on requests,
199
        # rather than just because the data stream ended. This lets us detect
200
        # short readv.
201
        data_stream = itertools.chain(fp.readv(requests),
202
                                      itertools.repeat(None))
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
203
        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.
204
            if data is None:
205
                if cur_coalesced is not None:
206
                    raise errors.ShortReadvError(self.relpath,
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
207
                        start, length, len(data))
208
            if len(data) != length:
209
                raise errors.ShortReadvError(self.relpath,
210
                    start, length, len(data))
3882.7.9 by Martin Pool
Move the point at which sftp issues transport activity (thanks vila)
211
            self._report_activity(length, 'read')
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
212
            if last_end is None:
213
                # This is the first request, just buffer it
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
214
                buffered_data = [data]
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
215
                buffered_len = length
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
216
                input_start = start
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
217
            elif start == last_end:
218
                # The data we are reading fits neatly on the previous
219
                # buffer, so this is all part of a larger coalesced range.
220
                buffered_data.append(data)
221
                buffered_len += length
222
            else:
223
                # We have an 'interrupt' in the data stream. So we know we are
224
                # at a request boundary.
225
                if buffered_len > 0:
226
                    # We haven't consumed the buffer so far, so put it into
227
                    # data_chunks, and continue.
228
                    buffered = ''.join(buffered_data)
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
229
                    data_chunks.append((input_start, buffered))
230
                input_start = start
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
231
                buffered_data = [data]
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
232
                buffered_len = length
233
            last_end = start + length
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
234
            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.
235
                # Simplify the next steps a bit by transforming buffered_data
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
236
                # into a single string. We also have the nice property that
237
                # when there is only one string ''.join([x]) == x, so there is
238
                # no data copying.
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
239
                buffered = ''.join(buffered_data)
3686.1.7 by John Arbash Meinel
Purge the list buffer when we have a simple string buffer.
240
                # Clean out buffered data so that we keep memory
241
                # consumption low
242
                del buffered_data[:]
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
243
                buffered_offset = 0
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
244
                # TODO: We *could* also consider the case where cur_offset is in
245
                #       in the buffered range, even though it doesn't *start*
246
                #       the buffered range. But for packs we pretty much always
247
                #       read in order, so you won't get any extra data in the
248
                #       middle.
249
                while (input_start == cur_offset
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
250
                       and (buffered_offset + cur_size) <= buffered_len):
251
                    # We've buffered enough data to process this request, spit it
252
                    # out
253
                    cur_data = buffered[buffered_offset:buffered_offset + cur_size]
254
                    # move the direct pointer into our buffered data
255
                    buffered_offset += cur_size
256
                    # Move the start-of-buffer pointer
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
257
                    input_start += cur_size
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
258
                    # Yield the requested data
259
                    yield cur_offset, cur_data
260
                    cur_offset, cur_size = offset_iter.next()
261
                # at this point, we've consumed as much of buffered as we can,
262
                # so break off the portion that we consumed
263
                if buffered_offset == len(buffered_data):
264
                    # No tail to leave behind
265
                    buffered_data = []
266
                    buffered_len = 0
267
                else:
268
                    buffered = buffered[buffered_offset:]
269
                    buffered_data = [buffered]
270
                    buffered_len = len(buffered)
5807.5.1 by John Arbash Meinel
Fix bug #767177. Be more agressive with file.close() calls.
271
        # now that the data stream is done, close the handle
272
        fp.close()
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
273
        if buffered_len:
274
            buffered = ''.join(buffered_data)
3686.1.7 by John Arbash Meinel
Purge the list buffer when we have a simple string buffer.
275
            del buffered_data[:]
3686.1.4 by John Arbash Meinel
rename cur_start => input_start for clarity.
276
            data_chunks.append((input_start, buffered))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
277
        if data_chunks:
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
278
            if 'sftp' in debug.debug_flags:
279
                mutter('SFTP readv left with %d out-of-order bytes',
280
                    sum(map(lambda x: len(x[1]), data_chunks)))
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
281
            # We've processed all the readv data, at this point, anything we
282
            # couldn't process is in data_chunks. This doesn't happen often, so
283
            # this code path isn't optimized
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
284
            # We use an interesting process for data_chunks
285
            # Specifically if we have "bisect_left([(start, len, entries)],
286
            #                                       (qstart,)])
287
            # If start == qstart, then we get the specific node. Otherwise we
288
            # get the previous node
289
            while True:
290
                idx = bisect.bisect_left(data_chunks, (cur_offset,))
3815.2.4 by Martin Pool
merge fix for out-of-order SFTP readv
291
                if idx < len(data_chunks) and data_chunks[idx][0] == cur_offset:
292
                    # The data starts here
3686.1.3 by John Arbash Meinel
Finish up handling out-of-order requests.
293
                    data = data_chunks[idx][1][:cur_size]
294
                elif idx > 0:
295
                    # The data is in a portion of a previous page
296
                    idx -= 1
297
                    sub_offset = cur_offset - data_chunks[idx][0]
298
                    data = data_chunks[idx][1]
299
                    data = data[sub_offset:sub_offset + cur_size]
300
                else:
301
                    # We are missing the page where the data should be found,
302
                    # something is wrong
303
                    data = ''
304
                if len(data) != cur_size:
305
                    raise AssertionError('We must have miscalulated.'
306
                        ' We expected %d bytes, but only found %d'
307
                        % (cur_size, len(data)))
308
                yield cur_offset, data
309
                cur_offset, cur_size = offset_iter.next()
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
310
311
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
312
class SFTPTransport(ConnectedTransport):
1752.2.40 by Andrew Bennetts
Merge from bzr.dev.
313
    """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
314
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.
315
    _do_prefetch = _default_do_prefetch
1864.5.6 by John Arbash Meinel
Setting defaults based on benchmarking data.
316
    # TODO: jam 20060717 Conceivably these could be configurable, either
317
    #       by auto-tuning at run-time, or by a configuration (per host??)
318
    #       but the performance curve is pretty flat, so just going with
319
    #       reasonable defaults.
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
320
    _max_readv_combine = 200
1864.5.6 by John Arbash Meinel
Setting defaults based on benchmarking data.
321
    # Having to round trip to the server means waiting for a response,
322
    # so it is better to download extra bytes.
323
    # 8KiB had good performance for both local and remote network operations
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
324
    _bytes_to_read_before_seek = 8192
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
325
1864.5.20 by John Arbash Meinel
Some small cleanups.
326
    # The sftp spec says that implementations SHOULD allow reads
327
    # to be at least 32K. paramiko.readv() does an async request
328
    # for the chunks. So we need to keep it within a single request
329
    # size for paramiko <= 1.6.1. paramiko 1.6.2 will probably chop
330
    # up the request itself, rather than us having to worry about it
331
    _max_request_size = 32768
1864.5.17 by John Arbash Meinel
A little cleanup, and restrict to 32K to conform better to sftp spec
332
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
333
    def _remote_path(self, relpath):
334
        """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
335
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
336
        :param relpath: is a urlencoded string.
337
        """
338
        relative = urlutils.unescape(relpath).encode('utf-8')
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
339
        remote_path = self._combine_paths(self._parsed_url.path, relative)
2485.8.27 by Vincent Ladeuil
Hearing jam saying "vila, you're trying too hard", I simplified again.
340
        # the initial slash should be removed from the path, and treated as a
341
        # homedir relative path (the path begins with a double slash if it is
342
        # absolute).  see draft-ietf-secsh-scp-sftp-ssh-uri-03.txt
343
        # RBC 20060118 we are not using this as its too user hostile. instead
344
        # we are following lftp and using /~/foo to mean '~/foo'
345
        # vila--20070602 and leave absolute paths begin with a single slash.
346
        if remote_path.startswith('/~/'):
347
            remote_path = remote_path[3:]
348
        elif remote_path == '/~':
349
            remote_path = ''
350
        return remote_path
351
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
352
    def _create_connection(self, credentials=None):
353
        """Create a new connection with the provided credentials.
354
355
        :param credentials: The credentials needed to establish the connection.
356
357
        :return: The created connection and its associated credentials.
358
359
        The credentials are only the password as it may have been entered
360
        interactively by the user and may be different from the one provided
361
        in base url at transport creation time.
362
        """
363
        if credentials is None:
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
364
            password = self._parsed_url.password
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
365
        else:
366
            password = credentials
367
368
        vendor = ssh._get_ssh_vendor()
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
369
        user = self._parsed_url.user
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
370
        if user is None:
371
            auth = config.AuthenticationConfig()
6055.2.1 by Jelmer Vernooij
Add UnparsedUrl.
372
            user = auth.get_user('ssh', self._parsed_url.host,
373
                self._parsed_url.port)
374
        connection = vendor.connect_sftp(self._parsed_url.user, password,
375
            self._parsed_url.host, self._parsed_url.port)
3777.1.1 by Aaron Bentley
Use auth.conf for sftp
376
        return connection, (user, password)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
377
5247.2.12 by Vincent Ladeuil
Ensure that all transports close their underlying connection.
378
    def disconnect(self):
379
        connection = self._get_connection()
380
        if connection is not None:
381
            connection.close()
382
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
383
    def _get_sftp(self):
384
        """Ensures that a connection is established"""
385
        connection = self._get_connection()
386
        if connection is None:
387
            # First connection ever
388
            connection, credentials = self._create_connection()
389
            self._set_connection(connection, credentials)
390
        return connection
391
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
392
    def has(self, relpath):
393
        """
394
        Does the target location exist?
395
        """
396
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
397
            self._get_sftp().stat(self._remote_path(relpath))
4103.3.1 by Martin Pool
More sftp progress hooks
398
            # stat result is about 20 bytes, let's say
399
            self._report_activity(20, 'read')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
400
            return True
401
        except IOError:
402
            return False
403
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
404
    def get(self, relpath):
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
405
        """Get the file at the given relative path.
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
406
407
        :param relpath: The relative path to the file
408
        """
409
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
410
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
411
            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.
412
            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
413
                f.prefetch()
414
            return f
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
415
        except (IOError, paramiko.SSHException), e:
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
416
            self._translate_io_exception(e, path, ': error retrieving',
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
417
                failure_exc=errors.ReadError)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
418
3882.7.4 by Martin Pool
SFTPTransport also sends activity from get()
419
    def get_bytes(self, relpath):
420
        # reimplement this here so that we can report how many bytes came back
421
        f = self.get(relpath)
422
        try:
423
            bytes = f.read()
424
            self._report_activity(len(bytes), 'read')
425
            return bytes
426
        finally:
427
            f.close()
428
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
429
    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.
430
        """See Transport.readv()"""
431
        # We overload the default readv() because we want to use a file
432
        # that does not have prefetch enabled.
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
433
        # 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.
434
        if not offsets:
435
            return
436
437
        try:
438
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
439
            fp = self._get_sftp().file(path, mode='rb')
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
440
            readv = getattr(fp, 'readv', None)
1864.5.18 by John Arbash Meinel
Remove benchmarking stipple.
441
            if readv:
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
442
                return self._sftp_readv(fp, offsets, relpath)
3959.1.3 by Martin Pool
Guard common sftp mutter statements by debug flags
443
            if 'sftp' in debug.debug_flags:
444
                mutter('seek and read %s offsets', len(offsets))
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
445
            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.
446
        except (IOError, paramiko.SSHException), e:
447
            self._translate_io_exception(e, path, ': error retrieving')
448
2671.3.1 by Robert Collins
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
449
    def recommended_page_size(self):
450
        """See Transport.recommended_page_size().
451
452
        For SFTP we suggest a large page size to reduce the overhead
453
        introduced by latency.
454
        """
455
        return 64 * 1024
456
3882.9.1 by Martin Pool
Fix strange default parameter to _sftp_readv
457
    def _sftp_readv(self, fp, offsets, relpath):
1864.5.15 by John Arbash Meinel
Cleanup and document the new sftp readv implementation
458
        """Use the readv() member of fp to do async readv.
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
459
3882.9.1 by Martin Pool
Fix strange default parameter to _sftp_readv
460
        Then read them using paramiko.readv(). paramiko.readv()
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
461
        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
462
        just reads until it gets all the stuff it wants.
1864.5.13 by John Arbash Meinel
Try using paramiko.readv()
463
        """
3882.7.2 by Martin Pool
Start reporting activity from sftp read access
464
        helper = _SFTPReadvHelper(offsets, relpath, self._report_activity)
3686.1.2 by John Arbash Meinel
Start moving the readv code into a helper.
465
        return helper.request_and_yield_offsets(fp)
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
466
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
467
    def put_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
468
        """
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
469
        Copy the file-like object into the location.
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
470
471
        :param relpath: Location to put the contents, relative to base.
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
472
        :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.
473
        :param mode: The final mode for the file
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
474
        """
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
475
        final_path = self._remote_path(relpath)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
476
        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.
477
478
    def _put(self, abspath, f, mode=None):
479
        """Helper function so both put() and copy_abspaths can reuse the code"""
480
        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
481
                        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.
482
        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.
483
        closed = False
1185.41.6 by Robey Pointer
modified version of john's patch to add atomic put and locking to the sftp transport
484
        try:
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
485
            try:
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
486
                fout.set_pipelined(True)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
487
                length = self._pump(f, fout)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
488
            except (IOError, paramiko.SSHException), e:
489
                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
490
            # XXX: This doesn't truly help like we would like it to.
491
            #      The problem is that openssh strips sticky bits. So while we
492
            #      can properly set group write permission, we lose the group
493
            #      sticky bit. So it is probably best to stop chmodding, and
494
            #      just tell users that they need to set the umask correctly.
495
            #      The attr.st_mode = mode, in _sftp_open_exclusive
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
496
            #      will handle when the user wants the final mode to be more
497
            #      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
498
            #      paramiko decides to expose an async chmod()
499
500
            # This is designed to chmod() right before we close.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
501
            # 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
502
            # 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.
503
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
504
                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.
505
            fout.close()
506
            closed = True
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
507
            self._rename_and_overwrite(tmp_abspath, abspath)
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
508
            return length
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
509
        except Exception, e:
510
            # If we fail, try to clean up the temporary file
511
            # before we throw the exception
512
            # 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.
513
            # Write out the traceback, because otherwise
514
            # 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.
515
            import traceback
516
            mutter(traceback.format_exc())
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
517
            try:
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
518
                if not closed:
519
                    fout.close()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
520
                self._get_sftp().remove(tmp_abspath)
1185.49.1 by John Arbash Meinel
Updating SftpTransport.put() so that it is atomic
521
            except:
1532 by Robert Collins
Merge in John Meinels integration branch.
522
                # raise the saved except
523
                raise e
524
            # raise the original with its traceback if we can.
525
            raise
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
526
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
527
    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
528
                               create_parent_dir=False,
529
                               dir_mode=None):
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
530
        abspath = self._remote_path(relpath)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
531
532
        # TODO: jam 20060816 paramiko doesn't publicly expose a way to
533
        #       set the file mode at create time. If it does, use it.
534
        #       But for now, we just chmod later anyway.
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
535
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
536
        def _open_and_write_file():
537
            """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.
538
            fout = None
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
539
            try:
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
540
                try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
541
                    fout = self._get_sftp().file(abspath, mode='wb')
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
542
                    fout.set_pipelined(True)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
543
                    writer(fout)
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
544
                except (paramiko.SSHException, IOError), e:
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
545
                    self._translate_io_exception(e, abspath,
546
                                                 ': unable to open')
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
547
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
548
                # This is designed to chmod() right before we close.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
549
                # Because we set_pipelined() earlier, theoretically we might
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
550
                # avoid the round trip for fout.close()
551
                if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
552
                    self._get_sftp().chmod(abspath, mode)
1946.1.10 by John Arbash Meinel
make sure to always close the file object.
553
            finally:
554
                if fout is not None:
555
                    fout.close()
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
556
557
        if not create_parent_dir:
558
            _open_and_write_file()
559
            return
560
561
        # Try error handling to create the parent directory if we need to
562
        try:
563
            _open_and_write_file()
564
        except NoSuchFile:
565
            # Try to create the parent directory, and then go back to
566
            # writing the file
567
            parent_dir = os.path.dirname(abspath)
1946.2.15 by John Arbash Meinel
Fix the sftp mkdir mode code
568
            self._mkdir(parent_dir, dir_mode)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
569
            _open_and_write_file()
1946.1.6 by John Arbash Meinel
Basic implementation of non_atomic_put for sftp
570
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
571
    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
572
                            create_parent_dir=False,
573
                            dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
574
        """Copy the file-like object into the target location.
575
576
        This function is not strictly safe to use. It is only meant to
577
        be used when you already know that the target does not exist.
578
        It is not safe, because it will open and truncate the remote
579
        file. So there may be a time when the file has invalid contents.
580
581
        :param relpath: The remote location to put the contents.
582
        :param f:       File-like object.
583
        :param mode:    Possible access permissions for new file.
584
                        None means do not set remote permissions.
585
        :param create_parent_dir: If we cannot create the target file because
586
                        the parent directory does not exist, go ahead and
587
                        create it, and then try again.
588
        """
589
        def writer(fout):
590
            self._pump(f, fout)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
591
        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
592
                                    create_parent_dir=create_parent_dir,
593
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
594
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
595
    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
596
                             create_parent_dir=False,
597
                             dir_mode=None):
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
598
        def writer(fout):
599
            fout.write(bytes)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
600
        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
601
                                    create_parent_dir=create_parent_dir,
602
                                    dir_mode=dir_mode)
1955.3.21 by John Arbash Meinel
Update the LocalTransport and SftpTransport to implement non_atomic_*
603
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
604
    def iter_files_recursive(self):
605
        """Walk the relative paths of all files in this transport."""
4103.3.1 by Martin Pool
More sftp progress hooks
606
        # progress is handled by list_dir
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
607
        queue = list(self.list_dir('.'))
608
        while queue:
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
609
            relpath = queue.pop(0)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
610
            st = self.stat(relpath)
611
            if stat.S_ISDIR(st.st_mode):
612
                for i, basename in enumerate(self.list_dir(relpath)):
613
                    queue.insert(i, relpath+'/'+basename)
614
            else:
615
                yield relpath
616
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
617
    def _mkdir(self, abspath, mode=None):
618
        if mode is None:
619
            local_mode = 0777
620
        else:
621
            local_mode = mode
622
        try:
4103.3.1 by Martin Pool
More sftp progress hooks
623
            self._report_activity(len(abspath), 'write')
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
624
            self._get_sftp().mkdir(abspath, local_mode)
4103.3.1 by Martin Pool
More sftp progress hooks
625
            self._report_activity(1, 'read')
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
626
            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).
627
                # chmod a dir through sftp will erase any sgid bit set
628
                # on the server side.  So, if the bit mode are already
629
                # set, avoid the chmod.  If the mode is not fine but
630
                # the sgid bit is set, report a warning to the user
631
                # with the umask fix.
632
                stat = self._get_sftp().lstat(abspath)
633
                mode = mode & 0777 # can't set special bits anyway
634
                if mode != stat.st_mode & 0777:
3526.4.2 by Christophe Troestler
sftp: More informative warning message for chmod and suid/sgid bits problems.
635
                    if stat.st_mode & 06000:
636
                        warning('About to chmod %s over sftp, which will result'
637
                                ' in its suid or sgid bits being cleared.  If'
638
                                ' you want to preserve those bits, change your '
639
                                ' 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).
640
                                % (abspath, 0777 - mode))
641
                    self._get_sftp().chmod(abspath, mode=mode)
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
642
        except (paramiko.SSHException, IOError), e:
643
            self._translate_io_exception(e, abspath, ': unable to mkdir',
644
                failure_exc=FileExists)
645
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
646
    def mkdir(self, relpath, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
647
        """Create a directory at the given path."""
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
648
        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.
649
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
650
    def open_write_stream(self, relpath, mode=None):
651
        """See Transport.open_write_stream."""
2671.3.2 by Robert Collins
Start open_file_stream logic.
652
        # initialise the file to zero-length
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
653
        # this is three round trips, but we don't use this
654
        # api more than once per write_group at the moment so
2671.3.2 by Robert Collins
Start open_file_stream logic.
655
        # it is a tolerable overhead. Better would be to truncate
656
        # the file after opening. RBC 20070805
2671.3.3 by Robert Collins
Add mode parameter to Transport.open_file_stream.
657
        self.put_bytes_non_atomic(relpath, "", mode)
2671.3.2 by Robert Collins
Start open_file_stream logic.
658
        abspath = self._remote_path(relpath)
659
        # TODO: jam 20060816 paramiko doesn't publicly expose a way to
660
        #       set the file mode at create time. If it does, use it.
661
        #       But for now, we just chmod later anyway.
662
        handle = None
663
        try:
664
            handle = self._get_sftp().file(abspath, mode='wb')
665
            handle.set_pipelined(True)
666
        except (paramiko.SSHException, IOError), e:
667
            self._translate_io_exception(e, abspath,
668
                                         ': unable to open')
669
        _file_streams[self.abspath(relpath)] = handle
2671.3.6 by Robert Collins
Review feedback.
670
        return FileFileStream(self, relpath, handle)
2671.3.2 by Robert Collins
Start open_file_stream logic.
671
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
672
    def _translate_io_exception(self, e, path, more_info='',
673
                                failure_exc=PathError):
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
674
        """Translate a paramiko or IOError into a friendlier exception.
675
676
        :param e: The original exception
677
        :param path: The path in question when the error is raised
678
        :param more_info: Extra information that can be included,
679
                          such as what was going on
680
        :param failure_exc: Paramiko has the super fun ability to raise completely
681
                           opaque errors that just set "e.args = ('Failure',)" with
682
                           no more information.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
683
                           If this parameter is set, it defines the exception
1662.1.12 by Martin Pool
Translate unknown sftp errors to PathError, no NoSuchFile
684
                           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.
685
        """
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
686
        # 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.
687
        self._translate_error(e, path, raise_generic=False)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
688
        if getattr(e, 'args', None) is not None:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
689
            if (e.args == ('No such file or directory',) or
690
                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.
691
                raise NoSuchFile(path, str(e) + more_info)
3565.4.1 by Christophe Troestler
[Bug #123475] SFTPTransport._translate_io_exception: better detection
692
            if (e.args == ('mkdir failed',) or
693
                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.
694
                raise FileExists(path, str(e) + more_info)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
695
            # strange but true, for the paramiko server.
696
            if (e.args == ('Failure',)):
2052.6.4 by Robert Collins
Tidier SFTP code (feedback from Aaron).
697
                raise failure_exc(path, str(e) + more_info)
4105.2.2 by Martin Pool
Clarify comment
698
            # Can be something like args = ('Directory not empty:
699
            # '/srv/bazaar.launchpad.net/blah...: '
700
            # [Errno 39] Directory not empty',)
4105.2.1 by Martin Pool
Correctly translate Paramiko ENOTEMPTY to DirectoryNotEmpty
701
            if (e.args[0].startswith('Directory not empty: ')
702
                or getattr(e, 'errno', None) == errno.ENOTEMPTY):
703
                raise errors.DirectoryNotEmpty(path, str(e))
5349.2.2 by Martin Pool
Better exception when sftp server doesn't support symlinks
704
            if e.args == ('Operation unsupported',):
705
                raise errors.TransportNotPossible()
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
706
            mutter('Raising exception with args %s', e.args)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
707
        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.
708
            mutter('Raising exception with errno %s', e.errno)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
709
        raise e
1489 by Robert Collins
Make the paramiko tests pass. Nice huh.
710
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
711
    def append_file(self, relpath, f, mode=None):
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
712
        """
713
        Append the text in the file-like object into the final
714
        location.
715
        """
716
        try:
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
717
            path = self._remote_path(relpath)
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
718
            fout = self._get_sftp().file(path, 'ab')
1666.1.6 by Robert Collins
Make knit the default format.
719
            if mode is not None:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
720
                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.
721
            result = fout.tell()
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
722
            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.
723
            return result
1185.50.13 by John Arbash Meinel
Expanded the Transport test suite. Including delete, copy, move, etc. Updated SftpTransport to conform.
724
        except (IOError, paramiko.SSHException), e:
725
            self._translate_io_exception(e, relpath, ': unable to append')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
726
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
727
    def rename(self, rel_from, rel_to):
728
        """Rename without special overwriting"""
729
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
730
            self._get_sftp().rename(self._remote_path(rel_from),
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
731
                              self._remote_path(rel_to))
732
        except (IOError, paramiko.SSHException), e:
733
            self._translate_io_exception(e, rel_from,
734
                    ': unable to rename to %r' % (rel_to))
735
736
    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.
737
        """Do a fancy rename on the remote server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
738
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
739
        Using the implementation provided by osutils.
740
        """
741
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
742
            sftp = self._get_sftp()
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
743
            fancy_rename(abs_from, abs_to,
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
744
                         rename_func=sftp.rename,
745
                         unlink_func=sftp.remove)
1185.31.47 by John Arbash Meinel
Added a fancy footwork rename to osutils, made SftpTransport use it.
746
        except (IOError, paramiko.SSHException), e:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
747
            self._translate_io_exception(e, abs_from,
748
                                         ': 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.
749
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
750
    def move(self, rel_from, rel_to):
751
        """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
752
        path_from = self._remote_path(rel_from)
753
        path_to = self._remote_path(rel_to)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
754
        self._rename_and_overwrite(path_from, path_to)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
755
756
    def delete(self, relpath):
757
        """Delete the item at relpath"""
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
758
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
759
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
760
            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.
761
        except (IOError, paramiko.SSHException), e:
762
            self._translate_io_exception(e, path, ': unable to delete')
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
763
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
764
    def external_url(self):
765
        """See bzrlib.transport.Transport.external_url."""
766
        # the external path for SFTP is the base
767
        return self.base
768
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
769
    def listable(self):
770
        """Return True if this store supports listing."""
771
        return True
772
773
    def list_dir(self, relpath):
774
        """
775
        Return a list of all files at the given location.
776
        """
777
        # does anything actually use this?
1959.2.1 by John Arbash Meinel
David Allouche: Make transports return escaped paths
778
        # -- Unknown
779
        # This is at least used by copy_tree for remote upgrades.
780
        # -- David Allouche 2006-08-11
1524.1.1 by Robert Collins
Test sftp with relative, absolute-in-homedir and absolute-not-in-homedir
781
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
782
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
783
            entries = self._get_sftp().listdir(path)
4103.3.1 by Martin Pool
More sftp progress hooks
784
            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.
785
        except (IOError, paramiko.SSHException), e:
786
            self._translate_io_exception(e, path, ': failed to list_dir')
1959.2.2 by John Arbash Meinel
Apply Andrew Bennetts list_dir fixes
787
        return [urlutils.escape(entry) for entry in entries]
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
788
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
789
    def rmdir(self, relpath):
790
        """See Transport.rmdir."""
791
        path = self._remote_path(relpath)
792
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
793
            return self._get_sftp().rmdir(path)
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
794
        except (IOError, paramiko.SSHException), e:
795
            self._translate_io_exception(e, path, ': failed to rmdir')
796
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
797
    def stat(self, relpath):
798
        """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
799
        path = self._remote_path(relpath)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
800
        try:
5056.1.5 by Neil Santos
Removed separate lstat() and reverted LocalTransport and SFTPTransport's stat() methods to using lstat() internally.
801
            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.
802
        except (IOError, paramiko.SSHException), e:
803
            self._translate_io_exception(e, path, ': unable to stat')
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
804
5056.1.4 by Neil Santos
Changed stat() in SFTPTransport and LocalTransport back to calling plain stat(), instead of lstat().
805
    def readlink(self, relpath):
806
        """See Transport.readlink."""
807
        path = self._remote_path(relpath)
808
        try:
809
            return self._get_sftp().readlink(path)
810
        except (IOError, paramiko.SSHException), e:
811
            self._translate_io_exception(e, path, ': unable to readlink')
812
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
813
    def symlink(self, source, link_name):
814
        """See Transport.symlink."""
815
        try:
816
            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.
817
            sftp_retval = conn.symlink(source, link_name)
818
            if SFTP_OK != sftp_retval:
819
                raise TransportError(
820
                    '%r: unable to create symlink to %r' % (link_name, source),
821
                    sftp_retval
822
                )
5056.1.1 by Neil Santos
Added default link() and symlink() methods to Transport.
823
        except (IOError, paramiko.SSHException), e:
824
            self._translate_io_exception(e, link_name,
825
                                         ': unable to create symlink to %r' % (source))
826
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
827
    def lock_read(self, relpath):
828
        """
829
        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
830
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
831
        """
832
        # FIXME: there should be something clever i can do here...
833
        class BogusLock(object):
834
            def __init__(self, path):
835
                self.path = path
836
            def unlock(self):
837
                pass
838
        return BogusLock(relpath)
839
840
    def lock_write(self, relpath):
841
        """
842
        Lock the given file for exclusive (write) access.
843
        WARNING: many transports do not support this, so trying avoid using it
844
1185.49.3 by John Arbash Meinel
Added a form of locking to sftp branches. Refactored _sftp_open_exclusive to take a relative path
845
        :return: A lock object, which has an unlock() member function
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
846
        """
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
847
        # This is a little bit bogus, but basically, we create a file
848
        # which should not already exist, and if it does, we assume
849
        # that there is a lock, and if it doesn't, the we assume
850
        # 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
851
        return SFTPLock(relpath, self)
1185.16.87 by mbp at sourcefrog
- fix line endings in sftp transport
852
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
853
    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
854
        """Open a remote path exclusively.
855
856
        SFTP supports O_EXCL (SFTP_FLAG_EXCL), which fails if
857
        the file already exists. However it does not expose this
858
        at the higher level of SFTPClient.open(), so we have to
859
        sneak away with it.
860
861
        WARNING: This breaks the SFTPClient abstraction, so it
862
        could easily break against an updated version of paramiko.
863
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
864
        :param abspath: The remote absolute path where the file should be opened
865
        :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
866
        """
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
867
        # TODO: jam 20060816 Paramiko >= 1.6.2 (probably earlier) supports
868
        #       using the 'x' flag to indicate SFTP_FLAG_EXCL.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
869
        #       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
870
        #       time using the sftp_client.file() functionality.
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
871
        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
872
        # 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
873
        attr = SFTPAttributes()
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
874
        if mode is not None:
875
            attr.st_mode = mode
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
876
        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
877
                | SFTP_FLAG_TRUNC | SFTP_FLAG_EXCL)
878
        try:
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
879
            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
880
            if t != CMD_HANDLE:
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
881
                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
882
            handle = msg.get_string()
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
883
            return SFTPFile(self._get_sftp(), handle, 'wb', -1)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
884
        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.
885
            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.
886
                failure_exc=FileExists)
1185.49.2 by John Arbash Meinel
Adding a open_exclusive function since paramiko supports it, but doesn't expose it
887
1988.1.1 by John Arbash Meinel
Restore mode bit tests for sftp, and track down bugs
888
    def _can_roundtrip_unix_modebits(self):
889
        if sys.platform == 'win32':
890
            # anyone else?
891
            return False
892
        else:
893
            return True
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
894
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.
895
896
def get_test_permutations():
897
    """Return the permutations to be used in testing."""
4797.11.2 by Vincent Ladeuil
Stop requiring testtools for sftp use.
898
    from bzrlib.tests import stub_sftp
899
    return [(SFTPTransport, stub_sftp.SFTPAbsoluteServer),
900
            (SFTPTransport, stub_sftp.SFTPHomeDirServer),
901
            (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.
902
            ]