/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2929.3.10 by Vincent Ladeuil
Add a fake https server and test facilities.
1
# Copyright (C) 2006, 2007 Canonical Ltd
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
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
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
16
17
import errno
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
18
import httplib
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
19
import os
2146.1.1 by Alexander Belchenko
fixes for test suite: forgotten imports in HttpServer.py
20
import posixpath
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
21
import random
22
import re
3734.2.8 by Vincent Ladeuil
Catch spurious exceptions (python-2.6) when SocketServer is shut down.
23
import select
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
24
import SimpleHTTPServer
25
import socket
3111.1.3 by Vincent Ladeuil
Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).
26
import SocketServer
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
27
import sys
28
import threading
29
import time
2146.1.1 by Alexander Belchenko
fixes for test suite: forgotten imports in HttpServer.py
30
import urllib
31
import urlparse
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
32
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
33
from bzrlib import transport
34
from bzrlib.transport import local
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
35
36
37
class BadWebserverPath(ValueError):
38
    def __str__(self):
39
        return 'path %s is not in %s' % self.args
40
41
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
42
class TestingHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
2420.1.10 by Vincent Ladeuil
Doc fixes.
43
    """Handles one request.
44
3111.1.21 by Vincent Ladeuil
Add some comments.
45
    A TestingHTTPRequestHandler is instantiated for every request received by
46
    the associated server. Note that 'request' here is inherited from the base
47
    TCPServer class, for the HTTP server it is really a connection which itself
48
    will handle one or several HTTP requests.
2420.1.10 by Vincent Ladeuil
Doc fixes.
49
    """
3111.1.24 by Vincent Ladeuil
Cleanups.
50
    # Default protocol version
51
    protocol_version = 'HTTP/1.1'
52
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
53
    # The Message-like class used to parse the request headers
54
    MessageClass = httplib.HTTPMessage
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
55
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
56
    def setup(self):
57
        SimpleHTTPServer.SimpleHTTPRequestHandler.setup(self)
3221.11.13 by Robert Collins
Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.
58
        self._cwd = self.server._home_dir
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
59
        tcs = self.server.test_case_server
60
        if tcs.protocol_version is not None:
61
            # If the test server forced a protocol version, use it
62
            self.protocol_version = tcs.protocol_version
63
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
64
    def log_message(self, format, *args):
2164.2.28 by Vincent Ladeuil
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.
65
        tcs = self.server.test_case_server
66
        tcs.log('webserver - %s - - [%s] %s "%s" "%s"',
67
                self.address_string(),
68
                self.log_date_time_string(),
69
                format % args,
3111.1.19 by Vincent Ladeuil
Merge back test_http_implementations.pc into test_http.py.
70
                self.headers.get('referer', '-'),
2164.2.28 by Vincent Ladeuil
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.
71
                self.headers.get('user-agent', '-'))
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
72
73
    def handle_one_request(self):
74
        """Handle a single HTTP request.
75
2831.6.1 by Vincent Ladeuil
Remove some more noise from test suite.
76
        We catch all socket errors occurring when the client close the
77
        connection early to avoid polluting the test results.
78
        """
79
        try:
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
80
            SimpleHTTPServer.SimpleHTTPRequestHandler.handle_one_request(self)
2831.6.1 by Vincent Ladeuil
Remove some more noise from test suite.
81
        except socket.error, e:
3111.1.24 by Vincent Ladeuil
Cleanups.
82
            # Any socket error should close the connection, but some errors are
83
            # due to the client closing early and we don't want to pollute test
3111.1.20 by Vincent Ladeuil
Make all the test pass. Looks like we are HTTP/1.1 compliant.
84
            # results, so we raise only the others.
85
            self.close_connection = 1
86
            if (len(e.args) == 0
87
                or e.args[0] not in (errno.EPIPE, errno.ECONNRESET,
88
                                     errno.ECONNABORTED, errno.EBADF)):
2831.6.1 by Vincent Ladeuil
Remove some more noise from test suite.
89
                raise
