~bzr-pqm/bzr/bzr.dev

3224.5.8 by Andrew Bennetts
Fix failing tests.
1
# Copyright (C) 2006, 2007 Canonical Ltd
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
2
#
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.
7
#
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.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
16
4160.2.14 by Andrew Bennetts
Merge bzr.dev, improve NEWS entry and bzrlib.smart.request docs.
17
"""Infrastructure for server-side request handlers.
18
19
Interesting module attributes:
20
    * The request_handlers registry maps verb names to SmartServerRequest
21
      classes.
22
    * The jail_info threading.local() object is used to prevent accidental
23
      opening of BzrDirs outside of the backing transport, or any other
24
      transports placed in jail_info.transports.  The jail_info is reset on
25
      every call into a request handler (which can happen an arbitrary number
26
      of times during a request).
3195.3.4 by Andrew Bennetts
Make the general request handler dispatch version 3 events to the specific request handler (i.e. to the SmartServerRequest instance).
27
"""
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
28
4160.2.14 by Andrew Bennetts
Merge bzr.dev, improve NEWS entry and bzrlib.smart.request docs.
29
# XXX: The class names are a little confusing: the protocol will instantiate a
30
# SmartServerRequestHandler, whose dispatch_command method creates an instance
31
# of a SmartServerRequest subclass.
32
33
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
34
import tempfile
4160.2.2 by Andrew Bennetts
Add setup_jail and teardown_jail to SmartServerRequest.
35
import threading
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
36
2402.1.2 by Andrew Bennetts
Deal with review comments.
37
from bzrlib import (
38
    bzrdir,
39
    errors,
40
    registry,
41
    revision,
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
42
    trace,
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
43
    urlutils,
2402.1.2 by Andrew Bennetts
Deal with review comments.
44
    )
3224.5.6 by Andrew Bennetts
Don't import bzrlib.bundle in bzrlib.smart.request until it's needed.
45
from bzrlib.lazy_import import lazy_import
46
lazy_import(globals(), """
47
from bzrlib.bundle import serializer
48
""")
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
49
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
50
4160.2.2 by Andrew Bennetts
Add setup_jail and teardown_jail to SmartServerRequest.
51
jail_info = threading.local()
52
jail_info.transports = None
53
54
4160.2.4 by Andrew Bennetts
Use BzrDir pre_open hook to jail request code from accessing transports other than the backing transport.
55
def _install_hook():
56
    bzrdir.BzrDir.hooks.install_named_hook(
57
        'pre_open', _pre_open_hook, 'checking server jail')
58
59
60
def _pre_open_hook(transport):
4205.2.1 by Andrew Bennetts
Fix BzrDir.open in non-main (and non-server-request) thread when bzrlib.smart.request's _pre_open_hook is installed.
61
    allowed_transports = getattr(jail_info, 'transports', None)
4160.2.4 by Andrew Bennetts
Use BzrDir pre_open hook to jail request code from accessing transports other than the backing transport.
62
    if allowed_transports is None:
63
        return
64
    abspath = transport.base
65
    for allowed_transport in allowed_transports:
66
        try:
67
            allowed_transport.relpath(abspath)
68
        except errors.PathNotChild:
69
            continue
70
        else:
71
            return
4294.2.8 by Robert Collins
Reduce round trips pushing new branches substantially.
72
    raise errors.JailBreak(abspath)
4160.2.4 by Andrew Bennetts
Use BzrDir pre_open hook to jail request code from accessing transports other than the backing transport.
73
74
75
_install_hook()
76
77
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
78
class SmartServerRequest(object):
2692.1.10 by Andrew Bennetts
More docstring polish
79
    """Base class for request handlers.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
80
2692.1.10 by Andrew Bennetts
More docstring polish
81
    To define a new request, subclass this class and override the `do` method
82
    (and if appropriate, `do_body` as well).  Request implementors should take
83
    care to call `translate_client_path` and `transport_from_client_path` as
84
    appropriate when dealing with paths received from the client.
85
    """
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
86
    # XXX: rename this class to BaseSmartServerRequestHandler ?  A request
87
    # *handler* is a different concept to the request.
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
88
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
89
    def __init__(self, backing_transport, root_client_path='/'):
2402.1.2 by Andrew Bennetts
Deal with review comments.
90
        """Constructor.
91
92
        :param backing_transport: the base transport to be used when performing
93
            this request.
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
94
        :param root_client_path: the client path that maps to the root of
2692.1.9 by Andrew Bennetts
Docstrings for translate_client_path and transport_from_client_path.
95
            backing_transport.  This is used to interpret relpaths received
96
            from the client.  Clients will not be able to refer to paths above
2692.1.16 by Andrew Bennetts
Improve comments.
97
            this root.  If root_client_path is None, then no translation will
98
            be performed on client paths.  Default is '/'.
2402.1.2 by Andrew Bennetts
Deal with review comments.
99
        """
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
100
        self._backing_transport = backing_transport
