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