66
66
from bzrlib.transport.http._pycurl import PyCurlTransport
69
def load_tests(standard_tests, module, loader):
70
"""Multiply tests for http clients and protocol versions."""
71
result = loader.suiteClass()
73
# one for each transport implementation
74
t_tests, remaining_tests = tests.split_suite_by_condition(
75
standard_tests, tests.condition_isinstance((
76
TestHttpTransportRegistration,
77
TestHttpTransportUrls,
69
load_tests = load_tests_apply_scenarios
72
def vary_by_http_client_implementation():
73
"""Test the two libraries we can use, pycurl and urllib."""
80
74
transport_scenarios = [
81
75
('urllib', dict(_transport=_urllib.HttpTransport_urllib,
82
76
_server=http_server.HttpServer_urllib,
83
_qualified_prefix='http+urllib',)),
77
_url_protocol='http+urllib',)),
85
79
if features.pycurl.available():
86
80
transport_scenarios.append(
87
81
('pycurl', dict(_transport=PyCurlTransport,
88
82
_server=http_server.HttpServer_PyCurl,
89
_qualified_prefix='http+pycurl',)))
90
tests.multiply_tests(t_tests, transport_scenarios, result)
92
# each implementation tested with each HTTP version
93
tp_tests, remaining_tests = tests.split_suite_by_condition(
94
remaining_tests, tests.condition_isinstance((
95
SmartHTTPTunnellingTest,
96
TestDoCatchRedirections,
99
TestHTTPSilentRedirections,
100
TestLimitedRangeRequestServer,
104
TestSpecificRequestHandler,
106
protocol_scenarios = [
107
('HTTP/1.0', dict(_protocol_version='HTTP/1.0')),
108
('HTTP/1.1', dict(_protocol_version='HTTP/1.1')),
110
tp_scenarios = tests.multiply_scenarios(transport_scenarios,
112
tests.multiply_tests(tp_tests, tp_scenarios, result)
114
# proxy auth: each auth scheme on all http versions on all implementations.
115
tppa_tests, remaining_tests = tests.split_suite_by_condition(
116
remaining_tests, tests.condition_isinstance((
119
proxy_auth_scheme_scenarios = [
120
('basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
121
('digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
123
dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
83
_url_protocol='http+pycurl',)))
84
return transport_scenarios
87
def vary_by_http_protocol_version():
88
"""Test on http/1.0 and 1.1"""
90
('HTTP/1.0', dict(_protocol_version='HTTP/1.0')),
91
('HTTP/1.1', dict(_protocol_version='HTTP/1.1')),
125
tppa_scenarios = tests.multiply_scenarios(tp_scenarios,
126
proxy_auth_scheme_scenarios)
127
tests.multiply_tests(tppa_tests, tppa_scenarios, result)
129
# auth: each auth scheme on all http versions on all implementations.
130
tpa_tests, remaining_tests = tests.split_suite_by_condition(
131
remaining_tests, tests.condition_isinstance((
134
auth_scheme_scenarios = [
95
def vary_by_http_auth_scheme():
135
97
('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
136
98
('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
138
dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
140
tpa_scenarios = tests.multiply_scenarios(tp_scenarios,
141
auth_scheme_scenarios)
142
tests.multiply_tests(tpa_tests, tpa_scenarios, result)
144
# activity: on all http[s] versions on all implementations
145
tpact_tests, remaining_tests = tests.split_suite_by_condition(
146
remaining_tests, tests.condition_isinstance((
100
dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
102
# Add some attributes common to all scenarios
103
for scenario_id, scenario_dict in scenarios:
104
scenario_dict.update(_auth_header='Authorization',
105
_username_prompt_prefix='',
106
_password_prompt_prefix='')
110
def vary_by_http_proxy_auth_scheme():
112
('proxy-basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
113
('proxy-digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
114
('proxy-basicdigest',
115
dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
117
# Add some attributes common to all scenarios
118
for scenario_id, scenario_dict in scenarios:
119
scenario_dict.update(_auth_header='Proxy-Authorization',
120
_username_prompt_prefix='Proxy ',
121
_password_prompt_prefix='Proxy ')
125
def vary_by_http_activity():
149
126
activity_scenarios = [
150
127
('urllib,http', dict(_activity_server=ActivityHTTPServer,
151
_transport=_urllib.HttpTransport_urllib,)),
128
_transport=_urllib.HttpTransport_urllib,)),
153
if tests.HTTPSServerFeature.available():
130
if features.pycurl.available():
131
activity_scenarios.append(
132
('pycurl,http', dict(_activity_server=ActivityHTTPServer,
133
_transport=PyCurlTransport,)),)
134
if features.HTTPSServerFeature.available():
135
# FIXME: Until we have a better way to handle self-signed certificates
136
# (like allowing them in a test specific authentication.conf for
137
# example), we need some specialized pycurl/urllib transport for tests.
139
from bzrlib.tests import (
142
class HTTPS_urllib_transport(_urllib.HttpTransport_urllib):
144
def __init__(self, base, _from_transport=None):
145
super(HTTPS_urllib_transport, self).__init__(
146
base, _from_transport=_from_transport,
147
ca_certs=ssl_certs.build_path('ca.crt'))
154
149
activity_scenarios.append(
155
150
('urllib,https', dict(_activity_server=ActivityHTTPSServer,
156
_transport=_urllib.HttpTransport_urllib,)),)
157
if features.pycurl.available():
158
activity_scenarios.append(
159
('pycurl,http', dict(_activity_server=ActivityHTTPServer,
160
_transport=PyCurlTransport,)),)
161
if tests.HTTPSServerFeature.available():
162
from bzrlib.tests import (
165
# FIXME: Until we have a better way to handle self-signed
166
# certificates (like allowing them in a test specific
167
# authentication.conf for example), we need some specialized pycurl
168
# transport for tests.
151
_transport=HTTPS_urllib_transport,)),)
152
if features.pycurl.available():
169
153
class HTTPS_pycurl_transport(PyCurlTransport):
171
155
def __init__(self, base, _from_transport=None):
296
275
self.assertEqual('realm="Thou should not pass"', remainder)
278
class TestHTTPRangeParsing(tests.TestCase):
281
super(TestHTTPRangeParsing, self).setUp()
282
# We focus on range parsing here and ignore everything else
283
class RequestHandler(http_server.TestingHTTPRequestHandler):
284
def setup(self): pass
285
def handle(self): pass
286
def finish(self): pass
288
self.req_handler = RequestHandler(None, None, None)
290
def assertRanges(self, ranges, header, file_size):
291
self.assertEquals(ranges,
292
self.req_handler._parse_ranges(header, file_size))
294
def test_simple_range(self):
295
self.assertRanges([(0,2)], 'bytes=0-2', 12)
298
self.assertRanges([(8, 11)], 'bytes=-4', 12)
300
def test_tail_bigger_than_file(self):
301
self.assertRanges([(0, 11)], 'bytes=-99', 12)
303
def test_range_without_end(self):
304
self.assertRanges([(4, 11)], 'bytes=4-', 12)
306
def test_invalid_ranges(self):
307
self.assertRanges(None, 'bytes=12-22', 12)
308
self.assertRanges(None, 'bytes=1-3,12-22', 12)
309
self.assertRanges(None, 'bytes=-', 12)
299
312
class TestHTTPServer(tests.TestCase):
300
313
"""Test the HTTP servers implementations."""
380
384
_transport = property(_get_pycurl_maybe)
383
class TestHttpUrls(tests.TestCase):
385
# TODO: This should be moved to authorization tests once they
388
def test_url_parsing(self):
390
url = http.extract_auth('http://example.com', f)
391
self.assertEqual('http://example.com', url)
392
self.assertEqual(0, len(f.credentials))
393
url = http.extract_auth(
394
'http://user:pass@example.com/bzr/bzr.dev', f)
395
self.assertEqual('http://example.com/bzr/bzr.dev', url)
396
self.assertEqual(1, len(f.credentials))
397
self.assertEqual([None, 'example.com', 'user', 'pass'],
401
387
class TestHttpTransportUrls(tests.TestCase):
402
388
"""Test the http urls."""
390
scenarios = vary_by_http_client_implementation()
404
392
def test_abs_url(self):
405
393
"""Construction of absolute http URLs"""
406
t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
394
t = self._transport('http://example.com/bzr/bzr.dev/')
407
395
eq = self.assertEqualDiff
408
eq(t.abspath('.'), 'http://bazaar-vcs.org/bzr/bzr.dev')
409
eq(t.abspath('foo/bar'), 'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
410
eq(t.abspath('.bzr'), 'http://bazaar-vcs.org/bzr/bzr.dev/.bzr')
396
eq(t.abspath('.'), 'http://example.com/bzr/bzr.dev')
397
eq(t.abspath('foo/bar'), 'http://example.com/bzr/bzr.dev/foo/bar')
398
eq(t.abspath('.bzr'), 'http://example.com/bzr/bzr.dev/.bzr')
411
399
eq(t.abspath('.bzr/1//2/./3'),
412
'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
400
'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
414
402
def test_invalid_http_urls(self):
415
403
"""Trap invalid construction of urls"""
416
t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
404
self._transport('http://example.com/bzr/bzr.dev/')
417
405
self.assertRaises(errors.InvalidURL,
419
'http://http://bazaar-vcs.org/bzr/bzr.dev/')
407
'http://http://example.com/bzr/bzr.dev/')
421
409
def test_http_root_urls(self):
422
410
"""Construction of URLs from server root"""
423
t = self._transport('http://bzr.ozlabs.org/')
411
t = self._transport('http://example.com/')
424
412
eq = self.assertEqualDiff
425
413
eq(t.abspath('.bzr/tree-version'),
426
'http://bzr.ozlabs.org/.bzr/tree-version')
414
'http://example.com/.bzr/tree-version')
428
416
def test_http_impl_urls(self):
429
417
"""There are servers which ask for particular clients to connect"""
525
518
class TestHttpTransportRegistration(tests.TestCase):
526
519
"""Test registrations of various http implementations"""
521
scenarios = vary_by_http_client_implementation()
528
523
def test_http_registered(self):
529
t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
524
t = transport.get_transport_from_url(
525
'%s://foo.com/' % self._url_protocol)
530
526
self.assertIsInstance(t, transport.Transport)
531
527
self.assertIsInstance(t, self._transport)
534
530
class TestPost(tests.TestCase):
532
scenarios = multiply_scenarios(
533
vary_by_http_client_implementation(),
534
vary_by_http_protocol_version(),
536
537
def test_post_body_is_received(self):
537
538
server = RecordingServer(expect_body_tail='end-of-body',
538
scheme=self._qualified_prefix)
539
scheme=self._url_protocol)
539
540
self.start_server(server)
540
541
url = server.get_url()
541
http_transport = self._transport(url)
542
# FIXME: needs a cleanup -- vila 20100611
543
http_transport = transport.get_transport_from_url(url)
542
544
code, response = http_transport._post('abc def end-of-body')
544
546
server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
545
547
self.assertTrue('content-length: 19\r' in server.received_bytes.lower())
548
self.assertTrue('content-type: application/octet-stream\r'
549
in server.received_bytes.lower())
546
550
# The transport should not be assuming that the server can accept
547
551
# chunked encoding the first time it connects, because HTTP/1.1, so we
548
552
# check for the literal string.
1043
1037
self.assertEqual('single', t._range_hint)
1040
class TruncatedBeforeBoundaryRequestHandler(
1041
http_server.TestingHTTPRequestHandler):
1042
"""Truncation before a boundary, like in bug 198646"""
1044
_truncated_ranges = 1
1046
def get_multiple_ranges(self, file, file_size, ranges):
1047
self.send_response(206)
1048
self.send_header('Accept-Ranges', 'bytes')
1050
self.send_header('Content-Type',
1051
'multipart/byteranges; boundary=%s' % boundary)
1052
boundary_line = '--%s\r\n' % boundary
1053
# Calculate the Content-Length
1055
for (start, end) in ranges:
1056
content_length += len(boundary_line)
1057
content_length += self._header_line_length(
1058
'Content-type', 'application/octet-stream')
1059
content_length += self._header_line_length(
1060
'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))
1061
content_length += len('\r\n') # end headers
1062
content_length += end - start # + 1
1063
content_length += len(boundary_line)
1064
self.send_header('Content-length', content_length)
1067
# Send the multipart body
1069
for (start, end) in ranges:
1070
if cur + self._truncated_ranges >= len(ranges):
1071
# Abruptly ends the response and close the connection
1072
self.close_connection = 1
1074
self.wfile.write(boundary_line)
1075
self.send_header('Content-type', 'application/octet-stream')
1076
self.send_header('Content-Range', 'bytes %d-%d/%d'
1077
% (start, end, file_size))
1079
self.send_range_content(file, start, end - start + 1)
1082
self.wfile.write(boundary_line)
1085
class TestTruncatedBeforeBoundary(TestSpecificRequestHandler):
1086
"""Tests the case of bug 198646, disconnecting before a boundary."""
1088
_req_handler_class = TruncatedBeforeBoundaryRequestHandler
1091
super(TestTruncatedBeforeBoundary, self).setUp()
1092
self.build_tree_contents([('a', '0123456789')],)
1094
def test_readv_with_short_reads(self):
1095
server = self.get_readonly_server()
1096
t = self.get_readonly_transport()
1097
# Force separate ranges for each offset
1098
t._bytes_to_read_before_seek = 0
1099
ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1100
self.assertEqual((0, '0'), ireadv.next())
1101
self.assertEqual((2, '2'), ireadv.next())
1102
self.assertEqual((4, '45'), ireadv.next())
1103
self.assertEqual((9, '9'), ireadv.next())
1045
1106
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1046
1107
"""Errors out when range specifiers exceed the limit"""
1114
1177
Only the urllib implementation is tested here.
1118
tests.TestCase.setUp(self)
1123
tests.TestCase.tearDown(self)
1125
def _install_env(self, env):
1126
for name, value in env.iteritems():
1127
self._old_env[name] = osutils.set_or_unset_env(name, value)
1129
def _restore_env(self):
1130
for name, value in self._old_env.iteritems():
1131
osutils.set_or_unset_env(name, value)
1133
1180
def _proxied_request(self):
1134
1181
handler = _urllib2_wrappers.ProxyHandler()
1135
request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
1182
request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
1136
1183
handler.set_proxy(request, 'http')
1186
def assertEvaluateProxyBypass(self, expected, host, no_proxy):
1187
handler = _urllib2_wrappers.ProxyHandler()
1188
self.assertEquals(expected,
1189
handler.evaluate_proxy_bypass(host, no_proxy))
1139
1191
def test_empty_user(self):
1140
self._install_env({'http_proxy': 'http://bar.com'})
1192
self.overrideEnv('http_proxy', 'http://bar.com')
1193
request = self._proxied_request()
1194
self.assertFalse(request.headers.has_key('Proxy-authorization'))
1196
def test_user_with_at(self):
1197
self.overrideEnv('http_proxy',
1198
'http://username@domain:password@proxy_host:1234')
1141
1199
request = self._proxied_request()
1142
1200
self.assertFalse(request.headers.has_key('Proxy-authorization'))
1144
1202
def test_invalid_proxy(self):
1145
1203
"""A proxy env variable without scheme"""
1146
self._install_env({'http_proxy': 'host:1234'})
1204
self.overrideEnv('http_proxy', 'host:1234')
1147
1205
self.assertRaises(errors.InvalidURL, self._proxied_request)
1207
def test_evaluate_proxy_bypass_true(self):
1208
"""The host is not proxied"""
1209
self.assertEvaluateProxyBypass(True, 'example.com', 'example.com')
1210
self.assertEvaluateProxyBypass(True, 'bzr.example.com', '*example.com')
1212
def test_evaluate_proxy_bypass_false(self):
1213
"""The host is proxied"""
1214
self.assertEvaluateProxyBypass(False, 'bzr.example.com', None)
1216
def test_evaluate_proxy_bypass_unknown(self):
1217
"""The host is not explicitly proxied"""
1218
self.assertEvaluateProxyBypass(None, 'example.com', 'not.example.com')
1219
self.assertEvaluateProxyBypass(None, 'bzr.example.com', 'example.com')
1221
def test_evaluate_proxy_bypass_empty_entries(self):
1222
"""Ignore empty entries"""
1223
self.assertEvaluateProxyBypass(None, 'example.com', '')
1224
self.assertEvaluateProxyBypass(None, 'example.com', ',')
1225
self.assertEvaluateProxyBypass(None, 'example.com', 'foo,,bar')
1150
1228
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1151
1229
"""Tests proxy server.
1156
1234
to the file names).
1237
scenarios = multiply_scenarios(
1238
vary_by_http_client_implementation(),
1239
vary_by_http_protocol_version(),
1159
1242
# FIXME: We don't have an https server available, so we don't
1160
# test https connections.
1243
# test https connections. --vila toolongago
1162
1245
def setUp(self):
1163
1246
super(TestProxyHttpServer, self).setUp()
1247
self.transport_secondary_server = http_utils.ProxyServer
1164
1248
self.build_tree_contents([('foo', 'contents of foo\n'),
1165
1249
('foo-proxied', 'proxied contents of foo\n')])
1166
1250
# Let's setup some attributes for tests
1167
self.server = self.get_readonly_server()
1168
self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
1251
server = self.get_readonly_server()
1252
self.server_host_port = '%s:%d' % (server.host, server.port)
1169
1253
if self._testing_pycurl():
1170
1254
# Oh my ! pycurl does not check for the port as part of
1171
1255
# no_proxy :-( So we just test the host part
1172
self.no_proxy_host = self.server.host
1256
self.no_proxy_host = server.host
1174
self.no_proxy_host = self.proxy_address
1258
self.no_proxy_host = self.server_host_port
1175
1259
# The secondary server is the proxy
1176
self.proxy = self.get_secondary_server()
1177
self.proxy_url = self.proxy.get_url()
1260
self.proxy_url = self.get_secondary_url()
1180
1262
def _testing_pycurl(self):
1181
1263
# TODO: This is duplicated for lots of the classes in this file
1182
1264
return (features.pycurl.available()
1183
1265
and self._transport == PyCurlTransport)
1185
def create_transport_secondary_server(self):
1186
"""Creates an http server that will serve files with
1187
'-proxied' appended to their names.
1189
return http_utils.ProxyServer(protocol_version=self._protocol_version)
1191
def _install_env(self, env):
1192
for name, value in env.iteritems():
1193
self._old_env[name] = osutils.set_or_unset_env(name, value)
1195
def _restore_env(self):
1196
for name, value in self._old_env.iteritems():
1197
osutils.set_or_unset_env(name, value)
1199
def proxied_in_env(self, env):
1200
self._install_env(env)
1201
url = self.server.get_url()
1202
t = self._transport(url)
1204
self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1208
def not_proxied_in_env(self, env):
1209
self._install_env(env)
1210
url = self.server.get_url()
1211
t = self._transport(url)
1213
self.assertEqual('contents of foo\n', t.get('foo').read())
1267
def assertProxied(self):
1268
t = self.get_readonly_transport()
1269
self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1271
def assertNotProxied(self):
1272
t = self.get_readonly_transport()
1273
self.assertEqual('contents of foo\n', t.get('foo').read())
1217
1275
def test_http_proxy(self):
1218
self.proxied_in_env({'http_proxy': self.proxy_url})
1276
self.overrideEnv('http_proxy', self.proxy_url)
1277
self.assertProxied()
1220
1279
def test_HTTP_PROXY(self):
1221
1280
if self._testing_pycurl():
1224
1283
# about. Should we ?)
1225
1284
raise tests.TestNotApplicable(
1226
1285
'pycurl does not check HTTP_PROXY for security reasons')
1227
self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
1286
self.overrideEnv('HTTP_PROXY', self.proxy_url)
1287
self.assertProxied()
1229
1289
def test_all_proxy(self):
1230
self.proxied_in_env({'all_proxy': self.proxy_url})
1290
self.overrideEnv('all_proxy', self.proxy_url)
1291
self.assertProxied()
1232
1293
def test_ALL_PROXY(self):
1233
self.proxied_in_env({'ALL_PROXY': self.proxy_url})
1294
self.overrideEnv('ALL_PROXY', self.proxy_url)
1295
self.assertProxied()
1235
1297
def test_http_proxy_with_no_proxy(self):
1236
self.not_proxied_in_env({'http_proxy': self.proxy_url,
1237
'no_proxy': self.no_proxy_host})
1298
self.overrideEnv('no_proxy', self.no_proxy_host)
1299
self.overrideEnv('http_proxy', self.proxy_url)
1300
self.assertNotProxied()
1239
1302
def test_HTTP_PROXY_with_NO_PROXY(self):
1240
1303
if self._testing_pycurl():
1241
1304
raise tests.TestNotApplicable(
1242
1305
'pycurl does not check HTTP_PROXY for security reasons')
1243
self.not_proxied_in_env({'HTTP_PROXY': self.proxy_url,
1244
'NO_PROXY': self.no_proxy_host})
1306
self.overrideEnv('NO_PROXY', self.no_proxy_host)
1307
self.overrideEnv('HTTP_PROXY', self.proxy_url)
1308
self.assertNotProxied()
1246
1310
def test_all_proxy_with_no_proxy(self):
1247
self.not_proxied_in_env({'all_proxy': self.proxy_url,
1248
'no_proxy': self.no_proxy_host})
1311
self.overrideEnv('no_proxy', self.no_proxy_host)
1312
self.overrideEnv('all_proxy', self.proxy_url)
1313
self.assertNotProxied()
1250
1315
def test_ALL_PROXY_with_NO_PROXY(self):
1251
self.not_proxied_in_env({'ALL_PROXY': self.proxy_url,
1252
'NO_PROXY': self.no_proxy_host})
1316
self.overrideEnv('NO_PROXY', self.no_proxy_host)
1317
self.overrideEnv('ALL_PROXY', self.proxy_url)
1318
self.assertNotProxied()
1254
1320
def test_http_proxy_without_scheme(self):
1321
self.overrideEnv('http_proxy', self.server_host_port)
1255
1322
if self._testing_pycurl():
1256
1323
# pycurl *ignores* invalid proxy env variables. If that ever change
1257
1324
# in the future, this test will fail indicating that pycurl do not
1258
1325
# ignore anymore such variables.
1259
self.not_proxied_in_env({'http_proxy': self.proxy_address})
1326
self.assertNotProxied()
1261
self.assertRaises(errors.InvalidURL,
1262
self.proxied_in_env,
1263
{'http_proxy': self.proxy_address})
1328
self.assertRaises(errors.InvalidURL, self.assertProxied)
1266
1331
class TestRanges(http_utils.TestCaseWithWebserver):
1267
1332
"""Test the Range header in GET methods."""
1334
scenarios = multiply_scenarios(
1335
vary_by_http_client_implementation(),
1336
vary_by_http_protocol_version(),
1269
1339
def setUp(self):
1270
http_utils.TestCaseWithWebserver.setUp(self)
1340
super(TestRanges, self).setUp()
1271
1341
self.build_tree_contents([('a', '0123456789')],)
1272
server = self.get_readonly_server()
1273
self.transport = self._transport(server.get_url())
1275
1343
def create_transport_readonly_server(self):
1276
1344
return http_server.HttpServer(protocol_version=self._protocol_version)
1278
1346
def _file_contents(self, relpath, ranges):
1347
t = self.get_readonly_transport()
1279
1348
offsets = [ (start, end - start + 1) for start, end in ranges]
1280
coalesce = self.transport._coalesce_offsets
1349
coalesce = t._coalesce_offsets
1281
1350
coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1282
code, data = self.transport._get(relpath, coalesced)
1351
code, data = t._get(relpath, coalesced)
1283
1352
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1284
1353
for start, end in ranges:
1285
1354
data.seek(start)
1286
1355
yield data.read(end - start + 1)
1288
1357
def _file_tail(self, relpath, tail_amount):
1289
code, data = self.transport._get(relpath, [], tail_amount)
1358
t = self.get_readonly_transport()
1359
code, data = t._get(relpath, [], tail_amount)
1290
1360
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1291
1361
data.seek(-tail_amount, 2)
1292
1362
return data.read(tail_amount)
1429
1503
('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1430
1504
('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1432
self.assertEqual('redirected 5 times',t._perform(req).read())
1506
self.assertEqual('redirected 5 times', t._perform(req).read())
1435
1509
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1436
1510
"""Test transport.do_catching_redirections."""
1512
scenarios = multiply_scenarios(
1513
vary_by_http_client_implementation(),
1514
vary_by_http_protocol_version(),
1438
1517
def setUp(self):
1439
1518
super(TestDoCatchRedirections, self).setUp()
1440
1519
self.build_tree_contents([('a', '0123456789'),],)
1442
self.old_transport = self._transport(self.old_server.get_url())
1444
def get_a(self, transport):
1445
return transport.get('a')
1520
cleanup_http_redirection_connections(self)
1522
self.old_transport = self.get_old_transport()
1447
1527
def test_no_redirection(self):
1448
t = self._transport(self.new_server.get_url())
1528
t = self.get_new_transport()
1450
1530
# We use None for redirected so that we fail if redirected
1451
1531
self.assertEqual('0123456789',
1478
1558
self.get_a, self.old_transport, redirected)
1561
def _setup_authentication_config(**kwargs):
1562
conf = config.AuthenticationConfig()
1563
conf._get_config().update({'httptest': kwargs})
1567
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
1568
"""Unit tests for glue by which urllib2 asks us for authentication"""
1570
def test_get_user_password_without_port(self):
1571
"""We cope if urllib2 doesn't tell us the port.
1573
See https://bugs.launchpad.net/bzr/+bug/654684
1577
_setup_authentication_config(scheme='http', host='localhost',
1578
user=user, password=password)
1579
handler = _urllib2_wrappers.HTTPAuthHandler()
1580
got_pass = handler.get_user_password(dict(
1587
self.assertEquals((user, password), got_pass)
1481
1590
class TestAuth(http_utils.TestCaseWithWebserver):
1482
1591
"""Test authentication scheme"""
1484
_auth_header = 'Authorization'
1485
_password_prompt_prefix = ''
1486
_username_prompt_prefix = ''
1593
scenarios = multiply_scenarios(
1594
vary_by_http_client_implementation(),
1595
vary_by_http_protocol_version(),
1596
vary_by_http_auth_scheme(),
1490
1599
def setUp(self):
1491
1600
super(TestAuth, self).setUp()
1642
1752
# Only one 'Authentication Required' error should occur
1643
1753
self.assertEqual(1, self.server.auth_required_errors)
1645
def test_user_from_auth_conf(self):
1646
if self._testing_pycurl():
1647
raise tests.TestNotApplicable(
1648
'pycurl does not support authentication.conf')
1651
self.server.add_user(user, password)
1652
# Create a minimal config file with the right password
1653
conf = config.AuthenticationConfig()
1654
conf._get_config().update(
1655
{'httptest': {'scheme': 'http', 'port': self.server.port,
1656
'user': user, 'password': password}})
1658
t = self.get_user_transport(None, None)
1659
# Issue a request to the server to connect
1660
self.assertEqual('contents of a\n', t.get('a').read())
1661
# Only one 'Authentication Required' error should occur
1662
self.assertEqual(1, self.server.auth_required_errors)
1664
1755
def test_changing_nonce(self):
1665
1756
if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1666
1757
http_utils.ProxyDigestAuthServer):
1667
1758
raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
1668
1759
if self._testing_pycurl():
1669
raise tests.KnownFailure(
1670
1761
'pycurl does not handle a nonce change')
1671
1762
self.server.add_user('joe', 'foo')
1672
1763
t = self.get_user_transport('joe', 'foo')
1682
1773
# initial 'who are you' and a second 'who are you' with the new nonce)
1683
1774
self.assertEqual(2, self.server.auth_required_errors)
1776
def test_user_from_auth_conf(self):
1777
if self._testing_pycurl():
1778
raise tests.TestNotApplicable(
1779
'pycurl does not support authentication.conf')
1782
self.server.add_user(user, password)
1783
_setup_authentication_config(scheme='http', port=self.server.port,
1784
user=user, password=password)
1785
t = self.get_user_transport(None, None)
1786
# Issue a request to the server to connect
1787
self.assertEqual('contents of a\n', t.get('a').read())
1788
# Only one 'Authentication Required' error should occur
1789
self.assertEqual(1, self.server.auth_required_errors)
1791
def test_no_credential_leaks_in_log(self):
1792
self.overrideAttr(debug, 'debug_flags', set(['http']))
1794
password = 'very-sensitive-password'
1795
self.server.add_user(user, password)
1796
t = self.get_user_transport(user, password)
1797
# Capture the debug calls to mutter
1800
lines = args[0] % args[1:]
1801
# Some calls output multiple lines, just split them now since we
1802
# care about a single one later.
1803
self.mutters.extend(lines.splitlines())
1804
self.overrideAttr(trace, 'mutter', mutter)
1805
# Issue a request to the server to connect
1806
self.assertEqual(True, t.has('a'))
1807
# Only one 'Authentication Required' error should occur
1808
self.assertEqual(1, self.server.auth_required_errors)
1809
# Since the authentification succeeded, there should be a corresponding
1811
sent_auth_headers = [line for line in self.mutters
1812
if line.startswith('> %s' % (self._auth_header,))]
1813
self.assertLength(1, sent_auth_headers)
1814
self.assertStartsWith(sent_auth_headers[0],
1815
'> %s: <masked>' % (self._auth_header,))
1687
1818
class TestProxyAuth(TestAuth):
1688
"""Test proxy authentication schemes."""
1690
_auth_header = 'Proxy-authorization'
1691
_password_prompt_prefix = 'Proxy '
1692
_username_prompt_prefix = 'Proxy '
1819
"""Test proxy authentication schemes.
1821
This inherits from TestAuth to tweak the setUp and filter some failing
1825
scenarios = multiply_scenarios(
1826
vary_by_http_client_implementation(),
1827
vary_by_http_protocol_version(),
1828
vary_by_http_proxy_auth_scheme(),
1694
1831
def setUp(self):
1695
1832
super(TestProxyAuth, self).setUp()
1697
self.addCleanup(self._restore_env)
1698
1833
# Override the contents to avoid false positives
1699
1834
self.build_tree_contents([('a', 'not proxied contents of a\n'),
1700
1835
('b', 'not proxied contents of b\n'),
1748
1876
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1878
scenarios = multiply_scenarios(
1879
vary_by_http_client_implementation(),
1880
vary_by_http_protocol_version(),
1750
1883
def setUp(self):
1751
1884
super(SmartHTTPTunnellingTest, self).setUp()
1752
1885
# We use the VFS layer as part of HTTP tunnelling tests.
1753
self._captureVar('BZR_NO_SMART_VFS', None)
1886
self.overrideEnv('BZR_NO_SMART_VFS', None)
1754
1887
self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1888
self.http_server = self.get_readonly_server()
1756
1890
def create_transport_readonly_server(self):
1757
return http_utils.HTTPServerWithSmarts(
1891
server = http_utils.HTTPServerWithSmarts(
1758
1892
protocol_version=self._protocol_version)
1893
server._url_protocol = self._url_protocol
1760
def test_open_bzrdir(self):
1896
def test_open_controldir(self):
1761
1897
branch = self.make_branch('relpath')
1762
http_server = self.get_readonly_server()
1763
url = http_server.get_url() + 'relpath'
1764
bd = bzrdir.BzrDir.open(url)
1898
url = self.http_server.get_url() + 'relpath'
1899
bd = controldir.ControlDir.open(url)
1900
self.addCleanup(bd.transport.disconnect)
1765
1901
self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1767
1903
def test_bulk_data(self):
1863
2002
r = t._redirected_to('http://www.example.com/foo',
1864
2003
'http://foo.example.com/foo/subdir')
1865
2004
self.assertIsInstance(r, type(t))
2005
self.assertEquals('http://foo.example.com/foo/subdir/',
1867
2008
def test_redirected_to_same_host_sibling_protocol(self):
1868
2009
t = self._transport('http://www.example.com/foo')
1869
2010
r = t._redirected_to('http://www.example.com/foo',
1870
2011
'https://www.example.com/foo')
1871
2012
self.assertIsInstance(r, type(t))
2013
self.assertEquals('https://www.example.com/foo/',
1873
2016
def test_redirected_to_same_host_different_protocol(self):
1874
2017
t = self._transport('http://www.example.com/foo')
1875
2018
r = t._redirected_to('http://www.example.com/foo',
1876
2019
'ftp://www.example.com/foo')
1877
2020
self.assertNotEquals(type(r), type(t))
2021
self.assertEquals('ftp://www.example.com/foo/', r.external_url())
2023
def test_redirected_to_same_host_specific_implementation(self):
2024
t = self._transport('http://www.example.com/foo')
2025
r = t._redirected_to('http://www.example.com/foo',
2026
'https+urllib://www.example.com/foo')
2027
self.assertEquals('https://www.example.com/foo/', r.external_url())
1879
2029
def test_redirected_to_different_host_same_user(self):
1880
2030
t = self._transport('http://joe@www.example.com/foo')
1881
2031
r = t._redirected_to('http://www.example.com/foo',
1882
2032
'https://foo.example.com/foo')
1883
2033
self.assertIsInstance(r, type(t))
1884
self.assertEqual(t._user, r._user)
2034
self.assertEqual(t._parsed_url.user, r._parsed_url.user)
2035
self.assertEquals('https://joe@foo.example.com/foo/', r.external_url())
1887
2038
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1956
2107
def setUp(self):
1957
tests.TestCase.setUp(self)
1958
2108
self.server = self._activity_server(self._protocol_version)
1959
2109
self.server.start_server()
1960
self.activities = {}
2110
self.addCleanup(self.server.stop_server)
2111
_activities = {} # Don't close over self and create a cycle
1961
2112
def report_activity(t, bytes, direction):
1962
count = self.activities.get(direction, 0)
2113
count = _activities.get(direction, 0)
1964
self.activities[direction] = count
2115
_activities[direction] = count
2116
self.activities = _activities
1966
2117
# We override at class level because constructors may propagate the
1967
2118
# bound method and render instance overriding ineffective (an
1968
2119
# alternative would be to define a specific ui factory instead...)
1969
self.orig_report_activity = self._transport._report_activity
1970
self._transport._report_activity = report_activity
1973
self._transport._report_activity = self.orig_report_activity
1974
self.server.stop_server()
1975
tests.TestCase.tearDown(self)
2120
self.overrideAttr(self._transport, '_report_activity', report_activity)
1977
2122
def get_transport(self):
1978
return self._transport(self.server.get_url())
2123
t = self._transport(self.server.get_url())
2124
# FIXME: Needs cleanup -- vila 20100611
1980
2127
def assertActivitiesMatch(self):
1981
2128
self.assertEqual(self.server.bytes_read,
2095
2242
class TestActivity(tests.TestCase, TestActivityMixin):
2244
scenarios = multiply_scenarios(
2245
vary_by_http_activity(),
2246
vary_by_http_protocol_version(),
2097
2249
def setUp(self):
2098
tests.TestCase.setUp(self)
2099
self.server = self._activity_server(self._protocol_version)
2100
self.server.start_server()
2101
self.activities = {}
2102
def report_activity(t, bytes, direction):
2103
count = self.activities.get(direction, 0)
2105
self.activities[direction] = count
2107
# We override at class level because constructors may propagate the
2108
# bound method and render instance overriding ineffective (an
2109
# alternative would be to define a specific ui factory instead...)
2110
self.orig_report_activity = self._transport._report_activity
2111
self._transport._report_activity = report_activity
2114
self._transport._report_activity = self.orig_report_activity
2115
self.server.stop_server()
2116
tests.TestCase.tearDown(self)
2250
super(TestActivity, self).setUp()
2251
TestActivityMixin.setUp(self)
2119
2254
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2256
# Unlike TestActivity, we are really testing ReportingFileSocket and
2257
# ReportingSocket, so we don't need all the parametrization. Since
2258
# ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2259
# test them through their use by the transport than directly (that's a
2260
# bit less clean but far more simpler and effective).
2261
_activity_server = ActivityHTTPServer
2262
_protocol_version = 'HTTP/1.1'
2121
2264
def setUp(self):
2122
tests.TestCase.setUp(self)
2123
# Unlike TestActivity, we are really testing ReportingFileSocket and
2124
# ReportingSocket, so we don't need all the parametrization. Since
2125
# ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2126
# test them through their use by the transport than directly (that's a
2127
# bit less clean but far more simpler and effective).
2128
self.server = ActivityHTTPServer('HTTP/1.1')
2129
self._transport=_urllib.HttpTransport_urllib
2131
self.server.start_server()
2133
# We override at class level because constructors may propagate the
2134
# bound method and render instance overriding ineffective (an
2135
# alternative would be to define a specific ui factory instead...)
2136
self.orig_report_activity = self._transport._report_activity
2137
self._transport._report_activity = None
2140
self._transport._report_activity = self.orig_report_activity
2141
self.server.stop_server()
2142
tests.TestCase.tearDown(self)
2265
super(TestNoReportActivity, self).setUp()
2266
self._transport =_urllib.HttpTransport_urllib
2267
TestActivityMixin.setUp(self)
2144
2269
def assertActivitiesMatch(self):
2145
2270
# Nothing to check here
added
removed
bzrlib/tests/test_http.py