90
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
91
    _range_regexp = re.compile(r'^(?P<start>\d+)-(?P<end>\d+)$')
92
    _tail_regexp = re.compile(r'^-(?P<tail>\d+)$')
93
94
    def parse_ranges(self, ranges_header):
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
95
        """Parse the range header value and returns ranges and tail.
96
97
        RFC2616 14.35 says that syntactically invalid range
98
        specifiers MUST be ignored. In that case, we return 0 for
99
        tail and [] for ranges.
100
        """
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
101
        tail = 0
102
        ranges = []
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
103
        if not ranges_header.startswith('bytes='):
104
            # Syntactically invalid header
105
            return 0, []
106
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
107
        ranges_header = ranges_header[len('bytes='):]
108
        for range_str in ranges_header.split(','):
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
109
            # FIXME: RFC2616 says end is optional and default to file_size
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
110
            range_match = self._range_regexp.match(range_str)
111
            if range_match is not None:
2182.2.2 by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance
112
                start = int(range_match.group('start'))
113
                end = int(range_match.group('end'))
114
                if start > end:
115
                    # Syntactically invalid range
116
                    return 0, []
117
                ranges.append((start, end))
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
118
            else:
119
                tail_match = self._tail_regexp.match(range_str)
120
                if tail_match is not None:
121
                    tail = int(tail_match.group('tail'))
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
122
                else:
123
                    # Syntactically invalid range
124
                    return 0, []
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
125
        return tail, ranges
126
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
127
    def _header_line_length(self, keyword, value):
128
        header_line = '%s: %s\r\n' % (keyword, value)
129
        return len(header_line)
130
3111.1.23 by Vincent Ladeuil
Make HTTP/1.1 the default implementation reveals one more bug.
131
    def send_head(self):
132
        """Overrides base implementation to work around a bug in python2.5."""
133
        path = self.translate_path(self.path)
134
        if os.path.isdir(path) and not self.path.endswith('/'):
135
            # redirect browser - doing basically what apache does when
136
            # DirectorySlash option is On which is quite common (braindead, but
137
            # common)
138
            self.send_response(301)
139
            self.send_header("Location", self.path + "/")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
140
            # Indicates that the body is empty for HTTP/1.1 clients
3111.1.23 by Vincent Ladeuil
Make HTTP/1.1 the default implementation reveals one more bug.
141
            self.send_header('Content-Length', '0')
142
            self.end_headers()
143
            return None
144
145
        return SimpleHTTPServer.SimpleHTTPRequestHandler.send_head(self)
146
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
147
    def send_range_content(self, file, start, length):
148
        file.seek(start)
149
        self.wfile.write(file.read(length))
150
151
    def get_single_range(self, file, file_size, start, end):
152
        self.send_response(206)
153
        length = end - start + 1
154
        self.send_header('Accept-Ranges', 'bytes')
155
        self.send_header("Content-Length", "%d" % length)
156
157
        self.send_header("Content-Type", 'application/octet-stream')
158
        self.send_header("Content-Range", "bytes %d-%d/%d" % (start,
159
                                                              end,
160
                                                              file_size))
161
        self.end_headers()
162
        self.send_range_content(file, start, length)
163
164
    def get_multiple_ranges(self, file, file_size, ranges):
165
        self.send_response(206)
166
        self.send_header('Accept-Ranges', 'bytes')
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
167
        boundary = '%d' % random.randint(0,0x7FFFFFFF)
168
        self.send_header('Content-Type',
169
                         'multipart/byteranges; boundary=%s' % boundary)
170
        boundary_line = '--%s\r\n' % boundary
171
        # Calculate the Content-Length
172
        content_length = 0
173
        for (start, end) in ranges:
174
            content_length += len(boundary_line)
175
            content_length += self._header_line_length(
176
                'Content-type', 'application/octet-stream')