2692.1.14 by Andrew Bennetts
All WSGI tests passing, and manual testing works too.
101
        if root_client_path is not None:
102
            if not root_client_path.startswith('/'):
103
                root_client_path = '/' + root_client_path
104
            if not root_client_path.endswith('/'):
105
                root_client_path += '/'
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
106
        self._root_client_path = root_client_path
3842.3.19 by Andrew Bennetts
Tweaks suggested by review.
107
        self._body_chunks = []
2018.5.5 by Andrew Bennetts
Pass body_bytes directly to SmartServerRequest.do_body
108
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
109
    def _check_enabled(self):
110
        """Raises DisabledMethod if this method is disabled."""
111
        pass
112
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
113
    def do(self, *args):
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
114
        """Mandatory extension point for SmartServerRequest subclasses.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
115
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
116
        Subclasses must implement this.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
117
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
118
        This should return a SmartServerResponse if this command expects to
119
        receive no body.
120
        """
2018.5.5 by Andrew Bennetts
Pass body_bytes directly to SmartServerRequest.do_body
121
        raise NotImplementedError(self.do)
122
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
123
    def execute(self, *args):
124
        """Public entry point to execute this request.
125
126
        It will return a SmartServerResponse if the command does not expect a
127
        body.
128
129
        :param *args: the arguments of the request.
130
        """
131
        self._check_enabled()
132
        return self.do(*args)
133
2018.5.5 by Andrew Bennetts
Pass body_bytes directly to SmartServerRequest.do_body
134
    def do_body(self, body_bytes):
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
135
        """Called if the client sends a body with the request.
3184.1.10 by Robert Collins
Change the smart server verb for Repository.stream_revisions_chunked to use SearchResults as the request mechanism for downloads.
136
137
        The do() method is still called, and must have returned None.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
138
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
139
        Must return a SmartServerResponse.
140
        """
3990.3.2 by Andrew Bennetts
Fix the do_body NotImplementedError log spam.
141
        if body_bytes != '':
3990.3.3 by Andrew Bennetts
Add a test that unexpected request bodies trigger a SmartProtocolError from request implementations.
142
            raise errors.SmartProtocolError('Request does not expect a body')
2018.5.4 by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler.
143
3195.3.4 by Andrew Bennetts
Make the general request handler dispatch version 3 events to the specific request handler (i.e. to the SmartServerRequest instance).
144
    def do_chunk(self, chunk_bytes):
145
        """Called with each body chunk if the request has a streamed body.
146
147
        The do() method is still called, and must have returned None.
148
        """
3842.3.19 by Andrew Bennetts
Tweaks suggested by review.
149
        self._body_chunks.append(chunk_bytes)
3195.3.4 by Andrew Bennetts
Make the general request handler dispatch version 3 events to the specific request handler (i.e. to the SmartServerRequest instance).
150
151
    def do_end(self):
152
        """Called when the end of the request has been received."""
3842.3.19 by Andrew Bennetts
Tweaks suggested by review.
153
        body_bytes = ''.join(self._body_chunks)
154
        self._body_chunks = None
3923.5.2 by Andrew Bennetts
Completely delegate handling of request body chunks to the command object. The default implementation accumulates, like the existing behaviour.
155
        return self.do_body(body_bytes)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
156
4160.2.2 by Andrew Bennetts
Add setup_jail and teardown_jail to SmartServerRequest.
157
    def setup_jail(self):
158
        jail_info.transports = [self._backing_transport]
159
160
    def teardown_jail(self):
161
        jail_info.transports = None
162
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
163
    def translate_client_path(self, client_path):
2692.1.9 by Andrew Bennetts
Docstrings for translate_client_path and transport_from_client_path.
164
        """Translate a path received from a network client into a local
165
        relpath.
166
167
        All paths received from the client *must* be translated.
168
2692.1.14 by Andrew Bennetts
All WSGI tests passing, and manual testing works too.
169
        :param client_path: the path from the client.
2692.1.9 by Andrew Bennetts
Docstrings for translate_client_path and transport_from_client_path.
170
        :returns: a relpath that may be used with self._backing_transport
2692.1.14 by Andrew Bennetts
All WSGI tests passing, and manual testing works too.
171
            (unlike the untranslated client_path, which must not be used with
172
            the backing transport).
2692.1.9 by Andrew Bennetts
Docstrings for translate_client_path and transport_from_client_path.
173
        """
