bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
5557.1.15
by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt |
1 |
# Copyright (C) 2006-2011 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 |
|
|
3111.1.2
by Vincent Ladeuil
Preparatory cleanup. |
23 |
import SimpleHTTPServer |
24 |
import socket |
|
|
2146.1.1
by Alexander Belchenko
fixes for test suite: forgotten imports in HttpServer.py |
25 |
import urlparse |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
26 |
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
27 |
from .. import ( |
|
6619.3.26
by Martin
Fix fallout from 2to3 getcwdu transformation and other test uses |
28 |
osutils, |
29 |
urlutils, |
|
30 |
)
|
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
31 |
from . import test_server |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
32 |
|
33 |
||
34 |
class BadWebserverPath(ValueError): |
|
35 |
def __str__(self): |
|
36 |
return 'path %s is not in %s' % self.args |
|
37 |
||
38 |
||
|
3111.1.2
by Vincent Ladeuil
Preparatory cleanup. |
39 |
class TestingHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): |
|
2420.1.10
by Vincent Ladeuil
Doc fixes. |
40 |
"""Handles one request. |
41 |
||
|
3111.1.21
by Vincent Ladeuil
Add some comments. |
42 |
A TestingHTTPRequestHandler is instantiated for every request received by
|
43 |
the associated server. Note that 'request' here is inherited from the base
|
|
44 |
TCPServer class, for the HTTP server it is really a connection which itself
|
|
45 |
will handle one or several HTTP requests.
|
|
|
2420.1.10
by Vincent Ladeuil
Doc fixes. |
46 |
"""
|
|
3111.1.24
by Vincent Ladeuil
Cleanups. |
47 |
# Default protocol version
|
48 |
protocol_version = 'HTTP/1.1' |
|
49 |
||
|
3111.1.2
by Vincent Ladeuil
Preparatory cleanup. |
50 |
# The Message-like class used to parse the request headers
|
51 |
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 :) |
52 |
|
|
3111.1.15
by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer. |
53 |
def setup(self): |
54 |
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. |
55 |
self._cwd = self.server._home_dir |
|
3111.1.15
by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer. |
56 |
tcs = self.server.test_case_server |
57 |
if tcs.protocol_version is not None: |
|
58 |
# If the test server forced a protocol version, use it
|
|
59 |
self.protocol_version = tcs.protocol_version |
|
60 |
||
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
61 |
def log_message(self, format, *args): |
|
2164.2.28
by Vincent Ladeuil
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions. |
62 |
tcs = self.server.test_case_server |
63 |
tcs.log('webserver - %s - - [%s] %s "%s" "%s"', |
|
64 |
self.address_string(), |
|
65 |
self.log_date_time_string(), |
|
66 |
format % args, |
|
|
3111.1.19
by Vincent Ladeuil
Merge back test_http_implementations.pc into test_http.py. |
67 |
self.headers.get('referer', '-'), |
|
2164.2.28
by Vincent Ladeuil
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions. |
68 |
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 :) |
69 |
|
70 |
def handle_one_request(self): |
|
71 |
"""Handle a single HTTP request. |
|
72 |
||
|
2831.6.1
by Vincent Ladeuil
Remove some more noise from test suite. |
73 |
We catch all socket errors occurring when the client close the
|
74 |
connection early to avoid polluting the test results.
|
|
75 |
"""
|
|
76 |
try: |
|
|
4731.2.3
by Vincent Ladeuil
Reduce the leaking http tests from ~200 to ~5. |
77 |
self._handle_one_request() |
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
78 |
except socket.error as e: |
|
3111.1.24
by Vincent Ladeuil
Cleanups. |
79 |
# Any socket error should close the connection, but some errors are
|
80 |
# 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. |
81 |
# results, so we raise only the others.
|
82 |
self.close_connection = 1 |
|
83 |
if (len(e.args) == 0 |
|
84 |
or e.args[0] not in (errno.EPIPE, errno.ECONNRESET, |
|
85 |
errno.ECONNABORTED, errno.EBADF)): |
|
|
2831.6.1
by Vincent Ladeuil
Remove some more noise from test suite. |
86 |
raise
|
87 |
||
|
5354.1.1
by Vincent Ladeuil
Set a Content-Length header on errors for HTTP/1.1. |
88 |
error_content_type = 'text/plain' |
89 |
error_message_format = '''\ |
|
90 |
Error code: %(code)s. |
|
91 |
Message: %(message)s. |
|
92 |
'''
|
|
93 |
||
94 |
def send_error(self, code, message=None): |
|
95 |
"""Send and log an error reply. |
|
96 |
||
97 |
We redefine the python-provided version to be able to set a
|
|
98 |
``Content-Length`` header as some http/1.1 clients complain otherwise
|
|
99 |
(see bug #568421).
|
|
100 |
||
101 |
:param code: The HTTP error code.
|
|
102 |
||
103 |
:param message: The explanation of the error code, Defaults to a short
|
|
104 |
entry.
|
|
105 |
"""
|
|
106 |
||
107 |
if message is None: |
|
108 |
try: |
|
109 |
message = self.responses[code][0] |
|
110 |
except KeyError: |
|
111 |
message = '???' |
|
112 |
self.log_error("code %d, message %s", code, message) |
|
113 |
content = (self.error_message_format % |
|
114 |
{'code': code, 'message': message}) |
|
115 |
self.send_response(code, message) |
|
116 |
self.send_header("Content-Type", self.error_content_type) |
|
117 |
self.send_header("Content-Length", "%d" % len(content)) |
|
118 |
self.send_header('Connection', 'close') |
|
119 |
self.end_headers() |
|
120 |
if self.command != 'HEAD' and code >= 200 and code not in (204, 304): |
|
121 |
self.wfile.write(content) |
|
122 |
||
|
4731.2.3
by Vincent Ladeuil
Reduce the leaking http tests from ~200 to ~5. |
123 |
def _handle_one_request(self): |
124 |
SimpleHTTPServer.SimpleHTTPRequestHandler.handle_one_request(self) |
|
125 |
||
|
5705.1.1
by Vincent Ladeuil
Correctly parse partial range specifiers in the HTTP test server |
126 |
_range_regexp = re.compile(r'^(?P<start>\d+)-(?P<end>\d+)?$') |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
127 |
_tail_regexp = re.compile(r'^-(?P<tail>\d+)$') |
128 |
||
|
5705.1.1
by Vincent Ladeuil
Correctly parse partial range specifiers in the HTTP test server |
129 |
def _parse_ranges(self, ranges_header, file_size): |
130 |
"""Parse the range header value and returns ranges. |
|
131 |
||
132 |
RFC2616 14.35 says that syntactically invalid range specifiers MUST be
|
|
133 |
ignored. In that case, we return None instead of a range list.
|
|
134 |
||
135 |
:param ranges_header: The 'Range' header value.
|
|
136 |
||
137 |
:param file_size: The size of the requested file.
|
|
138 |
||
139 |
:return: A list of (start, end) tuples or None if some invalid range
|
|
140 |
specifier is encountered.
|
|
|
2182.2.1
by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance |
141 |
"""
|
142 |
if not ranges_header.startswith('bytes='): |
|
143 |
# Syntactically invalid header
|
|
|
5705.1.1
by Vincent Ladeuil
Correctly parse partial range specifiers in the HTTP test server |
144 |
return None |
|
2182.2.1
by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance |
145 |
|
|
5705.1.1
by Vincent Ladeuil
Correctly parse partial range specifiers in the HTTP test server |
146 |
tail = None |
147 |
ranges = [] |
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
148 |
ranges_header = ranges_header[len('bytes='):] |
149 |
for range_str in ranges_header.split(','): |
|
150 |
range_match = self._range_regexp.match(range_str) |
|
151 |
if range_match is not None: |
|
|
2182.2.2
by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance |
152 |
start = int(range_match.group('start')) |
|
5705.1.1
by Vincent Ladeuil
Correctly parse partial range specifiers in the HTTP test server |
153 |
end_match = range_match.group('end') |
154 |
if end_match is None: |
|
155 |
# RFC2616 says end is optional and default to file_size
|
|
156 |
end = file_size |
|
157 |
else: |
|
158 |
end = int(end_match) |
|
|
2182.2.2
by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance |
159 |
if start > end: |
160 |
# Syntactically invalid range
|
|
|
5705.1.1
by Vincent Ladeuil
Correctly parse partial range specifiers in the HTTP test server |
161 |
return None |
|
2182.2.2
by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance |
162 |
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 :) |
163 |
else: |
164 |
tail_match = self._tail_regexp.match(range_str) |
|
165 |
if tail_match is not None: |
|
166 |
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 |
167 |
else: |
168 |
# Syntactically invalid range
|
|
|
5705.1.1
by Vincent Ladeuil
Correctly parse partial range specifiers in the HTTP test server |
169 |
return None |
170 |
if tail is not None: |
|
171 |
# Normalize tail into ranges
|
|
172 |
ranges.append((max(0, file_size - tail), file_size)) |
|
173 |
||
174 |
checked_ranges = [] |
|
175 |
for start, end in ranges: |
|
176 |
if start >= file_size: |
|
177 |
# RFC2616 14.35, ranges are invalid if start >= file_size
|
|
178 |
return None |
|
179 |
# RFC2616 14.35, end values should be truncated
|
|
180 |
# to file_size -1 if they exceed it
|
|
181 |
end = min(end, file_size - 1) |
|
182 |
checked_ranges.append((start, end)) |
|
183 |
return checked_ranges |
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
184 |
|
|
3111.1.28
by Vincent Ladeuil
Fix the multi-ranges http server and add tests. |
185 |
def _header_line_length(self, keyword, value): |
186 |
header_line = '%s: %s\r\n' % (keyword, value) |
|
187 |
return len(header_line) |
|
188 |
||
|
3111.1.23
by Vincent Ladeuil
Make HTTP/1.1 the default implementation reveals one more bug. |
189 |
def send_head(self): |
190 |
"""Overrides base implementation to work around a bug in python2.5.""" |
|
191 |
path = self.translate_path(self.path) |
|
192 |
if os.path.isdir(path) and not self.path.endswith('/'): |
|
193 |
# redirect browser - doing basically what apache does when
|
|
194 |
# DirectorySlash option is On which is quite common (braindead, but
|
|
195 |
# common)
|
|
196 |
self.send_response(301) |
|
197 |
self.send_header("Location", self.path + "/") |
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
198 |
# 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. |
199 |
self.send_header('Content-Length', '0') |
200 |
self.end_headers() |
|
201 |
return None |
|
202 |
||
203 |
return SimpleHTTPServer.SimpleHTTPRequestHandler.send_head(self) |
|
204 |
||
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
205 |
def send_range_content(self, file, start, length): |
206 |
file.seek(start) |
|
207 |
self.wfile.write(file.read(length)) |
|
208 |
||
209 |
def get_single_range(self, file, file_size, start, end): |
|
210 |
self.send_response(206) |
|
211 |
length = end - start + 1 |
|
212 |
self.send_header('Accept-Ranges', 'bytes') |
|
213 |
self.send_header("Content-Length", "%d" % length) |
|
214 |
||
215 |
self.send_header("Content-Type", 'application/octet-stream') |
|
216 |
self.send_header("Content-Range", "bytes %d-%d/%d" % (start, |
|
217 |
end, |
|
218 |
file_size)) |
|
219 |
self.end_headers() |
|
220 |
self.send_range_content(file, start, length) |
|
221 |
||
222 |
def get_multiple_ranges(self, file, file_size, ranges): |
|
223 |
self.send_response(206) |
|
224 |
self.send_header('Accept-Ranges', 'bytes') |
|
|
3111.1.28
by Vincent Ladeuil
Fix the multi-ranges http server and add tests. |
225 |
boundary = '%d' % random.randint(0,0x7FFFFFFF) |
226 |
self.send_header('Content-Type', |
|
227 |
'multipart/byteranges; boundary=%s' % boundary) |
|
228 |
boundary_line = '--%s\r\n' % boundary |
|
229 |
# Calculate the Content-Length
|
|
230 |
content_length = 0 |
|
231 |
for (start, end) in ranges: |
|
232 |
content_length += len(boundary_line) |
|
233 |
content_length += self._header_line_length( |
|
234 |
'Content-type', 'application/octet-stream') |
|
235 |
content_length += self._header_line_length( |
|
236 |
'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size)) |
|
237 |
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). |
238 |
content_length += end - start + 1 |
|
3111.1.28
by Vincent Ladeuil
Fix the multi-ranges http server and add tests. |
239 |
content_length += len(boundary_line) |
240 |
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 :) |
241 |
self.end_headers() |
|
3111.1.28
by Vincent Ladeuil
Fix the multi-ranges http server and add tests. |
242 |
|
243 |
# 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 :) |
244 |
for (start, end) in ranges: |
|
3111.1.28
by Vincent Ladeuil
Fix the multi-ranges http server and add tests. |
245 |
self.wfile.write(boundary_line) |
246 |
self.send_header('Content-type', 'application/octet-stream') |
|
247 |
self.send_header('Content-Range', 'bytes %d-%d/%d' |
|
248 |
% (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 :) |
249 |
self.end_headers() |
250 |
self.send_range_content(file, start, end - start + 1) |
|
|
3059.2.12
by Vincent Ladeuil
Spiv review feedback. |
251 |
# Final boundary
|
|
3111.1.28
by Vincent Ladeuil
Fix the multi-ranges http server and add tests. |
252 |
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 :) |
253 |
|
254 |
def do_GET(self): |
|
255 |
"""Serve a GET request. |
|
256 |
||
257 |
Handles the Range header.
|
|
258 |
"""
|
|
|
3052.3.2
by Vincent Ladeuil
Add tests and fix trivial bugs and other typos. |
259 |
# Update statistics
|
260 |
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 :) |
261 |
|
262 |
path = self.translate_path(self.path) |
|
263 |
ranges_header_value = self.headers.get('Range') |
|
264 |
if ranges_header_value is None or os.path.isdir(path): |
|
265 |
# Let the mother class handle most cases
|
|
|
3111.1.2
by Vincent Ladeuil
Preparatory cleanup. |
266 |
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 :) |
267 |
|
268 |
try: |
|
269 |
# Always read in binary mode. Opening files in text
|
|
270 |
# mode may cause newline translations, making the
|
|
271 |
# actual size of the content transmitted *less* than
|
|
272 |
# the content-length!
|
|
|
5247.3.17
by Vincent Ladeuil
Fix another python tiny bug revealed by pycurl being picky. |
273 |
f = open(path, 'rb') |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
274 |
except IOError: |
275 |
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 :) |
276 |
return
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
277 |
|
|
5247.3.17
by Vincent Ladeuil
Fix another python tiny bug revealed by pycurl being picky. |
278 |
file_size = os.fstat(f.fileno())[6] |
|
5705.1.1
by Vincent Ladeuil
Correctly parse partial range specifiers in the HTTP test server |
279 |
ranges = self._parse_ranges(ranges_header_value, file_size) |
280 |
if not ranges: |
|
|
2182.2.1
by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance |
281 |
# RFC2616 14.16 and 14.35 says that when a server
|
282 |
# encounters unsatisfiable range specifiers, it
|
|
283 |
# SHOULD return a 416.
|
|
|
5247.3.17
by Vincent Ladeuil
Fix another python tiny bug revealed by pycurl being picky. |
284 |
f.close() |
|
2182.2.1
by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance |
285 |
# FIXME: We SHOULD send a Content-Range header too,
|
286 |
# but the implementation of send_error does not
|
|
287 |
# 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 :) |
288 |
self.send_error(416, "Requested range not satisfiable") |
289 |
return
|
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
290 |
|
291 |
if len(ranges) == 1: |
|
292 |
(start, end) = ranges[0] |
|
|
5247.3.17
by Vincent Ladeuil
Fix another python tiny bug revealed by pycurl being picky. |
293 |
self.get_single_range(f, file_size, start, end) |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
294 |
else: |
|
5247.3.17
by Vincent Ladeuil
Fix another python tiny bug revealed by pycurl being picky. |
295 |
self.get_multiple_ranges(f, file_size, ranges) |
296 |
f.close() |
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
297 |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
298 |
def translate_path(self, path): |
299 |
"""Translate a /-separated PATH to the local filename syntax. |
|
300 |
||
301 |
If the server requires it, proxy the path before the usual translation
|
|
302 |
"""
|
|
303 |
if self.server.test_case_server.proxy_requests: |
|
304 |
# We need to act as a proxy and accept absolute urls,
|
|
305 |
# which SimpleHTTPRequestHandler (parent) is not
|
|
306 |
# ready for. So we just drop the protocol://host:port
|
|
307 |
# part in front of the request-url (because we know
|
|
308 |
# we would not forward the request to *another*
|
|
309 |
# proxy).
|
|
310 |
||
311 |
# So we do what SimpleHTTPRequestHandler.translate_path
|
|
312 |
# do beginning with python 2.4.3: abandon query
|
|
313 |
# parameters, scheme, host port, etc (which ensure we
|
|
314 |
# provide the right behaviour on all python versions).
|
|
315 |
path = urlparse.urlparse(path)[2] |
|
316 |
# And now, we can apply *our* trick to proxy files
|
|
317 |
path += '-proxied' |
|
318 |
||
319 |
return self._translate_path(path) |
|
320 |
||
321 |
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. |
322 |
"""Translate a /-separated PATH to the local filename syntax. |
323 |
||
|
3221.9.5
by Ian Clatworthy
some tweaks from abentley's earlier review feedback |
324 |
Note that we're translating http URLs here, not file URLs.
|
325 |
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. |
326 |
Components that mean special things to the local file system
|
327 |
(e.g. drive or directory names) are ignored. (XXX They should
|
|
328 |
probably be diagnosed.)
|
|
329 |
||
330 |
Override from python standard library to stop it calling os.getcwd()
|
|
331 |
"""
|
|
332 |
# abandon query parameters
|
|
333 |
path = urlparse.urlparse(path)[2] |
|
|
6379.4.2
by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote. |
334 |
path = posixpath.normpath(urlutils.unquote(path)) |
|
3221.9.4
by Ian Clatworthy
fix failing unicode_paths test |
335 |
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. |
336 |
words = path.split('/') |
337 |
path = self._cwd |
|
|
6631.4.2
by Martin
Remove uses of filter with None as first argument |
338 |
for num, word in enumerate(w for w in words if w): |
|
3221.9.5
by Ian Clatworthy
some tweaks from abentley's earlier review feedback |
339 |
if num == 0: |
340 |
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. |
341 |
head, word = os.path.split(word) |
342 |
if word in (os.curdir, os.pardir): continue |
|
343 |
path = os.path.join(path, word) |
|
344 |
return path |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
345 |
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
346 |
|
|
3111.1.22
by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug. |
347 |
class TestingHTTPServerMixin: |
348 |
||
349 |
def __init__(self, test_case_server): |
|
|
2164.2.28
by Vincent Ladeuil
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions. |
350 |
# 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 |
351 |
# tests and the server (or the request handler and the
|
352 |
# server), allowing dynamic behaviors to be defined from
|
|
353 |
# the tests cases.
|
|
|
3111.1.22
by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug. |
354 |
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. |
355 |
self._home_dir = test_case_server._home_dir |
|
5247.3.15
by Vincent Ladeuil
All http tests passing, https failing. |
356 |
|
357 |
||
358 |
class TestingHTTPServer(test_server.TestingTCPServer, TestingHTTPServerMixin): |
|
|
3111.1.3
by Vincent Ladeuil
Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually). |
359 |
|
|
3111.1.30
by Vincent Ladeuil
Update NEWS. Some cosmetic changes. |
360 |
def __init__(self, server_address, request_handler_class, |
361 |
test_case_server): |
|
|
5247.3.15
by Vincent Ladeuil
All http tests passing, https failing. |
362 |
test_server.TestingTCPServer.__init__(self, server_address, |
363 |
request_handler_class) |
|
|
3111.1.22
by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug. |
364 |
TestingHTTPServerMixin.__init__(self, test_case_server) |
|
5247.3.15
by Vincent Ladeuil
All http tests passing, https failing. |
365 |
|
366 |
||
367 |
class TestingThreadingHTTPServer(test_server.TestingThreadingTCPServer, |
|
368 |
TestingHTTPServerMixin): |
|
|
3111.1.3
by Vincent Ladeuil
Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually). |
369 |
"""A threading HTTP test server for HTTP 1.1. |
370 |
||
371 |
Since tests can initiate several concurrent connections to the same http
|
|
372 |
server, we need an independent connection for each of them. We achieve that
|
|
373 |
by spawning a new thread for each connection.
|
|
374 |
"""
|
|
|
3111.1.30
by Vincent Ladeuil
Update NEWS. Some cosmetic changes. |
375 |
def __init__(self, server_address, request_handler_class, |
376 |
test_case_server): |
|
|
5247.3.15
by Vincent Ladeuil
All http tests passing, https failing. |
377 |
test_server.TestingThreadingTCPServer.__init__(self, server_address, |
378 |
request_handler_class) |
|
|
3111.1.22
by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug. |
379 |
TestingHTTPServerMixin.__init__(self, test_case_server) |
|
5247.3.15
by Vincent Ladeuil
All http tests passing, https failing. |
380 |
|
381 |
||
382 |
class HttpServer(test_server.TestingTCPServerInAThread): |
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
383 |
"""A test server for http transports. |
384 |
||
385 |
Subclasses can provide a specific request handler.
|
|
386 |
"""
|
|
387 |
||
|
3111.1.4
by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests. |
388 |
# The real servers depending on the protocol
|
389 |
http_server_class = {'HTTP/1.0': TestingHTTPServer, |
|
390 |
'HTTP/1.1': TestingThreadingHTTPServer, |
|
391 |
}
|
|
392 |
||
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
393 |
# Whether or not we proxy the requests (see
|
394 |
# TestingHTTPRequestHandler.translate_path).
|
|
395 |
proxy_requests = False |
|
396 |
||
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
397 |
# used to form the url that connects to this server
|
398 |
_url_protocol = 'http' |
|
399 |
||
|
3111.1.15
by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer. |
400 |
def __init__(self, request_handler=TestingHTTPRequestHandler, |
401 |
protocol_version=None): |
|
402 |
"""Constructor. |
|
403 |
||
404 |
:param request_handler: a class that will be instantiated to handle an
|
|
405 |
http connection (one or several requests).
|
|
406 |
||
407 |
:param protocol_version: if specified, will override the protocol
|
|
408 |
version of the request handler.
|
|
409 |
"""
|
|
|
5247.3.15
by Vincent Ladeuil
All http tests passing, https failing. |
410 |
# Depending on the protocol version, we will create the approriate
|
411 |
# server
|
|
412 |
if protocol_version is None: |
|
413 |
# Use the request handler one
|
|
414 |
proto_vers = request_handler.protocol_version |
|
415 |
else: |
|
416 |
# Use our own, it will be used to override the request handler
|
|
417 |
# one too.
|
|
418 |
proto_vers = protocol_version |
|
419 |
# Get the appropriate server class for the required protocol
|
|
420 |
serv_cls = self.http_server_class.get(proto_vers, None) |
|
421 |
if serv_cls is None: |
|
422 |
raise httplib.UnknownProtocol(proto_vers) |
|
|
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
423 |
self.host = 'localhost' |
424 |
self.port = 0 |
|
|
5247.3.15
by Vincent Ladeuil
All http tests passing, https failing. |
425 |
super(HttpServer, self).__init__((self.host, self.port), |
426 |
serv_cls, |
|
427 |
request_handler) |
|
428 |
self.protocol_version = proto_vers |
|
|
3052.3.2
by Vincent Ladeuil
Add tests and fix trivial bugs and other typos. |
429 |
# Allows tests to verify number of GET requests issued
|
430 |
self.GET_request_nb = 0 |
|
|
5247.3.15
by Vincent Ladeuil
All http tests passing, https failing. |
431 |
self._http_base_url = None |
432 |
self.logs = [] |
|
433 |
||
434 |
def create_server(self): |
|
|
5247.3.16
by Vincent Ladeuil
All http tests passing (including https). |
435 |
return self.server_class( |
436 |
(self.host, self.port), self.request_handler_class, self) |
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
437 |
|
438 |
def _get_remote_url(self, path): |
|
439 |
path_parts = path.split(os.path.sep) |
|
440 |
if os.path.isabs(path): |
|
441 |
if path_parts[:len(self._local_path_parts)] != \ |
|
442 |
self._local_path_parts: |
|
443 |
raise BadWebserverPath(path, self.test_dir) |
|
444 |
remote_path = '/'.join(path_parts[len(self._local_path_parts):]) |
|
445 |
else: |
|
446 |
remote_path = '/'.join(path_parts) |
|
447 |
||
448 |
return self._http_base_url + remote_path |
|
449 |
||
450 |
def log(self, format, *args): |
|
451 |
"""Capture Server log output.""" |
|
452 |
self.logs.append(format % args) |
|
453 |
||
|
4934.3.3
by Martin Pool
Rename Server.setUp to Server.start_server |
454 |
def start_server(self, backing_transport_server=None): |
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
455 |
"""See breezy.transport.Server.start_server. |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
456 |
|
|
2381.1.2
by Robert Collins
Fixup the test changes made for hpss to be clean and self contained. |
457 |
: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 :). |
458 |
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. |
459 |
supported for HTTP.
|
|
2018.5.42
by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :). |
460 |
"""
|
|
2381.1.2
by Robert Collins
Fixup the test changes made for hpss to be clean and self contained. |
461 |
# XXX: TODO: make the server back onto vfs_server rather than local
|
462 |
# disk.
|
|
|
4731.2.1
by Vincent Ladeuil
Don't use shutdown() to stop http servers. |
463 |
if not (backing_transport_server is None |
|
5017.3.23
by Vincent Ladeuil
selftest -s bt.test_bzrdir passing |
464 |
or isinstance(backing_transport_server, |
465 |
test_server.LocalURLServer)): |
|
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
466 |
raise AssertionError( |
|
4731.2.1
by Vincent Ladeuil
Don't use shutdown() to stop http servers. |
467 |
"HTTPServer currently assumes local transport, got %s" % |
|
3376.2.4
by Martin Pool
Remove every assert statement from bzrlib! |
468 |
backing_transport_server) |
|
6619.3.26
by Martin
Fix fallout from 2to3 getcwdu transformation and other test uses |
469 |
self._home_dir = osutils.getcwd() |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
470 |
self._local_path_parts = self._home_dir.split(os.path.sep) |
|
5247.2.4
by Vincent Ladeuil
Add an event to ThreadWithException that can be shared with the calling thread. |
471 |
self.logs = [] |
|
3111.1.4
by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests. |
472 |
|
|
5247.3.15
by Vincent Ladeuil
All http tests passing, https failing. |
473 |
super(HttpServer, self).start_server() |
474 |
self._http_base_url = '%s://%s:%s/' % ( |
|
475 |
self._url_protocol, self.host, self.port) |
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
476 |
|
477 |
def get_url(self): |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
478 |
"""See breezy.transport.Server.get_url.""" |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
479 |
return self._get_remote_url(self._home_dir) |
480 |
||
481 |
def get_bogus_url(self): |
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
482 |
"""See breezy.transport.Server.get_bogus_url.""" |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
483 |
# this is chosen to try to prevent trouble with proxies, weird dns,
|
484 |
# etc
|
|
|
2929.3.10
by Vincent Ladeuil
Add a fake https server and test facilities. |
485 |
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 :) |
486 |
|
487 |
||
488 |
class HttpServer_urllib(HttpServer): |
|
489 |
"""Subclass of HttpServer that gives http+urllib urls. |
|
490 |
||
491 |
This is for use in testing: connections to this server will always go
|
|
492 |
through urllib where possible.
|
|
493 |
"""
|
|
494 |
||
495 |
# urls returned by this server should require the urllib client impl
|
|
496 |
_url_protocol = 'http+urllib' |