bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
4763.2.4
by John Arbash Meinel
 merge bzr.2.1 in preparation for NEWS entry.  | 
1  | 
# Copyright (C) 2006-2010 Canonical Ltd
 | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
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.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
16  | 
|
| 
2018.5.19
by Andrew Bennetts
 Add docstrings to all the new modules, and a few other places.  | 
17  | 
"""Server for smart-server protocol."""
 | 
18  | 
||
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
19  | 
import errno  | 
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
20  | 
import os.path  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
21  | 
import socket  | 
| 
3374.1.1
by Martin Pool
 Set SO_REUSEADDR on server sockets (#164288)  | 
22  | 
import sys  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
23  | 
import threading  | 
24  | 
||
| 
4119.3.2
by Robert Collins
 Migrate existing hooks over to the new HookPoint infrastructure.  | 
25  | 
from bzrlib.hooks import HookPoint, Hooks  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
26  | 
from bzrlib import (  | 
| 
2634.1.1
by Robert Collins
 (robertc) Reinstate the accidentally backed out external_url patch.  | 
27  | 
errors,  | 
| 
2018.5.15
by Andrew Bennetts
 Tidy some imports, and bugs introduced when adding server.py  | 
28  | 
trace,  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
29  | 
transport,  | 
30  | 
)
 | 
|
| 
3224.5.5
by Andrew Bennetts
 Don't import bzrlib.smart.medium from bzrlib.smart.server until it's needed. This helps the bzr-dbus plugin import faster.  | 
31  | 
from bzrlib.lazy_import import lazy_import  | 
32  | 
lazy_import(globals(), """  | 
|
33  | 
from bzrlib.smart import medium
 | 
|
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
34  | 
from bzrlib.transport import (
 | 
35  | 
    chroot,
 | 
|
36  | 
    get_transport,
 | 
|
37  | 
    pathfilter,
 | 
|
38  | 
    )
 | 
|
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
39  | 
from bzrlib import (
 | 
40  | 
    urlutils,
 | 
|
41  | 
    )
 | 
|
| 
3224.5.5
by Andrew Bennetts
 Don't import bzrlib.smart.medium from bzrlib.smart.server until it's needed. This helps the bzr-dbus plugin import faster.  | 
42  | 
""")  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
43  | 
|
44  | 
||
45  | 
class SmartTCPServer(object):  | 
|
46  | 
"""Listens on a TCP socket and accepts connections from smart clients.  | 
|
| 
2018.5.139
by Andrew Bennetts
 Merge from bzr.dev, resolving conflicts.  | 
47  | 
|
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
48  | 
    Each connection will be served by a SmartServerSocketStreamMedium running in
 | 
| 
2018.5.139
by Andrew Bennetts
 Merge from bzr.dev, resolving conflicts.  | 
49  | 
    a thread.
 | 
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
50  | 
|
51  | 
    hooks: An instance of SmartServerHooks.
 | 
|
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
52  | 
    """
 | 
53  | 
||
| 
2692.1.14
by Andrew Bennetts
 All WSGI tests passing, and manual testing works too.  | 
54  | 
def __init__(self, backing_transport, host='127.0.0.1', port=0,  | 
55  | 
root_client_path='/'):  | 
|
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
56  | 
"""Construct a new server.  | 
57  | 
||
58  | 
        To actually start it running, call either start_background_thread or
 | 
|
59  | 
        serve.
 | 
|
60  | 
||
| 
2692.1.14
by Andrew Bennetts
 All WSGI tests passing, and manual testing works too.  | 
61  | 
        :param backing_transport: The transport to serve.
 | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
62  | 
        :param host: Name of the interface to listen on.
 | 
63  | 
        :param port: TCP port to listen on, or 0 to allocate a transient port.
 | 
|
| 
2692.1.14
by Andrew Bennetts
 All WSGI tests passing, and manual testing works too.  | 
64  | 
        :param root_client_path: The client path that will correspond to root
 | 
65  | 
            of backing_transport.
 | 
|
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
66  | 
        """
 | 
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
67  | 
        # let connections timeout so that we get a chance to terminate
 | 
68  | 
        # Keep a reference to the exceptions we want to catch because the socket
 | 
|
69  | 
        # module's globals get set to None during interpreter shutdown.
 | 
|
70  | 
from socket import timeout as socket_timeout  | 
|
71  | 
from socket import error as socket_error  | 
|
72  | 
self._socket_error = socket_error  | 
|
73  | 
self._socket_timeout = socket_timeout  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
74  | 
addrs = socket.getaddrinfo(host, port, socket.AF_UNSPEC,  | 
| 
3711.2.2
by Jelmer Vernooij
 Avoid using AI_ADDRCONFIG since it's not portable.  | 
75  | 
socket.SOCK_STREAM, 0, socket.AI_PASSIVE)[0]  | 
| 
3665.4.1
by Jelmer Vernooij
 Support IPv6 in the smart server.  | 
76  | 
|
77  | 
(family, socktype, proto, canonname, sockaddr) = addrs  | 
|
78  | 
||
79  | 
self._server_socket = socket.socket(family, socktype, proto)  | 
|
| 
3374.1.1
by Martin Pool
 Set SO_REUSEADDR on server sockets (#164288)  | 
80  | 
        # SO_REUSERADDR has a different meaning on Windows
 | 
81  | 
if sys.platform != 'win32':  | 
|
82  | 
self._server_socket.setsockopt(socket.SOL_SOCKET,  | 
|
83  | 
socket.SO_REUSEADDR, 1)  | 
|
| 
3365.1.1
by Andrea Corbellini
 Handle errors raised by socket.bind() (bug 200575)  | 
84  | 
try:  | 
| 
3665.4.1
by Jelmer Vernooij
 Support IPv6 in the smart server.  | 
85  | 
self._server_socket.bind(sockaddr)  | 
| 
3365.1.1
by Andrea Corbellini
 Handle errors raised by socket.bind() (bug 200575)  | 
86  | 
except self._socket_error, message:  | 
87  | 
raise errors.CannotBindAddress(host, port, message)  | 
|
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
88  | 
self._sockname = self._server_socket.getsockname()  | 
89  | 
self.port = self._sockname[1]  | 
|
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
90  | 
self._server_socket.listen(1)  | 
91  | 
self._server_socket.settimeout(1)  | 
|
92  | 
self.backing_transport = backing_transport  | 
|
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
93  | 
self._started = threading.Event()  | 
94  | 
self._stopped = threading.Event()  | 
|
| 
2692.1.14
by Andrew Bennetts
 All WSGI tests passing, and manual testing works too.  | 
95  | 
self.root_client_path = root_client_path  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
96  | 
|
| 
3245.4.28
by Andrew Bennetts
 Remove another XXX, and include test ID in smart server thread names.  | 
97  | 
def serve(self, thread_name_suffix=''):  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
98  | 
self._should_terminate = False  | 
| 
2634.1.1
by Robert Collins
 (robertc) Reinstate the accidentally backed out external_url patch.  | 
99  | 
        # for hooks we are letting code know that a server has started (and
 | 
100  | 
        # later stopped).
 | 
|
101  | 
        # There are three interesting urls:
 | 
|
102  | 
        # The URL the server can be contacted on. (e.g. bzr://host/)
 | 
|
103  | 
        # The URL that a commit done on the same machine as the server will
 | 
|
104  | 
        # have within the servers space. (e.g. file:///home/user/source)
 | 
|
105  | 
        # The URL that will be given to other hooks in the same process -
 | 
|
106  | 
        # the URL of the backing transport itself. (e.g. chroot+:///)
 | 
|
107  | 
        # We need all three because:
 | 
|
108  | 
        #  * other machines see the first
 | 
|
109  | 
        #  * local commits on this machine should be able to be mapped to
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
110  | 
        #    this server
 | 
| 
2634.1.1
by Robert Collins
 (robertc) Reinstate the accidentally backed out external_url patch.  | 
111  | 
        #  * commits the server does itself need to be mapped across to this
 | 
112  | 
        #    server.
 | 
|
113  | 
        # The latter two urls are different aliases to the servers url,
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
114  | 
        # so we group those in a list - as there might be more aliases
 | 
| 
2634.1.1
by Robert Collins
 (robertc) Reinstate the accidentally backed out external_url patch.  | 
115  | 
        # in the future.
 | 
116  | 
backing_urls = [self.backing_transport.base]  | 
|
117  | 
try:  | 
|
118  | 
backing_urls.append(self.backing_transport.external_url())  | 
|
119  | 
except errors.InProcessTransport:  | 
|
120  | 
            pass
 | 
|
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
121  | 
for hook in SmartTCPServer.hooks['server_started']:  | 
| 
2634.1.1
by Robert Collins
 (robertc) Reinstate the accidentally backed out external_url patch.  | 
122  | 
hook(backing_urls, self.get_url())  | 
| 
4544.1.2
by Andrew Bennetts
 Add test that would catch the lack of ChrootServer in cmd_serve.  | 
123  | 
for hook in SmartTCPServer.hooks['server_started_ex']:  | 
| 
4544.1.3
by Andrew Bennetts
 Pass backing_urls to the new server_started_ex hook.  | 
124  | 
hook(backing_urls, self)  | 
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
125  | 
self._started.set()  | 
126  | 
try:  | 
|
127  | 
try:  | 
|
128  | 
while not self._should_terminate:  | 
|
129  | 
try:  | 
|
130  | 
conn, client_addr = self._server_socket.accept()  | 
|
131  | 
except self._socket_timeout:  | 
|
132  | 
                        # just check if we're asked to stop
 | 
|
133  | 
                        pass
 | 
|
134  | 
except self._socket_error, e:  | 
|
135  | 
                        # if the socket is closed by stop_background_thread
 | 
|
136  | 
                        # we might get a EBADF here, any other socket errors
 | 
|
137  | 
                        # should get logged.
 | 
|
138  | 
if e.args[0] != errno.EBADF:  | 
|
139  | 
trace.warning("listening socket error: %s", e)  | 
|
140  | 
else:  | 
|
| 
5011.3.10
by Andrew Bennetts
 Try a bit harder to stop a SmartTCPServer sooner when _should_terminate has been set.  | 
141  | 
if self._should_terminate:  | 
142  | 
                            break
 | 
|
| 
3245.4.28
by Andrew Bennetts
 Remove another XXX, and include test ID in smart server thread names.  | 
143  | 
self.serve_conn(conn, thread_name_suffix)  | 
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
144  | 
except KeyboardInterrupt:  | 
145  | 
                # dont log when CTRL-C'd.
 | 
|
146  | 
                raise
 | 
|
147  | 
except Exception, e:  | 
|
| 
4695.5.5
by Martin Pool
 Unhandled smart-server exceptions are reported using generic report_exception  | 
148  | 
trace.report_exception(sys.exc_info(), sys.stderr)  | 
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
149  | 
                raise
 | 
150  | 
finally:  | 
|
151  | 
self._stopped.set()  | 
|
152  | 
try:  | 
|
153  | 
                # ensure the server socket is closed.
 | 
|
154  | 
self._server_socket.close()  | 
|
155  | 
except self._socket_error:  | 
|
156  | 
                # ignore errors on close
 | 
|
157  | 
                pass
 | 
|
158  | 
for hook in SmartTCPServer.hooks['server_stopped']:  | 
|
| 
2634.1.1
by Robert Collins
 (robertc) Reinstate the accidentally backed out external_url patch.  | 
159  | 
hook(backing_urls, self.get_url())  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
160  | 
|
161  | 
def get_url(self):  | 
|
162  | 
"""Return the url of the server"""  | 
|
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
163  | 
return "bzr://%s:%d/" % self._sockname  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
164  | 
|
| 
3245.4.28
by Andrew Bennetts
 Remove another XXX, and include test ID in smart server thread names.  | 
165  | 
def serve_conn(self, conn, thread_name_suffix):  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
166  | 
        # For WIN32, where the timeout value from the listening socket
 | 
| 
4031.3.1
by Frank Aspell
 Fixing various typos  | 
167  | 
        # propagates to the newly accepted socket.
 | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
168  | 
conn.setblocking(True)  | 
169  | 
conn.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)  | 
|
| 
3224.5.5
by Andrew Bennetts
 Don't import bzrlib.smart.medium from bzrlib.smart.server until it's needed. This helps the bzr-dbus plugin import faster.  | 
170  | 
handler = medium.SmartServerSocketStreamMedium(  | 
| 
2692.1.11
by Andrew Bennetts
 Improve test coverage by making SmartTCPServer_for_testing by default create a server that does not serve the backing transport's root at its own root. This mirrors the way most HTTP smart servers are configured.  | 
171  | 
conn, self.backing_transport, self.root_client_path)  | 
| 
3245.4.28
by Andrew Bennetts
 Remove another XXX, and include test ID in smart server thread names.  | 
172  | 
thread_name = 'smart-server-child' + thread_name_suffix  | 
173  | 
connection_thread = threading.Thread(  | 
|
174  | 
None, handler.serve, name=thread_name)  | 
|
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
175  | 
connection_thread.setDaemon(True)  | 
176  | 
connection_thread.start()  | 
|
177  | 
||
| 
3245.4.28
by Andrew Bennetts
 Remove another XXX, and include test ID in smart server thread names.  | 
178  | 
def start_background_thread(self, thread_name_suffix=''):  | 
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
179  | 
self._started.clear()  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
180  | 
self._server_thread = threading.Thread(None,  | 
| 
3245.4.28
by Andrew Bennetts
 Remove another XXX, and include test ID in smart server thread names.  | 
181  | 
self.serve, args=(thread_name_suffix,),  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
182  | 
name='server-' + self.get_url())  | 
183  | 
self._server_thread.setDaemon(True)  | 
|
184  | 
self._server_thread.start()  | 
|
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
185  | 
self._started.wait()  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
186  | 
|
187  | 
def stop_background_thread(self):  | 
|
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
188  | 
self._stopped.clear()  | 
189  | 
        # tell the main loop to quit on the next iteration.
 | 
|
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
190  | 
self._should_terminate = True  | 
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
191  | 
        # close the socket - gives error to connections from here on in,
 | 
192  | 
        # rather than a connection reset error to connections made during
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
193  | 
        # the period between setting _should_terminate = True and
 | 
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
194  | 
        # the current request completing/aborting. It may also break out the
 | 
195  | 
        # main loop if it was currently in accept() (on some platforms).
 | 
|
196  | 
try:  | 
|
197  | 
self._server_socket.close()  | 
|
198  | 
except self._socket_error:  | 
|
199  | 
            # ignore errors on close
 | 
|
200  | 
            pass
 | 
|
201  | 
if not self._stopped.isSet():  | 
|
202  | 
            # server has not stopped (though it may be stopping)
 | 
|
203  | 
            # its likely in accept(), so give it a connection
 | 
|
204  | 
temp_socket = socket.socket()  | 
|
205  | 
temp_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)  | 
|
206  | 
if not temp_socket.connect_ex(self._sockname):  | 
|
207  | 
                # and close it immediately: we dont choose to send any requests.
 | 