2692.1.14 by Andrew Bennetts
All WSGI tests passing, and manual testing works too.
174
        if self._root_client_path is None:
175
            # no translation necessary!
176
            return client_path
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
177
        if not client_path.startswith('/'):
178
            client_path = '/' + client_path
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
179
        if client_path + '/' == self._root_client_path:
180
            return '.'
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
181
        if client_path.startswith(self._root_client_path):
182
            path = client_path[len(self._root_client_path):]
183
            relpath = urlutils.joinpath('/', path)
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
184
            if not relpath.startswith('/'):
185
                raise ValueError(relpath)
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
186
            return '.' + relpath
187
        else:
188
            raise errors.PathNotChild(client_path, self._root_client_path)
189
190
    def transport_from_client_path(self, client_path):
2692.1.9 by Andrew Bennetts
Docstrings for translate_client_path and transport_from_client_path.
191
        """Get a backing transport corresponding to the location referred to by
192
        a network client.
193
194
        :seealso: translate_client_path
195
        :returns: a transport cloned from self._backing_transport
196
        """
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
197
        relpath = self.translate_client_path(client_path)
2692.1.16 by Andrew Bennetts
Improve comments.
198
        return self._backing_transport.clone(relpath)
3195.3.4 by Andrew Bennetts
Make the general request handler dispatch version 3 events to the specific request handler (i.e. to the SmartServerRequest instance).
199
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
200
2018.5.16 by Andrew Bennetts
Move SmartServerResponse to smart/request.py, untangling more import dependencies.
201
class SmartServerResponse(object):
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
202
    """A response to a client request.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
203
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
204
    This base class should not be used. Instead use
205
    SuccessfulSmartServerResponse and FailedSmartServerResponse as appropriate.
206
    """
2018.5.16 by Andrew Bennetts
Move SmartServerResponse to smart/request.py, untangling more import dependencies.
207
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
208
    def __init__(self, args, body=None, body_stream=None):
209
        """Constructor.
210
211
        :param args: tuple of response arguments.
212
        :param body: string of a response body.
213
        :param body_stream: iterable of bytestrings to be streamed to the
214
            client.
215
        """
2018.5.16 by Andrew Bennetts
Move SmartServerResponse to smart/request.py, untangling more import dependencies.
216
        self.args = args
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
217
        if body is not None and body_stream is not None:
218
            raise errors.BzrError(
219
                "'body' and 'body_stream' are mutually exclusive.")
2018.5.16 by Andrew Bennetts
Move SmartServerResponse to smart/request.py, untangling more import dependencies.
220
        self.body = body
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
221
        self.body_stream = body_stream
2018.5.16 by Andrew Bennetts
Move SmartServerResponse to smart/request.py, untangling more import dependencies.
222
2402.1.1 by Andrew Bennetts
Use the Command pattern for handling smart server commands.
223
    def __eq__(self, other):
224
        if other is None:
225
            return False
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
226
        return (other.args == self.args and
227
                other.body == self.body and
228
                other.body_stream is self.body_stream)
2402.1.1 by Andrew Bennetts
Use the Command pattern for handling smart server commands.
229
230
    def __repr__(self):
3691.2.6 by Martin Pool
Disable RemoteBranch stacking, but get get_stacked_on_url working, and passing back exceptions
231
        return "<%s args=%r body=%r>" % (self.__class__.__name__,
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
232
            self.args, self.body)
2402.1.1 by Andrew Bennetts
Use the Command pattern for handling smart server commands.
233
2018.5.16 by Andrew Bennetts
Move SmartServerResponse to smart/request.py, untangling more import dependencies.
234
2432.4.2 by Robert Collins
Add FailedSmartServerResponse.
235
class FailedSmartServerResponse(SmartServerResponse):
236
    """A SmartServerResponse for a request which failed."""
237
238
    def is_successful(self):
239
        """FailedSmartServerResponse are not successful."""
240
        return False
241
242
2432.4.1 by Robert Collins
Add SuccessfulSmartServerResponse.
243
class SuccessfulSmartServerResponse(SmartServerResponse):
244
    """A SmartServerResponse for a successfully completed request."""
245
246
    def is_successful(self):
247
        """SuccessfulSmartServerResponse are successful."""
248
        return True
249
2018.5.16 by Andrew Bennetts
Move SmartServerResponse to smart/request.py, untangling more import dependencies.
250
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
251
class SmartServerRequestHandler(object):
252
    """Protocol logic for smart server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
253
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
254
    This doesn't handle serialization at all, it just processes requests and
255
    creates responses.
256
    """
257
258
    # IMPORTANT FOR IMPLEMENTORS: It is important that SmartServerRequestHandler
