76
54
from socket import error as socket_error
77
55
self._socket_error = socket_error
78
56
self._socket_timeout = socket_timeout
79
addrs = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
80
socket.SOCK_STREAM, 0, socket.AI_PASSIVE)[0]
82
(family, socktype, proto, canonname, sockaddr) = addrs
84
self._server_socket = socket.socket(family, socktype, proto)
85
# SO_REUSERADDR has a different meaning on Windows
86
if sys.platform != 'win32':
87
self._server_socket.setsockopt(socket.SOL_SOCKET,
88
socket.SO_REUSEADDR, 1)
90
self._server_socket.bind(sockaddr)
91
except self._socket_error, message:
92
raise errors.CannotBindAddress(host, port, message)
57
self._server_socket = socket.socket()
58
self._server_socket.bind((host, port))
93
59
self._sockname = self._server_socket.getsockname()
94
60
self.port = self._sockname[1]
95
61
self._server_socket.listen(1)
96
62
self._server_socket.settimeout(1)
63
self.backing_transport = backing_transport
97
64
self._started = threading.Event()
98
65
self._stopped = threading.Event()
100
def _backing_urls(self):
68
self._should_terminate = False
69
# for hooks we are letting code know that a server has started (and
101
71
# There are three interesting urls:
102
72
# The URL the server can be contacted on. (e.g. bzr://host/)
103
73
# The URL that a commit done on the same machine as the server will
104
74
# have within the servers space. (e.g. file:///home/user/source)
105
75
# The URL that will be given to other hooks in the same process -
106
# the URL of the backing transport itself. (e.g. filtered-36195:///)
76
# the URL of the backing transport itself. (e.g. chroot+:///)
107
77
# We need all three because:
108
78
# * other machines see the first
109
79
# * local commits on this machine should be able to be mapped to
111
81
# * commits the server does itself need to be mapped across to this
113
83
# The latter two urls are different aliases to the servers url,
114
# so we group those in a list - as there might be more aliases
84
# so we group those in a list - as there might be more aliases
116
urls = [self.backing_transport.base]
86
backing_urls = [self.backing_transport.base]
118
urls.append(self.backing_transport.external_url())
88
backing_urls.append(self.backing_transport.external_url())
119
89
except errors.InProcessTransport:
123
def run_server_started_hooks(self, backing_urls=None):
124
if backing_urls is None:
125
backing_urls = self._backing_urls()
126
91
for hook in SmartTCPServer.hooks['server_started']:
127
92
hook(backing_urls, self.get_url())
128
for hook in SmartTCPServer.hooks['server_started_ex']:
129
hook(backing_urls, self)
131
def run_server_stopped_hooks(self, backing_urls=None):
132
if backing_urls is None:
133
backing_urls = self._backing_urls()
134
for hook in SmartTCPServer.hooks['server_stopped']:
135
hook(backing_urls, self.get_url())
137
def serve(self, thread_name_suffix=''):
138
self._should_terminate = False
139
# for hooks we are letting code know that a server has started (and
141
self.run_server_started_hooks()
142
93
self._started.set()
172
122
except self._socket_error:
173
123
# ignore errors on close
175
self.run_server_stopped_hooks()
125
for hook in SmartTCPServer.hooks['server_stopped']:
126
hook(backing_urls, self.get_url())
177
128
def get_url(self):
178
129
"""Return the url of the server"""
179
return "bzr://%s:%s/" % (self._sockname[0], self._sockname[1])
130
return "bzr://%s:%d/" % self._sockname
181
def serve_conn(self, conn, thread_name_suffix):
132
def serve_conn(self, conn):
182
133
# For WIN32, where the timeout value from the listening socket
183
# propagates to the newly accepted socket.
134
# propogates to the newly accepted socket.
184
135
conn.setblocking(True)
185
136
conn.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
186
handler = medium.SmartServerSocketStreamMedium(
187
conn, self.backing_transport, self.root_client_path)
188
thread_name = 'smart-server-child' + thread_name_suffix
189
connection_thread = threading.Thread(
190
None, handler.serve, name=thread_name)
191
# FIXME: This thread is never joined, it should at least be collected
192
# somewhere so that tests that want to check for leaked threads can get
193
# rid of them -- vila 20100531
137
handler = SmartServerSocketStreamMedium(conn, self.backing_transport)
138
connection_thread = threading.Thread(None, handler.serve, name='smart-server-child')
194
139
connection_thread.setDaemon(True)
195
140
connection_thread.start()
196
return connection_thread
198
def start_background_thread(self, thread_name_suffix=''):
142
def start_background_thread(self):
199
143
self._started.clear()
200
144
self._server_thread = threading.Thread(None,
201
self.serve, args=(thread_name_suffix,),
202
146
name='server-' + self.get_url())
203
147
self._server_thread.setDaemon(True)
204
148
self._server_thread.start()
239
183
These are all empty initially, because by default nothing should get
242
Hooks.__init__(self, "bzrlib.smart.server", "SmartTCPServer.hooks")
243
self.add_hook('server_started',
244
"Called by the bzr server when it starts serving a directory. "
245
"server_started is called with (backing urls, public url), "
246
"where backing_url is a list of URLs giving the "
247
"server-specific directory locations, and public_url is the "
248
"public URL for the directory being served.", (0, 16))
249
self.add_hook('server_started_ex',
250
"Called by the bzr server when it starts serving a directory. "
251
"server_started is called with (backing_urls, server_obj).",
253
self.add_hook('server_stopped',
254
"Called by the bzr server when it stops serving a directory. "
255
"server_stopped is called with the same parameters as the "
256
"server_started hook: (backing_urls, public_url).", (0, 16))
257
self.add_hook('server_exception',
258
"Called by the bzr server when an exception occurs. "
259
"server_exception is called with the sys.exc_info() tuple "
260
"return true for the hook if the exception has been handled, "
261
"in which case the server will exit normally.", (2, 4))
187
# Introduced in 0.16:
188
# invoked whenever the server starts serving a directory.
189
# The api signature is (backing urls, public url).
190
self['server_started'] = []
191
# Introduced in 0.16:
192
# invoked whenever the server stops serving a directory.
193
# The api signature is (backing urls, public url).
194
self['server_stopped'] = []
263
196
SmartTCPServer.hooks = SmartServerHooks()
266
def _local_path_for_transport(transport):
267
"""Return a local path for transport, if reasonably possible.
269
This function works even if transport's url has a "readonly+" prefix,
270
unlike local_path_from_url.
272
This essentially recovers the --directory argument the user passed to "bzr
273
serve" from the transport passed to serve_bzr.
276
base_url = transport.external_url()
277
except (errors.InProcessTransport, NotImplementedError):
280
# Strip readonly prefix
281
if base_url.startswith('readonly+'):
282
base_url = base_url[len('readonly+'):]
284
return urlutils.local_path_from_url(base_url)
285
except errors.InvalidURL:
289
class BzrServerFactory(object):
290
"""Helper class for serve_bzr."""
292
def __init__(self, userdir_expander=None, get_base_path=None):
294
self.base_path = None
295
self.backing_transport = None
296
if userdir_expander is None:
297
userdir_expander = os.path.expanduser
298
self.userdir_expander = userdir_expander
299
if get_base_path is None:
300
get_base_path = _local_path_for_transport
301
self.get_base_path = get_base_path
303
def _expand_userdirs(self, path):
304
"""Translate /~/ or /~user/ to e.g. /home/foo, using
305
self.userdir_expander (os.path.expanduser by default).
307
If the translated path would fall outside base_path, or the path does
308
not start with ~, then no translation is applied.
310
If the path is inside, it is adjusted to be relative to the base path.
312
e.g. if base_path is /home, and the expanded path is /home/joe, then
313
the translated path is joe.
316
if path.startswith('~'):
317
expanded = self.userdir_expander(path)
318
if not expanded.endswith('/'):
320
if expanded.startswith(self.base_path):
321
result = expanded[len(self.base_path):]
324
def _make_expand_userdirs_filter(self, transport):
325
return pathfilter.PathFilteringServer(transport, self._expand_userdirs)
327
def _make_backing_transport(self, transport):
328
"""Chroot transport, and decorate with userdir expander."""
329
self.base_path = self.get_base_path(transport)
330
chroot_server = chroot.ChrootServer(transport)
331
chroot_server.start_server()
332
self.cleanups.append(chroot_server.stop_server)
333
transport = _mod_transport.get_transport(chroot_server.get_url())
334
if self.base_path is not None:
335
# Decorate the server's backing transport with a filter that can
337
expand_userdirs = self._make_expand_userdirs_filter(transport)
338
expand_userdirs.start_server()
339
self.cleanups.append(expand_userdirs.stop_server)
340
transport = _mod_transport.get_transport(expand_userdirs.get_url())
341
self.transport = transport
343
def _make_smart_server(self, host, port, inet):
345
smart_server = medium.SmartServerPipeStreamMedium(
346
sys.stdin, sys.stdout, self.transport)
349
host = medium.BZR_DEFAULT_INTERFACE
351
port = medium.BZR_DEFAULT_PORT
352
smart_server = SmartTCPServer(self.transport)
353
smart_server.start_server(host, port)
354
trace.note('listening on port: %s' % smart_server.port)
355
self.smart_server = smart_server
357
def _change_globals(self):
358
from bzrlib import lockdir, ui
359
# For the duration of this server, no UI output is permitted. note
360
# that this may cause problems with blackbox tests. This should be
361
# changed with care though, as we dont want to use bandwidth sending
362
# progress over stderr to smart server clients!
363
old_factory = ui.ui_factory
364
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
365
def restore_default_ui_factory_and_lockdir_timeout():
366
ui.ui_factory = old_factory
367
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
368
self.cleanups.append(restore_default_ui_factory_and_lockdir_timeout)
369
ui.ui_factory = ui.SilentUIFactory()
370
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
372
def set_up(self, transport, host, port, inet):
373
self._make_backing_transport(transport)
374
self._make_smart_server(host, port, inet)
375
self._change_globals()
378
for cleanup in reversed(self.cleanups):
381
def serve_bzr(transport, host=None, port=None, inet=False):
382
"""This is the default implementation of 'bzr serve'.
384
It creates a TCP or pipe smart server on 'transport, and runs it. The
385
transport will be decorated with a chroot and pathfilter (using
388
bzr_server = BzrServerFactory()
390
bzr_server.set_up(transport, host, port, inet)
391
bzr_server.smart_server.serve()
393
hook_caught_exception = False
394
for hook in SmartTCPServer.hooks['server_exception']:
395
hook_caught_exception = hook(sys.exc_info())
396
if not hook_caught_exception:
399
bzr_server.tear_down()
199
class SmartTCPServer_for_testing(SmartTCPServer):
200
"""Server suitable for use by transport tests.
202
This server is backed by the process's cwd.
206
SmartTCPServer.__init__(self, None)
208
def get_backing_transport(self, backing_transport_server):
209
"""Get a backing transport from a server we are decorating."""
210
return transport.get_transport(backing_transport_server.get_url())
212
def setUp(self, backing_transport_server=None):
213
"""Set up server for testing"""
214
from bzrlib.transport.chroot import ChrootServer
215
if backing_transport_server is None:
216
from bzrlib.transport.local import LocalURLServer
217
backing_transport_server = LocalURLServer()
218
self.chroot_server = ChrootServer(
219
self.get_backing_transport(backing_transport_server))
220
self.chroot_server.setUp()
221
self.backing_transport = transport.get_transport(
222
self.chroot_server.get_url())
223
self.start_background_thread()
226
self.stop_background_thread()
227
self.chroot_server.tearDown()
229
def get_bogus_url(self):
230
"""Return a URL which will fail to connect"""
231
return 'bzr://127.0.0.1:1/'
234
class ReadonlySmartTCPServer_for_testing(SmartTCPServer_for_testing):
235
"""Get a readonly server for testing."""
237
def get_backing_transport(self, backing_transport_server):
238
"""Get a backing transport from a server we are decorating."""
239
url = 'readonly+' + backing_transport_server.get_url()
240
return transport.get_transport(url)
added
removed
bzrlib/smart/server.py