177
            content_length += self._header_line_length(
178
                'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))
179
            content_length += len('\r\n') # end headers
2929.3.19 by Vincent Ladeuil
Fix 1.1 related bugs in HTTP server, add HTTPS passing tests (by temporarily disabling pycurl certificate verification).
180
            content_length += end - start + 1
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
181
        content_length += len(boundary_line)
182
        self.send_header('Content-length', content_length)
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
183
        self.end_headers()
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
184
185
        # Send the multipart body
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
186
        for (start, end) in ranges:
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
187
            self.wfile.write(boundary_line)
188
            self.send_header('Content-type', 'application/octet-stream')
189
            self.send_header('Content-Range', 'bytes %d-%d/%d'
190
                             % (start, end, file_size))
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
191
            self.end_headers()
192
            self.send_range_content(file, start, end - start + 1)
3059.2.12 by Vincent Ladeuil
Spiv review feedback.
193
        # Final boundary
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
194
        self.wfile.write(boundary_line)
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
195
196
    def do_GET(self):
197
        """Serve a GET request.
198
199
        Handles the Range header.
200
        """
3052.3.2 by Vincent Ladeuil
Add tests and fix trivial bugs and other typos.
201
        # Update statistics
202
        self.server.test_case_server.GET_request_nb += 1
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
203
204
        path = self.translate_path(self.path)
205
        ranges_header_value = self.headers.get('Range')
206
        if ranges_header_value is None or os.path.isdir(path):
207
            # Let the mother class handle most cases
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
208
            return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self)
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
209
210
        try:
211
            # Always read in binary mode. Opening files in text
212
            # mode may cause newline translations, making the
213
            # actual size of the content transmitted *less* than
214
            # the content-length!
215
            file = open(path, 'rb')
216
        except IOError:
217
            self.send_error(404, "File not found")
2000.3.9 by v.ladeuil+lp at free
The tests that would have help avoid bug #73948 and all that mess :)
218
            return
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
219
220
        file_size = os.fstat(file.fileno())[6]
221
        tail, ranges = self.parse_ranges(ranges_header_value)
222
        # Normalize tail into ranges
223
        if tail != 0:
224
            ranges.append((file_size - tail, file_size))
225
2182.2.2 by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance
226
        self._satisfiable_ranges = True
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
227
        if len(ranges) == 0:
2182.2.2 by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance
228
            self._satisfiable_ranges = False
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
229
        else:
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
230
            def check_range(range_specifier):
231
                start, end = range_specifier
2182.2.2 by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance
232
                # RFC2616 14.35, ranges are invalid if start >= file_size
233
                if start >= file_size:
234
                    self._satisfiable_ranges = False # Side-effect !
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
235
                    return 0, 0
236
                # RFC2616 14.35, end values should be truncated
237
                # to file_size -1 if they exceed it
238
                end = min(end, file_size - 1)
239
                return start, end
240
241
            ranges = map(check_range, ranges)
242
2182.2.2 by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance
243
        if not self._satisfiable_ranges:
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
244
            # RFC2616 14.16 and 14.35 says that when a server
245
            # encounters unsatisfiable range specifiers, it
246
            # SHOULD return a 416.
2000.3.9 by v.ladeuil+lp at free
The tests that would have help avoid bug #73948 and all that mess :)
247
            file.close()
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
248
            # FIXME: We SHOULD send a Content-Range header too,
249
            # but the implementation of send_error does not
250
            # allows that. So far.
2000.3.9 by v.ladeuil+lp at free
The tests that would have help avoid bug #73948 and all that mess :)
251
            self.send_error(416, "Requested range not satisfiable")
252
            return
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
253
254
        if len(ranges) == 1:
255
            (start, end) = ranges[0]
256
            self.get_single_range(file, file_size, start, end)
257
        else:
258
            self.get_multiple_ranges(file, file_size, ranges)
259
        file.close()
260
2420.1.9 by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth.
261
    def translate_path(self, path):