259
    # not contain encoding or decoding logic to allow the wire protocol to vary
260
    # from the object protocol: we will want to tweak the wire protocol separate
261
    # from the object model, and ideally we will be able to do that without
262
    # having a SmartServerRequestHandler subclass for each wire protocol, rather
263
    # just a Protocol subclass.
264
265
    # TODO: Better way of representing the body for commands that take it,
266
    # and allow it to be streamed into the server.
267
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
268
    def __init__(self, backing_transport, commands, root_client_path):
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
269
        """Constructor.
270
271
        :param backing_transport: a Transport to handle requests for.
2018.5.23 by Andrew Bennetts
Use a Registry for smart server command handlers.
272
        :param commands: a registry mapping command names to SmartServerRequest
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
273
            subclasses. e.g. bzrlib.transport.smart.vfs.vfs_commands.
274
        """
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
275
        self._backing_transport = backing_transport
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
276
        self._root_client_path = root_client_path
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
277
        self._commands = commands
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
278
        self.response = None
279
        self.finished_reading = False
280
        self._command = None
281
282
    def accept_body(self, bytes):
283
        """Accept body data."""
4475.2.2 by Andrew Bennetts
Don't try call do_chunk or do_end if there's no active command (e.g. while consuming a request for an unknown method)
284
        if self._command is None:
285
            # no active command object, so ignore the event.
286
            return
3923.5.2 by Andrew Bennetts
Completely delegate handling of request body chunks to the command object. The default implementation accumulates, like the existing behaviour.
287
        self._run_handler_code(self._command.do_chunk, (bytes,), {})
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
288
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
289
    def end_of_body(self):
290
        """No more body data will be received."""
3923.5.2 by Andrew Bennetts
Completely delegate handling of request body chunks to the command object. The default implementation accumulates, like the existing behaviour.
291
        self._run_handler_code(self._command.do_end, (), {})
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
292
        # cannot read after this.
293
        self.finished_reading = True
294
295
    def dispatch_command(self, cmd, args):
296
        """Deprecated compatibility method.""" # XXX XXX
2018.5.23 by Andrew Bennetts
Use a Registry for smart server command handlers.
297
        try:
298
            command = self._commands.get(cmd)
299
        except LookupError:
3245.4.29 by Andrew Bennetts
Add/tidy some comments, remove dud test_errors_are_logged test, add explicit UnknownSmartMethod to v3.
300
            raise errors.UnknownSmartMethod(cmd)
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
301
        self._command = command(self._backing_transport, self._root_client_path)
2018.5.24 by Andrew Bennetts
Setting NO_SMART_VFS in environment will disable VFS methods in the smart server. (Robert Collins, John Arbash Meinel, Andrew Bennetts)
302
        self._run_handler_code(self._command.execute, args, {})
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
303
304
    def _run_handler_code(self, callable, args, kwargs):
305
        """Run some handler specific code 'callable'.
306
307
        If a result is returned, it is considered to be the commands response,
308
        and finished_reading is set true, and its assigned to self.response.
309
310
        Any exceptions caught are translated and a response object created
311
        from them.
312
        """
313
        result = self._call_converting_errors(callable, args, kwargs)
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
314
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
315
        if result is not None:
316
            self.response = result
317
            self.finished_reading = True
318
319
    def _call_converting_errors(self, callable, args, kwargs):
320
        """Call callable converting errors to Response objects."""
321
        # XXX: most of this error conversion is VFS-related, and thus ought to
322
        # be in SmartServerVFSRequestHandler somewhere.
323
        try:
4160.2.2 by Andrew Bennetts
Add setup_jail and teardown_jail to SmartServerRequest.
324
            self._command.setup_jail()
325
            try:
326
                return callable(*args, **kwargs)
327
            finally:
328
                self._command.teardown_jail()
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
329
        except (KeyboardInterrupt, SystemExit):
330
            raise
331
        except Exception, err:
332
            err_struct = _translate_error(err)
333
            return FailedSmartServerResponse(err_struct)
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
334
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
335
    def headers_received(self, headers):
3245.4.33 by Andrew Bennetts
Remove unused no_body_received method on SmartServerRequestHandler.
336
        # Just a no-op at the moment.
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
337
        pass
338
339
    def args_received(self, args):
3195.3.4 by Andrew Bennetts
Make the general request handler dispatch version 3 events to the specific request handler (i.e. to the SmartServerRequest instance).
340
        cmd = args[0]
341
        args = args[1:]
342
        try:
343
            command = self._commands.get(cmd)
344
        except LookupError:
3245.4.48 by Andrew Bennetts
raise UnknownSmartMethod from dispatch_command.
345
            raise errors.UnknownSmartMethod(cmd)
