13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""Server for smart-server protocol."""
25
from bzrlib.hooks import HookPoint, Hooks
23
from bzrlib.smart import medium
26
24
from bzrlib import (
31
from bzrlib.lazy_import import lazy_import
32
lazy_import(globals(), """
33
from bzrlib.smart import medium
34
from bzrlib.transport import (
45
31
class SmartTCPServer(object):
46
32
"""Listens on a TCP socket and accepts connections from smart clients.
48
34
Each connection will be served by a SmartServerSocketStreamMedium running in
51
hooks: An instance of SmartServerHooks.
54
def __init__(self, backing_transport, host='127.0.0.1', port=0,
55
root_client_path='/'):
38
def __init__(self, backing_transport, host='127.0.0.1', port=0):
56
39
"""Construct a new server.
58
41
To actually start it running, call either start_background_thread or
61
:param backing_transport: The transport to serve.
62
44
:param host: Name of the interface to listen on.
63
45
:param port: TCP port to listen on, or 0 to allocate a transient port.
64
:param root_client_path: The client path that will correspond to root
47
self._server_socket = socket.socket()
48
self._server_socket.bind((host, port))
49
self.port = self._server_socket.getsockname()[1]
50
self._server_socket.listen(1)
51
self._server_socket.settimeout(1)
52
self.backing_transport = backing_transport
67
55
# let connections timeout so that we get a chance to terminate
68
56
# Keep a reference to the exceptions we want to catch because the socket
69
57
# module's globals get set to None during interpreter shutdown.
70
58
from socket import timeout as socket_timeout
71
59
from socket import error as socket_error
72
self._socket_error = socket_error
73
self._socket_timeout = socket_timeout
74
addrs = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
75
socket.SOCK_STREAM, 0, socket.AI_PASSIVE)[0]
77
(family, socktype, proto, canonname, sockaddr) = addrs
79
self._server_socket = socket.socket(family, socktype, proto)
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)
85
self._server_socket.bind(sockaddr)
86
except self._socket_error, message:
87
raise errors.CannotBindAddress(host, port, message)
88
self._sockname = self._server_socket.getsockname()
89
self.port = self._sockname[1]
90
self._server_socket.listen(1)
91
self._server_socket.settimeout(1)
92
self.backing_transport = backing_transport
93
self._started = threading.Event()
94
self._stopped = threading.Event()
95
self.root_client_path = root_client_path
97
def serve(self, thread_name_suffix=''):
98
60
self._should_terminate = False
99
# for hooks we are letting code know that a server has started (and
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
111
# * commits the server does itself need to be mapped across to this
113
# 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
116
backing_urls = [self.backing_transport.base]
118
backing_urls.append(self.backing_transport.external_url())
119
except errors.InProcessTransport:
121
for hook in SmartTCPServer.hooks['server_started']:
122
hook(backing_urls, self.get_url())
123
for hook in SmartTCPServer.hooks['server_started_ex']:
124
hook(backing_urls, self)
128
while not self._should_terminate:
130
conn, client_addr = self._server_socket.accept()
131
except self._socket_timeout:
132
# just check if we're asked to stop
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
138
if e.args[0] != errno.EBADF:
139
trace.warning("listening socket error: %s", e)
141
if self._should_terminate:
143
self.serve_conn(conn, thread_name_suffix)
144
except KeyboardInterrupt:
145
# dont log when CTRL-C'd.
148
trace.report_exception(sys.exc_info(), sys.stderr)
153
# ensure the server socket is closed.
154
self._server_socket.close()
155
except self._socket_error:
156
# ignore errors on close
158
for hook in SmartTCPServer.hooks['server_stopped']:
159
hook(backing_urls, self.get_url())
61
while not self._should_terminate:
63
self.accept_and_serve()
64
except socket_timeout:
65
# just check if we're asked to stop
67
except socket_error, e:
68
trace.warning("client disconnected: %s", e)
161
71
def get_url(self):
162
72
"""Return the url of the server"""
163
return "bzr://%s:%d/" % self._sockname
73
return "bzr://%s:%d/" % self._server_socket.getsockname()
165
def serve_conn(self, conn, thread_name_suffix):
75
def accept_and_serve(self):
76
conn, client_addr = self._server_socket.accept()
166
77
# For WIN32, where the timeout value from the listening socket
167
# propagates to the newly accepted socket.
78
# propogates to the newly accepted socket.
168
79
conn.setblocking(True)
169
80
conn.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
170
handler = medium.SmartServerSocketStreamMedium(
171
conn, self.backing_transport, self.root_client_path)
172
thread_name = 'smart-server-child' + thread_name_suffix
81
handler = medium.SmartServerSocketStreamMedium(conn, self.backing_transport)
173
82
connection_thread = threading.Thread(
174
None, handler.serve, name=thread_name)
83
None, handler.serve, name='smart-server-child')
175
84
connection_thread.setDaemon(True)
176
85
connection_thread.start()
178
def start_background_thread(self, thread_name_suffix=''):
179
self._started.clear()
87
def start_background_thread(self):
180
88
self._server_thread = threading.Thread(None,
181
self.serve, args=(thread_name_suffix,),
182
90
name='server-' + self.get_url())
183
91
self._server_thread.setDaemon(True)
184
92
self._server_thread.start()
187
94
def stop_background_thread(self):
188
self._stopped.clear()
189
# tell the main loop to quit on the next iteration.
190
95
self._should_terminate = True
191
# close the socket - gives error to connections from here on in,
192
# rather than a connection reset error to connections made during
193
# the period between setting _should_terminate = True and
194
# the current request completing/aborting. It may also break out the
195
# main loop if it was currently in accept() (on some platforms).
197
self._server_socket.close()
198
except self._socket_error:
199
# ignore errors on close
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.
210
self._server_thread.join()
213
class SmartServerHooks(Hooks):
214
"""Hooks for the smart server."""
217
"""Create the default hooks.
219
These are all empty initially, because by default nothing should get
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))
229
self.create_hook(HookPoint('server_started_ex',
230
"Called by the bzr server when it starts serving a directory. "
231
"server_started is called with (backing_urls, server_obj).",
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))
238
SmartTCPServer.hooks = SmartServerHooks()
241
def _local_path_for_transport(transport):
242
"""Return a local path for transport, if reasonably possible.
244
This function works even if transport's url has a "readonly+" prefix,
245
unlike local_path_from_url.
247
This essentially recovers the --directory argument the user passed to "bzr
248
serve" from the transport passed to serve_bzr.
251
base_url = transport.external_url()
252
except (errors.InProcessTransport, NotImplementedError):
255
# Strip readonly prefix
256
if base_url.startswith('readonly+'):
257
base_url = base_url[len('readonly+'):]
259
return urlutils.local_path_from_url(base_url)
260
except errors.InvalidURL:
264
class BzrServerFactory(object):
265
"""Helper class for serve_bzr."""
267
def __init__(self, userdir_expander=None, get_base_path=None):
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
274
if get_base_path is None:
275
get_base_path = _local_path_for_transport
276
self.get_base_path = get_base_path
278
def _expand_userdirs(self, path):
279
"""Translate /~/ or /~user/ to e.g. /home/foo, using
280
self.userdir_expander (os.path.expanduser by default).
282
If the translated path would fall outside base_path, or the path does
283
not start with ~, then no translation is applied.
285
If the path is inside, it is adjusted to be relative to the base path.
287
e.g. if base_path is /home, and the expanded path is /home/joe, then
288
the translated path is joe.
291
if path.startswith('~'):
292
expanded = self.userdir_expander(path)
293
if not expanded.endswith('/'):
295
if expanded.startswith(self.base_path):
296
result = expanded[len(self.base_path):]
299
def _make_expand_userdirs_filter(self, transport):
300
return pathfilter.PathFilteringServer(transport, self._expand_userdirs)
302
def _make_backing_transport(self, transport):
303
"""Chroot transport, and decorate with userdir expander."""
304
self.base_path = self.get_base_path(transport)
305
chroot_server = chroot.ChrootServer(transport)
306
chroot_server.start_server()
307
self.cleanups.append(chroot_server.stop_server)
308
transport = get_transport(chroot_server.get_url())
309
if self.base_path is not None:
310
# Decorate the server's backing transport with a filter that can
312
expand_userdirs = self._make_expand_userdirs_filter(transport)
313
expand_userdirs.start_server()
314
self.cleanups.append(expand_userdirs.stop_server)
315
transport = get_transport(expand_userdirs.get_url())
316
self.transport = transport
318
def _make_smart_server(self, host, port, inet):
320
smart_server = medium.SmartServerPipeStreamMedium(
321
sys.stdin, sys.stdout, self.transport)
324
host = medium.BZR_DEFAULT_INTERFACE
326
port = medium.BZR_DEFAULT_PORT
327
smart_server = SmartTCPServer(self.transport, host=host, port=port)
328
trace.note('listening on port: %s' % smart_server.port)
329
self.smart_server = smart_server
331
def _change_globals(self):
332
from bzrlib import lockdir, ui
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
342
self.cleanups.append(restore_default_ui_factory_and_lockdir_timeout)
343
ui.ui_factory = ui.SilentUIFactory()
344
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
346
def set_up(self, transport, host, port, inet):
347
self._make_backing_transport(transport)
348
self._make_smart_server(host, port, inet)
349
self._change_globals()
352
for cleanup in reversed(self.cleanups):
356
def serve_bzr(transport, host=None, port=None, inet=False):
357
"""This is the default implementation of 'bzr serve'.
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
363
bzr_server = BzrServerFactory()
365
bzr_server.set_up(transport, host, port, inet)
366
bzr_server.smart_server.serve()
368
bzr_server.tear_down()
96
# self._server_socket.close()
97
# we used to join the thread, but it's not really necessary; it will
99
## self._server_thread.join()
103
def SmartTCPServer_for_testing():
104
"""Get a readwrite server for testing."""
105
return ReadWriteLocalSmartTCPServer(
106
transport.get_transport(urlutils.local_path_to_url('/')))
109
def ReadonlySmartTCPServer_for_testing():
110
"""Get a readonly server for testing."""
111
return ReadWriteLocalSmartTCPServer(
112
transport.get_transport('readonly+' + urlutils.local_path_to_url('/')))
115
class ReadWriteLocalSmartTCPServer(SmartTCPServer):
116
"""Server suitable for use by transport tests.
118
This server has a _homedir of the current cwd.
121
def __init__(self, transport):
122
self._homedir = urlutils.local_path_to_url(os.getcwd())[7:]
123
# The server is set up by default like for ssh access: the client
124
# passes filesystem-absolute paths; therefore the server must look
125
# them up relative to the root directory. it might be better to act
126
# a public server and have the server rewrite paths into the test
128
SmartTCPServer.__init__(self, transport)
131
"""Set up server for testing"""
132
self.start_background_thread()
135
self.stop_background_thread()
138
"""Return the url of the server"""
139
host, port = self._server_socket.getsockname()
140
return "bzr://%s:%d%s" % (host, port, urlutils.escape(self._homedir))
142
def get_bogus_url(self):
143
"""Return a URL which will fail to connect"""
144
return 'bzr://127.0.0.1:1/'
added
removed
bzrlib/smart/server.py