|
208  | 
temp_socket.close()  | 
|
209  | 
self._stopped.wait()  | 
|
210  | 
self._server_thread.join()  | 
|
211  | 
||
212  | 
||
213  | 
class SmartServerHooks(Hooks):  | 
|
214  | 
"""Hooks for the smart server."""  | 
|
215  | 
||
216  | 
def __init__(self):  | 
|
217  | 
"""Create the default hooks.  | 
|
218  | 
||
219  | 
        These are all empty initially, because by default nothing should get
 | 
|
220  | 
        notified.
 | 
|
221  | 
        """
 | 
|
222  | 
Hooks.__init__(self)  | 
|
| 
4119.3.2
by Robert Collins
 Migrate existing hooks over to the new HookPoint infrastructure.  | 
223  | 
self.create_hook(HookPoint('server_started',  | 
224  | 
            "Called by the bzr server when it starts serving a directory. "
 | 
|
225  | 
            "server_started is called with (backing urls, public url), "
 | 
|
226  | 
            "where backing_url is a list of URLs giving the "
 | 
|
227  | 
            "server-specific directory locations, and public_url is the "
 | 
|
228  | 
"public URL for the directory being served.", (0, 16), None))  | 
|
| 
4544.1.2
by Andrew Bennetts
 Add test that would catch the lack of ChrootServer in cmd_serve.  | 