3195.3.4 by Andrew Bennetts
Make the general request handler dispatch version 3 events to the specific request handler (i.e. to the SmartServerRequest instance).
346
        self._command = command(self._backing_transport)
347
        self._run_handler_code(self._command.execute, args, {})
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
348
3195.3.4 by Andrew Bennetts
Make the general request handler dispatch version 3 events to the specific request handler (i.e. to the SmartServerRequest instance).
349
    def end_received(self):
4475.2.2 by Andrew Bennetts
Don't try call do_chunk or do_end if there's no active command (e.g. while consuming a request for an unknown method)
350
        if self._command is None:
351
            # no active command object, so ignore the event.
352
            return
3195.3.4 by Andrew Bennetts
Make the general request handler dispatch version 3 events to the specific request handler (i.e. to the SmartServerRequest instance).
353
        self._run_handler_code(self._command.do_end, (), {})
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
354
3923.5.4 by Andrew Bennetts
Allow a request's body part(s) to be followed by an error.
355
    def post_body_error_received(self, error_args):
356
        # Just a no-op at the moment.
357
        pass
358
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
359
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
360
def _translate_error(err):
361
    if isinstance(err, errors.NoSuchFile):
362
        return ('NoSuchFile', err.path)
363
    elif isinstance(err, errors.FileExists):
364
        return ('FileExists', err.path)
365
    elif isinstance(err, errors.DirectoryNotEmpty):
366
        return ('DirectoryNotEmpty', err.path)
4634.14.1 by Robert Collins
(robertc) Handle IncompatibleRepositories better with bzr:// connections. (Robert Collins)
367
    elif isinstance(err, errors.IncompatibleRepositories):
368
        return ('IncompatibleRepositories', str(err.source), str(err.target),
369
            str(err.details))
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
370
    elif isinstance(err, errors.ShortReadvError):
371
        return ('ShortReadvError', err.path, str(err.offset), str(err.length),
372
                str(err.actual))
373
    elif isinstance(err, errors.UnstackableRepositoryFormat):
374
        return (('UnstackableRepositoryFormat', str(err.format), err.url))
375
    elif isinstance(err, errors.UnstackableBranchFormat):
376
        return ('UnstackableBranchFormat', str(err.format), err.url)
377
    elif isinstance(err, errors.NotStacked):
378
        return ('NotStacked',)
379
    elif isinstance(err, UnicodeError):
380
        # If it is a DecodeError, than most likely we are starting
381
        # with a plain string
382
        str_or_unicode = err.object
383
        if isinstance(str_or_unicode, unicode):
384
            # XXX: UTF-8 might have \x01 (our protocol v1 and v2 seperator
385
            # byte) in it, so this encoding could cause broken responses.
386
            # Newer clients use protocol v3, so will be fine.
387
            val = 'u:' + str_or_unicode.encode('utf-8')
388
        else:
389
            val = 's:' + str_or_unicode.encode('base64')
390
        # This handles UnicodeEncodeError or UnicodeDecodeError
391
        return (err.__class__.__name__, err.encoding, val, str(err.start),
392
                str(err.end), err.reason)
393
    elif isinstance(err, errors.TransportNotPossible):
394
        if err.msg == "readonly transport":
395
            return ('ReadOnlyError', )
396
    elif isinstance(err, errors.ReadError):
397
        # cannot read the file
398
        return ('ReadError', err.path)
399
    elif isinstance(err, errors.PermissionDenied):
400
        return ('PermissionDenied', err.path, err.extra)
4144.3.1 by Andrew Bennetts
Add Repository.insert_stream_locked server-side implementation, plus tests for server-side _translate_error.
401
    elif isinstance(err, errors.TokenMismatch):
402
        return ('TokenMismatch', err.given_token, err.lock_token)
403
    elif isinstance(err, errors.LockContention):
4556.2.6 by Andrew Bennetts
More conservative fix for LockContention serialisation.
404
        return ('LockContention',)
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
405
    # Unserialisable error.  Log it, and return a generic error
406
    trace.log_exception_quietly()
407
    return ('error', str(err))
408
409
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
410
class HelloRequest(SmartServerRequest):
2432.2.6 by Andrew Bennetts
Improve HelloRequest's docstring.
411
    """Answer a version request with the highest protocol version this server
412
    supports.
413
    """
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
414
415
    def do(self):
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
416
        return SuccessfulSmartServerResponse(('ok', '2'))
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
417
418
419
class GetBundleRequest(SmartServerRequest):
2402.1.2 by Andrew Bennetts
Deal with review comments.
420
    """Get a bundle of from the null revision to the specified revision."""
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
421
422
    def do(self, path, revision_id):
