bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2005 Canonical Ltd
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
|
1185.1.18
by Robert Collins
Lalo Martins remotebranch patch |
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.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
|
1185.1.18
by Robert Collins
Lalo Martins remotebranch patch |
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.
|
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
|
1185.1.18
by Robert Collins
Lalo Martins remotebranch patch |
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
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
|
2004.1.28
by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code |
17 |
from cStringIO import StringIO |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
18 |
import errno |
|
2004.1.29
by v.ladeuil+lp at free
New tests for http range requests handling. |
19 |
from SimpleHTTPServer import SimpleHTTPRequestHandler |
|
2164.2.29
by Vincent Ladeuil
Test the http redirection at the request level even if it's not |
20 |
import re |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
21 |
import socket |
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
22 |
import time |
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
23 |
import urllib2 |
|
2213.1.1
by v.ladeuil+lp at free
Workaround SimpleHTTPRequestHandler.translate_path limitation in |
24 |
import urlparse |
|
1530.1.14
by Robert Collins
Remove duplicate web server from HTTPTestUtil. |
25 |
|
|
2929.3.1
by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite). |
26 |
from bzrlib.osutils import md5 |
|
2018.5.150
by Andrew Bennetts
Tidy imports in HTTPTestUtil.py |
27 |
from bzrlib.smart import protocol |
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
28 |
from bzrlib.tests import TestCaseWithTransport |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
29 |
from bzrlib.tests.HttpServer import ( |
30 |
HttpServer, |
|
31 |
TestingHTTPRequestHandler, |
|
32 |
)
|
|
|
2004.1.28
by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code |
33 |
from bzrlib.transport import ( |
34 |
get_transport, |
|
35 |
)
|
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
36 |
|
37 |
||
38 |
class WallRequestHandler(TestingHTTPRequestHandler): |
|
39 |
"""Whatever request comes in, close the connection""" |
|
40 |
||
41 |
def handle_one_request(self): |
|
42 |
"""Handle a single HTTP request, by abruptly closing the connection""" |
|
43 |
self.close_connection = 1 |
|
44 |
||
45 |
||
46 |
class BadStatusRequestHandler(TestingHTTPRequestHandler): |
|
47 |
"""Whatever request comes in, returns a bad status""" |
|
48 |
||
49 |
def parse_request(self): |
|
50 |
"""Fakes handling a single HTTP request, returns a bad status""" |
|
51 |
ignored = TestingHTTPRequestHandler.parse_request(self) |
|
52 |
try: |
|
53 |
self.send_response(0, "Bad status") |
|
54 |
self.end_headers() |
|
55 |
except socket.error, e: |
|
|
2158.2.1
by v.ladeuil+lp at free
Windows tests cleanup. |
56 |
# We don't want to pollute the test results with
|
57 |
# spurious server errors while test succeed. In our
|
|
|
2188.1.1
by Aaron Bentley
Windows tests cleanup. (Vincent Ladeuil) |
58 |
# case, it may occur that the test has already read
|
|
2158.2.1
by v.ladeuil+lp at free
Windows tests cleanup. |
59 |
# the 'Bad Status' and closed the socket while we are
|
60 |
# still trying to send some headers... So the test is
|
|
|
2188.1.1
by Aaron Bentley
Windows tests cleanup. (Vincent Ladeuil) |
61 |
# ok, but if we raise the exception, the output is
|
|
2158.2.1
by v.ladeuil+lp at free
Windows tests cleanup. |
62 |
# dirty. So we don't raise, but we close the
|
63 |
# connection, just to be safe :)
|
|
64 |
spurious = [errno.EPIPE, |
|
65 |
errno.ECONNRESET, |
|
66 |
errno.ECONNABORTED, |
|
67 |
]
|
|
68 |
if (len(e.args) > 0) and (e.args[0] in spurious): |
|
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
69 |
self.close_connection = 1 |
70 |
pass
|
|
71 |
else: |
|
72 |
raise
|
|
73 |
return False |
|
74 |
||
75 |
||
76 |
class InvalidStatusRequestHandler(TestingHTTPRequestHandler): |
|
77 |
"""Whatever request comes in, returns am invalid status""" |
|
78 |
||
79 |
def parse_request(self): |
|
80 |
"""Fakes handling a single HTTP request, returns a bad status""" |
|
81 |
ignored = TestingHTTPRequestHandler.parse_request(self) |
|
82 |
self.wfile.write("Invalid status line\r\n") |
|
83 |
return False |
|
84 |
||
85 |
||
86 |
class BadProtocolRequestHandler(TestingHTTPRequestHandler): |
|
87 |
"""Whatever request comes in, returns a bad protocol version""" |
|
88 |
||
89 |
def parse_request(self): |
|
90 |
"""Fakes handling a single HTTP request, returns a bad status""" |
|
91 |
ignored = TestingHTTPRequestHandler.parse_request(self) |
|
92 |
# Returns an invalid protocol version, but curl just
|
|
93 |
# ignores it and those cannot be tested.
|
|
94 |
self.wfile.write("%s %d %s\r\n" % ('HTTP/0.0', |
|
95 |
404, |
|
96 |
'Look at my protocol version')) |
|
97 |
return False |
|
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
98 |
|
99 |
||
|
2004.1.27
by v.ladeuil+lp at free
Fix bug #57644 by issuing an explicit error message. |
100 |
class ForbiddenRequestHandler(TestingHTTPRequestHandler): |
101 |
"""Whatever request comes in, returns a 403 code""" |
|
102 |
||
103 |
def parse_request(self): |
|
104 |
"""Handle a single HTTP request, by replying we cannot handle it""" |
|
105 |
ignored = TestingHTTPRequestHandler.parse_request(self) |
|
106 |
self.send_error(403) |
|
107 |
return False |
|
108 |
||
109 |
||
|
2004.1.28
by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code |
110 |
class HTTPServerWithSmarts(HttpServer): |
111 |
"""HTTPServerWithSmarts extends the HttpServer with POST methods that will |
|
112 |
trigger a smart server to execute with a transport rooted at the rootdir of
|
|
113 |
the HTTP server.
|
|
114 |
"""
|
|
115 |
||
116 |
def __init__(self): |
|
117 |
HttpServer.__init__(self, SmartRequestHandler) |
|
118 |
||
119 |
||
120 |
class SmartRequestHandler(TestingHTTPRequestHandler): |
|
121 |
"""Extend TestingHTTPRequestHandler to support smart client POSTs.""" |
|
122 |
||
123 |
def do_POST(self): |
|
124 |
"""Hand the request off to a smart server instance.""" |
|
125 |
self.send_response(200) |
|
126 |
self.send_header("Content-type", "application/octet-stream") |
|
|
2164.2.28
by Vincent Ladeuil
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions. |
127 |
transport = get_transport(self.server.test_case_server._home_dir) |
|
2004.1.28
by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code |
128 |
# TODO: We might like to support streaming responses. 1.0 allows no
|
129 |
# Content-length in this case, so for integrity we should perform our
|
|
130 |
# own chunking within the stream.
|
|
131 |
# 1.1 allows chunked responses, and in this case we could chunk using
|
|
132 |
# the HTTP chunking as this will allow HTTP persistence safely, even if
|
|
133 |
# we have to stop early due to error, but we would also have to use the
|
|
134 |
# HTTP trailer facility which may not be widely available.
|
|
135 |
out_buffer = StringIO() |
|
|
2018.5.150
by Andrew Bennetts
Tidy imports in HTTPTestUtil.py |
136 |
smart_protocol_request = protocol.SmartServerRequestProtocolOne( |
|
2004.1.28
by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code |
137 |
transport, out_buffer.write) |
138 |
# if this fails, we should return 400 bad request, but failure is
|
|
139 |
# failure for now - RBC 20060919
|
|
140 |
data_length = int(self.headers['Content-Length']) |
|
141 |
# Perhaps there should be a SmartServerHTTPMedium that takes care of
|
|
142 |
# feeding the bytes in the http request to the smart_protocol_request,
|
|
143 |
# but for now it's simpler to just feed the bytes directly.
|
|
144 |
smart_protocol_request.accept_bytes(self.rfile.read(data_length)) |
|
145 |
assert smart_protocol_request.next_read_size() == 0, ( |
|
146 |
"not finished reading, but all data sent to protocol.") |
|
147 |
self.send_header("Content-Length", str(len(out_buffer.getvalue()))) |
|
148 |
self.end_headers() |
|
149 |
self.wfile.write(out_buffer.getvalue()) |
|
150 |
||
151 |
||
|
2520.2.2
by Vincent Ladeuil
Fix #115209 by issuing a single range request on 400: Bad Request |
152 |
class LimitedRangeRequestHandler(TestingHTTPRequestHandler): |
153 |
"""Errors out when range specifiers exceed the limit""" |
|
154 |
||
155 |
def get_multiple_ranges(self, file, file_size, ranges): |
|
156 |
"""Refuses the multiple ranges request""" |
|
157 |
tcs = self.server.test_case_server |
|
158 |
if tcs.range_limit is not None and len(ranges) > tcs.range_limit: |
|
159 |
file.close() |
|
160 |
# Emulate apache behavior
|
|
161 |
self.send_error(400, "Bad Request") |
|
162 |
return
|
|
163 |
return TestingHTTPRequestHandler.get_multiple_ranges(self, file, |
|
164 |
file_size, ranges) |
|
165 |
||
166 |
def do_GET(self): |
|
167 |
tcs = self.server.test_case_server |
|
168 |
tcs.GET_request_nb += 1 |
|
169 |
return TestingHTTPRequestHandler.do_GET(self) |
|
170 |
||
171 |
||
172 |
class LimitedRangeHTTPServer(HttpServer): |
|
173 |
"""An HttpServer erroring out on requests with too much range specifiers""" |
|
174 |
||
175 |
def __init__(self, request_handler=LimitedRangeRequestHandler, |
|
176 |
range_limit=None): |
|
177 |
HttpServer.__init__(self, request_handler) |
|
178 |
self.range_limit = range_limit |
|
179 |
self.GET_request_nb = 0 |
|
180 |
||
181 |
||
|
2004.1.29
by v.ladeuil+lp at free
New tests for http range requests handling. |
182 |
class SingleRangeRequestHandler(TestingHTTPRequestHandler): |
183 |
"""Always reply to range request as if they were single. |
|
184 |
||
185 |
Don't be explicit about it, just to annoy the clients.
|
|
186 |
"""
|
|
187 |
||
188 |
def get_multiple_ranges(self, file, file_size, ranges): |
|
189 |
"""Answer as if it was a single range request and ignores the rest""" |
|
190 |
(start, end) = ranges[0] |
|
191 |
return self.get_single_range(file, file_size, start, end) |
|
192 |
||
193 |
||
|
2481.3.1
by Vincent Ladeuil
Fix bug #112719 by using the right range header. |
194 |
class SingleOnlyRangeRequestHandler(TestingHTTPRequestHandler): |
195 |
"""Only reply to simple range requests, errors out on multiple""" |
|
196 |
||
197 |
def get_multiple_ranges(self, file, file_size, ranges): |
|
198 |
"""Refuses the multiple ranges request""" |
|
199 |
if len(ranges) > 1: |
|
200 |
file.close() |
|
201 |
self.send_error(416, "Requested range not satisfiable") |
|
202 |
return
|
|
203 |
(start, end) = ranges[0] |
|
204 |
return self.get_single_range(file, file_size, start, end) |
|
205 |
||
206 |
||
|
2004.1.29
by v.ladeuil+lp at free
New tests for http range requests handling. |
207 |
class NoRangeRequestHandler(TestingHTTPRequestHandler): |
208 |
"""Ignore range requests without notice""" |
|
209 |
||
210 |
# Just bypass the range handling done by TestingHTTPRequestHandler
|
|
211 |
do_GET = SimpleHTTPRequestHandler.do_GET |
|
212 |
||
213 |
||
|
1534.4.50
by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running. |
214 |
class TestCaseWithWebserver(TestCaseWithTransport): |
215 |
"""A support class that provides readonly urls that are http://. |
|
216 |
||
|
2004.3.3
by vila
Better (but still incomplete) design for bogus servers. |
217 |
This is done by forcing the readonly server to be an http
|
218 |
one. This will currently fail if the primary transport is not
|
|
219 |
backed by regular disk files.
|
|
|
1185.1.18
by Robert Collins
Lalo Martins remotebranch patch |
220 |
"""
|
221 |
def setUp(self): |
|
|
1530.1.14
by Robert Collins
Remove duplicate web server from HTTPTestUtil. |
222 |
super(TestCaseWithWebserver, self).setUp() |
|
2004.1.25
by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :) |
223 |
self.transport_readonly_server = HttpServer |
|
2167.3.5
by v.ladeuil+lp at free
Tests for proxies, covering #74759. |
224 |
|
225 |
||
226 |
class TestCaseWithTwoWebservers(TestCaseWithWebserver): |
|
|
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
227 |
"""A support class providing readonly urls on two servers that are http://. |
|
2167.3.5
by v.ladeuil+lp at free
Tests for proxies, covering #74759. |
228 |
|
|
2164.2.25
by Vincent Ladeuil
Fix typos noticed by Aaron. |
229 |
We set up two webservers to allows various tests involving
|
|
2167.3.5
by v.ladeuil+lp at free
Tests for proxies, covering #74759. |
230 |
proxies or redirections from one server to the other.
|
231 |
"""
|
|
232 |
def setUp(self): |
|
233 |
super(TestCaseWithTwoWebservers, self).setUp() |
|
234 |
self.transport_secondary_server = HttpServer |
|
235 |
self.__secondary_server = None |
|
236 |
||
237 |
def create_transport_secondary_server(self): |
|
238 |
"""Create a transport server from class defined at init. |
|
239 |
||
240 |
This is mostly a hook for daughter classes.
|
|
241 |
"""
|
|
242 |
return self.transport_secondary_server() |
|
243 |
||
244 |
def get_secondary_server(self): |
|
245 |
"""Get the server instance for the secondary transport.""" |
|
246 |
if self.__secondary_server is None: |
|
247 |
self.__secondary_server = self.create_transport_secondary_server() |
|
248 |
self.__secondary_server.setUp() |
|
249 |
self.addCleanup(self.__secondary_server.tearDown) |
|
250 |
return self.__secondary_server |
|
251 |
||
252 |
||
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
253 |
class ProxyServer(HttpServer): |
254 |
"""A proxy test server for http transports.""" |
|
255 |
||
256 |
proxy_requests = True |
|
|
2213.1.1
by v.ladeuil+lp at free
Workaround SimpleHTTPRequestHandler.translate_path limitation in |
257 |
|
|
2167.3.5
by v.ladeuil+lp at free
Tests for proxies, covering #74759. |
258 |
|
|
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
259 |
class RedirectRequestHandler(TestingHTTPRequestHandler): |
260 |
"""Redirect all request to the specified server""" |
|
261 |
||
262 |
def parse_request(self): |
|
263 |
"""Redirect a single HTTP request to another host""" |
|
264 |
valid = TestingHTTPRequestHandler.parse_request(self) |
|
265 |
if valid: |
|
|
2164.2.29
by Vincent Ladeuil
Test the http redirection at the request level even if it's not |
266 |
tcs = self.server.test_case_server |
267 |
code, target = tcs.is_redirected(self.path) |
|
268 |
if code is not None and target is not None: |
|
269 |
# Redirect as instructed
|
|
270 |
self.send_response(code) |
|
|
2164.2.16
by Vincent Ladeuil
Add tests. |
271 |
self.send_header('Location', target) |
272 |
self.end_headers() |
|
273 |
return False # The job is done |
|
|
2164.2.29
by Vincent Ladeuil
Test the http redirection at the request level even if it's not |
274 |
else: |
275 |
# We leave the parent class serve the request
|
|
276 |
pass
|
|
|
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
277 |
return valid |
278 |
||
279 |
||
280 |
class HTTPServerRedirecting(HttpServer): |
|
281 |
"""An HttpServer redirecting to another server """ |
|
282 |
||
|
2164.2.16
by Vincent Ladeuil
Add tests. |
283 |
def __init__(self, request_handler=RedirectRequestHandler): |
|
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
284 |
HttpServer.__init__(self, request_handler) |
|
2164.2.29
by Vincent Ladeuil
Test the http redirection at the request level even if it's not |
285 |
# redirections is a list of tuples (source, target, code)
|
286 |
# - source is a regexp for the paths requested
|
|
287 |
# - target is a replacement for re.sub describing where
|
|
288 |
# the request will be redirected
|
|
289 |
# - code is the http error code associated to the
|
|
290 |
# redirection (301 permanent, 302 temporarry, etc
|
|
291 |
self.redirections = [] |
|
292 |
||
293 |
def redirect_to(self, host, port): |
|
294 |
"""Redirect all requests to a specific host:port""" |
|
295 |
self.redirections = [('(.*)', |
|
296 |
r'http://%s:%s\1' % (host, port) , |
|
297 |
301)] |
|
298 |
||
299 |
def is_redirected(self, path): |
|
300 |
"""Is the path redirected by this server. |
|
301 |
||
302 |
:param path: the requested relative path
|
|
303 |
||
304 |
:returns: a tuple (code, target) if a matching
|
|
305 |
redirection is found, (None, None) otherwise.
|
|
306 |
"""
|
|
307 |
code = None |
|
308 |
target = None |
|
309 |
for (rsource, rtarget, rcode) in self.redirections: |
|
310 |
target, match = re.subn(rsource, rtarget, path) |
|
311 |
if match: |
|
312 |
code = rcode |
|
313 |
break # The first match wins |
|
314 |
else: |
|
315 |
target = None |
|
316 |
return code, target |
|
|
2164.2.13
by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations. |
317 |
|
|
2167.3.5
by v.ladeuil+lp at free
Tests for proxies, covering #74759. |
318 |
|
|
2164.2.22
by Vincent Ladeuil
Take Aaron's review comments into account. |
319 |
class TestCaseWithRedirectedWebserver(TestCaseWithTwoWebservers): |
320 |
"""A support class providing redirections from one server to another. |
|
321 |
||
|
2164.2.25
by Vincent Ladeuil
Fix typos noticed by Aaron. |
322 |
We set up two webservers to allows various tests involving
|
|
2164.2.22
by Vincent Ladeuil
Take Aaron's review comments into account. |
323 |
redirections.
|
324 |
The 'old' server is redirected to the 'new' server.
|
|
325 |
"""
|
|
326 |
||
327 |
def create_transport_secondary_server(self): |
|
328 |
"""Create the secondary server redirecting to the primary server""" |
|
329 |
new = self.get_readonly_server() |
|
330 |
redirecting = HTTPServerRedirecting() |
|
331 |
redirecting.redirect_to(new.host, new.port) |
|
332 |
return redirecting |
|
333 |
||
334 |
def setUp(self): |
|
335 |
super(TestCaseWithRedirectedWebserver, self).setUp() |
|
336 |
# The redirections will point to the new server
|
|
337 |
self.new_server = self.get_readonly_server() |
|
338 |
# The requests to the old server will be redirected
|
|
339 |
self.old_server = self.get_secondary_server() |
|
340 |
||
341 |
||
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
342 |
class AuthRequestHandler(TestingHTTPRequestHandler): |
343 |
"""Requires an authentication to process requests. |
|
|
2363.4.12
by Vincent Ladeuil
Take jam's review comments into account. Fix typos, give better |
344 |
|
345 |
This is intended to be used with a server that always and
|
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
346 |
only use one authentication scheme (implemented by daughter
|
347 |
classes).
|
|
|
2363.4.12
by Vincent Ladeuil
Take jam's review comments into account. Fix typos, give better |
348 |
"""
|
|
2363.4.8
by Vincent Ladeuil
Implement a basic auth HTTP server, rewrite tests accordingly. |
349 |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
350 |
# The following attributes should be defined in the server
|
|
2420.1.10
by Vincent Ladeuil
Doc fixes. |
351 |
# - auth_header_sent: the header name sent to require auth
|
352 |
# - auth_header_recv: the header received containing auth
|
|
353 |
# - auth_error_code: the error code to indicate auth required
|
|
|
2420.1.2
by Vincent Ladeuil
Define tests for http proxy basic authentication. They fail. |
354 |
|
|
2363.4.8
by Vincent Ladeuil
Implement a basic auth HTTP server, rewrite tests accordingly. |
355 |
def do_GET(self): |
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
356 |
if self.authorized(): |
357 |
return TestingHTTPRequestHandler.do_GET(self) |
|
358 |
else: |
|
359 |
# Note that we must update test_case_server *before*
|
|
360 |
# sending the error or the client may try to read it
|
|
361 |
# before we have sent the whole error back.
|
|
362 |
tcs = self.server.test_case_server |
|
363 |
tcs.auth_required_errors += 1 |
|
364 |
self.send_response(tcs.auth_error_code) |
|
365 |
self.send_header_auth_reqed() |
|
366 |
self.end_headers() |
|
367 |
return
|
|
|
2363.4.8
by Vincent Ladeuil
Implement a basic auth HTTP server, rewrite tests accordingly. |
368 |
|
|
2363.4.12
by Vincent Ladeuil
Take jam's review comments into account. Fix typos, give better |
369 |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
370 |
class BasicAuthRequestHandler(AuthRequestHandler): |
371 |
"""Implements the basic authentication of a request""" |
|
372 |
||
373 |
def authorized(self): |
|
374 |
tcs = self.server.test_case_server |
|
375 |
if tcs.auth_scheme != 'basic': |
|
376 |
return False |
|
377 |
||
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
378 |
auth_header = self.headers.get(tcs.auth_header_recv, None) |
379 |
if auth_header: |
|
380 |
scheme, raw_auth = auth_header.split(' ', 1) |
|
381 |
if scheme.lower() == tcs.auth_scheme: |
|
382 |
user, password = raw_auth.decode('base64').split(':') |
|
383 |
return tcs.authorized(user, password) |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
384 |
|
385 |
return False |
|
386 |
||
387 |
def send_header_auth_reqed(self): |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
388 |
tcs = self.server.test_case_server |
389 |
self.send_header(tcs.auth_header_sent, |
|
390 |
'Basic realm="%s"' % tcs.auth_realm) |
|
391 |
||
392 |
||
|
2420.1.19
by Vincent Ladeuil
Cosmetic changes. |
393 |
# FIXME: We could send an Authentication-Info header too when
|
394 |
# the authentication is succesful
|
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
395 |
|
396 |
class DigestAuthRequestHandler(AuthRequestHandler): |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
397 |
"""Implements the digest authentication of a request. |
398 |
||
399 |
We need persistence for some attributes and that can't be
|
|
400 |
achieved here since we get instantiated for each request. We
|
|
401 |
rely on the DigestAuthServer to take care of them.
|
|
402 |
"""
|
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
403 |
|
404 |
def authorized(self): |
|
405 |
tcs = self.server.test_case_server |
|
406 |
if tcs.auth_scheme != 'digest': |
|
407 |
return False |
|
408 |
||
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
409 |
auth_header = self.headers.get(tcs.auth_header_recv, None) |
410 |
if auth_header is None: |
|
411 |
return False |
|
412 |
scheme, auth = auth_header.split(None, 1) |
|
413 |
if scheme.lower() == tcs.auth_scheme: |
|
414 |
auth_dict = urllib2.parse_keqv_list(urllib2.parse_http_list(auth)) |
|
415 |
||
416 |
return tcs.digest_authorized(auth_dict, self.command) |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
417 |
|
418 |
return False |
|
419 |
||
420 |
def send_header_auth_reqed(self): |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
421 |
tcs = self.server.test_case_server |
422 |
header = 'Digest realm="%s", ' % tcs.auth_realm |
|
|
2545.2.1
by Vincent Ladeuil
Fix 121889 by working around urllib2 bug. |
423 |
header += 'nonce="%s", algorithm="%s", qop="auth"' % (tcs.auth_nonce, |
424 |
'MD5') |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
425 |
self.send_header(tcs.auth_header_sent,header) |
426 |
||
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
427 |
|
428 |
class AuthServer(HttpServer): |
|
429 |
"""Extends HttpServer with a dictionary of passwords. |
|
430 |
||
431 |
This is used as a base class for various schemes which should
|
|
432 |
all use or redefined the associated AuthRequestHandler.
|
|
|
2363.4.12
by Vincent Ladeuil
Take jam's review comments into account. Fix typos, give better |
433 |
|
434 |
Note that no users are defined by default, so add_user should
|
|
435 |
be called before issuing the first request.
|
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
436 |
"""
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
437 |
|
438 |
# The following attributes should be set dy daughter classes
|
|
439 |
# and are used by AuthRequestHandler.
|
|
440 |
auth_header_sent = None |
|
441 |
auth_header_recv = None |
|
442 |
auth_error_code = None |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
443 |
auth_realm = "Thou should not pass" |
|
2363.4.12
by Vincent Ladeuil
Take jam's review comments into account. Fix typos, give better |
444 |
|
445 |
def __init__(self, request_handler, auth_scheme): |
|
|
2363.4.8
by Vincent Ladeuil
Implement a basic auth HTTP server, rewrite tests accordingly. |
446 |
HttpServer.__init__(self, request_handler) |
|
2363.4.12
by Vincent Ladeuil
Take jam's review comments into account. Fix typos, give better |
447 |
self.auth_scheme = auth_scheme |
|
2363.4.8
by Vincent Ladeuil
Implement a basic auth HTTP server, rewrite tests accordingly. |
448 |
self.password_of = {} |
|
2420.1.4
by Vincent Ladeuil
Add test checking the number of roundtrips due to 401 or 407 errors. |
449 |
self.auth_required_errors = 0 |
|
2363.4.8
by Vincent Ladeuil
Implement a basic auth HTTP server, rewrite tests accordingly. |
450 |
|
451 |
def add_user(self, user, password): |
|
|
2363.4.12
by Vincent Ladeuil
Take jam's review comments into account. Fix typos, give better |
452 |
"""Declare a user with an associated password. |
453 |
||
454 |
password can be empty, use an empty string ('') in that
|
|
455 |
case, not None.
|
|
456 |
"""
|
|
|
2363.4.8
by Vincent Ladeuil
Implement a basic auth HTTP server, rewrite tests accordingly. |
457 |
self.password_of[user] = password |
458 |
||
459 |
def authorized(self, user, password): |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
460 |
"""Check that the given user provided the right password""" |
|
2363.4.12
by Vincent Ladeuil
Take jam's review comments into account. Fix typos, give better |
461 |
expected_password = self.password_of.get(user, None) |
462 |
return expected_password is not None and password == expected_password |
|
463 |
||
464 |
||
|
2420.1.19
by Vincent Ladeuil
Cosmetic changes. |
465 |
# FIXME: There is some code duplication with
|
|
2900.2.5
by Vincent Ladeuil
ake ftp aware of authentication config. |
466 |
# _urllib2_wrappers.py.DigestAuthHandler. If that duplication
|
|
2420.1.19
by Vincent Ladeuil
Cosmetic changes. |
467 |
# grows, it may require a refactoring. Also, we don't implement
|
468 |
# SHA algorithm nor MD5-sess here, but that does not seem worth
|
|
469 |
# it.
|
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
470 |
class DigestAuthServer(AuthServer): |
471 |
"""A digest authentication server""" |
|
472 |
||
|
2420.1.16
by Vincent Ladeuil
Handle nonce changes. Fix a nasty bug breaking the auth parameters sharing. |
473 |
auth_nonce = 'now!' |
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
474 |
|
475 |
def __init__(self, request_handler, auth_scheme): |
|
476 |
AuthServer.__init__(self, request_handler, auth_scheme) |
|
477 |
||
478 |
def digest_authorized(self, auth, command): |
|
|
2420.1.16
by Vincent Ladeuil
Handle nonce changes. Fix a nasty bug breaking the auth parameters sharing. |
479 |
nonce = auth['nonce'] |
480 |
if nonce != self.auth_nonce: |
|
481 |
return False |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
482 |
realm = auth['realm'] |
483 |
if realm != self.auth_realm: |
|
484 |
return False |
|
485 |
user = auth['username'] |
|
486 |
if not self.password_of.has_key(user): |
|
487 |
return False |
|
488 |
algorithm= auth['algorithm'] |
|
489 |
if algorithm != 'MD5': |
|
490 |
return False |
|
491 |
qop = auth['qop'] |
|
492 |
if qop != 'auth': |
|
493 |
return False |
|
494 |
||
495 |
password = self.password_of[user] |
|
496 |
||
497 |
# Recalculate the response_digest to compare with the one
|
|
498 |
# sent by the client
|
|
499 |
A1 = '%s:%s:%s' % (user, realm, password) |
|
500 |
A2 = '%s:%s' % (command, auth['uri']) |
|
501 |
||
|
2929.3.1
by Vincent Ladeuil
Fix python2.6 deprecation warnings (still 4 failures 5 errors in test suite). |
502 |
H = lambda x: md5(x).hexdigest() |
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
503 |
KD = lambda secret, data: H("%s:%s" % (secret, data)) |
504 |
||
505 |
nonce_count = int(auth['nc'], 16) |
|
506 |
||
507 |
ncvalue = '%08x' % nonce_count |
|
508 |
||
509 |
cnonce = auth['cnonce'] |
|
510 |
noncebit = '%s:%s:%s:%s:%s' % (nonce, ncvalue, cnonce, qop, H(A2)) |
|
511 |
response_digest = KD(H(A1), noncebit) |
|
512 |
||
513 |
return response_digest == auth['response'] |
|
514 |
||
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
515 |
class HTTPAuthServer(AuthServer): |
516 |
"""An HTTP server requiring authentication""" |
|
517 |
||
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
518 |
def init_http_auth(self): |
519 |
self.auth_header_sent = 'WWW-Authenticate' |
|
520 |
self.auth_header_recv = 'Authorization' |
|
521 |
self.auth_error_code = 401 |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
522 |
|
523 |
||
524 |
class ProxyAuthServer(AuthServer): |
|
525 |
"""A proxy server requiring authentication""" |
|
526 |
||
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
527 |
def init_proxy_auth(self): |
528 |
self.proxy_requests = True |
|
529 |
self.auth_header_sent = 'Proxy-Authenticate' |
|
530 |
self.auth_header_recv = 'Proxy-Authorization' |
|
531 |
self.auth_error_code = 407 |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
532 |
|
533 |
||
534 |
class HTTPBasicAuthServer(HTTPAuthServer): |
|
535 |
"""An HTTP server requiring basic authentication""" |
|
536 |
||
537 |
def __init__(self): |
|
538 |
HTTPAuthServer.__init__(self, BasicAuthRequestHandler, 'basic') |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
539 |
self.init_http_auth() |
540 |
||
541 |
||
542 |
class HTTPDigestAuthServer(DigestAuthServer, HTTPAuthServer): |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
543 |
"""An HTTP server requiring digest authentication""" |
544 |
||
545 |
def __init__(self): |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
546 |
DigestAuthServer.__init__(self, DigestAuthRequestHandler, 'digest') |
547 |
self.init_http_auth() |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
548 |
|
549 |
||
550 |
class ProxyBasicAuthServer(ProxyAuthServer): |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
551 |
"""A proxy server requiring basic authentication""" |
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
552 |
|
553 |
def __init__(self): |
|
554 |
ProxyAuthServer.__init__(self, BasicAuthRequestHandler, 'basic') |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
555 |
self.init_proxy_auth() |
556 |
||
557 |
||
558 |
class ProxyDigestAuthServer(DigestAuthServer, ProxyAuthServer): |
|
559 |
"""A proxy server requiring basic authentication""" |
|
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
560 |
|
561 |
def __init__(self): |
|
562 |
ProxyAuthServer.__init__(self, DigestAuthRequestHandler, 'digest') |
|
|
2420.1.11
by Vincent Ladeuil
Implement digest authentication. Test suite passes. Tested against apache-2.x. |
563 |
self.init_proxy_auth() |
|
2420.1.9
by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth. |
564 |
|
565 |