262
        """Translate a /-separated PATH to the local filename syntax.
263
264
        If the server requires it, proxy the path before the usual translation
265
        """
266
        if self.server.test_case_server.proxy_requests:
267
            # We need to act as a proxy and accept absolute urls,
268
            # which SimpleHTTPRequestHandler (parent) is not
269
            # ready for. So we just drop the protocol://host:port
270
            # part in front of the request-url (because we know
271
            # we would not forward the request to *another*
272
            # proxy).
273
274
            # So we do what SimpleHTTPRequestHandler.translate_path
275
            # do beginning with python 2.4.3: abandon query
276
            # parameters, scheme, host port, etc (which ensure we
277
            # provide the right behaviour on all python versions).
278
            path = urlparse.urlparse(path)[2]
279
            # And now, we can apply *our* trick to proxy files
280
            path += '-proxied'
281
282
        return self._translate_path(path)
283
284
    def _translate_path(self, path):
3221.11.13 by Robert Collins
Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.
285
        """Translate a /-separated PATH to the local filename syntax.
286
3221.9.5 by Ian Clatworthy
some tweaks from abentley's earlier review feedback
287
        Note that we're translating http URLs here, not file URLs.
288
        The URL root location is the server's startup directory.
3221.11.13 by Robert Collins
Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.
289
        Components that mean special things to the local file system
290
        (e.g. drive or directory names) are ignored.  (XXX They should
291
        probably be diagnosed.)
292
293
        Override from python standard library to stop it calling os.getcwd()
294
        """
295
        # abandon query parameters
296
        path = urlparse.urlparse(path)[2]
297
        path = posixpath.normpath(urllib.unquote(path))
3221.9.4 by Ian Clatworthy
fix failing unicode_paths test
298
        path = path.decode('utf-8')
3221.11.13 by Robert Collins
Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.
299
        words = path.split('/')
300
        words = filter(None, words)
301
        path = self._cwd
3221.9.5 by Ian Clatworthy
some tweaks from abentley's earlier review feedback
302
        for num, word in enumerate(words):
303
            if num == 0:
304
                drive, word = os.path.splitdrive(word)
3221.11.13 by Robert Collins
Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.
305
            head, word = os.path.split(word)
306
            if word in (os.curdir, os.pardir): continue
307
            path = os.path.join(path, word)
308
        return path
2420.1.9 by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth.
309
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
310
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
311
class TestingHTTPServerMixin:
312
313
    def __init__(self, test_case_server):
2164.2.28 by Vincent Ladeuil
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.
314
        # test_case_server can be used to communicate between the
2164.2.29 by Vincent Ladeuil
Test the http redirection at the request level even if it's not
315
        # tests and the server (or the request handler and the
316
        # server), allowing dynamic behaviors to be defined from
317
        # the tests cases.
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
318
        self.test_case_server = test_case_server
3221.11.13 by Robert Collins
Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.
319
        self._home_dir = test_case_server._home_dir
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
320
        self.serving = False
321
        self.is_shut_down = threading.Event()
322
323
    def serve(self):
324
        self.serving = True
325
        self.is_shut_down.clear()
326
        while self.serving:
327
            try:
328
                # Really a connection but the python framework is generic and
329
                # call them requests
330
                self.handle_request()
331
            except socket.timeout:
332
                pass
333
            except (socket.error, select.error), e:
334
               if e[0] == errno.EBADF:
335
                   # Starting with python-2.6, handle_request may raise socket
336
                   # or select exceptions when the server is shut down as we
337
                   # do.
338
                   pass
339
               else:
340
                   raise
341
        # Let's close the listening socket
342
        self.server_close()
343
        self.is_shut_down.set()
344
345
    def shutdown(self):
346
        """Stops the serve() loop.
347
348
        Blocks until the loop has finished. This must be called while serve()
349
        is running in another thread, or it will deadlock.
350
        """
351
        if not self.serving:
352
            return
353
        self.serving = False
354
        # The server is listening for a last connection, let's give it:
355
        try:
356
            fake_conn = socket.create_connection(self.server_address)
357
            fake_conn.close()
358
        except socket.error, e:
359
            # But ignore connection errors as the point is to unblock the
360
            # server thread, it may happen that it's not blocked or even not
361
            # started (when something went wrong during test case setup
362
            # leading to self.setUp() *not* being called but self.tearDown()
363
            # still being called)
364
            pass
365
        self.is_shut_down.wait()
366
367
368
class TestingHTTPServer(TestingHTTPServerMixin, SocketServer.TCPServer):
3111.1.3 by Vincent Ladeuil
Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).
369
3111.1.30 by Vincent Ladeuil
Update NEWS. Some cosmetic changes.
370
    def __init__(self, server_address, request_handler_class,
371
                 test_case_server):
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
372
        TestingHTTPServerMixin.__init__(self, test_case_server)
373
        SocketServer.TCPServer.__init__(self, server_address,
374
                                        request_handler_class)
375
376
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
377
class TestingThreadingHTTPServer(TestingHTTPServerMixin,
378
                                 SocketServer.ThreadingTCPServer,
379
                                 ):
3111.1.3 by Vincent Ladeuil
Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).
380
    """A threading HTTP test server for HTTP 1.1.
381
382
    Since tests can initiate several concurrent connections to the same http
383
    server, we need an independent connection for each of them. We achieve that
384
    by spawning a new thread for each connection.
385
    """
386
3111.1.30 by Vincent Ladeuil
Update NEWS. Some cosmetic changes.
387
    def __init__(self, server_address, request_handler_class,
388
                 test_case_server):
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
389
        TestingHTTPServerMixin.__init__(self, test_case_server)
390
        SocketServer.ThreadingTCPServer.__init__(self, server_address,
391
                                                 request_handler_class)
3111.1.3 by Vincent Ladeuil
Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).
392
        # Decides how threads will act upon termination of the main
393
        # process. This is prophylactic as we should not leave the threads
394
        # lying around.
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
395
        self.daemon_threads = True
2953.2.1 by Vincent Ladeuil
Fix #158972 by not using timeout for HttpServer.
396
4512.1.2 by Vincent Ladeuil
lifeless said: try harder :)
397
    def process_request_thread(self, request, client_address):
398
        SocketServer.ThreadingTCPServer.process_request_thread(
399
            self, request, client_address)
400
        # Under some circumstances (as in bug #383920), we need to force the
401
        # shutdown as python delays it until gc occur otherwise and the client
402
        # may hang.
403
        try:
404
            # The request process has been completed, the thread is about to
405
            # die, let's shutdown the socket if we can.
406
            request.shutdown(socket.SHUT_RDWR)
407
        except (socket.error, select.error), e:
408
            if e[0] in (errno.EBADF, errno.ENOTCONN):
409
                # Right, the socket is already down
410
                pass
411
            else:
412
                raise
413
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
414
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
415
class HttpServer(transport.Server):
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
416
    """A test server for http transports.
417
418
    Subclasses can provide a specific request handler.
419
    """
420
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
421
    # The real servers depending on the protocol
422
    http_server_class = {'HTTP/1.0': TestingHTTPServer,
423
                         'HTTP/1.1': TestingThreadingHTTPServer,
424
                         }
425
2420.1.9 by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth.
426
    # Whether or not we proxy the requests (see
427
    # TestingHTTPRequestHandler.translate_path).
428
    proxy_requests = False
429
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
430
    # used to form the url that connects to this server
431
    _url_protocol = 'http'
432
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
433
    def __init__(self, request_handler=TestingHTTPRequestHandler,
434
                 protocol_version=None):
435
        """Constructor.
436
437
        :param request_handler: a class that will be instantiated to handle an
438
            http connection (one or several requests).
439
440
        :param protocol_version: if specified, will override the protocol
441
            version of the request handler.
442
        """
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
443
        transport.Server.__init__(self)
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
444
        self.request_handler = request_handler
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
445
        self.host = 'localhost'