423
        # open transport relative to our base
2692.1.7 by Andrew Bennetts
Translate path in GetBundleRequest too.
424
        t = self.transport_from_client_path(path)
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
425
        control, extra_path = bzrdir.BzrDir.open_containing_from_transport(t)
426
        repo = control.open_repository()
427
        tmpf = tempfile.TemporaryFile()
428
        base_revision = revision.NULL_REVISION
3224.5.6 by Andrew Bennetts
Don't import bzrlib.bundle in bzrlib.smart.request until it's needed.
429
        serializer.write_bundle(repo, revision_id, base_revision, tmpf)
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
430
        tmpf.seek(0)
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
431
        return SuccessfulSmartServerResponse((), tmpf.read())
2018.5.6 by Andrew Bennetts
Tidy ups, and turn do_hello and do_get_bundle into command objects.
432
433
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
434
class SmartServerIsReadonly(SmartServerRequest):
435
    # XXX: this request method belongs somewhere else.
436
437
    def do(self):
438
        if self._backing_transport.is_readonly():
439
            answer = 'yes'
440
        else:
441
            answer = 'no'
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
442
        return SuccessfulSmartServerResponse((answer,))
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
443
444
2018.5.23 by Andrew Bennetts
Use a Registry for smart server command handlers.
445
request_handlers = registry.Registry()
446
request_handlers.register_lazy(
447
    'append', 'bzrlib.smart.vfs', 'AppendRequest')
448
request_handlers.register_lazy(
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
449
    'Branch.get_config_file', 'bzrlib.smart.branch',
450
    'SmartServerBranchGetConfigFile')
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
451
request_handlers.register_lazy(
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
452
    'Branch.get_parent', 'bzrlib.smart.branch', 'SmartServerBranchGetParent')
453
request_handlers.register_lazy(
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
454
    'Branch.get_tags_bytes', 'bzrlib.smart.branch',
455
    'SmartServerBranchGetTagsBytes')
456
request_handlers.register_lazy(
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
457
    'Branch.set_tags_bytes', 'bzrlib.smart.branch',
458
    'SmartServerBranchSetTagsBytes')
459
request_handlers.register_lazy(
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
460
    'Branch.get_stacked_on_url', 'bzrlib.smart.branch', 'SmartServerBranchRequestGetStackedOnURL')
461
request_handlers.register_lazy(
2018.5.51 by Wouter van Heyst
Test and implement RemoteBranch.last_revision_info()
462
    'Branch.last_revision_info', 'bzrlib.smart.branch', 'SmartServerBranchRequestLastRevisionInfo')
463
request_handlers.register_lazy(
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
464
    'Branch.lock_write', 'bzrlib.smart.branch', 'SmartServerBranchRequestLockWrite')
4226.2.1 by Robert Collins
Set branch config options via a smart method.
465
request_handlers.register_lazy( 'Branch.revision_history',
466
    'bzrlib.smart.branch', 'SmartServerRequestRevisionHistory')
467
request_handlers.register_lazy( 'Branch.set_config_option',
468
    'bzrlib.smart.branch', 'SmartServerBranchRequestSetConfigOption')
469
request_handlers.register_lazy( 'Branch.set_last_revision',
470
    'bzrlib.smart.branch', 'SmartServerBranchRequestSetLastRevision')
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
471
request_handlers.register_lazy(
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
472
    'Branch.set_last_revision_info', 'bzrlib.smart.branch',
473
    'SmartServerBranchRequestSetLastRevisionInfo')
474
request_handlers.register_lazy(
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
475
    'Branch.set_last_revision_ex', 'bzrlib.smart.branch',
476
    'SmartServerBranchRequestSetLastRevisionEx')
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
477
request_handlers.register_lazy(
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
478
    'Branch.set_parent_location', 'bzrlib.smart.branch',
479
    'SmartServerBranchRequestSetParentLocation')
480
request_handlers.register_lazy(
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
481
    'Branch.unlock', 'bzrlib.smart.branch', 'SmartServerBranchRequestUnlock')
482
request_handlers.register_lazy(
4070.2.3 by Robert Collins
Get BzrDir.cloning_metadir working.
483
    'BzrDir.cloning_metadir', 'bzrlib.smart.bzrdir',
484
    'SmartServerBzrDirRequestCloningMetaDir')
485
request_handlers.register_lazy(
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
486
    'BzrDir.create_branch', 'bzrlib.smart.bzrdir',
487
    'SmartServerRequestCreateBranch')
488
request_handlers.register_lazy(
489
    'BzrDir.create_repository', 'bzrlib.smart.bzrdir',
490
    'SmartServerRequestCreateRepository')