229  | 
self.create_hook(HookPoint('server_started_ex',  | 
230  | 
            "Called by the bzr server when it starts serving a directory. "
 | 
|
| 
4544.1.3
by Andrew Bennetts
 Pass backing_urls to the new server_started_ex hook.  | 
231  | 
"server_started is called with (backing_urls, server_obj).",  | 
232  | 
(1, 17), None))  | 
|
| 
4119.3.2
by Robert Collins
 Migrate existing hooks over to the new HookPoint infrastructure.  | 
233  | 
self.create_hook(HookPoint('server_stopped',  | 
234  | 
            "Called by the bzr server when it stops serving a directory. "
 | 
|
235  | 
            "server_stopped is called with the same parameters as the "
 | 
|
236  | 
"server_started hook: (backing_urls, public_url).", (0, 16), None))  | 
|
| 
2400.1.7
by Andrew Bennetts
 Merge from bzr.dev.  | 
237  | 
|
238  | 
SmartTCPServer.hooks = SmartServerHooks()  | 
|
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
239  | 
|
| 
2400.1.2
by Andrew Bennetts
 Move SmartTCPServer classes into bzrlib/smart/server.py  | 
240  | 
|
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
241  | 
def _local_path_for_transport(transport):  | 
242  | 
"""Return a local path for transport, if reasonably possible.  | 
|
243  | 
    
 | 
|
244  | 
    This function works even if transport's url has a "readonly+" prefix,
 | 
|
245  | 
    unlike local_path_from_url.
 | 
|
246  | 
    
 | 
|
247  | 
    This essentially recovers the --directory argument the user passed to "bzr
 | 
|
248  | 
    serve" from the transport passed to serve_bzr.
 | 
|
249  | 
    """
 | 
