66
if features.pycurl.available():
67
65
from bzrlib.transport.http._pycurl import PyCurlTransport
70
load_tests = load_tests_apply_scenarios
73
def vary_by_http_client_implementation():
74
"""Test the two libraries we can use, pycurl and urllib."""
67
except errors.DependencyNotPresent:
68
pycurl_present = False
71
def load_tests(standard_tests, module, loader):
72
"""Multiply tests for http clients and protocol versions."""
73
result = loader.suiteClass()
75
# one for each transport implementation
76
t_tests, remaining_tests = tests.split_suite_by_condition(
77
standard_tests, tests.condition_isinstance((
78
TestHttpTransportRegistration,
79
TestHttpTransportUrls,
75
82
transport_scenarios = [
76
83
('urllib', dict(_transport=_urllib.HttpTransport_urllib,
77
84
_server=http_server.HttpServer_urllib,
78
_url_protocol='http+urllib',)),
85
_qualified_prefix='http+urllib',)),
80
if features.pycurl.available():
81
88
transport_scenarios.append(
82
89
('pycurl', dict(_transport=PyCurlTransport,
83
90
_server=http_server.HttpServer_PyCurl,
84
_url_protocol='http+pycurl',)))
85
return transport_scenarios
88
def vary_by_http_protocol_version():
89
"""Test on http/1.0 and 1.1"""
91
('HTTP/1.0', dict(_protocol_version='HTTP/1.0')),
92
('HTTP/1.1', dict(_protocol_version='HTTP/1.1')),
91
_qualified_prefix='http+pycurl',)))
92
tests.multiply_tests(t_tests, transport_scenarios, result)
94
# each implementation tested with each HTTP version
95
tp_tests, remaining_tests = tests.split_suite_by_condition(
96
remaining_tests, tests.condition_isinstance((
97
SmartHTTPTunnellingTest,
98
TestDoCatchRedirections,
100
TestHTTPRedirections,
101
TestHTTPSilentRedirections,
102
TestLimitedRangeRequestServer,
106
TestSpecificRequestHandler,
108
protocol_scenarios = [
109
('HTTP/1.0', dict(_protocol_version='HTTP/1.0')),
110
('HTTP/1.1', dict(_protocol_version='HTTP/1.1')),
112
tp_scenarios = tests.multiply_scenarios(transport_scenarios,
114
tests.multiply_tests(tp_tests, tp_scenarios, result)
116
# proxy auth: each auth scheme on all http versions on all implementations.
117
tppa_tests, remaining_tests = tests.split_suite_by_condition(
118
remaining_tests, tests.condition_isinstance((
121
proxy_auth_scheme_scenarios = [
122
('basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
123
('digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
125
dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
96
def vary_by_http_auth_scheme():
127
tppa_scenarios = tests.multiply_scenarios(tp_scenarios,
128
proxy_auth_scheme_scenarios)
129
tests.multiply_tests(tppa_tests, tppa_scenarios, result)
131
# auth: each auth scheme on all http versions on all implementations.
132
tpa_tests, remaining_tests = tests.split_suite_by_condition(
133
remaining_tests, tests.condition_isinstance((
136
auth_scheme_scenarios = [
98
137
('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
99
138
('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
101
dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
103
# Add some attributes common to all scenarios
104
for scenario_id, scenario_dict in scenarios:
105
scenario_dict.update(_auth_header='Authorization',
106
_username_prompt_prefix='',
107
_password_prompt_prefix='')
111
def vary_by_http_proxy_auth_scheme():
113
('proxy-basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
114
('proxy-digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
115
('proxy-basicdigest',
116
dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
118
# Add some attributes common to all scenarios
119
for scenario_id, scenario_dict in scenarios:
120
scenario_dict.update(_auth_header='Proxy-Authorization',
121
_username_prompt_prefix='Proxy ',
122
_password_prompt_prefix='Proxy ')
126
def vary_by_http_activity():
140
dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
142
tpa_scenarios = tests.multiply_scenarios(tp_scenarios,
143
auth_scheme_scenarios)
144
tests.multiply_tests(tpa_tests, tpa_scenarios, result)
146
# activity: on all http[s] versions on all implementations
147
tpact_tests, remaining_tests = tests.split_suite_by_condition(
148
remaining_tests, tests.condition_isinstance((
127
151
activity_scenarios = [
128
152
('urllib,http', dict(_activity_server=ActivityHTTPServer,
129
_transport=_urllib.HttpTransport_urllib,)),
153
_transport=_urllib.HttpTransport_urllib,)),
131
if features.HTTPSServerFeature.available():
155
if tests.HTTPSServerFeature.available():
132
156
activity_scenarios.append(
133
157
('urllib,https', dict(_activity_server=ActivityHTTPSServer,
134
_transport=_urllib.HttpTransport_urllib,)),)
135
if features.pycurl.available():
158
_transport=_urllib.HttpTransport_urllib,)),)
136
160
activity_scenarios.append(
137
161
('pycurl,http', dict(_activity_server=ActivityHTTPServer,
138
_transport=PyCurlTransport,)),)
139
if features.HTTPSServerFeature.available():
162
_transport=PyCurlTransport,)),)
163
if tests.HTTPSServerFeature.available():
140
164
from bzrlib.tests import (
188
220
def get_url(self):
189
221
return '%s://%s:%s/' % (self.scheme, self.host, self.port)
191
def start_server(self):
192
224
self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
193
225
self._sock.bind(('127.0.0.1', 0))
194
226
self.host, self.port = self._sock.getsockname()
195
227
self._ready = threading.Event()
196
self._thread = test_server.TestThread(
197
sync_event=self._ready, target=self._accept_read_and_reply)
228
self._thread = threading.Thread(target=self._accept_read_and_reply)
229
self._thread.setDaemon(True)
198
230
self._thread.start()
199
if 'threads' in tests.selftest_debug_flags:
200
sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
203
233
def _accept_read_and_reply(self):
204
234
self._sock.listen(1)
205
235
self._ready.set()
206
conn, address = self._sock.accept()
207
if self._expect_body_tail is not None:
236
self._sock.settimeout(5)
238
conn, address = self._sock.accept()
239
# On win32, the accepted connection will be non-blocking to start
240
# with because we're using settimeout.
241
conn.setblocking(True)
208
242
while not self.received_bytes.endswith(self._expect_body_tail):
209
243
self.received_bytes += conn.recv(4096)
210
244
conn.sendall('HTTP/1.1 200 OK\r\n')
245
except socket.timeout:
246
# Make sure the client isn't stuck waiting for us to e.g. accept.
212
247
self._sock.close()
213
248
except socket.error:
214
249
# The client may have already closed the socket.
217
def stop_server(self):
219
# Issue a fake connection to wake up the server and allow it to
221
fake_conn = osutils.connect_socket((self.host, self.port))
223
255
except socket.error:
224
256
# We might have already closed it. We don't care.
229
if 'threads' in tests.selftest_debug_flags:
230
sys.stderr.write('Thread joined: %s\n' % (self._thread.ident,))
233
262
class TestAuthHeader(tests.TestCase):
241
270
def test_empty_header(self):
242
271
scheme, remainder = self.parse_header('')
243
self.assertEqual('', scheme)
272
self.assertEquals('', scheme)
244
273
self.assertIs(None, remainder)
246
275
def test_negotiate_header(self):
247
276
scheme, remainder = self.parse_header('Negotiate')
248
self.assertEqual('negotiate', scheme)
277
self.assertEquals('negotiate', scheme)
249
278
self.assertIs(None, remainder)
251
280
def test_basic_header(self):
252
281
scheme, remainder = self.parse_header(
253
282
'Basic realm="Thou should not pass"')
254
self.assertEqual('basic', scheme)
255
self.assertEqual('realm="Thou should not pass"', remainder)
283
self.assertEquals('basic', scheme)
284
self.assertEquals('realm="Thou should not pass"', remainder)
257
286
def test_basic_extract_realm(self):
258
287
scheme, remainder = self.parse_header(
260
289
_urllib2_wrappers.BasicAuthHandler)
261
290
match, realm = self.auth_handler.extract_realm(remainder)
262
291
self.assertTrue(match is not None)
263
self.assertEqual('Thou should not pass', realm)
292
self.assertEquals('Thou should not pass', realm)
265
294
def test_digest_header(self):
266
295
scheme, remainder = self.parse_header(
267
296
'Digest realm="Thou should not pass"')
268
self.assertEqual('digest', scheme)
269
self.assertEqual('realm="Thou should not pass"', remainder)
272
class TestHTTPRangeParsing(tests.TestCase):
275
super(TestHTTPRangeParsing, self).setUp()
276
# We focus on range parsing here and ignore everything else
277
class RequestHandler(http_server.TestingHTTPRequestHandler):
278
def setup(self): pass
279
def handle(self): pass
280
def finish(self): pass
282
self.req_handler = RequestHandler(None, None, None)
284
def assertRanges(self, ranges, header, file_size):
285
self.assertEquals(ranges,
286
self.req_handler._parse_ranges(header, file_size))
288
def test_simple_range(self):
289
self.assertRanges([(0,2)], 'bytes=0-2', 12)
292
self.assertRanges([(8, 11)], 'bytes=-4', 12)
294
def test_tail_bigger_than_file(self):
295
self.assertRanges([(0, 11)], 'bytes=-99', 12)
297
def test_range_without_end(self):
298
self.assertRanges([(4, 11)], 'bytes=4-', 12)
300
def test_invalid_ranges(self):
301
self.assertRanges(None, 'bytes=12-22', 12)
302
self.assertRanges(None, 'bytes=1-3,12-22', 12)
303
self.assertRanges(None, 'bytes=-', 12)
297
self.assertEquals('digest', scheme)
298
self.assertEquals('realm="Thou should not pass"', remainder)
306
301
class TestHTTPServer(tests.TestCase):
312
307
protocol_version = 'HTTP/0.1'
314
self.assertRaises(httplib.UnknownProtocol,
315
http_server.HttpServer, BogusRequestHandler)
309
server = http_server.HttpServer(BogusRequestHandler)
311
self.assertRaises(httplib.UnknownProtocol, server.setUp)
314
self.fail('HTTP Server creation did not raise UnknownProtocol')
317
316
def test_force_invalid_protocol(self):
318
self.assertRaises(httplib.UnknownProtocol,
319
http_server.HttpServer, protocol_version='HTTP/0.1')
317
server = http_server.HttpServer(protocol_version='HTTP/0.1')
319
self.assertRaises(httplib.UnknownProtocol, server.setUp)
322
self.fail('HTTP Server creation did not raise UnknownProtocol')
321
324
def test_server_start_and_stop(self):
322
325
server = http_server.HttpServer()
323
self.addCleanup(server.stop_server)
324
server.start_server()
325
self.assertTrue(server.server is not None)
326
self.assertTrue(server.server.serving is not None)
327
self.assertTrue(server.server.serving)
328
self.assertTrue(server._http_running)
331
self.assertFalse(server._http_running)
329
333
def test_create_http_server_one_zero(self):
330
334
class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
386
393
def test_url_parsing(self):
387
394
f = FakeManager()
388
395
url = http.extract_auth('http://example.com', f)
389
self.assertEqual('http://example.com', url)
390
self.assertEqual(0, len(f.credentials))
396
self.assertEquals('http://example.com', url)
397
self.assertEquals(0, len(f.credentials))
391
398
url = http.extract_auth(
392
'http://user:pass@example.com/bzr/bzr.dev', f)
393
self.assertEqual('http://example.com/bzr/bzr.dev', url)
394
self.assertEqual(1, len(f.credentials))
395
self.assertEqual([None, 'example.com', 'user', 'pass'],
399
'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
400
self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
401
self.assertEquals(1, len(f.credentials))
402
self.assertEquals([None, 'www.bazaar-vcs.org', 'user', 'pass'],
399
406
class TestHttpTransportUrls(tests.TestCase):
400
407
"""Test the http urls."""
402
scenarios = vary_by_http_client_implementation()
404
409
def test_abs_url(self):
405
410
"""Construction of absolute http URLs"""
406
t = self._transport('http://example.com/bzr/bzr.dev/')
411
t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
407
412
eq = self.assertEqualDiff
408
eq(t.abspath('.'), 'http://example.com/bzr/bzr.dev')
409
eq(t.abspath('foo/bar'), 'http://example.com/bzr/bzr.dev/foo/bar')
410
eq(t.abspath('.bzr'), 'http://example.com/bzr/bzr.dev/.bzr')
413
eq(t.abspath('.'), 'http://bazaar-vcs.org/bzr/bzr.dev')
414
eq(t.abspath('foo/bar'), 'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
415
eq(t.abspath('.bzr'), 'http://bazaar-vcs.org/bzr/bzr.dev/.bzr')
411
416
eq(t.abspath('.bzr/1//2/./3'),
412
'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
417
'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
414
419
def test_invalid_http_urls(self):
415
420
"""Trap invalid construction of urls"""
416
self._transport('http://example.com/bzr/bzr.dev/')
421
t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
417
422
self.assertRaises(errors.InvalidURL,
419
'http://http://example.com/bzr/bzr.dev/')
424
'http://http://bazaar-vcs.org/bzr/bzr.dev/')
421
426
def test_http_root_urls(self):
422
427
"""Construction of URLs from server root"""
423
t = self._transport('http://example.com/')
428
t = self._transport('http://bzr.ozlabs.org/')
424
429
eq = self.assertEqualDiff
425
430
eq(t.abspath('.bzr/tree-version'),
426
'http://example.com/.bzr/tree-version')
431
'http://bzr.ozlabs.org/.bzr/tree-version')
428
433
def test_http_impl_urls(self):
429
434
"""There are servers which ask for particular clients to connect"""
430
435
server = self._server()
431
server.start_server()
433
438
url = server.get_url()
434
self.assertTrue(url.startswith('%s://' % self._url_protocol))
439
self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
439
444
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
448
453
https by supplying a fake version_info that do not
451
self.requireFeature(features.pycurl)
452
# Import the module locally now that we now it's available.
453
pycurl = features.pycurl.module
459
raise tests.TestSkipped('pycurl not present')
455
self.overrideAttr(pycurl, 'version_info',
456
# Fake the pycurl version_info This was taken from
457
# a windows pycurl without SSL (thanks to bialix)
466
('ftp', 'gopher', 'telnet',
467
'dict', 'ldap', 'http', 'file'),
471
self.assertRaises(errors.DependencyNotPresent, self._transport,
472
'https://launchpad.net')
461
version_info_orig = pycurl.version_info
463
# Now that we have pycurl imported, we can fake its version_info
464
# This was taken from a windows pycurl without SSL
466
pycurl.version_info = lambda : (2,
474
('ftp', 'gopher', 'telnet',
475
'dict', 'ldap', 'http', 'file'),
479
self.assertRaises(errors.DependencyNotPresent, self._transport,
480
'https://launchpad.net')
482
# Restore the right function
483
pycurl.version_info = version_info_orig
475
486
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
476
487
"""Test the http connections."""
478
scenarios = multiply_scenarios(
479
vary_by_http_client_implementation(),
480
vary_by_http_protocol_version(),
484
490
http_utils.TestCaseWithWebserver.setUp(self)
485
491
self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
530
536
class TestHttpTransportRegistration(tests.TestCase):
531
537
"""Test registrations of various http implementations"""
533
scenarios = vary_by_http_client_implementation()
535
539
def test_http_registered(self):
536
t = transport.get_transport('%s://foo.com/' % self._url_protocol)
540
t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
537
541
self.assertIsInstance(t, transport.Transport)
538
542
self.assertIsInstance(t, self._transport)
541
545
class TestPost(tests.TestCase):
543
scenarios = multiply_scenarios(
544
vary_by_http_client_implementation(),
545
vary_by_http_protocol_version(),
548
547
def test_post_body_is_received(self):
549
548
server = RecordingServer(expect_body_tail='end-of-body',
550
scheme=self._url_protocol)
549
scheme=self._qualified_prefix)
551
550
self.start_server(server)
552
551
url = server.get_url()
553
# FIXME: needs a cleanup -- vila 20100611
554
http_transport = transport.get_transport(url)
552
http_transport = self._transport(url)
555
553
code, response = http_transport._post('abc def end-of-body')
557
555
server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
558
556
self.assertTrue('content-length: 19\r' in server.received_bytes.lower())
559
self.assertTrue('content-type: application/octet-stream\r'
560
in server.received_bytes.lower())
561
557
# The transport should not be assuming that the server can accept
562
558
# chunked encoding the first time it connects, because HTTP/1.1, so we
563
559
# check for the literal string.
599
595
Daughter classes are expected to override _req_handler_class
602
scenarios = multiply_scenarios(
603
vary_by_http_client_implementation(),
604
vary_by_http_protocol_version(),
607
598
# Provide a useful default
608
599
_req_handler_class = http_server.TestingHTTPRequestHandler
610
601
def create_transport_readonly_server(self):
611
server = http_server.HttpServer(self._req_handler_class,
612
protocol_version=self._protocol_version)
613
server._url_protocol = self._url_protocol
602
return http_server.HttpServer(self._req_handler_class,
603
protocol_version=self._protocol_version)
616
605
def _testing_pycurl(self):
617
# TODO: This is duplicated for lots of the classes in this file
618
return (features.pycurl.available()
619
and self._transport == PyCurlTransport)
606
return pycurl_present and self._transport == PyCurlTransport
622
609
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
623
610
"""Whatever request comes in, close the connection"""
625
def _handle_one_request(self):
612
def handle_one_request(self):
626
613
"""Handle a single HTTP request, by abruptly closing the connection"""
627
614
self.close_connection = 1
1048
1052
self.assertEqual('single', t._range_hint)
1051
class TruncatedBeforeBoundaryRequestHandler(
1052
http_server.TestingHTTPRequestHandler):
1053
"""Truncation before a boundary, like in bug 198646"""
1055
_truncated_ranges = 1
1057
def get_multiple_ranges(self, file, file_size, ranges):
1058
self.send_response(206)
1059
self.send_header('Accept-Ranges', 'bytes')
1061
self.send_header('Content-Type',
1062
'multipart/byteranges; boundary=%s' % boundary)
1063
boundary_line = '--%s\r\n' % boundary
1064
# Calculate the Content-Length
1066
for (start, end) in ranges:
1067
content_length += len(boundary_line)
1068
content_length += self._header_line_length(
1069
'Content-type', 'application/octet-stream')
1070
content_length += self._header_line_length(
1071
'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))
1072
content_length += len('\r\n') # end headers
1073
content_length += end - start # + 1
1074
content_length += len(boundary_line)
1075
self.send_header('Content-length', content_length)
1078
# Send the multipart body
1080
for (start, end) in ranges:
1081
if cur + self._truncated_ranges >= len(ranges):
1082
# Abruptly ends the response and close the connection
1083
self.close_connection = 1
1085
self.wfile.write(boundary_line)
1086
self.send_header('Content-type', 'application/octet-stream')
1087
self.send_header('Content-Range', 'bytes %d-%d/%d'
1088
% (start, end, file_size))
1090
self.send_range_content(file, start, end - start + 1)
1093
self.wfile.write(boundary_line)
1096
class TestTruncatedBeforeBoundary(TestSpecificRequestHandler):
1097
"""Tests the case of bug 198646, disconnecting before a boundary."""
1099
_req_handler_class = TruncatedBeforeBoundaryRequestHandler
1102
super(TestTruncatedBeforeBoundary, self).setUp()
1103
self.build_tree_contents([('a', '0123456789')],)
1105
def test_readv_with_short_reads(self):
1106
server = self.get_readonly_server()
1107
t = self.get_readonly_transport()
1108
# Force separate ranges for each offset
1109
t._bytes_to_read_before_seek = 0
1110
ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1111
self.assertEqual((0, '0'), ireadv.next())
1112
self.assertEqual((2, '2'), ireadv.next())
1113
self.assertEqual((4, '45'), ireadv.next())
1114
self.assertEqual((9, '9'), ireadv.next())
1117
1054
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1118
1055
"""Errors out when range specifiers exceed the limit"""
1188
1123
Only the urllib implementation is tested here.
1127
tests.TestCase.setUp(self)
1132
tests.TestCase.tearDown(self)
1134
def _install_env(self, env):
1135
for name, value in env.iteritems():
1136
self._old_env[name] = osutils.set_or_unset_env(name, value)
1138
def _restore_env(self):
1139
for name, value in self._old_env.iteritems():
1140
osutils.set_or_unset_env(name, value)
1191
1142
def _proxied_request(self):
1192
1143
handler = _urllib2_wrappers.ProxyHandler()
1193
request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
1144
request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
1194
1145
handler.set_proxy(request, 'http')
1197
def assertEvaluateProxyBypass(self, expected, host, no_proxy):
1198
handler = _urllib2_wrappers.ProxyHandler()
1199
self.assertEquals(expected,
1200
handler.evaluate_proxy_bypass(host, no_proxy))
1202
1148
def test_empty_user(self):
1203
self.overrideEnv('http_proxy', 'http://bar.com')
1204
request = self._proxied_request()
1205
self.assertFalse(request.headers.has_key('Proxy-authorization'))
1207
def test_user_with_at(self):
1208
self.overrideEnv('http_proxy',
1209
'http://username@domain:password@proxy_host:1234')
1149
self._install_env({'http_proxy': 'http://bar.com'})
1210
1150
request = self._proxied_request()
1211
1151
self.assertFalse(request.headers.has_key('Proxy-authorization'))
1213
1153
def test_invalid_proxy(self):
1214
1154
"""A proxy env variable without scheme"""
1215
self.overrideEnv('http_proxy', 'host:1234')
1155
self._install_env({'http_proxy': 'host:1234'})
1216
1156
self.assertRaises(errors.InvalidURL, self._proxied_request)
1218
def test_evaluate_proxy_bypass_true(self):
1219
"""The host is not proxied"""
1220
self.assertEvaluateProxyBypass(True, 'example.com', 'example.com')
1221
self.assertEvaluateProxyBypass(True, 'bzr.example.com', '*example.com')
1223
def test_evaluate_proxy_bypass_false(self):
1224
"""The host is proxied"""
1225
self.assertEvaluateProxyBypass(False, 'bzr.example.com', None)
1227
def test_evaluate_proxy_bypass_unknown(self):
1228
"""The host is not explicitly proxied"""
1229
self.assertEvaluateProxyBypass(None, 'example.com', 'not.example.com')
1230
self.assertEvaluateProxyBypass(None, 'bzr.example.com', 'example.com')
1232
def test_evaluate_proxy_bypass_empty_entries(self):
1233
"""Ignore empty entries"""
1234
self.assertEvaluateProxyBypass(None, 'example.com', '')
1235
self.assertEvaluateProxyBypass(None, 'example.com', ',')
1236
self.assertEvaluateProxyBypass(None, 'example.com', 'foo,,bar')
1239
1159
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1240
1160
"""Tests proxy server.
1245
1165
to the file names).
1248
scenarios = multiply_scenarios(
1249
vary_by_http_client_implementation(),
1250
vary_by_http_protocol_version(),
1253
1168
# FIXME: We don't have an https server available, so we don't
1254
# test https connections. --vila toolongago
1169
# test https connections.
1256
1171
def setUp(self):
1257
1172
super(TestProxyHttpServer, self).setUp()
1258
self.transport_secondary_server = http_utils.ProxyServer
1259
1173
self.build_tree_contents([('foo', 'contents of foo\n'),
1260
1174
('foo-proxied', 'proxied contents of foo\n')])
1261
1175
# Let's setup some attributes for tests
1262
server = self.get_readonly_server()
1263
self.server_host_port = '%s:%d' % (server.host, server.port)
1176
self.server = self.get_readonly_server()
1177
self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
1264
1178
if self._testing_pycurl():
1265
1179
# Oh my ! pycurl does not check for the port as part of
1266
1180
# no_proxy :-( So we just test the host part
1267
self.no_proxy_host = server.host
1181
self.no_proxy_host = 'localhost'
1269
self.no_proxy_host = self.server_host_port
1183
self.no_proxy_host = self.proxy_address
1270
1184
# The secondary server is the proxy
1271
self.proxy_url = self.get_secondary_url()
1185
self.proxy = self.get_secondary_server()
1186
self.proxy_url = self.proxy.get_url()
1273
1189
def _testing_pycurl(self):
1274
# TODO: This is duplicated for lots of the classes in this file
1275
return (features.pycurl.available()
1276
and self._transport == PyCurlTransport)
1278
def assertProxied(self):
1279
t = self.get_readonly_transport()
1280
self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1282
def assertNotProxied(self):
1283
t = self.get_readonly_transport()
1284
self.assertEqual('contents of foo\n', t.get('foo').read())
1190
return pycurl_present and self._transport == PyCurlTransport
1192
def create_transport_secondary_server(self):
1193
"""Creates an http server that will serve files with
1194
'-proxied' appended to their names.
1196
return http_utils.ProxyServer(protocol_version=self._protocol_version)
1198
def _install_env(self, env):
1199
for name, value in env.iteritems():
1200
self._old_env[name] = osutils.set_or_unset_env(name, value)
1202
def _restore_env(self):
1203
for name, value in self._old_env.iteritems():
1204
osutils.set_or_unset_env(name, value)
1206
def proxied_in_env(self, env):
1207
self._install_env(env)
1208
url = self.server.get_url()
1209
t = self._transport(url)
1211
self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1215
def not_proxied_in_env(self, env):
1216
self._install_env(env)
1217
url = self.server.get_url()
1218
t = self._transport(url)
1220
self.assertEqual('contents of foo\n', t.get('foo').read())
1286
1224
def test_http_proxy(self):
1287
self.overrideEnv('http_proxy', self.proxy_url)
1288
self.assertProxied()
1225
self.proxied_in_env({'http_proxy': self.proxy_url})
1290
1227
def test_HTTP_PROXY(self):
1291
1228
if self._testing_pycurl():
1294
1231
# about. Should we ?)
1295
1232
raise tests.TestNotApplicable(
1296
1233
'pycurl does not check HTTP_PROXY for security reasons')
1297
self.overrideEnv('HTTP_PROXY', self.proxy_url)
1298
self.assertProxied()
1234
self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
1300
1236
def test_all_proxy(self):
1301
self.overrideEnv('all_proxy', self.proxy_url)
1302
self.assertProxied()
1237
self.proxied_in_env({'all_proxy': self.proxy_url})
1304
1239
def test_ALL_PROXY(self):
1305
self.overrideEnv('ALL_PROXY', self.proxy_url)
1306
self.assertProxied()
1240
self.proxied_in_env({'ALL_PROXY': self.proxy_url})
1308
1242
def test_http_proxy_with_no_proxy(self):
1309
self.overrideEnv('no_proxy', self.no_proxy_host)
1310
self.overrideEnv('http_proxy', self.proxy_url)
1311
self.assertNotProxied()
1243
self.not_proxied_in_env({'http_proxy': self.proxy_url,
1244
'no_proxy': self.no_proxy_host})
1313
1246
def test_HTTP_PROXY_with_NO_PROXY(self):
1314
1247
if self._testing_pycurl():
1315
1248
raise tests.TestNotApplicable(
1316
1249
'pycurl does not check HTTP_PROXY for security reasons')
1317
self.overrideEnv('NO_PROXY', self.no_proxy_host)
1318
self.overrideEnv('HTTP_PROXY', self.proxy_url)
1319
self.assertNotProxied()
1250
self.not_proxied_in_env({'HTTP_PROXY': self.proxy_url,
1251
'NO_PROXY': self.no_proxy_host})
1321
1253
def test_all_proxy_with_no_proxy(self):
1322
self.overrideEnv('no_proxy', self.no_proxy_host)
1323
self.overrideEnv('all_proxy', self.proxy_url)
1324
self.assertNotProxied()
1254
self.not_proxied_in_env({'all_proxy': self.proxy_url,
1255
'no_proxy': self.no_proxy_host})
1326
1257
def test_ALL_PROXY_with_NO_PROXY(self):
1327
self.overrideEnv('NO_PROXY', self.no_proxy_host)
1328
self.overrideEnv('ALL_PROXY', self.proxy_url)
1329
self.assertNotProxied()
1258
self.not_proxied_in_env({'ALL_PROXY': self.proxy_url,
1259
'NO_PROXY': self.no_proxy_host})
1331
1261
def test_http_proxy_without_scheme(self):
1332
self.overrideEnv('http_proxy', self.server_host_port)
1333
1262
if self._testing_pycurl():
1334
1263
# pycurl *ignores* invalid proxy env variables. If that ever change
1335
1264
# in the future, this test will fail indicating that pycurl do not
1336
1265
# ignore anymore such variables.
1337
self.assertNotProxied()
1266
self.not_proxied_in_env({'http_proxy': self.proxy_address})
1339
self.assertRaises(errors.InvalidURL, self.assertProxied)
1268
self.assertRaises(errors.InvalidURL,
1269
self.proxied_in_env,
1270
{'http_proxy': self.proxy_address})
1342
1273
class TestRanges(http_utils.TestCaseWithWebserver):
1343
1274
"""Test the Range header in GET methods."""
1345
scenarios = multiply_scenarios(
1346
vary_by_http_client_implementation(),
1347
vary_by_http_protocol_version(),
1350
1276
def setUp(self):
1351
1277
http_utils.TestCaseWithWebserver.setUp(self)
1352
1278
self.build_tree_contents([('a', '0123456789')],)
1279
server = self.get_readonly_server()
1280
self.transport = self._transport(server.get_url())
1354
1282
def create_transport_readonly_server(self):
1355
1283
return http_server.HttpServer(protocol_version=self._protocol_version)
1357
1285
def _file_contents(self, relpath, ranges):
1358
t = self.get_readonly_transport()
1359
1286
offsets = [ (start, end - start + 1) for start, end in ranges]
1360
coalesce = t._coalesce_offsets
1287
coalesce = self.transport._coalesce_offsets
1361
1288
coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1362
code, data = t._get(relpath, coalesced)
1289
code, data = self.transport._get(relpath, coalesced)
1363
1290
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1364
1291
for start, end in ranges:
1365
1292
data.seek(start)
1366
1293
yield data.read(end - start + 1)
1368
1295
def _file_tail(self, relpath, tail_amount):
1369
t = self.get_readonly_transport()
1370
code, data = t._get(relpath, [], tail_amount)
1296
code, data = self.transport._get(relpath, [], tail_amount)
1371
1297
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1372
1298
data.seek(-tail_amount, 2)
1373
1299
return data.read(tail_amount)
1491
1400
('5/a', 'redirected 5 times'),
1403
self.old_transport = self._transport(self.old_server.get_url())
1405
def setup_redirected_request(self):
1406
self.original_class = _urllib2_wrappers.Request
1407
_urllib2_wrappers.Request = RedirectedRequest
1409
def cleanup_redirected_request(self):
1410
_urllib2_wrappers.Request = self.original_class
1412
def create_transport_secondary_server(self):
1413
"""Create the secondary server, redirections are defined in the tests"""
1414
return http_utils.HTTPServerRedirecting(
1415
protocol_version=self._protocol_version)
1494
1417
def test_one_redirection(self):
1495
t = self.get_old_transport()
1496
req = RedirectedRequest('GET', t._remote_path('a'))
1418
t = self.old_transport
1420
req = RedirectedRequest('GET', t.abspath('a'))
1421
req.follow_redirections = True
1497
1422
new_prefix = 'http://%s:%s' % (self.new_server.host,
1498
1423
self.new_server.port)
1499
1424
self.old_server.redirections = \
1500
1425
[('(.*)', r'%s/1\1' % (new_prefix), 301),]
1501
self.assertEqual('redirected once', t._perform(req).read())
1426
self.assertEquals('redirected once',t._perform(req).read())
1503
1428
def test_five_redirections(self):
1504
t = self.get_old_transport()
1505
req = RedirectedRequest('GET', t._remote_path('a'))
1429
t = self.old_transport
1431
req = RedirectedRequest('GET', t.abspath('a'))
1432
req.follow_redirections = True
1506
1433
old_prefix = 'http://%s:%s' % (self.old_server.host,
1507
1434
self.old_server.port)
1508
1435
new_prefix = 'http://%s:%s' % (self.new_server.host,
1514
1441
('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1515
1442
('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1517
self.assertEqual('redirected 5 times', t._perform(req).read())
1444
self.assertEquals('redirected 5 times',t._perform(req).read())
1520
1447
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1521
1448
"""Test transport.do_catching_redirections."""
1523
scenarios = multiply_scenarios(
1524
vary_by_http_client_implementation(),
1525
vary_by_http_protocol_version(),
1528
1450
def setUp(self):
1529
1451
super(TestDoCatchRedirections, self).setUp()
1530
1452
self.build_tree_contents([('a', '0123456789'),],)
1531
cleanup_http_redirection_connections(self)
1533
self.old_transport = self.get_old_transport()
1454
self.old_transport = self._transport(self.old_server.get_url())
1456
def get_a(self, transport):
1457
return transport.get('a')
1538
1459
def test_no_redirection(self):
1539
t = self.get_new_transport()
1460
t = self._transport(self.new_server.get_url())
1541
1462
# We use None for redirected so that we fail if redirected
1542
self.assertEqual('0123456789',
1543
transport.do_catching_redirections(
1463
self.assertEquals('0123456789',
1464
transport.do_catching_redirections(
1544
1465
self.get_a, t, None).read())
1546
1467
def test_one_redirection(self):
1547
1468
self.redirections = 0
1549
def redirected(t, exception, redirection_notice):
1470
def redirected(transport, exception, redirection_notice):
1550
1471
self.redirections += 1
1551
redirected_t = t._redirected_to(exception.source, exception.target)
1472
dir, file = urlutils.split(exception.target)
1473
return self._transport(dir)
1554
self.assertEqual('0123456789',
1555
transport.do_catching_redirections(
1475
self.assertEquals('0123456789',
1476
transport.do_catching_redirections(
1556
1477
self.get_a, self.old_transport, redirected).read())
1557
self.assertEqual(1, self.redirections)
1478
self.assertEquals(1, self.redirections)
1559
1480
def test_redirection_loop(self):
1569
1490
self.get_a, self.old_transport, redirected)
1572
def _setup_authentication_config(**kwargs):
1573
conf = config.AuthenticationConfig()
1574
conf._get_config().update({'httptest': kwargs})
1578
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
1579
"""Unit tests for glue by which urllib2 asks us for authentication"""
1581
def test_get_user_password_without_port(self):
1582
"""We cope if urllib2 doesn't tell us the port.
1584
See https://bugs.launchpad.net/bzr/+bug/654684
1588
_setup_authentication_config(scheme='http', host='localhost',
1589
user=user, password=password)
1590
handler = _urllib2_wrappers.HTTPAuthHandler()
1591
got_pass = handler.get_user_password(dict(
1598
self.assertEquals((user, password), got_pass)
1601
1493
class TestAuth(http_utils.TestCaseWithWebserver):
1602
1494
"""Test authentication scheme"""
1604
scenarios = multiply_scenarios(
1605
vary_by_http_client_implementation(),
1606
vary_by_http_protocol_version(),
1607
vary_by_http_auth_scheme(),
1496
_auth_header = 'Authorization'
1497
_password_prompt_prefix = ''
1498
_username_prompt_prefix = ''
1610
1502
def setUp(self):
1611
1503
super(TestAuth, self).setUp()
1762
1652
# Only one 'Authentication Required' error should occur
1763
1653
self.assertEqual(1, self.server.auth_required_errors)
1655
def test_user_from_auth_conf(self):
1656
if self._testing_pycurl():
1657
raise tests.TestNotApplicable(
1658
'pycurl does not support authentication.conf')
1661
self.server.add_user(user, password)
1662
# Create a minimal config file with the right password
1663
conf = config.AuthenticationConfig()
1664
conf._get_config().update(
1665
{'httptest': {'scheme': 'http', 'port': self.server.port,
1666
'user': user, 'password': password}})
1668
t = self.get_user_transport(None, None)
1669
# Issue a request to the server to connect
1670
self.assertEqual('contents of a\n', t.get('a').read())
1671
# Only one 'Authentication Required' error should occur
1672
self.assertEqual(1, self.server.auth_required_errors)
1765
1674
def test_changing_nonce(self):
1766
1675
if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1767
1676
http_utils.ProxyDigestAuthServer):
1768
1677
raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
1769
1678
if self._testing_pycurl():
1679
raise tests.KnownFailure(
1771
1680
'pycurl does not handle a nonce change')
1772
1681
self.server.add_user('joe', 'foo')
1773
1682
t = self.get_user_transport('joe', 'foo')
1783
1692
# initial 'who are you' and a second 'who are you' with the new nonce)
1784
1693
self.assertEqual(2, self.server.auth_required_errors)
1786
def test_user_from_auth_conf(self):
1787
if self._testing_pycurl():
1788
raise tests.TestNotApplicable(
1789
'pycurl does not support authentication.conf')
1792
self.server.add_user(user, password)
1793
_setup_authentication_config(scheme='http', port=self.server.port,
1794
user=user, password=password)
1795
t = self.get_user_transport(None, None)
1796
# Issue a request to the server to connect
1797
self.assertEqual('contents of a\n', t.get('a').read())
1798
# Only one 'Authentication Required' error should occur
1799
self.assertEqual(1, self.server.auth_required_errors)
1801
def test_no_credential_leaks_in_log(self):
1802
self.overrideAttr(debug, 'debug_flags', set(['http']))
1804
password = 'very-sensitive-password'
1805
self.server.add_user(user, password)
1806
t = self.get_user_transport(user, password)
1807
# Capture the debug calls to mutter
1810
lines = args[0] % args[1:]
1811
# Some calls output multiple lines, just split them now since we
1812
# care about a single one later.
1813
self.mutters.extend(lines.splitlines())
1814
self.overrideAttr(trace, 'mutter', mutter)
1815
# Issue a request to the server to connect
1816
self.assertEqual(True, t.has('a'))
1817
# Only one 'Authentication Required' error should occur
1818
self.assertEqual(1, self.server.auth_required_errors)
1819
# Since the authentification succeeded, there should be a corresponding
1821
sent_auth_headers = [line for line in self.mutters
1822
if line.startswith('> %s' % (self._auth_header,))]
1823
self.assertLength(1, sent_auth_headers)
1824
self.assertStartsWith(sent_auth_headers[0],
1825
'> %s: <masked>' % (self._auth_header,))
1828
1697
class TestProxyAuth(TestAuth):
1829
"""Test proxy authentication schemes.
1831
This inherits from TestAuth to tweak the setUp and filter some failing
1835
scenarios = multiply_scenarios(
1836
vary_by_http_client_implementation(),
1837
vary_by_http_protocol_version(),
1838
vary_by_http_proxy_auth_scheme(),
1698
"""Test proxy authentication schemes."""
1700
_auth_header = 'Proxy-authorization'
1701
_password_prompt_prefix = 'Proxy '
1702
_username_prompt_prefix = 'Proxy '
1841
1704
def setUp(self):
1842
1705
super(TestProxyAuth, self).setUp()
1707
self.addCleanup(self._restore_env)
1843
1708
# Override the contents to avoid false positives
1844
1709
self.build_tree_contents([('a', 'not proxied contents of a\n'),
1845
1710
('b', 'not proxied contents of b\n'),
1886
1758
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1888
scenarios = multiply_scenarios(
1889
vary_by_http_client_implementation(),
1890
vary_by_http_protocol_version(),
1893
1760
def setUp(self):
1894
1761
super(SmartHTTPTunnellingTest, self).setUp()
1895
1762
# We use the VFS layer as part of HTTP tunnelling tests.
1896
self.overrideEnv('BZR_NO_SMART_VFS', None)
1763
self._captureVar('BZR_NO_SMART_VFS', None)
1897
1764
self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1898
self.http_server = self.get_readonly_server()
1900
1766
def create_transport_readonly_server(self):
1901
server = http_utils.HTTPServerWithSmarts(
1767
return http_utils.HTTPServerWithSmarts(
1902
1768
protocol_version=self._protocol_version)
1903
server._url_protocol = self._url_protocol
1906
1770
def test_open_bzrdir(self):
1907
1771
branch = self.make_branch('relpath')
1908
url = self.http_server.get_url() + 'relpath'
1772
http_server = self.get_readonly_server()
1773
url = http_server.get_url() + 'relpath'
1909
1774
bd = bzrdir.BzrDir.open(url)
1910
self.addCleanup(bd.transport.disconnect)
1911
1775
self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1913
1777
def test_bulk_data(self):
2102
1966
def setUp(self):
2103
1967
tests.TestCase.setUp(self)
2104
1968
self.server = self._activity_server(self._protocol_version)
2105
self.server.start_server()
2106
_activities = {} # Don't close over self and create a cycle
1970
self.activities = {}
2107
1971
def report_activity(t, bytes, direction):
2108
count = _activities.get(direction, 0)
1972
count = self.activities.get(direction, 0)
2110
_activities[direction] = count
2111
self.activities = _activities
1974
self.activities[direction] = count
2113
1976
# We override at class level because constructors may propagate the
2114
1977
# bound method and render instance overriding ineffective (an
2115
1978
# alternative would be to define a specific ui factory instead...)
2116
self.overrideAttr(self._transport, '_report_activity', report_activity)
2117
self.addCleanup(self.server.stop_server)
1979
self.orig_report_activity = self._transport._report_activity
1980
self._transport._report_activity = report_activity
1983
self._transport._report_activity = self.orig_report_activity
1984
self.server.tearDown()
1985
tests.TestCase.tearDown(self)
2119
1987
def get_transport(self):
2120
t = self._transport(self.server.get_url())
2121
# FIXME: Needs cleanup -- vila 20100611
1988
return self._transport(self.server.get_url())
2124
1990
def assertActivitiesMatch(self):
2125
1991
self.assertEqual(self.server.bytes_read,
2231
2097
t = self.get_transport()
2232
2098
# We must send a single line of body bytes, see
2233
# PredefinedRequestHandler._handle_one_request
2099
# PredefinedRequestHandler.handle_one_request
2234
2100
code, f = t._post('abc def end-of-body\n')
2235
2101
self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2236
2102
self.assertActivitiesMatch()
2239
class TestActivity(tests.TestCase, TestActivityMixin):
2241
scenarios = multiply_scenarios(
2242
vary_by_http_activity(),
2243
vary_by_http_protocol_version(),
2247
TestActivityMixin.setUp(self)
2250
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2252
# Unlike TestActivity, we are really testing ReportingFileSocket and
2253
# ReportingSocket, so we don't need all the parametrization. Since
2254
# ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2255
# test them through their use by the transport than directly (that's a
2256
# bit less clean but far more simpler and effective).
2257
_activity_server = ActivityHTTPServer
2258
_protocol_version = 'HTTP/1.1'
2261
self._transport =_urllib.HttpTransport_urllib
2262
TestActivityMixin.setUp(self)
2264
def assertActivitiesMatch(self):
2265
# Nothing to check here
2269
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
2270
"""Test authentication on the redirected http server."""
2272
scenarios = vary_by_http_protocol_version()
2274
_auth_header = 'Authorization'
2275
_password_prompt_prefix = ''
2276
_username_prompt_prefix = ''
2277
_auth_server = http_utils.HTTPBasicAuthServer
2278
_transport = _urllib.HttpTransport_urllib
2281
super(TestAuthOnRedirected, self).setUp()
2282
self.build_tree_contents([('a','a'),
2284
('1/a', 'redirected once'),
2286
new_prefix = 'http://%s:%s' % (self.new_server.host,
2287
self.new_server.port)
2288
self.old_server.redirections = [
2289
('(.*)', r'%s/1\1' % (new_prefix), 301),]
2290
self.old_transport = self.get_old_transport()
2291
self.new_server.add_user('joe', 'foo')
2292
cleanup_http_redirection_connections(self)
2294
def create_transport_readonly_server(self):
2295
server = self._auth_server(protocol_version=self._protocol_version)
2296
server._url_protocol = self._url_protocol
2302
def test_auth_on_redirected_via_do_catching_redirections(self):
2303
self.redirections = 0
2305
def redirected(t, exception, redirection_notice):
2306
self.redirections += 1
2307
redirected_t = t._redirected_to(exception.source, exception.target)
2308
self.addCleanup(redirected_t.disconnect)
2311
stdout = tests.StringIOWrapper()
2312
stderr = tests.StringIOWrapper()
2313
ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2314
stdout=stdout, stderr=stderr)
2315
self.assertEqual('redirected once',
2316
transport.do_catching_redirections(
2317
self.get_a, self.old_transport, redirected).read())
2318
self.assertEqual(1, self.redirections)
2319
# stdin should be empty
2320
self.assertEqual('', ui.ui_factory.stdin.readline())
2321
# stdout should be empty, stderr will contains the prompts
2322
self.assertEqual('', stdout.getvalue())
2324
def test_auth_on_redirected_via_following_redirections(self):
2325
self.new_server.add_user('joe', 'foo')
2326
stdout = tests.StringIOWrapper()
2327
stderr = tests.StringIOWrapper()
2328
ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2329
stdout=stdout, stderr=stderr)
2330
t = self.old_transport
2331
req = RedirectedRequest('GET', t.abspath('a'))
2332
new_prefix = 'http://%s:%s' % (self.new_server.host,
2333
self.new_server.port)
2334
self.old_server.redirections = [
2335
('(.*)', r'%s/1\1' % (new_prefix), 301),]
2336
self.assertEqual('redirected once', t._perform(req).read())
2337
# stdin should be empty
2338
self.assertEqual('', ui.ui_factory.stdin.readline())
2339
# stdout should be empty, stderr will contains the prompts
2340
self.assertEqual('', stdout.getvalue())
added
removed
bzrlib/tests/test_http.py