491
request_handlers.register_lazy(
492
    'BzrDir.find_repository', 'bzrlib.smart.bzrdir',
493
    'SmartServerRequestFindRepositoryV1')
494
request_handlers.register_lazy(
495
    'BzrDir.find_repositoryV2', 'bzrlib.smart.bzrdir',
496
    'SmartServerRequestFindRepositoryV2')
497
request_handlers.register_lazy(
498
    'BzrDir.find_repositoryV3', 'bzrlib.smart.bzrdir',
499
    'SmartServerRequestFindRepositoryV3')
500
request_handlers.register_lazy(
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
501
    'BzrDir.get_config_file', 'bzrlib.smart.bzrdir',
502
    'SmartServerBzrDirRequestConfigFile')
503
request_handlers.register_lazy(
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
504
    'BzrDirFormat.initialize', 'bzrlib.smart.bzrdir',
505
    'SmartServerRequestInitializeBzrDir')
506
request_handlers.register_lazy(
4436.1.1 by Andrew Bennetts
Rename BzrDirFormat.initialize_ex verb to BzrDirFormat.initialize_ex_1.16.
507
    'BzrDirFormat.initialize_ex_1.16', 'bzrlib.smart.bzrdir',
4294.2.7 by Robert Collins
Start building up a BzrDir.initialize_ex verb for the smart server.
508
    'SmartServerRequestBzrDirInitializeEx')
509
request_handlers.register_lazy(
4288.1.2 by Robert Collins
Create a server verb for doing BzrDir.get_config()
510
    'BzrDir.open', 'bzrlib.smart.bzrdir', 'SmartServerRequestOpenBzrDir')
511
request_handlers.register_lazy(
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
512
    'BzrDir.open_branch', 'bzrlib.smart.bzrdir',
513
    'SmartServerRequestOpenBranch')
514
request_handlers.register_lazy(
515
    'BzrDir.open_branchV2', 'bzrlib.smart.bzrdir',
516
    'SmartServerRequestOpenBranchV2')
2018.6.1 by Robert Collins
Implement a BzrDir.open_branch smart server method for opening a branch without VFS.
517
request_handlers.register_lazy(
2018.5.23 by Andrew Bennetts
Use a Registry for smart server command handlers.
518
    'delete', 'bzrlib.smart.vfs', 'DeleteRequest')
519
request_handlers.register_lazy(
520
    'get', 'bzrlib.smart.vfs', 'GetRequest')
521
request_handlers.register_lazy(
522
    'get_bundle', 'bzrlib.smart.request', 'GetBundleRequest')
523
request_handlers.register_lazy(
524
    'has', 'bzrlib.smart.vfs', 'HasRequest')
525
request_handlers.register_lazy(
526
    'hello', 'bzrlib.smart.request', 'HelloRequest')
527
request_handlers.register_lazy(
2018.5.37 by Andrew Bennetts
Make sure all the request handlers in bzrlib/smart/vfs.py have consistent names.
528
    'iter_files_recursive', 'bzrlib.smart.vfs', 'IterFilesRecursiveRequest')
2018.5.23 by Andrew Bennetts
Use a Registry for smart server command handlers.
529
request_handlers.register_lazy(
530
    'list_dir', 'bzrlib.smart.vfs', 'ListDirRequest')
531
request_handlers.register_lazy(
2018.5.37 by Andrew Bennetts
Make sure all the request handlers in bzrlib/smart/vfs.py have consistent names.
532
    'mkdir', 'bzrlib.smart.vfs', 'MkdirRequest')
533
request_handlers.register_lazy(
534
    'move', 'bzrlib.smart.vfs', 'MoveRequest')
535
request_handlers.register_lazy(
536
    'put', 'bzrlib.smart.vfs', 'PutRequest')
537
request_handlers.register_lazy(
538
    'put_non_atomic', 'bzrlib.smart.vfs', 'PutNonAtomicRequest')
539
request_handlers.register_lazy(
540
    'readv', 'bzrlib.smart.vfs', 'ReadvRequest')
541
request_handlers.register_lazy(
542
    'rename', 'bzrlib.smart.vfs', 'RenameRequest')
3452.2.2 by Andrew Bennetts
Experimental PackRepository.{check_references,autopack} RPCs.
543
request_handlers.register_lazy(
544
    'PackRepository.autopack', 'bzrlib.smart.packrepository',
545
    'SmartServerPackRepositoryAutopack')
2018.10.2 by v.ladeuil+lp at free
gather_stats server side and request registration
546
request_handlers.register_lazy('Repository.gather_stats',
547
                               'bzrlib.smart.repository',
548
                               'SmartServerRepositoryGatherStats')
