14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""Smart-server protocol, client and server.
19
Requests are sent as a command and list of arguments, followed by optional
20
bulk body data. Responses are similarly a response and list of arguments,
21
followed by bulk body data. ::
24
Fields are separated by Ctrl-A.
25
BULK_DATA := CHUNK+ TRAILER
26
Chunks can be repeated as many times as necessary.
27
CHUNK := CHUNK_LEN CHUNK_BODY
28
CHUNK_LEN := DIGIT+ NEWLINE
29
Gives the number of bytes in the following chunk.
30
CHUNK_BODY := BYTE[chunk_len]
31
TRAILER := SUCCESS_TRAILER | ERROR_TRAILER
32
SUCCESS_TRAILER := 'done' NEWLINE
35
Paths are passed across the network. The client needs to see a namespace that
36
includes any repository that might need to be referenced, and the client needs
37
to know about a root directory beyond which it cannot ascend.
39
Servers run over ssh will typically want to be able to access any path the user
40
can access. Public servers on the other hand (which might be over http, ssh
41
or tcp) will typically want to restrict access to only a particular directory
42
and its children, so will want to do a software virtual root at that level.
43
In other words they'll want to rewrite incoming paths to be under that level
44
(and prevent escaping using ../ tricks.)
46
URLs that include ~ should probably be passed across to the server verbatim
47
and the server can expand them. This will proably not be meaningful when
48
limited to a directory?
17
"""RemoteTransport client for the smart-server.
19
This module shouldn't be accessed directly. The classes defined here should be
20
imported from bzrlib.smart.
52
# TODO: _translate_error should be on the client, not the transport because
53
# error coding is wire protocol specific.
55
# TODO: A plain integer from query_version is too simple; should give some
58
# TODO: Server should probably catch exceptions within itself and send them
59
# back across the network. (But shouldn't catch KeyboardInterrupt etc)
60
# Also needs to somehow report protocol errors like bad requests. Need to
61
# consider how we'll handle error reporting, e.g. if we get halfway through a
62
# bulk transfer and then something goes wrong.
64
# TODO: Standard marker at start of request/response lines?
66
# TODO: Make each request and response self-validatable, e.g. with checksums.
68
# TODO: get/put objects could be changed to gradually read back the data as it
69
# comes across the network
71
# TODO: What should the server do if it hits an error and has to terminate?
73
# TODO: is it useful to allow multiple chunks in the bulk data?
75
# TODO: If we get an exception during transmission of bulk data we can't just
76
# emit the exception because it won't be seen.
77
# John proposes: I think it would be worthwhile to have a header on each
78
# chunk, that indicates it is another chunk. Then you can send an 'error'
79
# chunk as long as you finish the previous chunk.
81
# TODO: Clone method on Transport; should work up towards parent directory;
82
# unclear how this should be stored or communicated to the server... maybe
83
# just pass it on all relevant requests?
85
# TODO: Better name than clone() for changing between directories. How about
86
# open_dir or change_dir or chdir?
88
# TODO: Is it really good to have the notion of current directory within the
89
# connection? Perhaps all Transports should factor out a common connection
90
# from the thing that has the directory context?
92
# TODO: Pull more things common to sftp and ssh to a higher level.
94
# TODO: The server that manages a connection should be quite small and retain
95
# minimum state because each of the requests are supposed to be stateless.
96
# Then we can write another implementation that maps to http.
98
# TODO: What to do when a client connection is garbage collected? Maybe just
99
# abruptly drop the connection?
101
# TODO: Server in some cases will need to restrict access to files outside of
102
# a particular root directory. LocalTransport doesn't do anything to stop you
103
# ascending above the base directory, so we need to prevent paths
104
# containing '..' in either the server or transport layers. (Also need to
105
# consider what happens if someone creates a symlink pointing outside the
108
# TODO: Server should rebase absolute paths coming across the network to put
109
# them under the virtual root, if one is in use. LocalTransport currently
110
# doesn't do that; if you give it an absolute path it just uses it.
112
# XXX: Arguments can't contain newlines or ascii; possibly we should e.g.
113
# urlescape them instead. Indeed possibly this should just literally be
116
# FIXME: This transport, with several others, has imperfect handling of paths
117
# within urls. It'd probably be better for ".." from a root to raise an error
118
# rather than return the same directory as we do at present.
120
# TODO: Rather than working at the Transport layer we want a Branch,
121
# Repository or BzrDir objects that talk to a server.
123
# TODO: Probably want some way for server commands to gradually produce body
124
# data rather than passing it as a string; they could perhaps pass an
125
# iterator-like callback that will gradually yield data; it probably needs a
126
# close() method that will always be closed to do any necessary cleanup.
128
# TODO: Split the actual smart server from the ssh encoding of it.
130
# TODO: Perhaps support file-level readwrite operations over the transport
133
# TODO: SmartBzrDir class, proxying all Branch etc methods across to another
134
# branch doing file-level operations.
136
# TODO: jam 20060915 _decode_tuple is acting directly on input over
137
# the socket, and it assumes everything is UTF8 sections separated
138
# by \001. Which means a request like '\002' Will abort the connection
139
# because of a UnicodeDecodeError. It does look like invalid data will
140
# kill the SmartStreamServer, but only with an abort + exception, and
141
# the overall server shouldn't die.
23
__all__ = ['RemoteTransport', 'RemoteTCPTransport', 'RemoteSSHTransport']
143
25
from cStringIO import StringIO
153
29
from bzrlib import (
161
from bzrlib.bundle.serializer import write_bundle
162
from bzrlib.trace import mutter
163
from bzrlib.transport import local
34
from bzrlib.smart import client, medium, protocol
165
36
# must do this otherwise urllib can't parse the urls properly :(
166
for scheme in ['ssh', 'bzr', 'bzr+loopback', 'bzr+ssh']:
37
for scheme in ['ssh', 'bzr', 'bzr+loopback', 'bzr+ssh', 'bzr+http']:
167
38
transport.register_urlparse_netloc_protocol(scheme)
171
def _recv_tuple(from_file):
172
req_line = from_file.readline()
173
return _decode_tuple(req_line)
176
def _decode_tuple(req_line):
177
if req_line == None or req_line == '':
179
if req_line[-1] != '\n':
180
raise errors.SmartProtocolError("request %r not terminated" % req_line)
181
return tuple((a.decode('utf-8') for a in req_line[:-1].split('\x01')))
184
def _encode_tuple(args):
185
"""Encode the tuple args to a bytestream."""
186
return '\x01'.join((a.encode('utf-8') for a in args)) + '\n'
189
class SmartProtocolBase(object):
190
"""Methods common to client and server"""
192
def _send_bulk_data(self, body):
193
"""Send chunked body data"""
194
assert isinstance(body, str)
195
bytes = ''.join(('%d\n' % len(body), body, 'done\n'))
196
self._write_and_flush(bytes)
198
# TODO: this only actually accomodates a single block; possibly should support
200
def _recv_bulk(self):
201
chunk_len = self._in.readline()
203
chunk_len = int(chunk_len)
205
raise errors.SmartProtocolError("bad chunk length line %r" % chunk_len)
206
bulk = self._in.read(chunk_len)
207
if len(bulk) != chunk_len:
208
raise errors.SmartProtocolError("short read fetching bulk data chunk")
212
def _recv_tuple(self):
213
return _recv_tuple(self._in)
215
def _recv_trailer(self):
216
resp = self._recv_tuple()
217
if resp == ('done', ):
220
self._translate_error(resp)
222
def _serialise_offsets(self, offsets):
223
"""Serialise a readv offset list."""
225
for start, length in offsets:
226
txt.append('%d,%d' % (start, length))
227
return '\n'.join(txt)
229
def _write_and_flush(self, bytes):
230
"""Write bytes to self._out and flush it."""
231
# XXX: this will be inefficient. Just ask Robert.
232
self._out.write(bytes)
236
class SmartStreamServer(SmartProtocolBase):
237
"""Handles smart commands coming over a stream.
239
The stream may be a pipe connected to sshd, or a tcp socket, or an
240
in-process fifo for testing.
242
One instance is created for each connected client; it can serve multiple
243
requests in the lifetime of the connection.
245
The server passes requests through to an underlying backing transport,
246
which will typically be a LocalTransport looking at the server's filesystem.
249
def __init__(self, in_file, out_file, backing_transport):
250
"""Construct new server.
252
:param in_file: Python file from which requests can be read.
253
:param out_file: Python file to write responses.
254
:param backing_transport: Transport for the directory served.
258
self.smart_server = SmartServer(backing_transport)
259
# server can call back to us to get bulk data - this is not really
260
# ideal, they should get it per request instead
261
self.smart_server._recv_body = self._recv_bulk
263
def _recv_tuple(self):
264
"""Read a request from the client and return as a tuple.
266
Returns None at end of file (if the client closed the connection.)
268
return _recv_tuple(self._in)
270
def _send_tuple(self, args):
271
"""Send response header"""
272
return self._write_and_flush(_encode_tuple(args))
274
def _send_error_and_disconnect(self, exception):
275
self._send_tuple(('error', str(exception)))
279
def _serve_one_request(self):
280
"""Read one request from input, process, send back a response.
282
:return: False if the server should terminate, otherwise None.
284
req_args = self._recv_tuple()
286
# client closed connection
287
return False # shutdown server
289
response = self.smart_server.dispatch_command(req_args[0], req_args[1:])
290
self._send_tuple(response.args)
291
if response.body is not None:
292
self._send_bulk_data(response.body)
293
except KeyboardInterrupt:
296
# everything else: pass to client, flush, and quit
297
self._send_error_and_disconnect(e)
301
"""Serve requests until the client disconnects."""
302
# Keep a reference to stderr because the sys module's globals get set to
303
# None during interpreter shutdown.
304
from sys import stderr
306
while self._serve_one_request() != False:
309
stderr.write("%s terminating on exception %s\n" % (self, e))
313
class SmartServerResponse(object):
314
"""Response generated by SmartServer."""
316
def __init__(self, args, body=None):
320
# XXX: TODO: Create a SmartServerRequest which will take the responsibility
321
# for delivering the data for a request. This could be done with as the
322
# StreamServer, though that would create conflation between request and response
323
# which may be undesirable.
326
class SmartServer(object):
327
"""Protocol logic for smart server.
329
This doesn't handle serialization at all, it just processes requests and
333
# IMPORTANT FOR IMPLEMENTORS: It is important that SmartServer not contain
334
# encoding or decoding logic to allow the wire protocol to vary from the
335
# object protocol: we will want to tweak the wire protocol separate from
336
# the object model, and ideally we will be able to do that without having
337
# a SmartServer subclass for each wire protocol, rather just a Protocol
340
# TODO: Better way of representing the body for commands that take it,
341
# and allow it to be streamed into the server.
343
def __init__(self, backing_transport):
344
self._backing_transport = backing_transport
347
"""Answer a version request with my version."""
348
return SmartServerResponse(('ok', '1'))
350
def do_has(self, relpath):
351
r = self._backing_transport.has(relpath) and 'yes' or 'no'
352
return SmartServerResponse((r,))
354
def do_get(self, relpath):
355
backing_bytes = self._backing_transport.get_bytes(relpath)
356
return SmartServerResponse(('ok',), backing_bytes)
358
def _deserialise_optional_mode(self, mode):
359
# XXX: FIXME this should be on the protocol object.
365
def do_append(self, relpath, mode):
366
old_length = self._backing_transport.append_bytes(
367
relpath, self._recv_body(), self._deserialise_optional_mode(mode))
368
return SmartServerResponse(('appended', '%d' % old_length))
370
def do_delete(self, relpath):
371
self._backing_transport.delete(relpath)
373
def do_iter_files_recursive(self, abspath):
374
# XXX: the path handling needs some thought.
375
#relpath = self._backing_transport.relpath(abspath)
376
transport = self._backing_transport.clone(abspath)
377
filenames = transport.iter_files_recursive()
378
return SmartServerResponse(('names',) + tuple(filenames))
380
def do_list_dir(self, relpath):
381
filenames = self._backing_transport.list_dir(relpath)
382
return SmartServerResponse(('names',) + tuple(filenames))
384
def do_mkdir(self, relpath, mode):
385
self._backing_transport.mkdir(relpath,
386
self._deserialise_optional_mode(mode))
388
def do_move(self, rel_from, rel_to):
389
self._backing_transport.move(rel_from, rel_to)
391
def do_put(self, relpath, mode):
392
self._backing_transport.put_bytes(relpath,
394
self._deserialise_optional_mode(mode))
396
def _deserialise_offsets(self, text):
397
# XXX: FIXME this should be on the protocol object.
399
for line in text.split('\n'):
402
start, length = line.split(',')
403
offsets.append((int(start), int(length)))
406
def do_put_non_atomic(self, relpath, mode, create_parent, dir_mode):
407
create_parent_dir = (create_parent == 'T')
408
self._backing_transport.put_bytes_non_atomic(relpath,
410
mode=self._deserialise_optional_mode(mode),
411
create_parent_dir=create_parent_dir,
412
dir_mode=self._deserialise_optional_mode(dir_mode))
414
def do_readv(self, relpath):
415
offsets = self._deserialise_offsets(self._recv_body())
416
backing_bytes = ''.join(bytes for offset, bytes in
417
self._backing_transport.readv(relpath, offsets))
418
return SmartServerResponse(('readv',), backing_bytes)
420
def do_rename(self, rel_from, rel_to):
421
self._backing_transport.rename(rel_from, rel_to)
423
def do_rmdir(self, relpath):
424
self._backing_transport.rmdir(relpath)
426
def do_stat(self, relpath):
427
stat = self._backing_transport.stat(relpath)
428
return SmartServerResponse(('stat', str(stat.st_size), oct(stat.st_mode)))
430
def do_get_bundle(self, path, revision_id):
431
# open transport relative to our base
432
t = self._backing_transport.clone(path)
433
control, extra_path = bzrdir.BzrDir.open_containing_from_transport(t)
434
repo = control.open_repository()
435
tmpf = tempfile.TemporaryFile()
436
base_revision = revision.NULL_REVISION
437
write_bundle(repo, revision_id, base_revision, tmpf)
439
return SmartServerResponse((), tmpf.read())
441
def dispatch_command(self, cmd, args):
442
func = getattr(self, 'do_' + cmd, None)
444
raise errors.SmartProtocolError("bad request %r" % (cmd,))
448
result = SmartServerResponse(('ok',))
450
except errors.NoSuchFile, e:
451
return SmartServerResponse(('NoSuchFile', e.path))
452
except errors.FileExists, e:
453
return SmartServerResponse(('FileExists', e.path))
454
except errors.DirectoryNotEmpty, e:
455
return SmartServerResponse(('DirectoryNotEmpty', e.path))
456
except errors.ShortReadvError, e:
457
return SmartServerResponse(('ShortReadvError',
458
e.path, str(e.offset), str(e.length), str(e.actual)))
459
except UnicodeError, e:
460
# If it is a DecodeError, than most likely we are starting
461
# with a plain string
462
str_or_unicode = e.object
463
if isinstance(str_or_unicode, unicode):
464
val = u'u:' + str_or_unicode
466
val = u's:' + str_or_unicode.encode('base64')
467
# This handles UnicodeEncodeError or UnicodeDecodeError
468
return SmartServerResponse((e.__class__.__name__,
469
e.encoding, val, str(e.start), str(e.end), e.reason))
470
except errors.TransportNotPossible, e:
471
if e.msg == "readonly transport":
472
return SmartServerResponse(('ReadOnlyError', ))
477
class SmartTCPServer(object):
478
"""Listens on a TCP socket and accepts connections from smart clients"""
480
def __init__(self, backing_transport=None, host='127.0.0.1', port=0):
481
"""Construct a new server.
483
To actually start it running, call either start_background_thread or
486
:param host: Name of the interface to listen on.
487
:param port: TCP port to listen on, or 0 to allocate a transient port.
489
if backing_transport is None:
490
backing_transport = memory.MemoryTransport()
491
self._server_socket = socket.socket()
492
self._server_socket.bind((host, port))
493
self.port = self._server_socket.getsockname()[1]
494
self._server_socket.listen(1)
495
self._server_socket.settimeout(1)
496
self.backing_transport = backing_transport
499
# let connections timeout so that we get a chance to terminate
500
# Keep a reference to the exceptions we want to catch because the socket
501
# module's globals get set to None during interpreter shutdown.
502
from socket import timeout as socket_timeout
503
from socket import error as socket_error
504
self._should_terminate = False
505
while not self._should_terminate:
507
self.accept_and_serve()
508
except socket_timeout:
509
# just check if we're asked to stop
511
except socket_error, e:
512
trace.warning("client disconnected: %s", e)
516
"""Return the url of the server"""
517
return "bzr://%s:%d/" % self._server_socket.getsockname()
519
def accept_and_serve(self):
520
conn, client_addr = self._server_socket.accept()
521
# For WIN32, where the timeout value from the listening socket
522
# propogates to the newly accepted socket.
523
conn.setblocking(True)
524
conn.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
525
from_client = conn.makefile('r')
526
to_client = conn.makefile('w')
527
handler = SmartStreamServer(from_client, to_client,
528
self.backing_transport)
529
connection_thread = threading.Thread(None, handler.serve, name='smart-server-child')
530
connection_thread.setDaemon(True)
531
connection_thread.start()
533
def start_background_thread(self):
534
self._server_thread = threading.Thread(None,
536
name='server-' + self.get_url())
537
self._server_thread.setDaemon(True)
538
self._server_thread.start()
540
def stop_background_thread(self):
541
self._should_terminate = True
542
# self._server_socket.close()
543
# we used to join the thread, but it's not really necessary; it will
545
## self._server_thread.join()
548
class SmartTCPServer_for_testing(SmartTCPServer):
549
"""Server suitable for use by transport tests.
551
This server is backed by the process's cwd.
555
self._homedir = os.getcwd()
556
# The server is set up by default like for ssh access: the client
557
# passes filesystem-absolute paths; therefore the server must look
558
# them up relative to the root directory. it might be better to act
559
# a public server and have the server rewrite paths into the test
561
SmartTCPServer.__init__(self, transport.get_transport("file:///"))
564
"""Set up server for testing"""
565
self.start_background_thread()
568
self.stop_background_thread()
571
"""Return the url of the server"""
572
host, port = self._server_socket.getsockname()
573
# XXX: I think this is likely to break on windows -- self._homedir will
574
# have backslashes (and maybe a drive letter?).
575
# -- Andrew Bennetts, 2006-08-29
576
return "bzr://%s:%d%s" % (host, port, urlutils.escape(self._homedir))
578
def get_bogus_url(self):
579
"""Return a URL which will fail to connect"""
580
return 'bzr://127.0.0.1:1/'
583
class SmartStat(object):
42
# Port 4155 is the default port for bzr://, registered with IANA.
43
BZR_DEFAULT_INTERFACE = '0.0.0.0'
44
BZR_DEFAULT_PORT = 4155
47
class _SmartStat(object):
585
49
def __init__(self, size, mode):
586
50
self.st_size = size
587
51
self.st_mode = mode
590
class SmartTransport(transport.Transport):
54
class RemoteTransport(transport.Transport):
591
55
"""Connection to a smart server.
593
The connection holds references to pipes that can be used to send requests
57
The connection holds references to the medium that can be used to send
58
requests to the server.
596
60
The connection has a notion of the current directory to which it's
597
61
connected; this is incorporated in filenames passed to the server.
917
424
def list_dir(self, relpath):
918
resp = self._client._call('list_dir',
919
self._remote_path(relpath))
425
resp = self._call2('list_dir', self._remote_path(relpath))
920
426
if resp[0] == 'names':
921
427
return [name.encode('ascii') for name in resp[1:]]
923
429
self._translate_error(resp)
925
431
def iter_files_recursive(self):
926
resp = self._client._call('iter_files_recursive',
927
self._remote_path(''))
432
resp = self._call2('iter_files_recursive', self._remote_path(''))
928
433
if resp[0] == 'names':
931
436
self._translate_error(resp)
934
class SmartStreamClient(SmartProtocolBase):
935
"""Connection to smart server over two streams"""
937
def __init__(self, connect_func):
938
self._connect_func = connect_func
939
self._connected = False
944
def _ensure_connection(self):
945
if not self._connected:
946
self._in, self._out = self._connect_func()
947
self._connected = True
949
def _send_tuple(self, args):
950
self._ensure_connection()
951
return self._write_and_flush(_encode_tuple(args))
953
def _send_bulk_data(self, body):
954
self._ensure_connection()
955
SmartProtocolBase._send_bulk_data(self, body)
957
def _recv_bulk(self):
958
self._ensure_connection()
959
return SmartProtocolBase._recv_bulk(self)
961
def _recv_tuple(self):
962
self._ensure_connection()
963
return SmartProtocolBase._recv_tuple(self)
965
def _recv_trailer(self):
966
self._ensure_connection()
967
return SmartProtocolBase._recv_trailer(self)
969
def disconnect(self):
970
"""Close connection to the server"""
975
def _call(self, *args):
976
self._send_tuple(args)
977
return self._recv_tuple()
979
def _call_with_upload(self, method, args, body):
980
"""Call an rpc, supplying bulk upload data.
982
:param method: method name to call
983
:param args: parameter args tuple
984
:param body: upload body as a byte string
986
self._send_tuple((method,) + args)
987
self._send_bulk_data(body)
988
return self._recv_tuple()
990
def query_version(self):
991
"""Return protocol version number of the server."""
992
# XXX: should make sure it's empty
993
self._send_tuple(('hello',))
994
resp = self._recv_tuple()
995
if resp == ('ok', '1'):
439
class RemoteTCPTransport(RemoteTransport):
440
"""Connection to smart server over plain tcp.
442
This is essentially just a factory to get 'RemoteTransport(url,
443
SmartTCPClientMedium).
446
def __init__(self, url):
447
_scheme, _username, _password, _host, _port, _path = \
448
transport.split_url(url)
450
_port = BZR_DEFAULT_PORT
998
raise errors.SmartProtocolError("bad response %r" % (resp,))
1001
class SmartTCPTransport(SmartTransport):
1002
"""Connection to smart server over plain tcp"""
1004
def __init__(self, url, clone_from=None):
1005
super(SmartTCPTransport, self).__init__(url, clone_from)
454
except (ValueError, TypeError), e:
455
raise errors.InvalidURL(
456
path=url, extra="invalid port %s" % _port)
457
client_medium = medium.SmartTCPClientMedium(_host, _port)
458
super(RemoteTCPTransport, self).__init__(url, medium=client_medium)
461
class RemoteSSHTransport(RemoteTransport):
462
"""Connection to smart server over SSH.
464
This is essentially just a factory to get 'RemoteTransport(url,
465
SmartSSHClientMedium).
468
def __init__(self, url):
469
_scheme, _username, _password, _host, _port, _path = \
470
transport.split_url(url)
1007
self._port = int(self._port)
472
if _port is not None:
1008
474
except (ValueError, TypeError), e:
1009
raise errors.InvalidURL(path=url, extra="invalid port %s" % self._port)
1012
def _connect_to_server(self):
1013
self._socket = socket.socket()
1014
self._socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
1015
result = self._socket.connect_ex((self._host, int(self._port)))
1017
raise errors.ConnectionError("failed to connect to %s:%d: %s" %
1018
(self._host, self._port, os.strerror(result)))
1019
# TODO: May be more efficient to just treat them as sockets
1020
# throughout? But what about pipes to ssh?...
1021
to_server = self._socket.makefile('w')
1022
from_server = self._socket.makefile('r')
1023
return from_server, to_server
1025
def disconnect(self):
1026
super(SmartTCPTransport, self).disconnect()
1027
# XXX: Is closing the socket as well as closing the files really
1029
if self._socket is not None:
1030
self._socket.close()
1033
from bzrlib.transport import sftp, ssh
1034
except errors.ParamikoNotPresent:
1035
# no paramiko, no SSHTransport.
1038
class SmartSSHTransport(SmartTransport):
1039
"""Connection to smart server over SSH."""
1041
def __init__(self, url, clone_from=None):
1042
# TODO: all this probably belongs in the parent class.
1043
super(SmartSSHTransport, self).__init__(url, clone_from)
1045
if self._port is not None:
1046
self._port = int(self._port)
1047
except (ValueError, TypeError), e:
1048
raise errors.InvalidURL(path=url, extra="invalid port %s" % self._port)
1050
def _connect_to_server(self):
1051
executable = os.environ.get('BZR_REMOTE_PATH', 'bzr')
1052
vendor = ssh._get_ssh_vendor()
1053
self._ssh_connection = vendor.connect_ssh(self._username,
1054
self._password, self._host, self._port,
1055
command=[executable, 'serve', '--inet', '--directory=/',
1057
return self._ssh_connection.get_filelike_channels()
1059
def disconnect(self):
1060
super(SmartSSHTransport, self).disconnect()
1061
self._ssh_connection.close()
475
raise errors.InvalidURL(path=url, extra="invalid port %s" %
477
client_medium = medium.SmartSSHClientMedium(_host, _port,
478
_username, _password)
479
super(RemoteSSHTransport, self).__init__(url, medium=client_medium)
482
class RemoteHTTPTransport(RemoteTransport):
483
"""Just a way to connect between a bzr+http:// url and http://.
485
This connection operates slightly differently than the RemoteSSHTransport.
486
It uses a plain http:// transport underneath, which defines what remote
487
.bzr/smart URL we are connected to. From there, all paths that are sent are
488
sent as relative paths, this way, the remote side can properly
489
de-reference them, since it is likely doing rewrite rules to translate an
490
HTTP path into a local path.
493
def __init__(self, url, http_transport=None):
494
assert url.startswith('bzr+http://')
496
if http_transport is None:
497
http_url = url[len('bzr+'):]
498
self._http_transport = transport.get_transport(http_url)
500
self._http_transport = http_transport
501
http_medium = self._http_transport.get_smart_medium()
502
super(RemoteHTTPTransport, self).__init__(url, medium=http_medium)
504
def _remote_path(self, relpath):
505
"""After connecting HTTP Transport only deals in relative URLs."""
506
# Adjust the relpath based on which URL this smart transport is
508
base = urlutils.normalize_url(self._http_transport.base)
509
url = urlutils.join(self.base[len('bzr+'):], relpath)
510
url = urlutils.normalize_url(url)
511
return urlutils.relative_url(base, url)
513
def abspath(self, relpath):
514
"""Return the full url to the given relative path.
516
:param relpath: the relative path or path components
517
:type relpath: str or list
519
return self._unparse_url(self._combine_paths(self._path, relpath))
521
def clone(self, relative_url):
522
"""Make a new RemoteHTTPTransport related to me.
524
This is re-implemented rather than using the default
525
RemoteTransport.clone() because we must be careful about the underlying
528
Also, the cloned smart transport will POST to the same .bzr/smart
529
location as this transport (although obviously the relative paths in the
530
smart requests may be different). This is so that the server doesn't
531
have to handle .bzr/smart requests at arbitrary places inside .bzr
532
directories, just at the initial URL the user uses.
534
The exception is parent paths (i.e. relative_url of "..").
537
abs_url = self.abspath(relative_url)
540
# We either use the exact same http_transport (for child locations), or
541
# a clone of the underlying http_transport (for parent locations). This
542
# means we share the connection.
543
norm_base = urlutils.normalize_url(self.base)
544
norm_abs_url = urlutils.normalize_url(abs_url)
545
normalized_rel_url = urlutils.relative_url(norm_base, norm_abs_url)
546
if normalized_rel_url == ".." or normalized_rel_url.startswith("../"):
547
http_transport = self._http_transport.clone(normalized_rel_url)
549
http_transport = self._http_transport
550
return RemoteHTTPTransport(abs_url, http_transport=http_transport)
1064
553
def get_test_permutations():
1065
"""Return (transport, server) permutations for testing"""
1066
return [(SmartTCPTransport, SmartTCPServer_for_testing)]
554
"""Return (transport, server) permutations for testing."""
555
### We may need a little more test framework support to construct an
556
### appropriate RemoteTransport in the future.
557
from bzrlib.smart import server
558
return [(RemoteTCPTransport, server.SmartTCPServer_for_testing)]
added
removed
bzrlib/transport/remote.py
