66
67
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,
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."""
80
75
transport_scenarios = [
81
76
('urllib', dict(_transport=_urllib.HttpTransport_urllib,
82
77
_server=http_server.HttpServer_urllib,
83
_qualified_prefix='http+urllib',)),
78
_url_protocol='http+urllib',)),
85
80
if features.pycurl.available():
86
81
transport_scenarios.append(
87
82
('pycurl', dict(_transport=PyCurlTransport,
88
83
_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)),
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')),
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 = [
96
def vary_by_http_auth_scheme():
135
98
('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
136
99
('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((
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():
149
127
activity_scenarios = [
150
128
('urllib,http', dict(_activity_server=ActivityHTTPServer,
151
_transport=_urllib.HttpTransport_urllib,)),
129
_transport=_urllib.HttpTransport_urllib,)),
153
131
if tests.HTTPSServerFeature.available():
154
132
activity_scenarios.append(
155
133
('urllib,https', dict(_activity_server=ActivityHTTPSServer,
156
_transport=_urllib.HttpTransport_urllib,)),)
134
_transport=_urllib.HttpTransport_urllib,)),)
157
135
if features.pycurl.available():
158
136
activity_scenarios.append(
159
137
('pycurl,http', dict(_activity_server=ActivityHTTPServer,
160
_transport=PyCurlTransport,)),)
138
_transport=PyCurlTransport,)),)
161
139
if tests.HTTPSServerFeature.available():
162
140
from bzrlib.tests import (
223
193
self._sock.bind(('127.0.0.1', 0))
224
194
self.host, self.port = self._sock.getsockname()
225
195
self._ready = threading.Event()
226
self._thread = threading.Thread(target=self._accept_read_and_reply)
227
self._thread.setDaemon(True)
196
self._thread = test_server.TestThread(
197
sync_event=self._ready, target=self._accept_read_and_reply)
228
198
self._thread.start()
199
if 'threads' in tests.selftest_debug_flags:
200
sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
231
203
def _accept_read_and_reply(self):
232
204
self._sock.listen(1)
233
205
self._ready.set()
234
self._sock.settimeout(5)
236
conn, address = self._sock.accept()
237
# On win32, the accepted connection will be non-blocking to start
238
# with because we're using settimeout.
239
conn.setblocking(True)
206
conn, address = self._sock.accept()
207
if self._expect_body_tail is not None:
240
208
while not self.received_bytes.endswith(self._expect_body_tail):
241
209
self.received_bytes += conn.recv(4096)
242
210
conn.sendall('HTTP/1.1 200 OK\r\n')
243
except socket.timeout:
244
# Make sure the client isn't stuck waiting for us to e.g. accept.
245
212
self._sock.close()
246
213
except socket.error:
247
214
# The client may have already closed the socket.
296
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)
299
306
class TestHTTPServer(tests.TestCase):
300
307
"""Test the HTTP servers implementations."""
305
312
protocol_version = 'HTTP/0.1'
307
server = http_server.HttpServer(BogusRequestHandler)
309
self.assertRaises(httplib.UnknownProtocol, server.start_server)
312
self.fail('HTTP Server creation did not raise UnknownProtocol')
314
self.assertRaises(httplib.UnknownProtocol,
315
http_server.HttpServer, BogusRequestHandler)
314
317
def test_force_invalid_protocol(self):
315
server = http_server.HttpServer(protocol_version='HTTP/0.1')
317
self.assertRaises(httplib.UnknownProtocol, server.start_server)
320
self.fail('HTTP Server creation did not raise UnknownProtocol')
318
self.assertRaises(httplib.UnknownProtocol,
319
http_server.HttpServer, protocol_version='HTTP/0.1')
322
321
def test_server_start_and_stop(self):
323
322
server = http_server.HttpServer()
323
self.addCleanup(server.stop_server)
324
324
server.start_server()
326
self.assertTrue(server._http_running)
329
self.assertFalse(server._http_running)
325
self.assertTrue(server.server is not None)
326
self.assertTrue(server.server.serving is not None)
327
self.assertTrue(server.server.serving)
331
329
def test_create_http_server_one_zero(self):
332
330
class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
401
399
class TestHttpTransportUrls(tests.TestCase):
402
400
"""Test the http urls."""
402
scenarios = vary_by_http_client_implementation()
404
404
def test_abs_url(self):
405
405
"""Construction of absolute http URLs"""
406
t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
406
t = self._transport('http://example.com/bzr/bzr.dev/')
407
407
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')
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')
411
411
eq(t.abspath('.bzr/1//2/./3'),
412
'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
412
'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
414
414
def test_invalid_http_urls(self):
415
415
"""Trap invalid construction of urls"""
416
t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
416
self._transport('http://example.com/bzr/bzr.dev/')
417
417
self.assertRaises(errors.InvalidURL,
419
'http://http://bazaar-vcs.org/bzr/bzr.dev/')
419
'http://http://example.com/bzr/bzr.dev/')
421
421
def test_http_root_urls(self):
422
422
"""Construction of URLs from server root"""
423
t = self._transport('http://bzr.ozlabs.org/')
423
t = self._transport('http://example.com/')
424
424
eq = self.assertEqualDiff
425
425
eq(t.abspath('.bzr/tree-version'),
426
'http://bzr.ozlabs.org/.bzr/tree-version')
426
'http://example.com/.bzr/tree-version')
428
428
def test_http_impl_urls(self):
429
429
"""There are servers which ask for particular clients to connect"""
525
530
class TestHttpTransportRegistration(tests.TestCase):
526
531
"""Test registrations of various http implementations"""
533
scenarios = vary_by_http_client_implementation()
528
535
def test_http_registered(self):
529
t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
536
t = transport.get_transport('%s://foo.com/' % self._url_protocol)
530
537
self.assertIsInstance(t, transport.Transport)
531
538
self.assertIsInstance(t, self._transport)
534
541
class TestPost(tests.TestCase):
543
scenarios = multiply_scenarios(
544
vary_by_http_client_implementation(),
545
vary_by_http_protocol_version(),
536
548
def test_post_body_is_received(self):
537
549
server = RecordingServer(expect_body_tail='end-of-body',
538
scheme=self._qualified_prefix)
550
scheme=self._url_protocol)
539
551
self.start_server(server)
540
552
url = server.get_url()
541
http_transport = self._transport(url)
553
# FIXME: needs a cleanup -- vila 20100611
554
http_transport = transport.get_transport(url)
542
555
code, response = http_transport._post('abc def end-of-body')
544
557
server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
545
558
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())
546
561
# The transport should not be assuming that the server can accept
547
562
# chunked encoding the first time it connects, because HTTP/1.1, so we
548
563
# check for the literal string.
1114
1122
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
1125
def _proxied_request(self):
1134
1126
handler = _urllib2_wrappers.ProxyHandler()
1135
request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
1127
request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
1136
1128
handler.set_proxy(request, 'http')
1131
def assertEvaluateProxyBypass(self, expected, host, no_proxy):
1132
handler = _urllib2_wrappers.ProxyHandler()
1133
self.assertEquals(expected,
1134
handler.evaluate_proxy_bypass(host, no_proxy))
1139
1136
def test_empty_user(self):
1140
self._install_env({'http_proxy': 'http://bar.com'})
1137
self.overrideEnv('http_proxy', 'http://bar.com')
1138
request = self._proxied_request()
1139
self.assertFalse(request.headers.has_key('Proxy-authorization'))
1141
def test_user_with_at(self):
1142
self.overrideEnv('http_proxy',
1143
'http://username@domain:password@proxy_host:1234')
1141
1144
request = self._proxied_request()
1142
1145
self.assertFalse(request.headers.has_key('Proxy-authorization'))
1144
1147
def test_invalid_proxy(self):
1145
1148
"""A proxy env variable without scheme"""
1146
self._install_env({'http_proxy': 'host:1234'})
1149
self.overrideEnv('http_proxy', 'host:1234')
1147
1150
self.assertRaises(errors.InvalidURL, self._proxied_request)
1152
def test_evaluate_proxy_bypass_true(self):
1153
"""The host is not proxied"""
1154
self.assertEvaluateProxyBypass(True, 'example.com', 'example.com')
1155
self.assertEvaluateProxyBypass(True, 'bzr.example.com', '*example.com')
1157
def test_evaluate_proxy_bypass_false(self):
1158
"""The host is proxied"""
1159
self.assertEvaluateProxyBypass(False, 'bzr.example.com', None)
1161
def test_evaluate_proxy_bypass_unknown(self):
1162
"""The host is not explicitly proxied"""
1163
self.assertEvaluateProxyBypass(None, 'example.com', 'not.example.com')
1164
self.assertEvaluateProxyBypass(None, 'bzr.example.com', 'example.com')
1166
def test_evaluate_proxy_bypass_empty_entries(self):
1167
"""Ignore empty entries"""
1168
self.assertEvaluateProxyBypass(None, 'example.com', '')
1169
self.assertEvaluateProxyBypass(None, 'example.com', ',')
1170
self.assertEvaluateProxyBypass(None, 'example.com', 'foo,,bar')
1150
1173
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1151
1174
"""Tests proxy server.
1156
1179
to the file names).
1182
scenarios = multiply_scenarios(
1183
vary_by_http_client_implementation(),
1184
vary_by_http_protocol_version(),
1159
1187
# FIXME: We don't have an https server available, so we don't
1160
# test https connections.
1188
# test https connections. --vila toolongago
1162
1190
def setUp(self):
1163
1191
super(TestProxyHttpServer, self).setUp()
1192
self.transport_secondary_server = http_utils.ProxyServer
1164
1193
self.build_tree_contents([('foo', 'contents of foo\n'),
1165
1194
('foo-proxied', 'proxied contents of foo\n')])
1166
1195
# 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)
1196
server = self.get_readonly_server()
1197
self.server_host_port = '%s:%d' % (server.host, server.port)
1169
1198
if self._testing_pycurl():
1170
1199
# Oh my ! pycurl does not check for the port as part of
1171
1200
# no_proxy :-( So we just test the host part
1172
self.no_proxy_host = self.server.host
1201
self.no_proxy_host = server.host
1174
self.no_proxy_host = self.proxy_address
1203
self.no_proxy_host = self.server_host_port
1175
1204
# The secondary server is the proxy
1176
self.proxy = self.get_secondary_server()
1177
self.proxy_url = self.proxy.get_url()
1205
self.proxy_url = self.get_secondary_url()
1180
1207
def _testing_pycurl(self):
1181
1208
# TODO: This is duplicated for lots of the classes in this file
1182
1209
return (features.pycurl.available()
1183
1210
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())
1212
def assertProxied(self):
1213
t = self.get_readonly_transport()
1214
self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1216
def assertNotProxied(self):
1217
t = self.get_readonly_transport()
1218
self.assertEqual('contents of foo\n', t.get('foo').read())
1217
1220
def test_http_proxy(self):
1218
self.proxied_in_env({'http_proxy': self.proxy_url})
1221
self.overrideEnv('http_proxy', self.proxy_url)
1222
self.assertProxied()
1220
1224
def test_HTTP_PROXY(self):
1221
1225
if self._testing_pycurl():
1224
1228
# about. Should we ?)
1225
1229
raise tests.TestNotApplicable(
1226
1230
'pycurl does not check HTTP_PROXY for security reasons')
1227
self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
1231
self.overrideEnv('HTTP_PROXY', self.proxy_url)
1232
self.assertProxied()
1229
1234
def test_all_proxy(self):
1230
self.proxied_in_env({'all_proxy': self.proxy_url})
1235
self.overrideEnv('all_proxy', self.proxy_url)
1236
self.assertProxied()
1232
1238
def test_ALL_PROXY(self):
1233
self.proxied_in_env({'ALL_PROXY': self.proxy_url})
1239
self.overrideEnv('ALL_PROXY', self.proxy_url)
1240
self.assertProxied()
1235
1242
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})
1243
self.overrideEnv('no_proxy', self.no_proxy_host)
1244
self.overrideEnv('http_proxy', self.proxy_url)
1245
self.assertNotProxied()
1239
1247
def test_HTTP_PROXY_with_NO_PROXY(self):
1240
1248
if self._testing_pycurl():
1241
1249
raise tests.TestNotApplicable(
1242
1250
'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})
1251
self.overrideEnv('NO_PROXY', self.no_proxy_host)
1252
self.overrideEnv('HTTP_PROXY', self.proxy_url)
1253
self.assertNotProxied()
1246
1255
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})
1256
self.overrideEnv('no_proxy', self.no_proxy_host)
1257
self.overrideEnv('all_proxy', self.proxy_url)
1258
self.assertNotProxied()
1250
1260
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})
1261
self.overrideEnv('NO_PROXY', self.no_proxy_host)
1262
self.overrideEnv('ALL_PROXY', self.proxy_url)
1263
self.assertNotProxied()
1254
1265
def test_http_proxy_without_scheme(self):
1266
self.overrideEnv('http_proxy', self.server_host_port)
1255
1267
if self._testing_pycurl():
1256
1268
# pycurl *ignores* invalid proxy env variables. If that ever change
1257
1269
# in the future, this test will fail indicating that pycurl do not
1258
1270
# ignore anymore such variables.
1259
self.not_proxied_in_env({'http_proxy': self.proxy_address})
1271
self.assertNotProxied()
1261
self.assertRaises(errors.InvalidURL,
1262
self.proxied_in_env,
1263
{'http_proxy': self.proxy_address})
1273
self.assertRaises(errors.InvalidURL, self.assertProxied)
1266
1276
class TestRanges(http_utils.TestCaseWithWebserver):
1267
1277
"""Test the Range header in GET methods."""
1279
scenarios = multiply_scenarios(
1280
vary_by_http_client_implementation(),
1281
vary_by_http_protocol_version(),
1269
1284
def setUp(self):
1270
1285
http_utils.TestCaseWithWebserver.setUp(self)
1271
1286
self.build_tree_contents([('a', '0123456789')],)
1272
server = self.get_readonly_server()
1273
self.transport = self._transport(server.get_url())
1275
1288
def create_transport_readonly_server(self):
1276
1289
return http_server.HttpServer(protocol_version=self._protocol_version)
1278
1291
def _file_contents(self, relpath, ranges):
1292
t = self.get_readonly_transport()
1279
1293
offsets = [ (start, end - start + 1) for start, end in ranges]
1280
coalesce = self.transport._coalesce_offsets
1294
coalesce = t._coalesce_offsets
1281
1295
coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1282
code, data = self.transport._get(relpath, coalesced)
1296
code, data = t._get(relpath, coalesced)
1283
1297
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1284
1298
for start, end in ranges:
1285
1299
data.seek(start)
1286
1300
yield data.read(end - start + 1)
1288
1302
def _file_tail(self, relpath, tail_amount):
1289
code, data = self.transport._get(relpath, [], tail_amount)
1303
t = self.get_readonly_transport()
1304
code, data = t._get(relpath, [], tail_amount)
1290
1305
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1291
1306
data.seek(-tail_amount, 2)
1292
1307
return data.read(tail_amount)
1327
1338
'# Bazaar revision bundle v0.9\n#\n')
1329
# The requests to the old server will be redirected to the new server
1330
self.old_transport = self._transport(self.old_server.get_url())
1332
1341
def test_redirected(self):
1333
self.assertRaises(errors.RedirectRequested, self.old_transport.get, 'a')
1334
t = self._transport(self.new_server.get_url())
1335
self.assertEqual('0123456789', t.get('a').read())
1337
def test_read_redirected_bundle_from_url(self):
1338
from bzrlib.bundle import read_bundle_from_url
1339
url = self.old_transport.abspath('bundle')
1340
bundle = self.applyDeprecated(deprecated_in((1, 12, 0)),
1341
read_bundle_from_url, url)
1342
# If read_bundle_from_url was successful we get an empty bundle
1343
self.assertEqual([], bundle.revisions)
1342
self.assertRaises(errors.RedirectRequested,
1343
self.get_old_transport().get, 'a')
1344
self.assertEqual('0123456789', self.get_new_transport().get('a').read())
1346
1347
class RedirectedRequest(_urllib2_wrappers.Request):
1397
1425
('5/a', 'redirected 5 times'),
1400
self.old_transport = self._transport(self.old_server.get_url())
1402
def create_transport_secondary_server(self):
1403
"""Create the secondary server, redirections are defined in the tests"""
1404
return http_utils.HTTPServerRedirecting(
1405
protocol_version=self._protocol_version)
1407
1428
def test_one_redirection(self):
1408
t = self.old_transport
1410
req = RedirectedRequest('GET', t.abspath('a'))
1429
t = self.get_old_transport()
1430
req = RedirectedRequest('GET', t._remote_path('a'))
1411
1431
new_prefix = 'http://%s:%s' % (self.new_server.host,
1412
1432
self.new_server.port)
1413
1433
self.old_server.redirections = \
1414
1434
[('(.*)', r'%s/1\1' % (new_prefix), 301),]
1415
self.assertEqual('redirected once',t._perform(req).read())
1435
self.assertEqual('redirected once', t._perform(req).read())
1417
1437
def test_five_redirections(self):
1418
t = self.old_transport
1420
req = RedirectedRequest('GET', t.abspath('a'))
1438
t = self.get_old_transport()
1439
req = RedirectedRequest('GET', t._remote_path('a'))
1421
1440
old_prefix = 'http://%s:%s' % (self.old_server.host,
1422
1441
self.old_server.port)
1423
1442
new_prefix = 'http://%s:%s' % (self.new_server.host,
1429
1448
('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1430
1449
('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1432
self.assertEqual('redirected 5 times',t._perform(req).read())
1451
self.assertEqual('redirected 5 times', t._perform(req).read())
1435
1454
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1436
1455
"""Test transport.do_catching_redirections."""
1457
scenarios = multiply_scenarios(
1458
vary_by_http_client_implementation(),
1459
vary_by_http_protocol_version(),
1438
1462
def setUp(self):
1439
1463
super(TestDoCatchRedirections, self).setUp()
1440
1464
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')
1465
cleanup_http_redirection_connections(self)
1467
self.old_transport = self.get_old_transport()
1447
1472
def test_no_redirection(self):
1448
t = self._transport(self.new_server.get_url())
1473
t = self.get_new_transport()
1450
1475
# We use None for redirected so that we fail if redirected
1451
1476
self.assertEqual('0123456789',
1478
1503
self.get_a, self.old_transport, redirected)
1506
def _setup_authentication_config(**kwargs):
1507
conf = config.AuthenticationConfig()
1508
conf._get_config().update({'httptest': kwargs})
1512
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
1513
"""Unit tests for glue by which urllib2 asks us for authentication"""
1515
def test_get_user_password_without_port(self):
1516
"""We cope if urllib2 doesn't tell us the port.
1518
See https://bugs.launchpad.net/bzr/+bug/654684
1522
_setup_authentication_config(scheme='http', host='localhost',
1523
user=user, password=password)
1524
handler = _urllib2_wrappers.HTTPAuthHandler()
1525
got_pass = handler.get_user_password(dict(
1532
self.assertEquals((user, password), got_pass)
1481
1535
class TestAuth(http_utils.TestCaseWithWebserver):
1482
1536
"""Test authentication scheme"""
1484
_auth_header = 'Authorization'
1485
_password_prompt_prefix = ''
1486
_username_prompt_prefix = ''
1538
scenarios = multiply_scenarios(
1539
vary_by_http_client_implementation(),
1540
vary_by_http_protocol_version(),
1541
vary_by_http_auth_scheme(),
1490
1544
def setUp(self):
1491
1545
super(TestAuth, self).setUp()
1642
1696
# Only one 'Authentication Required' error should occur
1643
1697
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
1699
def test_changing_nonce(self):
1665
1700
if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1666
1701
http_utils.ProxyDigestAuthServer):
1682
1717
# initial 'who are you' and a second 'who are you' with the new nonce)
1683
1718
self.assertEqual(2, self.server.auth_required_errors)
1720
def test_user_from_auth_conf(self):
1721
if self._testing_pycurl():
1722
raise tests.TestNotApplicable(
1723
'pycurl does not support authentication.conf')
1726
self.server.add_user(user, password)
1727
_setup_authentication_config(scheme='http', port=self.server.port,
1728
user=user, password=password)
1729
t = self.get_user_transport(None, None)
1730
# Issue a request to the server to connect
1731
self.assertEqual('contents of a\n', t.get('a').read())
1732
# Only one 'Authentication Required' error should occur
1733
self.assertEqual(1, self.server.auth_required_errors)
1735
def test_no_credential_leaks_in_log(self):
1736
self.overrideAttr(debug, 'debug_flags', set(['http']))
1738
password = 'very-sensitive-password'
1739
self.server.add_user(user, password)
1740
t = self.get_user_transport(user, password)
1741
# Capture the debug calls to mutter
1744
lines = args[0] % args[1:]
1745
# Some calls output multiple lines, just split them now since we
1746
# care about a single one later.
1747
self.mutters.extend(lines.splitlines())
1748
self.overrideAttr(trace, 'mutter', mutter)
1749
# Issue a request to the server to connect
1750
self.assertEqual(True, t.has('a'))
1751
# Only one 'Authentication Required' error should occur
1752
self.assertEqual(1, self.server.auth_required_errors)
1753
# Since the authentification succeeded, there should be a corresponding
1755
sent_auth_headers = [line for line in self.mutters
1756
if line.startswith('> %s' % (self._auth_header,))]
1757
self.assertLength(1, sent_auth_headers)
1758
self.assertStartsWith(sent_auth_headers[0],
1759
'> %s: <masked>' % (self._auth_header,))
1687
1762
class TestProxyAuth(TestAuth):
1688
"""Test proxy authentication schemes."""
1690
_auth_header = 'Proxy-authorization'
1691
_password_prompt_prefix = 'Proxy '
1692
_username_prompt_prefix = 'Proxy '
1763
"""Test proxy authentication schemes.
1765
This inherits from TestAuth to tweak the setUp and filter some failing
1769
scenarios = multiply_scenarios(
1770
vary_by_http_client_implementation(),
1771
vary_by_http_protocol_version(),
1772
vary_by_http_proxy_auth_scheme(),
1694
1775
def setUp(self):
1695
1776
super(TestProxyAuth, self).setUp()
1697
self.addCleanup(self._restore_env)
1698
1777
# Override the contents to avoid false positives
1699
1778
self.build_tree_contents([('a', 'not proxied contents of a\n'),
1700
1779
('b', 'not proxied contents of b\n'),
1748
1820
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1822
scenarios = multiply_scenarios(
1823
vary_by_http_client_implementation(),
1824
vary_by_http_protocol_version(),
1750
1827
def setUp(self):
1751
1828
super(SmartHTTPTunnellingTest, self).setUp()
1752
1829
# We use the VFS layer as part of HTTP tunnelling tests.
1753
self._captureVar('BZR_NO_SMART_VFS', None)
1830
self.overrideEnv('BZR_NO_SMART_VFS', None)
1754
1831
self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1832
self.http_server = self.get_readonly_server()
1756
1834
def create_transport_readonly_server(self):
1757
return http_utils.HTTPServerWithSmarts(
1835
server = http_utils.HTTPServerWithSmarts(
1758
1836
protocol_version=self._protocol_version)
1837
server._url_protocol = self._url_protocol
1760
1840
def test_open_bzrdir(self):
1761
1841
branch = self.make_branch('relpath')
1762
http_server = self.get_readonly_server()
1763
url = http_server.get_url() + 'relpath'
1842
url = self.http_server.get_url() + 'relpath'
1764
1843
bd = bzrdir.BzrDir.open(url)
1844
self.addCleanup(bd.transport.disconnect)
1765
1845
self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1767
1847
def test_bulk_data(self):
1957
2037
tests.TestCase.setUp(self)
1958
2038
self.server = self._activity_server(self._protocol_version)
1959
2039
self.server.start_server()
1960
self.activities = {}
2040
_activities = {} # Don't close over self and create a cycle
1961
2041
def report_activity(t, bytes, direction):
1962
count = self.activities.get(direction, 0)
2042
count = _activities.get(direction, 0)
1964
self.activities[direction] = count
2044
_activities[direction] = count
2045
self.activities = _activities
1966
2047
# We override at class level because constructors may propagate the
1967
2048
# bound method and render instance overriding ineffective (an
1968
2049
# 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)
2050
self.overrideAttr(self._transport, '_report_activity', report_activity)
2051
self.addCleanup(self.server.stop_server)
1977
2053
def get_transport(self):
1978
return self._transport(self.server.get_url())
2054
t = self._transport(self.server.get_url())
2055
# FIXME: Needs cleanup -- vila 20100611
1980
2058
def assertActivitiesMatch(self):
1981
2059
self.assertEqual(self.server.bytes_read,
2095
2173
class TestActivity(tests.TestCase, TestActivityMixin):
2175
scenarios = multiply_scenarios(
2176
vary_by_http_activity(),
2177
vary_by_http_protocol_version(),
2097
2180
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)
2181
TestActivityMixin.setUp(self)
2119
2184
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2186
# Unlike TestActivity, we are really testing ReportingFileSocket and
2187
# ReportingSocket, so we don't need all the parametrization. Since
2188
# ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2189
# test them through their use by the transport than directly (that's a
2190
# bit less clean but far more simpler and effective).
2191
_activity_server = ActivityHTTPServer
2192
_protocol_version = 'HTTP/1.1'
2121
2194
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)
2195
self._transport =_urllib.HttpTransport_urllib
2196
TestActivityMixin.setUp(self)
2144
2198
def assertActivitiesMatch(self):
2145
2199
# Nothing to check here
2176
2221
self.new_server.port)
2177
2222
self.old_server.redirections = [
2178
2223
('(.*)', r'%s/1\1' % (new_prefix), 301),]
2179
self.old_transport = self._transport(self.old_server.get_url())
2224
self.old_transport = self.get_old_transport()
2180
2225
self.new_server.add_user('joe', 'foo')
2182
def get_a(self, transport):
2183
return transport.get('a')
2226
cleanup_http_redirection_connections(self)
2228
def create_transport_readonly_server(self):
2229
server = self._auth_server(protocol_version=self._protocol_version)
2230
server._url_protocol = self._url_protocol
2185
2236
def test_auth_on_redirected_via_do_catching_redirections(self):
2186
2237
self.redirections = 0
2188
def redirected(transport, exception, redirection_notice):
2239
def redirected(t, exception, redirection_notice):
2189
2240
self.redirections += 1
2190
dir, file = urlutils.split(exception.target)
2191
return self._transport(dir)
2241
redirected_t = t._redirected_to(exception.source, exception.target)
2242
self.addCleanup(redirected_t.disconnect)
2193
2245
stdout = tests.StringIOWrapper()
2194
2246
stderr = tests.StringIOWrapper()
added
removed
bzrlib/tests/test_http.py
