3374.1.1
by Martin Pool
Set SO_REUSEADDR on server sockets (#164288) |
1 |
# Copyright (C) 2006, 2007, 2008 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: |
|
3245.4.28
by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names. |
141 |
self.serve_conn(conn, thread_name_suffix) |
2400.1.7
by Andrew Bennetts
Merge from bzr.dev. |
142 |
except KeyboardInterrupt: |
143 |
# dont log when CTRL-C'd.
|
|
144 |
raise
|
|
145 |
except Exception, e: |
|
4695.5.5
by Martin Pool
Unhandled smart-server exceptions are reported using generic report_exception |
146 |
trace.report_exception(sys.exc_info(), sys.stderr) |
2400.1.7
by Andrew Bennetts
Merge from bzr.dev. |
147 |
raise
|
148 |
finally: |
|
149 |
self._stopped.set() |
|
150 |
try: |
|
151 |
# ensure the server socket is closed.
|
|
152 |
self._server_socket.close() |
|
153 |
except self._socket_error: |
|
154 |
# ignore errors on close
|
|
155 |
pass
|
|
156 |
for hook in SmartTCPServer.hooks['server_stopped']: |
|
2634.1.1
by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch. |
157 |
hook(backing_urls, self.get_url()) |
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
158 |
|
159 |
def get_url(self): |
|
160 |
"""Return the url of the server"""
|
|
2400.1.7
by Andrew Bennetts
Merge from bzr.dev. |
161 |
return "bzr://%s:%d/" % self._sockname |
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
162 |
|
3245.4.28
by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names. |
163 |
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. |
164 |
# For WIN32, where the timeout value from the listening socket
|
4031.3.1
by Frank Aspell
Fixing various typos |
165 |
# propagates to the newly accepted socket.
|
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
166 |
conn.setblocking(True) |
167 |
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. |
168 |
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. |
169 |
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. |
170 |
thread_name = 'smart-server-child' + thread_name_suffix |
171 |
connection_thread = threading.Thread( |
|
172 |
None, handler.serve, name=thread_name) |
|
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
173 |
connection_thread.setDaemon(True) |
174 |
connection_thread.start() |
|
175 |
||
3245.4.28
by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names. |
176 |
def start_background_thread(self, thread_name_suffix=''): |
2400.1.7
by Andrew Bennetts
Merge from bzr.dev. |
177 |
self._started.clear() |
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
178 |
self._server_thread = threading.Thread(None, |
3245.4.28
by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names. |
179 |
self.serve, args=(thread_name_suffix,), |
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
180 |
name='server-' + self.get_url()) |
181 |
self._server_thread.setDaemon(True) |
|
182 |
self._server_thread.start() |
|
2400.1.7
by Andrew Bennetts
Merge from bzr.dev. |
183 |
self._started.wait() |
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
184 |
|
185 |
def stop_background_thread(self): |
|
2400.1.7
by Andrew Bennetts
Merge from bzr.dev. |
186 |
self._stopped.clear() |
187 |
# 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. |
188 |
self._should_terminate = True |
2400.1.7
by Andrew Bennetts
Merge from bzr.dev. |
189 |
# close the socket - gives error to connections from here on in,
|
190 |
# rather than a connection reset error to connections made during
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
191 |
# the period between setting _should_terminate = True and
|
2400.1.7
by Andrew Bennetts
Merge from bzr.dev. |
192 |
# the current request completing/aborting. It may also break out the
|
193 |
# main loop if it was currently in accept() (on some platforms).
|
|
194 |
try: |
|
195 |
self._server_socket.close() |
|
196 |
except self._socket_error: |
|
197 |
# ignore errors on close
|
|
198 |
pass
|
|
199 |
if not self._stopped.isSet(): |
|
200 |
# server has not stopped (though it may be stopping)
|
|
201 |
# its likely in accept(), so give it a connection
|
|
202 |
temp_socket = socket.socket() |
|
203 |
temp_socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) |
|
204 |
if not temp_socket.connect_ex(self._sockname): |
|
205 |
# and close it immediately: we dont choose to send any requests.
|
|
206 |
temp_socket.close() |
|
207 |
self._stopped.wait() |
|
208 |
self._server_thread.join() |
|
209 |
||
210 |
||
211 |
class SmartServerHooks(Hooks): |
|
212 |
"""Hooks for the smart server."""
|
|
213 |
||
214 |
def __init__(self): |
|
215 |
"""Create the default hooks.
|
|
216 |
||
217 |
These are all empty initially, because by default nothing should get
|
|
218 |
notified.
|
|
219 |
"""
|
|
220 |
Hooks.__init__(self) |
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
221 |
self.create_hook(HookPoint('server_started', |
222 |
"Called by the bzr server when it starts serving a directory. "
|
|
223 |
"server_started is called with (backing urls, public url), "
|
|
224 |
"where backing_url is a list of URLs giving the "
|
|
225 |
"server-specific directory locations, and public_url is the "
|
|
226 |
"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. |
227 |
self.create_hook(HookPoint('server_started_ex', |
228 |
"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. |
229 |
"server_started is called with (backing_urls, server_obj).", |
230 |
(1, 17), None)) |
|
4119.3.2
by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure. |
231 |
self.create_hook(HookPoint('server_stopped', |
232 |
"Called by the bzr server when it stops serving a directory. "
|
|
233 |
"server_stopped is called with the same parameters as the "
|
|
234 |
"server_started hook: (backing_urls, public_url).", (0, 16), None)) |
|
2400.1.7
by Andrew Bennetts
Merge from bzr.dev. |
235 |
|
236 |
SmartTCPServer.hooks = SmartServerHooks() |
|
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
237 |
|
2400.1.2
by Andrew Bennetts
Move SmartTCPServer classes into bzrlib/smart/server.py |
238 |
|
239 |
class SmartTCPServer_for_testing(SmartTCPServer): |
|
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
240 |
"""Server suitable for use by transport tests.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
241 |
|
2400.1.2
by Andrew Bennetts
Move SmartTCPServer classes into bzrlib/smart/server.py |
242 |
This server is backed by the process's cwd.
|
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
243 |
"""
|
244 |
||
3245.4.28
by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names. |
245 |
def __init__(self, thread_name_suffix=''): |
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
246 |
SmartTCPServer.__init__(self, None) |
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. |
247 |
self.client_path_extra = None |
3245.4.28
by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names. |
248 |
self.thread_name_suffix = thread_name_suffix |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
249 |
|
2400.1.2
by Andrew Bennetts
Move SmartTCPServer classes into bzrlib/smart/server.py |
250 |
def get_backing_transport(self, backing_transport_server): |
251 |
"""Get a backing transport from a server we are decorating."""
|
|
2018.5.104
by Andrew Bennetts
Completely rework chrooted transports. |
252 |
return transport.get_transport(backing_transport_server.get_url()) |
2400.1.2
by Andrew Bennetts
Move SmartTCPServer classes into bzrlib/smart/server.py |
253 |
|
4934.3.3
by Martin Pool
Rename Server.setUp to Server.start_server |
254 |
def start_server(self, backing_transport_server=None, |
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. |
255 |
client_path_extra='/extra/'): |
256 |
"""Set up server for testing.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
257 |
|
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. |
258 |
:param backing_transport_server: backing server to use. If not
|
259 |
specified, a LocalURLServer at the current working directory will
|
|
260 |
be used.
|
|
261 |
:param client_path_extra: a path segment starting with '/' to append to
|
|
262 |
the root URL for this server. For instance, a value of '/foo/bar/'
|
|
263 |
will mean the root of the backing transport will be published at a
|
|
264 |
URL like `bzr://127.0.0.1:nnnn/foo/bar/`, rather than
|
|
265 |
`bzr://127.0.0.1:nnnn/`. Default value is `extra`, so that tests
|
|
266 |
by default will fail unless they do the necessary path translation.
|
|
267 |
"""
|
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
268 |
if not client_path_extra.startswith('/'): |
269 |
raise ValueError(client_path_extra) |
|
2018.5.104
by Andrew Bennetts
Completely rework chrooted transports. |
270 |
from bzrlib.transport.chroot import ChrootServer |
2018.5.47
by Andrew Bennetts
Make SmartTCPServer_for_Testing.setUp's backing_transport_server argument optional. |
271 |
if backing_transport_server is None: |
272 |
from bzrlib.transport.local import LocalURLServer |
|
273 |
backing_transport_server = LocalURLServer() |
|
2018.5.104
by Andrew Bennetts
Completely rework chrooted transports. |
274 |
self.chroot_server = ChrootServer( |
275 |
self.get_backing_transport(backing_transport_server)) |
|
4934.3.3
by Martin Pool
Rename Server.setUp to Server.start_server |
276 |
self.chroot_server.start_server() |
2018.5.104
by Andrew Bennetts
Completely rework chrooted transports. |
277 |
self.backing_transport = transport.get_transport( |
278 |
self.chroot_server.get_url()) |
|
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. |
279 |
self.root_client_path = self.client_path_extra = client_path_extra |
3245.4.28
by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names. |
280 |
self.start_background_thread(self.thread_name_suffix) |
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
281 |
|
4934.3.1
by Martin Pool
Rename Server.tearDown to .stop_server |
282 |
def stop_server(self): |
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
283 |
self.stop_background_thread() |
4934.3.1
by Martin Pool
Rename Server.tearDown to .stop_server |
284 |
self.chroot_server.stop_server() |
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
285 |
|
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. |
286 |
def get_url(self): |
287 |
url = super(SmartTCPServer_for_testing, self).get_url() |
|
288 |
return url[:-1] + self.client_path_extra |
|
289 |
||
2018.5.14
by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py. |
290 |
def get_bogus_url(self): |
291 |
"""Return a URL which will fail to connect"""
|
|
292 |
return 'bzr://127.0.0.1:1/' |
|
293 |
||
294 |
||
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
295 |
class ReadonlySmartTCPServer_for_testing(SmartTCPServer_for_testing): |
296 |
"""Get a readonly server for testing."""
|
|
297 |
||
298 |
def get_backing_transport(self, backing_transport_server): |
|
299 |
"""Get a backing transport from a server we are decorating."""
|
|
2018.5.104
by Andrew Bennetts
Completely rework chrooted transports. |
300 |
url = 'readonly+' + backing_transport_server.get_url() |
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
301 |
return transport.get_transport(url) |
3453.5.1
by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs. |
302 |
|
303 |
||
304 |
class SmartTCPServer_for_testing_v2_only(SmartTCPServer_for_testing): |
|
305 |
"""A variation of SmartTCPServer_for_testing that limits the client to
|
|
306 |
using RPCs in protocol v2 (i.e. bzr <= 1.5).
|
|
307 |
"""
|
|
308 |
||
309 |
def get_url(self): |
|
310 |
url = super(SmartTCPServer_for_testing_v2_only, self).get_url() |
|
311 |
url = 'bzr-v2://' + url[len('bzr://'):] |
|
312 |
return url |
|
313 |
||
314 |
||
315 |
class ReadonlySmartTCPServer_for_testing_v2_only(SmartTCPServer_for_testing_v2_only): |
|
316 |
"""Get a readonly server for testing."""
|
|
317 |
||
318 |
def get_backing_transport(self, backing_transport_server): |
|
319 |
"""Get a backing transport from a server we are decorating."""
|
|
320 |
url = 'readonly+' + backing_transport_server.get_url() |
|
321 |
return transport.get_transport(url) |
|
322 |
||
323 |
||
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
324 |
def _local_path_for_transport(transport): |
325 |
"""Return a local path for transport, if reasonably possible.
|
|
326 |
|
|
327 |
This function works even if transport's url has a "readonly+" prefix,
|
|
328 |
unlike local_path_from_url.
|
|
329 |
|
|
330 |
This essentially recovers the --directory argument the user passed to "bzr
|
|
331 |
serve" from the transport passed to serve_bzr.
|
|
332 |
"""
|
|
333 |
try: |
|
334 |
base_url = transport.external_url() |
|
335 |
except (errors.InProcessTransport, NotImplementedError): |
|
336 |
return None |
|
337 |
else: |
|
338 |
# Strip readonly prefix
|
|
339 |
if base_url.startswith('readonly+'): |
|
340 |
base_url = base_url[len('readonly+'):] |
|
341 |
try: |
|
342 |
return urlutils.local_path_from_url(base_url) |
|
343 |
except errors.InvalidURL: |
|
344 |
return None |
|
345 |
||
4634.43.4
by Andrew Bennetts
Add docstring. |
346 |
|
4634.43.15
by Andrew Bennetts
Rename BzrServerMaker -> BzrServerFactory. |
347 |
class BzrServerFactory(object): |
4634.43.16
by Andrew Bennetts
Docstring improvements. |
348 |
"""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. |
349 |
|
4634.43.7
by Andrew Bennetts
Add some unit tests for parts of userdir expansion. |
350 |
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. |
351 |
self.cleanups = [] |
352 |
self.base_path = None |
|
353 |
self.backing_transport = None |
|
354 |
if userdir_expander is None: |
|
355 |
userdir_expander = os.path.expanduser |
|
356 |
self.userdir_expander = userdir_expander |
|
4634.43.7
by Andrew Bennetts
Add some unit tests for parts of userdir expansion. |
357 |
if get_base_path is None: |
358 |
get_base_path = _local_path_for_transport |
|
359 |
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. |
360 |
|
361 |
def _expand_userdirs(self, path): |
|
4634.43.4
by Andrew Bennetts
Add docstring. |
362 |
"""Translate /~/ or /~user/ to e.g. /home/foo, using
|
4634.43.16
by Andrew Bennetts
Docstring improvements. |
363 |
self.userdir_expander (os.path.expanduser by default).
|
4634.43.4
by Andrew Bennetts
Add docstring. |
364 |
|
365 |
If the translated path would fall outside base_path, or the path does
|
|
366 |
not start with ~, then no translation is applied.
|
|
367 |
||
368 |
If the path is inside, it is adjusted to be relative to the base path.
|
|
369 |
||
370 |
e.g. if base_path is /home, and the expanded path is /home/joe, then
|
|
371 |
the translated path is joe.
|
|
372 |
"""
|
|
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
373 |
result = path |
374 |
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. |
375 |
expanded = self.userdir_expander(path) |
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
376 |
if not expanded.endswith('/'): |
377 |
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. |
378 |
if expanded.startswith(self.base_path): |
379 |
result = expanded[len(self.base_path):] |
|
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
380 |
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. |
381 |
|
382 |
def _make_expand_userdirs_filter(self, transport): |
|
383 |
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. |
384 |
|
385 |
def _make_backing_transport(self, transport): |
|
386 |
"""Chroot transport, and decorate with userdir expander."""
|
|
4634.43.7
by Andrew Bennetts
Add some unit tests for parts of userdir expansion. |
387 |
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. |
388 |
chroot_server = chroot.ChrootServer(transport) |
4934.3.3
by Martin Pool
Rename Server.setUp to Server.start_server |
389 |
chroot_server.start_server() |
4934.3.1
by Martin Pool
Rename Server.tearDown to .stop_server |
390 |
self.cleanups.append(chroot_server.stop_server) |
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
391 |
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. |
392 |
if self.base_path is not None: |
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
393 |
# Decorate the server's backing transport with a filter that can
|
394 |
# 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. |
395 |
expand_userdirs = self._make_expand_userdirs_filter(transport) |
4934.3.3
by Martin Pool
Rename Server.setUp to Server.start_server |
396 |
expand_userdirs.start_server() |
4934.3.1
by Martin Pool
Rename Server.tearDown to .stop_server |
397 |
self.cleanups.append(expand_userdirs.stop_server) |
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
398 |
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. |
399 |
self.transport = transport |
400 |
||
401 |
def _make_smart_server(self, host, port, inet): |
|
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
402 |
if inet: |
403 |
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. |
404 |
sys.stdin, sys.stdout, self.transport) |
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
405 |
else: |
406 |
if host is None: |
|
407 |
host = medium.BZR_DEFAULT_INTERFACE |
|
408 |
if port is None: |
|
409 |
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. |
410 |
smart_server = SmartTCPServer(self.transport, host=host, port=port) |
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
411 |
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. |
412 |
self.smart_server = smart_server |
413 |
||
414 |
def _change_globals(self): |
|
415 |
from bzrlib import lockdir, ui |
|
4634.43.3
by Andrew Bennetts
Expand /~/ and /~user/ in 'bzr serve'. |
416 |
# For the duration of this server, no UI output is permitted. note
|
417 |
# that this may cause problems with blackbox tests. This should be
|
|
418 |
# changed with care though, as we dont want to use bandwidth sending
|
|
419 |
# progress over stderr to smart server clients!
|
|
420 |
old_factory = ui.ui_factory |
|
421 |
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS |
|
422 |
def restore_default_ui_factory_and_lockdir_timeout(): |
|
423 |
ui.ui_factory = old_factory |
|
424 |
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. |
425 |
self.cleanups.append(restore_default_ui_factory_and_lockdir_timeout) |
4370.4.6
by Jelmer Vernooij
Move server protocol registry to bzrlib.transport. |
426 |
ui.ui_factory = ui.SilentUIFactory() |
427 |
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. |
428 |
|
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. |
429 |
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. |
430 |
self._make_backing_transport(transport) |
431 |
self._make_smart_server(host, port, inet) |
|
432 |
self._change_globals() |
|
433 |
||
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. |
434 |
def tear_down(self): |
4634.43.9
by Andrew Bennetts
Add BzrServerMaker.tearDown, and call it from tests. |
435 |
for cleanup in reversed(self.cleanups): |
436 |
cleanup() |
|
437 |
||
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. |
438 |
|
439 |
def serve_bzr(transport, host=None, port=None, inet=False): |
|
4634.43.16
by Andrew Bennetts
Docstring improvements. |
440 |
"""This is the default implementation of 'bzr serve'.
|
441 |
|
|
442 |
It creates a TCP or pipe smart server on 'transport, and runs it. The
|
|
443 |
transport will be decorated with a chroot and pathfilter (using
|
|
444 |
os.path.expanduser).
|
|
445 |
"""
|
|
4634.43.15
by Andrew Bennetts
Rename BzrServerMaker -> BzrServerFactory. |
446 |
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. |
447 |
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. |
448 |
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. |
449 |
bzr_server.smart_server.serve() |
4370.4.6
by Jelmer Vernooij
Move server protocol registry to bzrlib.transport. |
450 |
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. |
451 |
bzr_server.tear_down() |
4370.4.6
by Jelmer Vernooij
Move server protocol registry to bzrlib.transport. |
452 |