|
250  | 
try:  | 
|
251  | 
base_url = transport.external_url()  | 
|
252  | 
except (errors.InProcessTransport, NotImplementedError):  | 
|
253  | 
return None  | 
|
254  | 
else:  | 
|
255  | 
        # Strip readonly prefix
 | 
|
256  | 
if base_url.startswith('readonly+'):  | 
|
257  | 
base_url = base_url[len('readonly+'):]  | 
|
258  | 
try:  | 
|
259  | 
return urlutils.local_path_from_url(base_url)  | 
|
260  | 
except errors.InvalidURL:  | 
|
261  | 
return None  | 
|
262  | 
||
| 
4634.43.4
by Andrew Bennetts
 Add docstring.  | 
263  | 
|
| 
4634.43.15
by Andrew Bennetts
 Rename BzrServerMaker -> BzrServerFactory.  | 
264  | 
class BzrServerFactory(object):  | 
| 
4634.43.16
by Andrew Bennetts
 Docstring improvements.  | 
265  | 
"""Helper class for serve_bzr."""  | 
| 
4634.43.6
by Andrew Bennetts
 Refactor bzr_serve more so that it is possible to use a function other than os.path.expanduser for the userdir expansion.  | 
266  | 
|
| 
4634.43.7
by Andrew Bennetts
 Add some unit tests for parts of userdir expansion.  | 