446
        self.port = 0
447
        self._httpd = None
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
448
        self.protocol_version = protocol_version
3052.3.2 by Vincent Ladeuil
Add tests and fix trivial bugs and other typos.
449
        # Allows tests to verify number of GET requests issued
450
        self.GET_request_nb = 0
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
451
2929.3.19 by Vincent Ladeuil
Fix 1.1 related bugs in HTTP server, add HTTPS passing tests (by temporarily disabling pycurl certificate verification).
452
    def create_httpd(self, serv_cls, rhandler_cls):
453
        return serv_cls((self.host, self.port), self.request_handler, self)
2929.3.12 by Vincent Ladeuil
Implement an https server passing the same tests than http. Except
454
3734.2.8 by Vincent Ladeuil
Catch spurious exceptions (python-2.6) when SocketServer is shut down.
455
    def __repr__(self):
456
        return "%s(%s:%s)" % \
457
            (self.__class__.__name__, self.host, self.port)
458
2004.1.28 by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code
459
    def _get_httpd(self):
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
460
        if self._httpd is None:
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
461
            rhandler = self.request_handler
3111.1.21 by Vincent Ladeuil
Add some comments.
462
            # Depending on the protocol version, we will create the approriate
463
            # server
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
464
            if self.protocol_version is None:
3111.1.21 by Vincent Ladeuil
Add some comments.
465
                # Use the request handler one
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
466
                proto_vers = rhandler.protocol_version
467
            else:
3111.1.21 by Vincent Ladeuil
Add some comments.
468
                # Use our own, it will be used to override the request handler
469
                # one too.
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
470
                proto_vers = self.protocol_version
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
471
            # Create the appropriate server for the required protocol
472
            serv_cls = self.http_server_class.get(proto_vers, None)
473
            if serv_cls is None:
474
                raise httplib.UnknownProtocol(proto_vers)
475
            else:
2929.3.19 by Vincent Ladeuil
Fix 1.1 related bugs in HTTP server, add HTTPS passing tests (by temporarily disabling pycurl certificate verification).
476
                self._httpd = self.create_httpd(serv_cls, rhandler)
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
477
            # Ensure we get the right port
478
            host, self.port = self._httpd.server_address
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
479
        return self._httpd
2004.1.28 by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code
480
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
481
    def _http_start(self):
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
482
        """Server thread main entry point. """
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
483
        server = None
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
484
        try:
485
            try:
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
486
                server = self._get_httpd()
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
487
                self._http_base_url = '%s://%s:%s/' % (self._url_protocol,
488
                                                       self.host, self.port)
489
            except:
490
                # Whatever goes wrong, we save the exception for the main
491
                # thread. Note that since we are running in a thread, no signal
492
                # can be received, so we don't care about KeyboardInterrupt.
493
                self._http_exception = sys.exc_info()
494
        finally:
495
            # Release the lock or the main thread will block and the whole
496
            # process will hang.
497
            self._http_starting.release()
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
498
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
499
        # From now on, exceptions are taken care of by the
500
        # SocketServer.BaseServer or the request handler.
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
501
        if server is not None:
502
            server.serve()
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
503
504
    def _get_remote_url(self, path):
505
        path_parts = path.split(os.path.sep)
506
        if os.path.isabs(path):
507
            if path_parts[:len(self._local_path_parts)] != \
508
                   self._local_path_parts:
509
                raise BadWebserverPath(path, self.test_dir)
510
            remote_path = '/'.join(path_parts[len(self._local_path_parts):])
511
        else:
512
            remote_path = '/'.join(path_parts)
513
514
        return self._http_base_url + remote_path
515
516
    def log(self, format, *args):
517
        """Capture Server log output."""
518
        self.logs.append(format % args)
