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