267  | 
def __init__(self, userdir_expander=None, get_base_path=None):  | 
| 
4634.43.6
by Andrew Bennetts
 Refactor bzr_serve more so that it is possible to use a function other than os.path.expanduser for the userdir expansion.  | 
268  | 
self.cleanups = []  | 
269  | 
self.base_path = None  | 
|
270  | 
self.backing_transport = None  | 
|
271  | 
if userdir_expander is None:  | 
|
272  | 
userdir_expander = os.path.expanduser  | 
|
273  | 
self.userdir_expander = userdir_expander  | 
|
| 
4634.43.7
by Andrew Bennetts
 Add some unit tests for parts of userdir expansion.  | 
274  | 
if get_base_path is None:  | 
275  | 
get_base_path = _local_path_for_transport  | 
|
276  | 
self.get_base_path = get_base_path  | 
|
| 
4634.43.6
by Andrew Bennetts
 Refactor bzr_serve more so that it is possible to use a function other than os.path.expanduser for the userdir expansion.  | 
277  | 
|
278  | 
def _expand_userdirs(self, path):  | 
|
| 
4634.43.4
by Andrew Bennetts
 Add docstring.  | 
279  | 
"""Translate /~/ or /~user/ to e.g. /home/foo, using  | 
| 
4634.43.16
by Andrew Bennetts
 Docstring improvements.  | 
280  | 
        self.userdir_expander (os.path.expanduser by default).
 | 
| 
4634.43.4
by Andrew Bennetts
 Add docstring.  | 
281  | 
|
282  | 
        If the translated path would fall outside base_path, or the path does
 | 
|
283  | 
        not start with ~, then no translation is applied.
 | 
|
284  | 
||
285  | 
        If the path is inside, it is adjusted to be relative to the base path.
 | 
|
286  | 
||
287  | 
        e.g. if base_path is /home, and the expanded path is /home/joe, then
 | 
|
288  | 
        the translated path is joe.
 | 
|
289  | 
        """
 | 
