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