66
if features.pycurl.available():
65
67
from bzrlib.transport.http._pycurl import PyCurlTransport
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,
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."""
82
75
transport_scenarios = [
83
76
('urllib', dict(_transport=_urllib.HttpTransport_urllib,
84
77
_server=http_server.HttpServer_urllib,
85
_qualified_prefix='http+urllib',)),
78
_url_protocol='http+urllib',)),
80
if features.pycurl.available():
88
81
transport_scenarios.append(
89
82
('pycurl', dict(_transport=PyCurlTransport,
90
83
_server=http_server.HttpServer_PyCurl,
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)),
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')),
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 = [
96
def vary_by_http_auth_scheme():
137
98
('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
138
99
('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
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((
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():
151
127
activity_scenarios = [
152
128
('urllib,http', dict(_activity_server=ActivityHTTPServer,
153
_transport=_urllib.HttpTransport_urllib,)),
129
_transport=_urllib.HttpTransport_urllib,)),
155
if tests.HTTPSServerFeature.available():
131
if features.HTTPSServerFeature.available():
156
132
activity_scenarios.append(
157
133
('urllib,https', dict(_activity_server=ActivityHTTPSServer,
158
_transport=_urllib.HttpTransport_urllib,)),)
134
_transport=_urllib.HttpTransport_urllib,)),)
135
if features.pycurl.available():
160
136
activity_scenarios.append(
161
137
('pycurl,http', dict(_activity_server=ActivityHTTPServer,
162
_transport=PyCurlTransport,)),)
163
if tests.HTTPSServerFeature.available():
138
_transport=PyCurlTransport,)),)
139
if features.HTTPSServerFeature.available():
164
140
from bzrlib.tests import (
217
185
self.received_bytes = ''
189
return '%s://%s:%s/' % (self.scheme, self.host, self.port)
191
def start_server(self):
220
192
self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
221
193
self._sock.bind(('127.0.0.1', 0))
222
194
self.host, self.port = self._sock.getsockname()
223
195
self._ready = threading.Event()
224
self._thread = threading.Thread(target=self._accept_read_and_reply)
225
self._thread.setDaemon(True)
196
self._thread = test_server.TestThread(
197
sync_event=self._ready, target=self._accept_read_and_reply)
226
198
self._thread.start()
199
if 'threads' in tests.selftest_debug_flags:
200
sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
229
203
def _accept_read_and_reply(self):
230
204
self._sock.listen(1)
231
205
self._ready.set()
232
self._sock.settimeout(5)
234
conn, address = self._sock.accept()
235
# On win32, the accepted connection will be non-blocking to start
236
# with because we're using settimeout.
237
conn.setblocking(True)
206
conn, address = self._sock.accept()
207
if self._expect_body_tail is not None:
238
208
while not self.received_bytes.endswith(self._expect_body_tail):
239
209
self.received_bytes += conn.recv(4096)
240
210
conn.sendall('HTTP/1.1 200 OK\r\n')
241
except socket.timeout:
242
# Make sure the client isn't stuck waiting for us to e.g. accept.
243
212
self._sock.close()
244
213
except socket.error:
245
214
# 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))
251
223
except socket.error:
252
224
# 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,))
258
233
class TestAuthHeader(tests.TestCase):
266
241
def test_empty_header(self):
267
242
scheme, remainder = self.parse_header('')
268
self.assertEquals('', scheme)
243
self.assertEqual('', scheme)
269
244
self.assertIs(None, remainder)
271
246
def test_negotiate_header(self):
272
247
scheme, remainder = self.parse_header('Negotiate')
273
self.assertEquals('negotiate', scheme)
248
self.assertEqual('negotiate', scheme)
274
249
self.assertIs(None, remainder)
276
251
def test_basic_header(self):
277
252
scheme, remainder = self.parse_header(
278
253
'Basic realm="Thou should not pass"')
279
self.assertEquals('basic', scheme)
280
self.assertEquals('realm="Thou should not pass"', remainder)
254
self.assertEqual('basic', scheme)
255
self.assertEqual('realm="Thou should not pass"', remainder)
282
257
def test_basic_extract_realm(self):
283
258
scheme, remainder = self.parse_header(
285
260
_urllib2_wrappers.BasicAuthHandler)
286
261
match, realm = self.auth_handler.extract_realm(remainder)
287
262
self.assertTrue(match is not None)
288
self.assertEquals('Thou should not pass', realm)
263
self.assertEqual('Thou should not pass', realm)
290
265
def test_digest_header(self):
291
266
scheme, remainder = self.parse_header(
292
267
'Digest realm="Thou should not pass"')
293
self.assertEquals('digest', scheme)
294
self.assertEquals('realm="Thou should not pass"', remainder)
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
306
class TestHTTPServer(tests.TestCase):
303
312
protocol_version = 'HTTP/0.1'
305
server = http_server.HttpServer(BogusRequestHandler)
307
self.assertRaises(httplib.UnknownProtocol,server.setUp)
310
self.fail('HTTP Server creation did not raise UnknownProtocol')
314
self.assertRaises(httplib.UnknownProtocol,
315
http_server.HttpServer, BogusRequestHandler)
312
317
def test_force_invalid_protocol(self):
313
server = http_server.HttpServer(protocol_version='HTTP/0.1')
315
self.assertRaises(httplib.UnknownProtocol,server.setUp)
318
self.fail('HTTP Server creation did not raise UnknownProtocol')
318
self.assertRaises(httplib.UnknownProtocol,
319
http_server.HttpServer, protocol_version='HTTP/0.1')
320
321
def test_server_start_and_stop(self):
321
322
server = http_server.HttpServer()
323
self.assertTrue(server._http_running)
325
self.assertFalse(server._http_running)
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)
327
329
def test_create_http_server_one_zero(self):
328
330
class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
391
386
def test_url_parsing(self):
392
387
f = FakeManager()
393
388
url = http.extract_auth('http://example.com', f)
394
self.assertEquals('http://example.com', url)
395
self.assertEquals(0, len(f.credentials))
389
self.assertEqual('http://example.com', url)
390
self.assertEqual(0, len(f.credentials))
396
391
url = http.extract_auth(
397
'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
398
self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
399
self.assertEquals(1, len(f.credentials))
400
self.assertEquals([None, 'www.bazaar-vcs.org', 'user', 'pass'],
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'],
404
399
class TestHttpTransportUrls(tests.TestCase):
405
400
"""Test the http urls."""
402
scenarios = vary_by_http_client_implementation()
407
404
def test_abs_url(self):
408
405
"""Construction of absolute http URLs"""
409
t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
406
t = self._transport('http://example.com/bzr/bzr.dev/')
410
407
eq = self.assertEqualDiff
411
eq(t.abspath('.'), 'http://bazaar-vcs.org/bzr/bzr.dev')
412
eq(t.abspath('foo/bar'), 'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
413
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')
414
411
eq(t.abspath('.bzr/1//2/./3'),
415
'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
412
'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
417
414
def test_invalid_http_urls(self):
418
415
"""Trap invalid construction of urls"""
419
t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
416
self._transport('http://example.com/bzr/bzr.dev/')
420
417
self.assertRaises(errors.InvalidURL,
422
'http://http://bazaar-vcs.org/bzr/bzr.dev/')
419
'http://http://example.com/bzr/bzr.dev/')
424
421
def test_http_root_urls(self):
425
422
"""Construction of URLs from server root"""
426
t = self._transport('http://bzr.ozlabs.org/')
423
t = self._transport('http://example.com/')
427
424
eq = self.assertEqualDiff
428
425
eq(t.abspath('.bzr/tree-version'),
429
'http://bzr.ozlabs.org/.bzr/tree-version')
426
'http://example.com/.bzr/tree-version')
431
428
def test_http_impl_urls(self):
432
429
"""There are servers which ask for particular clients to connect"""
433
430
server = self._server()
431
server.start_server()
436
433
url = server.get_url()
437
self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
434
self.assertTrue(url.startswith('%s://' % self._url_protocol))
442
439
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
451
448
https by supplying a fake version_info that do not
457
raise tests.TestSkipped('pycurl not present')
451
self.requireFeature(features.pycurl)
452
# Import the module locally now that we now it's available.
453
pycurl = features.pycurl.module
459
version_info_orig = pycurl.version_info
461
# Now that we have pycurl imported, we can fake its version_info
462
# This was taken from a windows pycurl without SSL
464
pycurl.version_info = lambda : (2,
472
('ftp', 'gopher', 'telnet',
473
'dict', 'ldap', 'http', 'file'),
477
self.assertRaises(errors.DependencyNotPresent, self._transport,
478
'https://launchpad.net')
480
# Restore the right function
481
pycurl.version_info = version_info_orig
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')
484
475
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
485
476
"""Test the http connections."""
478
scenarios = multiply_scenarios(
479
vary_by_http_client_implementation(),
480
vary_by_http_protocol_version(),
488
484
http_utils.TestCaseWithWebserver.setUp(self)
489
485
self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
534
530
class TestHttpTransportRegistration(tests.TestCase):
535
531
"""Test registrations of various http implementations"""
533
scenarios = vary_by_http_client_implementation()
537
535
def test_http_registered(self):
538
t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
536
t = transport.get_transport_from_url(
537
'%s://foo.com/' % self._url_protocol)
539
538
self.assertIsInstance(t, transport.Transport)
540
539
self.assertIsInstance(t, self._transport)
543
542
class TestPost(tests.TestCase):
544
scenarios = multiply_scenarios(
545
vary_by_http_client_implementation(),
546
vary_by_http_protocol_version(),
545
549
def test_post_body_is_received(self):
546
server = RecordingServer(expect_body_tail='end-of-body')
548
self.addCleanup(server.tearDown)
549
scheme = self._qualified_prefix
550
url = '%s://%s:%s/' % (scheme, server.host, server.port)
551
http_transport = self._transport(url)
550
server = RecordingServer(expect_body_tail='end-of-body',
551
scheme=self._url_protocol)
552
self.start_server(server)
553
url = server.get_url()
554
# FIXME: needs a cleanup -- vila 20100611
555
http_transport = transport.get_transport_from_url(url)
552
556
code, response = http_transport._post('abc def end-of-body')
554
558
server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
555
559
self.assertTrue('content-length: 19\r' in server.received_bytes.lower())
560
self.assertTrue('content-type: application/octet-stream\r'
561
in server.received_bytes.lower())
556
562
# The transport should not be assuming that the server can accept
557
563
# chunked encoding the first time it connects, because HTTP/1.1, so we
558
564
# check for the literal string.
594
600
Daughter classes are expected to override _req_handler_class
603
scenarios = multiply_scenarios(
604
vary_by_http_client_implementation(),
605
vary_by_http_protocol_version(),
597
608
# Provide a useful default
598
609
_req_handler_class = http_server.TestingHTTPRequestHandler
600
611
def create_transport_readonly_server(self):
601
return http_server.HttpServer(self._req_handler_class,
602
protocol_version=self._protocol_version)
612
server = http_server.HttpServer(self._req_handler_class,
613
protocol_version=self._protocol_version)
614
server._url_protocol = self._url_protocol
604
617
def _testing_pycurl(self):
605
return pycurl_present and self._transport == PyCurlTransport
618
# TODO: This is duplicated for lots of the classes in this file
619
return (features.pycurl.available()
620
and self._transport == PyCurlTransport)
608
623
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
609
624
"""Whatever request comes in, close the connection"""
611
def handle_one_request(self):
626
def _handle_one_request(self):
612
627
"""Handle a single HTTP request, by abruptly closing the connection"""
613
628
self.close_connection = 1
619
634
_req_handler_class = WallRequestHandler
621
636
def test_http_has(self):
622
server = self.get_readonly_server()
623
t = self._transport(server.get_url())
637
t = self.get_readonly_transport()
624
638
# Unfortunately httplib (see HTTPResponse._read_status
625
639
# for details) make no distinction between a closed
626
640
# socket and badly formatted status line, so we can't
627
641
# just test for ConnectionError, we have to test
628
# InvalidHttpResponse too.
629
self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
642
# InvalidHttpResponse too. And pycurl may raise ConnectionReset
643
# instead of ConnectionError too.
644
self.assertRaises(( errors.ConnectionError, errors.ConnectionReset,
645
errors.InvalidHttpResponse),
630
646
t.has, 'foo/bar')
632
648
def test_http_get(self):
633
server = self.get_readonly_server()
634
t = self._transport(server.get_url())
635
self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
649
t = self.get_readonly_transport()
650
self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
651
errors.InvalidHttpResponse),
636
652
t.get, 'foo/bar')
1049
1049
self.assertEqual('single', t._range_hint)
1052
class TruncatedBeforeBoundaryRequestHandler(
1053
http_server.TestingHTTPRequestHandler):
1054
"""Truncation before a boundary, like in bug 198646"""
1056
_truncated_ranges = 1
1058
def get_multiple_ranges(self, file, file_size, ranges):
1059
self.send_response(206)
1060
self.send_header('Accept-Ranges', 'bytes')
1062
self.send_header('Content-Type',
1063
'multipart/byteranges; boundary=%s' % boundary)
1064
boundary_line = '--%s\r\n' % boundary
1065
# Calculate the Content-Length
1067
for (start, end) in ranges:
1068
content_length += len(boundary_line)
1069
content_length += self._header_line_length(
1070
'Content-type', 'application/octet-stream')
1071
content_length += self._header_line_length(
1072
'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))
1073
content_length += len('\r\n') # end headers
1074
content_length += end - start # + 1
1075
content_length += len(boundary_line)
1076
self.send_header('Content-length', content_length)
1079
# Send the multipart body
1081
for (start, end) in ranges:
1082
if cur + self._truncated_ranges >= len(ranges):
1083
# Abruptly ends the response and close the connection
1084
self.close_connection = 1
1086
self.wfile.write(boundary_line)
1087
self.send_header('Content-type', 'application/octet-stream')
1088
self.send_header('Content-Range', 'bytes %d-%d/%d'
1089
% (start, end, file_size))
1091
self.send_range_content(file, start, end - start + 1)
1094
self.wfile.write(boundary_line)
1097
class TestTruncatedBeforeBoundary(TestSpecificRequestHandler):
1098
"""Tests the case of bug 198646, disconnecting before a boundary."""
1100
_req_handler_class = TruncatedBeforeBoundaryRequestHandler
1103
super(TestTruncatedBeforeBoundary, self).setUp()
1104
self.build_tree_contents([('a', '0123456789')],)
1106
def test_readv_with_short_reads(self):
1107
server = self.get_readonly_server()
1108
t = self.get_readonly_transport()
1109
# Force separate ranges for each offset
1110
t._bytes_to_read_before_seek = 0
1111
ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1112
self.assertEqual((0, '0'), ireadv.next())
1113
self.assertEqual((2, '2'), ireadv.next())
1114
self.assertEqual((4, '45'), ireadv.next())
1115
self.assertEqual((9, '9'), ireadv.next())
1051
1118
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1052
1119
"""Errors out when range specifiers exceed the limit"""
1120
1189
Only the urllib implementation is tested here.
1124
tests.TestCase.setUp(self)
1129
tests.TestCase.tearDown(self)
1131
def _install_env(self, env):
1132
for name, value in env.iteritems():
1133
self._old_env[name] = osutils.set_or_unset_env(name, value)
1135
def _restore_env(self):
1136
for name, value in self._old_env.iteritems():
1137
osutils.set_or_unset_env(name, value)
1139
1192
def _proxied_request(self):
1140
1193
handler = _urllib2_wrappers.ProxyHandler()
1141
request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
1194
request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
1142
1195
handler.set_proxy(request, 'http')
1198
def assertEvaluateProxyBypass(self, expected, host, no_proxy):
1199
handler = _urllib2_wrappers.ProxyHandler()
1200
self.assertEquals(expected,
1201
handler.evaluate_proxy_bypass(host, no_proxy))
1145
1203
def test_empty_user(self):
1146
self._install_env({'http_proxy': 'http://bar.com'})
1204
self.overrideEnv('http_proxy', 'http://bar.com')
1205
request = self._proxied_request()
1206
self.assertFalse(request.headers.has_key('Proxy-authorization'))
1208
def test_user_with_at(self):
1209
self.overrideEnv('http_proxy',
1210
'http://username@domain:password@proxy_host:1234')
1147
1211
request = self._proxied_request()
1148
1212
self.assertFalse(request.headers.has_key('Proxy-authorization'))
1150
1214
def test_invalid_proxy(self):
1151
1215
"""A proxy env variable without scheme"""
1152
self._install_env({'http_proxy': 'host:1234'})
1216
self.overrideEnv('http_proxy', 'host:1234')
1153
1217
self.assertRaises(errors.InvalidURL, self._proxied_request)
1219
def test_evaluate_proxy_bypass_true(self):
1220
"""The host is not proxied"""
1221
self.assertEvaluateProxyBypass(True, 'example.com', 'example.com')
1222
self.assertEvaluateProxyBypass(True, 'bzr.example.com', '*example.com')
1224
def test_evaluate_proxy_bypass_false(self):
1225
"""The host is proxied"""
1226
self.assertEvaluateProxyBypass(False, 'bzr.example.com', None)
1228
def test_evaluate_proxy_bypass_unknown(self):
1229
"""The host is not explicitly proxied"""
1230
self.assertEvaluateProxyBypass(None, 'example.com', 'not.example.com')
1231
self.assertEvaluateProxyBypass(None, 'bzr.example.com', 'example.com')
1233
def test_evaluate_proxy_bypass_empty_entries(self):
1234
"""Ignore empty entries"""
1235
self.assertEvaluateProxyBypass(None, 'example.com', '')
1236
self.assertEvaluateProxyBypass(None, 'example.com', ',')
1237
self.assertEvaluateProxyBypass(None, 'example.com', 'foo,,bar')
1156
1240
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1157
1241
"""Tests proxy server.
1162
1246
to the file names).
1249
scenarios = multiply_scenarios(
1250
vary_by_http_client_implementation(),
1251
vary_by_http_protocol_version(),
1165
1254
# FIXME: We don't have an https server available, so we don't
1166
# test https connections.
1255
# test https connections. --vila toolongago
1168
1257
def setUp(self):
1169
1258
super(TestProxyHttpServer, self).setUp()
1259
self.transport_secondary_server = http_utils.ProxyServer
1170
1260
self.build_tree_contents([('foo', 'contents of foo\n'),
1171
1261
('foo-proxied', 'proxied contents of foo\n')])
1172
1262
# Let's setup some attributes for tests
1173
self.server = self.get_readonly_server()
1174
self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
1263
server = self.get_readonly_server()
1264
self.server_host_port = '%s:%d' % (server.host, server.port)
1175
1265
if self._testing_pycurl():
1176
1266
# Oh my ! pycurl does not check for the port as part of
1177
1267
# no_proxy :-( So we just test the host part
1178
self.no_proxy_host = 'localhost'
1268
self.no_proxy_host = server.host
1180
self.no_proxy_host = self.proxy_address
1270
self.no_proxy_host = self.server_host_port
1181
1271
# The secondary server is the proxy
1182
self.proxy = self.get_secondary_server()
1183
self.proxy_url = self.proxy.get_url()
1272
self.proxy_url = self.get_secondary_url()
1186
1274
def _testing_pycurl(self):
1187
return pycurl_present and self._transport == PyCurlTransport
1189
def create_transport_secondary_server(self):
1190
"""Creates an http server that will serve files with
1191
'-proxied' appended to their names.
1193
return http_utils.ProxyServer(protocol_version=self._protocol_version)
1195
def _install_env(self, env):
1196
for name, value in env.iteritems():
1197
self._old_env[name] = osutils.set_or_unset_env(name, value)
1199
def _restore_env(self):
1200
for name, value in self._old_env.iteritems():
1201
osutils.set_or_unset_env(name, value)
1203
def proxied_in_env(self, env):
1204
self._install_env(env)
1205
url = self.server.get_url()
1206
t = self._transport(url)
1208
self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1212
def not_proxied_in_env(self, env):
1213
self._install_env(env)
1214
url = self.server.get_url()
1215
t = self._transport(url)
1217
self.assertEqual('contents of foo\n', t.get('foo').read())
1275
# TODO: This is duplicated for lots of the classes in this file
1276
return (features.pycurl.available()
1277
and self._transport == PyCurlTransport)
1279
def assertProxied(self):
1280
t = self.get_readonly_transport()
1281
self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1283
def assertNotProxied(self):
1284
t = self.get_readonly_transport()
1285
self.assertEqual('contents of foo\n', t.get('foo').read())
1221
1287
def test_http_proxy(self):
1222
self.proxied_in_env({'http_proxy': self.proxy_url})
1288
self.overrideEnv('http_proxy', self.proxy_url)
1289
self.assertProxied()
1224
1291
def test_HTTP_PROXY(self):
1225
1292
if self._testing_pycurl():
1228
1295
# about. Should we ?)
1229
1296
raise tests.TestNotApplicable(
1230
1297
'pycurl does not check HTTP_PROXY for security reasons')
1231
self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
1298
self.overrideEnv('HTTP_PROXY', self.proxy_url)
1299
self.assertProxied()
1233
1301
def test_all_proxy(self):
1234
self.proxied_in_env({'all_proxy': self.proxy_url})
1302
self.overrideEnv('all_proxy', self.proxy_url)
1303
self.assertProxied()
1236
1305
def test_ALL_PROXY(self):
1237
self.proxied_in_env({'ALL_PROXY': self.proxy_url})
1306
self.overrideEnv('ALL_PROXY', self.proxy_url)
1307
self.assertProxied()
1239
1309
def test_http_proxy_with_no_proxy(self):
1240
self.not_proxied_in_env({'http_proxy': self.proxy_url,
1241
'no_proxy': self.no_proxy_host})
1310
self.overrideEnv('no_proxy', self.no_proxy_host)
1311
self.overrideEnv('http_proxy', self.proxy_url)
1312
self.assertNotProxied()
1243
1314
def test_HTTP_PROXY_with_NO_PROXY(self):
1244
1315
if self._testing_pycurl():
1245
1316
raise tests.TestNotApplicable(
1246
1317
'pycurl does not check HTTP_PROXY for security reasons')
1247
self.not_proxied_in_env({'HTTP_PROXY': self.proxy_url,
1248
'NO_PROXY': self.no_proxy_host})
1318
self.overrideEnv('NO_PROXY', self.no_proxy_host)
1319
self.overrideEnv('HTTP_PROXY', self.proxy_url)
1320
self.assertNotProxied()
1250
1322
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})
1323
self.overrideEnv('no_proxy', self.no_proxy_host)
1324
self.overrideEnv('all_proxy', self.proxy_url)
1325
self.assertNotProxied()
1254
1327
def test_ALL_PROXY_with_NO_PROXY(self):
1255
self.not_proxied_in_env({'ALL_PROXY': self.proxy_url,
1256
'NO_PROXY': self.no_proxy_host})
1328
self.overrideEnv('NO_PROXY', self.no_proxy_host)
1329
self.overrideEnv('ALL_PROXY', self.proxy_url)
1330
self.assertNotProxied()
1258
1332
def test_http_proxy_without_scheme(self):
1333
self.overrideEnv('http_proxy', self.server_host_port)
1259
1334
if self._testing_pycurl():
1260
1335
# pycurl *ignores* invalid proxy env variables. If that ever change
1261
1336
# in the future, this test will fail indicating that pycurl do not
1262
1337
# ignore anymore such variables.
1263
self.not_proxied_in_env({'http_proxy': self.proxy_address})
1338
self.assertNotProxied()
1265
self.assertRaises(errors.InvalidURL,
1266
self.proxied_in_env,
1267
{'http_proxy': self.proxy_address})
1340
self.assertRaises(errors.InvalidURL, self.assertProxied)
1270
1343
class TestRanges(http_utils.TestCaseWithWebserver):
1271
1344
"""Test the Range header in GET methods."""
1346
scenarios = multiply_scenarios(
1347
vary_by_http_client_implementation(),
1348
vary_by_http_protocol_version(),
1273
1351
def setUp(self):
1274
1352
http_utils.TestCaseWithWebserver.setUp(self)
1275
1353
self.build_tree_contents([('a', '0123456789')],)
1276
server = self.get_readonly_server()
1277
self.transport = self._transport(server.get_url())
1279
1355
def create_transport_readonly_server(self):
1280
1356
return http_server.HttpServer(protocol_version=self._protocol_version)
1282
1358
def _file_contents(self, relpath, ranges):
1359
t = self.get_readonly_transport()
1283
1360
offsets = [ (start, end - start + 1) for start, end in ranges]
1284
coalesce = self.transport._coalesce_offsets
1361
coalesce = t._coalesce_offsets
1285
1362
coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1286
code, data = self.transport._get(relpath, coalesced)
1363
code, data = t._get(relpath, coalesced)
1287
1364
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1288
1365
for start, end in ranges:
1289
1366
data.seek(start)
1290
1367
yield data.read(end - start + 1)
1292
1369
def _file_tail(self, relpath, tail_amount):
1293
code, data = self.transport._get(relpath, [], tail_amount)
1370
t = self.get_readonly_transport()
1371
code, data = t._get(relpath, [], tail_amount)
1294
1372
self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1295
1373
data.seek(-tail_amount, 2)
1296
1374
return data.read(tail_amount)
1397
1492
('5/a', 'redirected 5 times'),
1400
self.old_transport = self._transport(self.old_server.get_url())
1402
def setup_redirected_request(self):
1403
self.original_class = _urllib2_wrappers.Request
1404
_urllib2_wrappers.Request = RedirectedRequest
1406
def cleanup_redirected_request(self):
1407
_urllib2_wrappers.Request = self.original_class
1409
def create_transport_secondary_server(self):
1410
"""Create the secondary server, redirections are defined in the tests"""
1411
return http_utils.HTTPServerRedirecting(
1412
protocol_version=self._protocol_version)
1414
1495
def test_one_redirection(self):
1415
t = self.old_transport
1417
req = RedirectedRequest('GET', t.abspath('a'))
1418
req.follow_redirections = True
1496
t = self.get_old_transport()
1497
req = RedirectedRequest('GET', t._remote_path('a'))
1419
1498
new_prefix = 'http://%s:%s' % (self.new_server.host,
1420
1499
self.new_server.port)
1421
1500
self.old_server.redirections = \
1422
1501
[('(.*)', r'%s/1\1' % (new_prefix), 301),]
1423
self.assertEquals('redirected once',t._perform(req).read())
1502
self.assertEqual('redirected once', t._perform(req).read())
1425
1504
def test_five_redirections(self):
1426
t = self.old_transport
1428
req = RedirectedRequest('GET', t.abspath('a'))
1429
req.follow_redirections = True
1505
t = self.get_old_transport()
1506
req = RedirectedRequest('GET', t._remote_path('a'))
1430
1507
old_prefix = 'http://%s:%s' % (self.old_server.host,
1431
1508
self.old_server.port)
1432
1509
new_prefix = 'http://%s:%s' % (self.new_server.host,
1438
1515
('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1439
1516
('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1441
self.assertEquals('redirected 5 times',t._perform(req).read())
1518
self.assertEqual('redirected 5 times', t._perform(req).read())
1444
1521
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1445
1522
"""Test transport.do_catching_redirections."""
1524
scenarios = multiply_scenarios(
1525
vary_by_http_client_implementation(),
1526
vary_by_http_protocol_version(),
1447
1529
def setUp(self):
1448
1530
super(TestDoCatchRedirections, self).setUp()
1449
1531
self.build_tree_contents([('a', '0123456789'),],)
1451
self.old_transport = self._transport(self.old_server.get_url())
1453
def get_a(self, transport):
1454
return transport.get('a')
1532
cleanup_http_redirection_connections(self)
1534
self.old_transport = self.get_old_transport()
1456
1539
def test_no_redirection(self):
1457
t = self._transport(self.new_server.get_url())
1540
t = self.get_new_transport()
1459
1542
# We use None for redirected so that we fail if redirected
1460
self.assertEquals('0123456789',
1461
transport.do_catching_redirections(
1543
self.assertEqual('0123456789',
1544
transport.do_catching_redirections(
1462
1545
self.get_a, t, None).read())
1464
1547
def test_one_redirection(self):
1465
1548
self.redirections = 0
1467
def redirected(transport, exception, redirection_notice):
1550
def redirected(t, exception, redirection_notice):
1468
1551
self.redirections += 1
1469
dir, file = urlutils.split(exception.target)
1470
return self._transport(dir)
1552
redirected_t = t._redirected_to(exception.source, exception.target)
1472
self.assertEquals('0123456789',
1473
transport.do_catching_redirections(
1555
self.assertEqual('0123456789',
1556
transport.do_catching_redirections(
1474
1557
self.get_a, self.old_transport, redirected).read())
1475
self.assertEquals(1, self.redirections)
1558
self.assertEqual(1, self.redirections)
1477
1560
def test_redirection_loop(self):
1487
1570
self.get_a, self.old_transport, redirected)
1573
def _setup_authentication_config(**kwargs):
1574
conf = config.AuthenticationConfig()
1575
conf._get_config().update({'httptest': kwargs})
1579
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
1580
"""Unit tests for glue by which urllib2 asks us for authentication"""
1582
def test_get_user_password_without_port(self):
1583
"""We cope if urllib2 doesn't tell us the port.
1585
See https://bugs.launchpad.net/bzr/+bug/654684
1589
_setup_authentication_config(scheme='http', host='localhost',
1590
user=user, password=password)
1591
handler = _urllib2_wrappers.HTTPAuthHandler()
1592
got_pass = handler.get_user_password(dict(
1599
self.assertEquals((user, password), got_pass)
1490
1602
class TestAuth(http_utils.TestCaseWithWebserver):
1491
1603
"""Test authentication scheme"""
1493
_auth_header = 'Authorization'
1494
_password_prompt_prefix = ''
1495
_username_prompt_prefix = ''
1605
scenarios = multiply_scenarios(
1606
vary_by_http_client_implementation(),
1607
vary_by_http_protocol_version(),
1608
vary_by_http_auth_scheme(),
1499
1611
def setUp(self):
1500
1612
super(TestAuth, self).setUp()
1649
1764
# Only one 'Authentication Required' error should occur
1650
1765
self.assertEqual(1, self.server.auth_required_errors)
1652
def test_user_from_auth_conf(self):
1653
if self._testing_pycurl():
1654
raise tests.TestNotApplicable(
1655
'pycurl does not support authentication.conf')
1658
self.server.add_user(user, password)
1659
# Create a minimal config file with the right password
1660
conf = config.AuthenticationConfig()
1661
conf._get_config().update(
1662
{'httptest': {'scheme': 'http', 'port': self.server.port,
1663
'user': user, 'password': password}})
1665
t = self.get_user_transport(None, None)
1666
# Issue a request to the server to connect
1667
self.assertEqual('contents of a\n', t.get('a').read())
1668
# Only one 'Authentication Required' error should occur
1669
self.assertEqual(1, self.server.auth_required_errors)
1671
1767
def test_changing_nonce(self):
1672
1768
if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1673
1769
http_utils.ProxyDigestAuthServer):
1674
1770
raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
1675
1771
if self._testing_pycurl():
1676
raise tests.KnownFailure(
1677
1773
'pycurl does not handle a nonce change')
1678
1774
self.server.add_user('joe', 'foo')
1679
1775
t = self.get_user_transport('joe', 'foo')
1689
1785
# initial 'who are you' and a second 'who are you' with the new nonce)
1690
1786
self.assertEqual(2, self.server.auth_required_errors)
1788
def test_user_from_auth_conf(self):
1789
if self._testing_pycurl():
1790
raise tests.TestNotApplicable(
1791
'pycurl does not support authentication.conf')
1794
self.server.add_user(user, password)
1795
_setup_authentication_config(scheme='http', port=self.server.port,
1796
user=user, password=password)
1797
t = self.get_user_transport(None, None)
1798
# Issue a request to the server to connect
1799
self.assertEqual('contents of a\n', t.get('a').read())
1800
# Only one 'Authentication Required' error should occur
1801
self.assertEqual(1, self.server.auth_required_errors)
1803
def test_no_credential_leaks_in_log(self):
1804
self.overrideAttr(debug, 'debug_flags', set(['http']))
1806
password = 'very-sensitive-password'
1807
self.server.add_user(user, password)
1808
t = self.get_user_transport(user, password)
1809
# Capture the debug calls to mutter
1812
lines = args[0] % args[1:]
1813
# Some calls output multiple lines, just split them now since we
1814
# care about a single one later.
1815
self.mutters.extend(lines.splitlines())
1816
self.overrideAttr(trace, 'mutter', mutter)
1817
# Issue a request to the server to connect
1818
self.assertEqual(True, t.has('a'))
1819
# Only one 'Authentication Required' error should occur
1820
self.assertEqual(1, self.server.auth_required_errors)
1821
# Since the authentification succeeded, there should be a corresponding
1823
sent_auth_headers = [line for line in self.mutters
1824
if line.startswith('> %s' % (self._auth_header,))]
1825
self.assertLength(1, sent_auth_headers)
1826
self.assertStartsWith(sent_auth_headers[0],
1827
'> %s: <masked>' % (self._auth_header,))
1694
1830
class TestProxyAuth(TestAuth):
1695
"""Test proxy authentication schemes."""
1697
_auth_header = 'Proxy-authorization'
1698
_password_prompt_prefix = 'Proxy '
1699
_username_prompt_prefix = 'Proxy '
1831
"""Test proxy authentication schemes.
1833
This inherits from TestAuth to tweak the setUp and filter some failing
1837
scenarios = multiply_scenarios(
1838
vary_by_http_client_implementation(),
1839
vary_by_http_protocol_version(),
1840
vary_by_http_proxy_auth_scheme(),
1701
1843
def setUp(self):
1702
1844
super(TestProxyAuth, self).setUp()
1704
self.addCleanup(self._restore_env)
1705
1845
# Override the contents to avoid false positives
1706
1846
self.build_tree_contents([('a', 'not proxied contents of a\n'),
1707
1847
('b', 'not proxied contents of b\n'),
1755
1888
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1890
scenarios = multiply_scenarios(
1891
vary_by_http_client_implementation(),
1892
vary_by_http_protocol_version(),
1757
1895
def setUp(self):
1758
1896
super(SmartHTTPTunnellingTest, self).setUp()
1759
1897
# We use the VFS layer as part of HTTP tunnelling tests.
1760
self._captureVar('BZR_NO_SMART_VFS', None)
1898
self.overrideEnv('BZR_NO_SMART_VFS', None)
1761
1899
self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1900
self.http_server = self.get_readonly_server()
1763
1902
def create_transport_readonly_server(self):
1764
return http_utils.HTTPServerWithSmarts(
1903
server = http_utils.HTTPServerWithSmarts(
1765
1904
protocol_version=self._protocol_version)
1905
server._url_protocol = self._url_protocol
1767
1908
def test_open_bzrdir(self):
1768
1909
branch = self.make_branch('relpath')
1769
http_server = self.get_readonly_server()
1770
url = http_server.get_url() + 'relpath'
1910
url = self.http_server.get_url() + 'relpath'
1771
1911
bd = bzrdir.BzrDir.open(url)
1912
self.addCleanup(bd.transport.disconnect)
1772
1913
self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1774
1915
def test_bulk_data(self):
1838
1979
def test_probe_smart_server(self):
1839
1980
"""Test error handling against server refusing smart requests."""
1840
server = self.get_readonly_server()
1841
t = self._transport(server.get_url())
1981
t = self.get_readonly_transport()
1842
1982
# No need to build a valid smart request here, the server will not even
1843
1983
# try to interpret it.
1844
1984
self.assertRaises(errors.SmartProtocolError,
1845
1985
t.get_smart_medium().send_http_smart_request,
1848
1989
class Test_redirected_to(tests.TestCase):
1991
scenarios = vary_by_http_client_implementation()
1850
1993
def test_redirected_to_subdir(self):
1851
1994
t = self._transport('http://www.example.com/foo')
1852
1995
r = t._redirected_to('http://www.example.com/foo',
1853
1996
'http://www.example.com/foo/subdir')
1854
1997
self.assertIsInstance(r, type(t))
1855
1998
# Both transports share the some connection
1856
self.assertEquals(t._get_connection(), r._get_connection())
1999
self.assertEqual(t._get_connection(), r._get_connection())
2000
self.assertEquals('http://www.example.com/foo/subdir/', r.base)
1858
2002
def test_redirected_to_self_with_slash(self):
1859
2003
t = self._transport('http://www.example.com/foo')
1863
2007
# Both transports share the some connection (one can argue that we
1864
2008
# should return the exact same transport here, but that seems
1866
self.assertEquals(t._get_connection(), r._get_connection())
2010
self.assertEqual(t._get_connection(), r._get_connection())
1868
2012
def test_redirected_to_host(self):
1869
2013
t = self._transport('http://www.example.com/foo')
1870
2014
r = t._redirected_to('http://www.example.com/foo',
1871
2015
'http://foo.example.com/foo/subdir')
1872
2016
self.assertIsInstance(r, type(t))
2017
self.assertEquals('http://foo.example.com/foo/subdir/',
1874
2020
def test_redirected_to_same_host_sibling_protocol(self):
1875
2021
t = self._transport('http://www.example.com/foo')
1876
2022
r = t._redirected_to('http://www.example.com/foo',
1877
2023
'https://www.example.com/foo')
1878
2024
self.assertIsInstance(r, type(t))
2025
self.assertEquals('https://www.example.com/foo/',
1880
2028
def test_redirected_to_same_host_different_protocol(self):
1881
2029
t = self._transport('http://www.example.com/foo')
1882
2030
r = t._redirected_to('http://www.example.com/foo',
1883
2031
'ftp://www.example.com/foo')
1884
2032
self.assertNotEquals(type(r), type(t))
2033
self.assertEquals('ftp://www.example.com/foo/', r.external_url())
2035
def test_redirected_to_same_host_specific_implementation(self):
2036
t = self._transport('http://www.example.com/foo')
2037
r = t._redirected_to('http://www.example.com/foo',
2038
'https+urllib://www.example.com/foo')
2039
self.assertEquals('https://www.example.com/foo/', r.external_url())
1886
2041
def test_redirected_to_different_host_same_user(self):
1887
2042
t = self._transport('http://joe@www.example.com/foo')
1888
2043
r = t._redirected_to('http://www.example.com/foo',
1889
2044
'https://foo.example.com/foo')
1890
2045
self.assertIsInstance(r, type(t))
1891
self.assertEquals(t._user, r._user)
2046
self.assertEqual(t._parsed_url.user, r._parsed_url.user)
2047
self.assertEquals('https://joe@foo.example.com/foo/', r.external_url())
1894
2050
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1963
2119
def setUp(self):
1964
2120
tests.TestCase.setUp(self)
1965
2121
self.server = self._activity_server(self._protocol_version)
1967
self.activities = {}
2122
self.server.start_server()
2123
_activities = {} # Don't close over self and create a cycle
1968
2124
def report_activity(t, bytes, direction):
1969
count = self.activities.get(direction, 0)
2125
count = _activities.get(direction, 0)
1971
self.activities[direction] = count
2127
_activities[direction] = count
2128
self.activities = _activities
1973
2130
# We override at class level because constructors may propagate the
1974
2131
# bound method and render instance overriding ineffective (an
1975
2132
# alternative would be to define a specific ui factory instead...)
1976
self.orig_report_activity = self._transport._report_activity
1977
self._transport._report_activity = report_activity
1980
self._transport._report_activity = self.orig_report_activity
1981
self.server.tearDown()
1982
tests.TestCase.tearDown(self)
2133
self.overrideAttr(self._transport, '_report_activity', report_activity)
2134
self.addCleanup(self.server.stop_server)
1984
2136
def get_transport(self):
1985
return self._transport(self.server.get_url())
2137
t = self._transport(self.server.get_url())
2138
# FIXME: Needs cleanup -- vila 20100611
1987
2141
def assertActivitiesMatch(self):
1988
2142
self.assertEqual(self.server.bytes_read,
2094
2248
t = self.get_transport()
2095
2249
# We must send a single line of body bytes, see
2096
# PredefinedRequestHandler.handle_one_request
2250
# PredefinedRequestHandler._handle_one_request
2097
2251
code, f = t._post('abc def end-of-body\n')
2098
2252
self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2099
2253
self.assertActivitiesMatch()
2256
class TestActivity(tests.TestCase, TestActivityMixin):
2258
scenarios = multiply_scenarios(
2259
vary_by_http_activity(),
2260
vary_by_http_protocol_version(),
2264
TestActivityMixin.setUp(self)
2267
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2269
# Unlike TestActivity, we are really testing ReportingFileSocket and
2270
# ReportingSocket, so we don't need all the parametrization. Since
2271
# ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2272
# test them through their use by the transport than directly (that's a
2273
# bit less clean but far more simpler and effective).
2274
_activity_server = ActivityHTTPServer
2275
_protocol_version = 'HTTP/1.1'
2278
self._transport =_urllib.HttpTransport_urllib
2279
TestActivityMixin.setUp(self)
2281
def assertActivitiesMatch(self):
2282
# Nothing to check here
2286
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
2287
"""Test authentication on the redirected http server."""
2289
scenarios = vary_by_http_protocol_version()
2291
_auth_header = 'Authorization'
2292
_password_prompt_prefix = ''
2293
_username_prompt_prefix = ''
2294
_auth_server = http_utils.HTTPBasicAuthServer
2295
_transport = _urllib.HttpTransport_urllib
2298
super(TestAuthOnRedirected, self).setUp()
2299
self.build_tree_contents([('a','a'),
2301
('1/a', 'redirected once'),
2303
new_prefix = 'http://%s:%s' % (self.new_server.host,
2304
self.new_server.port)
2305
self.old_server.redirections = [
2306
('(.*)', r'%s/1\1' % (new_prefix), 301),]
2307
self.old_transport = self.get_old_transport()
2308
self.new_server.add_user('joe', 'foo')
2309
cleanup_http_redirection_connections(self)
2311
def create_transport_readonly_server(self):
2312
server = self._auth_server(protocol_version=self._protocol_version)
2313
server._url_protocol = self._url_protocol
2319
def test_auth_on_redirected_via_do_catching_redirections(self):
2320
self.redirections = 0
2322
def redirected(t, exception, redirection_notice):
2323
self.redirections += 1
2324
redirected_t = t._redirected_to(exception.source, exception.target)
2325
self.addCleanup(redirected_t.disconnect)
2328
stdout = tests.StringIOWrapper()
2329
stderr = tests.StringIOWrapper()
2330
ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2331
stdout=stdout, stderr=stderr)
2332
self.assertEqual('redirected once',
2333
transport.do_catching_redirections(
2334
self.get_a, self.old_transport, redirected).read())
2335
self.assertEqual(1, self.redirections)
2336
# stdin should be empty
2337
self.assertEqual('', ui.ui_factory.stdin.readline())
2338
# stdout should be empty, stderr will contains the prompts
2339
self.assertEqual('', stdout.getvalue())
2341
def test_auth_on_redirected_via_following_redirections(self):
2342
self.new_server.add_user('joe', 'foo')
2343
stdout = tests.StringIOWrapper()
2344
stderr = tests.StringIOWrapper()
2345
ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2346
stdout=stdout, stderr=stderr)
2347
t = self.old_transport
2348
req = RedirectedRequest('GET', t.abspath('a'))
2349
new_prefix = 'http://%s:%s' % (self.new_server.host,
2350
self.new_server.port)
2351
self.old_server.redirections = [
2352
('(.*)', r'%s/1\1' % (new_prefix), 301),]
2353
self.assertEqual('redirected once', t._perform(req).read())
2354
# stdin should be empty
2355
self.assertEqual('', ui.ui_factory.stdin.readline())
2356
# stdout should be empty, stderr will contains the prompts
2357
self.assertEqual('', stdout.getvalue())
added
removed
bzrlib/tests/test_http.py