|
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
290  | 
result = path  | 
291  | 
if path.startswith('~'):  | 
|
| 
4634.43.6
by Andrew Bennetts
 Refactor bzr_serve more so that it is possible to use a function other than os.path.expanduser for the userdir expansion.  | 
292  | 
expanded = self.userdir_expander(path)  | 
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
293  | 
if not expanded.endswith('/'):  | 
294  | 
expanded += '/'  | 
|
| 
4634.43.6
by Andrew Bennetts
 Refactor bzr_serve more so that it is possible to use a function other than os.path.expanduser for the userdir expansion.  | 
295  | 
if expanded.startswith(self.base_path):  | 
296  | 
result = expanded[len(self.base_path):]  | 
|
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
297  | 
return result  | 
| 
4634.43.6
by Andrew Bennetts
 Refactor bzr_serve more so that it is possible to use a function other than os.path.expanduser for the userdir expansion.  | 
298  | 
|
299  | 
def _make_expand_userdirs_filter(self, transport):  | 
|
300  | 
return pathfilter.PathFilteringServer(transport, self._expand_userdirs)  | 
|
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
301  | 
|
302  | 
def _make_backing_transport(self, transport):  | 
|
303  | 
"""Chroot transport, and decorate with userdir expander."""  | 
|
| 
4634.43.7
by Andrew Bennetts
 Add some unit tests for parts of userdir expansion.  | 
304  | 
self.base_path = self.get_base_path(transport)  | 
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
305  | 
chroot_server = chroot.ChrootServer(transport)  | 
| 
4934.3.3
by Martin Pool
 Rename Server.setUp to Server.start_server  | 
306  | 
chroot_server.start_server()  | 
| 
4934.3.1
by Martin Pool
 Rename Server.tearDown to .stop_server  | 
307  | 
self.cleanups.append(chroot_server.stop_server)  | 
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
308  | 
transport = get_transport(chroot_server.get_url())  | 
| 
4634.43.6
by Andrew Bennetts
 Refactor bzr_serve more so that it is possible to use a function other than os.path.expanduser for the userdir expansion.  | 
309  | 
if self.base_path is not None:  | 
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
310  | 
            # Decorate the server's backing transport with a filter that can
 | 
311  | 
            # expand homedirs.
 | 
|
| 
4634.43.6
by Andrew Bennetts
 Refactor bzr_serve more so that it is possible to use a function other than os.path.expanduser for the userdir expansion.  | 
312  | 
expand_userdirs = self._make_expand_userdirs_filter(transport)  | 
| 
4934.3.3
by Martin Pool
 Rename Server.setUp to Server.start_server  | 
313  | 
expand_userdirs.start_server()  | 
| 
4934.3.1
by Martin Pool
 Rename Server.tearDown to .stop_server  | 
314  | 
self.cleanups.append(expand_userdirs.stop_server)  | 
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
315  | 
transport = get_transport(expand_userdirs.get_url())  | 
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
316  | 
self.transport = transport  | 
317  | 
||
318  | 
def _make_smart_server(self, host, port, inet):  | 
|
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
319  | 
if inet:  | 
320  | 
smart_server = medium.SmartServerPipeStreamMedium(  | 
|
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
321  | 
sys.stdin, sys.stdout, self.transport)  | 
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
322  | 
else:  | 
323  | 
if host is None:  | 
|
324  | 
host = medium.BZR_DEFAULT_INTERFACE  | 
|
325  | 
if port is None:  | 
|
326  | 
port = medium.BZR_DEFAULT_PORT  | 
|
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
327  | 
smart_server = SmartTCPServer(self.transport, host=host, port=port)  | 
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
328  | 
trace.note('listening on port: %s' % smart_server.port)  | 
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
329  | 
self.smart_server = smart_server  | 
330  | 
||
331  | 
def _change_globals(self):  | 
|
332  | 
from bzrlib import lockdir, ui  | 
|
| 
4634.43.3
by Andrew Bennetts
 Expand /~/ and /~user/ in 'bzr serve'.  | 
