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