519
2381.1.2 by Robert Collins
Fixup the test changes made for hpss to be clean and self contained.
520
    def setUp(self, backing_transport_server=None):
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
521
        """See bzrlib.transport.Server.setUp.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
522
2381.1.2 by Robert Collins
Fixup the test changes made for hpss to be clean and self contained.
523
        :param backing_transport_server: The transport that requests over this
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
524
            protocol should be forwarded to. Note that this is currently not
2381.1.2 by Robert Collins
Fixup the test changes made for hpss to be clean and self contained.
525
            supported for HTTP.
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
526
        """
2381.1.2 by Robert Collins
Fixup the test changes made for hpss to be clean and self contained.
527
        # XXX: TODO: make the server back onto vfs_server rather than local
528
        # disk.
4731.2.1 by Vincent Ladeuil
Don't use shutdown() to stop http servers.
529
        if not (backing_transport_server is None
530
                or isinstance(backing_transport_server, local.LocalURLServer)):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
531
            raise AssertionError(
4731.2.1 by Vincent Ladeuil
Don't use shutdown() to stop http servers.
532
                "HTTPServer currently assumes local transport, got %s" %
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
533
                backing_transport_server)
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
534
        self._home_dir = os.getcwdu()
535
        self._local_path_parts = self._home_dir.split(os.path.sep)
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
536
        self._http_base_url = None
537
3111.1.6 by Vincent Ladeuil
Begin refactoring test_http.py into parameterized tests.
538
        # Create the server thread
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
539
        self._http_starting = threading.Lock()
540
        self._http_starting.acquire()
541
        self._http_thread = threading.Thread(target=self._http_start)
542
        self._http_thread.setDaemon(True)
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
543
        self._http_exception = None
2167.3.5 by v.ladeuil+lp at free
Tests for proxies, covering #74759.
544
        self._http_thread.start()
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
545
2167.3.6 by v.ladeuil+lp at free
Take John's comments into account and add more tests.
546
        # Wait for the server thread to start (i.e release the lock)
547
        self._http_starting.acquire()
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
548
549
        if self._http_exception is not None:
3111.1.21 by Vincent Ladeuil
Add some comments.
550
            # Something went wrong during server start
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
551
            exc_class, exc_value, exc_tb = self._http_exception
552
            raise exc_class, exc_value, exc_tb
2167.3.6 by v.ladeuil+lp at free
Take John's comments into account and add more tests.
553
        self._http_starting.release()
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
554
        self.logs = []
555
556
    def tearDown(self):
557
        """See bzrlib.transport.Server.tearDown."""
4731.2.1 by Vincent Ladeuil
Don't use shutdown() to stop http servers.
558
        self._http_running = False
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
559
        self._httpd.shutdown()
4731.2.1 by Vincent Ladeuil
Don't use shutdown() to stop http servers.
560
        self._http_thread.join()
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
561
562
    def get_url(self):
563
        """See bzrlib.transport.Server.get_url."""
564
        return self._get_remote_url(self._home_dir)
565
566
    def get_bogus_url(self):
567
        """See bzrlib.transport.Server.get_bogus_url."""
568
        # this is chosen to try to prevent trouble with proxies, weird dns,
569
        # etc
2929.3.10 by Vincent Ladeuil
Add a fake https server and test facilities.
570
        return self._url_protocol + '://127.0.0.1:1/'
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
571
572
573
class HttpServer_urllib(HttpServer):
574
    """Subclass of HttpServer that gives http+urllib urls.
575
576
    This is for use in testing: connections to this server will always go
577
    through urllib where possible.
578
    """
579
580
    # urls returned by this server should require the urllib client impl
581
    _url_protocol = 'http+urllib'
582
583
584
class HttpServer_PyCurl(HttpServer):
585
    """Subclass of HttpServer that gives http+pycurl urls.
586
587
    This is for use in testing: connections to this server will always go
588
    through pycurl where possible.
589
    """
590
591
    # We don't care about checking the pycurl availability as
592
    # this server will be required only when pycurl is present
593
594
    # urls returned by this server should require the pycurl client impl
595
    _url_protocol = 'http+pycurl'