333  | 
        # For the duration of this server, no UI output is permitted. note
 | 
334  | 
        # that this may cause problems with blackbox tests. This should be
 | 
|
335  | 
        # changed with care though, as we dont want to use bandwidth sending
 | 
|
336  | 
        # progress over stderr to smart server clients!
 | 
|
337  | 
old_factory = ui.ui_factory  | 
|
338  | 
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS  | 
|
339  | 
def restore_default_ui_factory_and_lockdir_timeout():  | 
|
340  | 
ui.ui_factory = old_factory  | 
|
341  | 
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout  | 
|
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
342  | 
self.cleanups.append(restore_default_ui_factory_and_lockdir_timeout)  | 
| 
4370.4.6
by Jelmer Vernooij
 Move server protocol registry to bzrlib.transport.  | 
343  | 
ui.ui_factory = ui.SilentUIFactory()  | 
344  | 
lockdir._DEFAULT_TIMEOUT_SECONDS = 0  | 
|
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
345  | 
|
| 
4634.43.19
by Andrew Bennetts
 Rename BzrServerFactory's setUp/tearDown to set_up/tear_down; this isn't a TestCase (or transport Server), so we should not use camelCase names.  | 
346  | 
def set_up(self, transport, host, port, inet):  | 
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
347  | 
self._make_backing_transport(transport)  | 
348  | 
self._make_smart_server(host, port, inet)  | 
|
349  | 
self._change_globals()  | 
|
350  | 
||
| 
4634.43.19
by Andrew Bennetts
 Rename BzrServerFactory's setUp/tearDown to set_up/tear_down; this isn't a TestCase (or transport Server), so we should not use camelCase names.  | 
351  | 
def tear_down(self):  | 
| 
4634.43.9
by Andrew Bennetts
 Add BzrServerMaker.tearDown, and call it from tests.  | 
352  | 
for cleanup in reversed(self.cleanups):  | 
353  | 
cleanup()  | 
|
354  | 
||
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
355  | 
|
356  | 
def serve_bzr(transport, host=None, port=None, inet=False):  | 
|
| 
4634.43.16
by Andrew Bennetts
 Docstring improvements.  | 
357  | 
"""This is the default implementation of 'bzr serve'.  | 
358  | 
    
 | 
|
359  | 
    It creates a TCP or pipe smart server on 'transport, and runs it.  The
 | 
|
360  | 
    transport will be decorated with a chroot and pathfilter (using
 | 
|
361  | 
    os.path.expanduser).
 | 
|
362  | 
    """
 | 
|
| 
4634.43.15
by Andrew Bennetts
 Rename BzrServerMaker -> BzrServerFactory.  | 
363  | 
bzr_server = BzrServerFactory()  | 
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
364  | 
try:  | 
| 
4634.43.19
by Andrew Bennetts
 Rename BzrServerFactory's setUp/tearDown to set_up/tear_down; this isn't a TestCase (or transport Server), so we should not use camelCase names.  | 
365  | 
bzr_server.set_up(transport, host, port, inet)  | 
| 
4634.43.5
by Andrew Bennetts
 Refactor bzr_serve so that building the backing_transport, constructing the server object, and actually starting the server are separate functions/methods.  | 
366  | 
bzr_server.smart_server.serve()  | 
| 
4370.4.6
by Jelmer Vernooij
 Move server protocol registry to bzrlib.transport.  | 
367  | 
finally:  | 
| 
4634.43.19
by Andrew Bennetts
 Rename BzrServerFactory's setUp/tearDown to set_up/tear_down; this isn't a TestCase (or transport Server), so we should not use camelCase names.  | 
368  | 
bzr_server.tear_down()  | 
| 
4370.4.6
by Jelmer Vernooij
 Move server protocol registry to bzrlib.transport.  | 
369  |