3842.3.3 by Andrew Bennetts
Remove RPC registration for VersionedFiles.get_parent_map, not Repository.get_parent_map.
549
request_handlers.register_lazy('Repository.get_parent_map',
550
                               'bzrlib.smart.repository',
551
                               'SmartServerRepositoryGetParentMap')
2018.5.37 by Andrew Bennetts
Make sure all the request handlers in bzrlib/smart/vfs.py have consistent names.
552
request_handlers.register_lazy(
2018.5.67 by Wouter van Heyst
Implement RemoteRepository.get_revision_graph (Wouter van Heyst, Robert Collins)
553
    'Repository.get_revision_graph', 'bzrlib.smart.repository', 'SmartServerRepositoryGetRevisionGraph')
554
request_handlers.register_lazy(
2018.5.40 by Robert Collins
Implement a remote Repository.has_revision method.
555
    'Repository.has_revision', 'bzrlib.smart.repository', 'SmartServerRequestHasRevision')
556
request_handlers.register_lazy(
4022.1.6 by Robert Collins
Cherrypick and polish the RemoteSink for streaming push.
557
    'Repository.insert_stream', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStream')
558
request_handlers.register_lazy(
4476.3.82 by Andrew Bennetts
Mention another bug fix in NEWS, and update verb name, comments, and NEWS additions for landing on 1.19 rather than 1.18.
559
    'Repository.insert_stream_1.19', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStream_1_19')
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
560
request_handlers.register_lazy(
4144.3.1 by Andrew Bennetts
Add Repository.insert_stream_locked server-side implementation, plus tests for server-side _translate_error.
561
    'Repository.insert_stream_locked', 'bzrlib.smart.repository', 'SmartServerRepositoryInsertStreamLocked')
562
request_handlers.register_lazy(
2018.5.57 by Robert Collins
Implement RemoteRepository.is_shared (Robert Collins, Vincent Ladeuil).
563
    'Repository.is_shared', 'bzrlib.smart.repository', 'SmartServerRepositoryIsShared')
564
request_handlers.register_lazy(
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
565
    'Repository.lock_write', 'bzrlib.smart.repository', 'SmartServerRepositoryLockWrite')
566
request_handlers.register_lazy(
4017.3.4 by Robert Collins
Create a verb for Repository.set_make_working_trees.
567
    'Repository.set_make_working_trees', 'bzrlib.smart.repository',
568
    'SmartServerRepositorySetMakeWorkingTrees')
569
request_handlers.register_lazy(
2018.5.78 by Andrew Bennetts
Implement RemoteRepository.lock_write/unlock to expect and send tokens over the
570
    'Repository.unlock', 'bzrlib.smart.repository', 'SmartServerRepositoryUnlock')
571
request_handlers.register_lazy(
4419.2.4 by Andrew Bennetts
Add Repository.get_rev_id_for_revno RPC, removes VFS calls from 'pull -r 123' case.
572
    'Repository.get_rev_id_for_revno', 'bzrlib.smart.repository',
573
    'SmartServerRepositoryGetRevIdForRevno')
574
request_handlers.register_lazy(
4060.1.5 by Robert Collins
Verb change name requested by Andrew.
575
    'Repository.get_stream', 'bzrlib.smart.repository',
576
    'SmartServerRepositoryGetStream')
4060.1.4 by Robert Collins
Streaming fetch from remote servers.
577
request_handlers.register_lazy(
4476.3.82 by Andrew Bennetts
Mention another bug fix in NEWS, and update verb name, comments, and NEWS additions for landing on 1.19 rather than 1.18.
578
    'Repository.get_stream_1.19', 'bzrlib.smart.repository',
579
    'SmartServerRepositoryGetStream_1_19')
4476.3.29 by Andrew Bennetts
Add Repository.get_stream_1.18 verb.
580
request_handlers.register_lazy(
2018.18.1 by Martin Pool
Add stub Repository.tarball smart method
581
    'Repository.tarball', 'bzrlib.smart.repository',
582
    'SmartServerRepositoryTarball')
583
request_handlers.register_lazy(
2018.5.37 by Andrew Bennetts
Make sure all the request handlers in bzrlib/smart/vfs.py have consistent names.
584
    'rmdir', 'bzrlib.smart.vfs', 'RmdirRequest')
585
request_handlers.register_lazy(
586
    'stat', 'bzrlib.smart.vfs', 'StatRequest')
2018.5.26 by Andrew Bennetts
Extract a simple SmartClient class from RemoteTransport, and a hack to avoid VFS operations when probing for a bzrdir over a smart transport.
587
request_handlers.register_lazy(
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
588
    'Transport.is_readonly', 'bzrlib.smart.request', 'SmartServerIsReadonly')