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