~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 19:26:41 UTC
  • mto: This revision was merged to the branch mainline in revision 6616.
  • Revision ID: v.ladeuil+lp@free.fr-20160201192641-mzn90m51rydhw00n
Open trunk again as 2.8b1

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2015, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
23
23
# TODO: Should be renamed to bzrlib.transport.http.tests?
24
24
# TODO: What about renaming to bzrlib.tests.transport.http ?
25
25
 
26
 
from cStringIO import StringIO
27
26
import httplib
28
 
import os
29
 
import select
30
27
import SimpleHTTPServer
31
28
import socket
32
29
import sys
34
31
 
35
32
import bzrlib
36
33
from bzrlib import (
37
 
    bzrdir,
38
34
    config,
 
35
    controldir,
 
36
    debug,
39
37
    errors,
40
38
    osutils,
41
39
    remote as _mod_remote,
42
40
    tests,
 
41
    trace,
43
42
    transport,
44
43
    ui,
45
 
    urlutils,
46
 
    )
47
 
from bzrlib.symbol_versioning import (
48
 
    deprecated_in,
49
44
    )
50
45
from bzrlib.tests import (
 
46
    features,
51
47
    http_server,
52
48
    http_utils,
 
49
    test_server,
 
50
    )
 
51
from bzrlib.tests.scenarios import (
 
52
    load_tests_apply_scenarios,
 
53
    multiply_scenarios,
53
54
    )
54
55
from bzrlib.transport import (
55
56
    http,
61
62
    )
62
63
 
63
64
 
64
 
try:
 
65
if features.pycurl.available():
65
66
    from bzrlib.transport.http._pycurl import PyCurlTransport
66
 
    pycurl_present = True
67
 
except errors.DependencyNotPresent:
68
 
    pycurl_present = False
69
 
 
70
 
 
71
 
def load_tests(standard_tests, module, loader):
72
 
    """Multiply tests for http clients and protocol versions."""
73
 
    result = loader.suiteClass()
74
 
 
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,
80
 
                Test_redirected_to,
81
 
                )))
 
67
 
 
68
 
 
69
load_tests = load_tests_apply_scenarios
 
70
 
 
71
 
 
72
def vary_by_http_client_implementation():
 
73
    """Test the two libraries we can use, pycurl and urllib."""
82
74
    transport_scenarios = [
83
75
        ('urllib', dict(_transport=_urllib.HttpTransport_urllib,
84
76
                        _server=http_server.HttpServer_urllib,
85
 
                        _qualified_prefix='http+urllib',)),
 
77
                        _url_protocol='http+urllib',)),
86
78
        ]
87
 
    if pycurl_present:
 
79
    if features.pycurl.available():
88
80
        transport_scenarios.append(
89
81
            ('pycurl', dict(_transport=PyCurlTransport,
90
82
                            _server=http_server.HttpServer_PyCurl,
91
 
                            _qualified_prefix='http+pycurl',)))
92
 
    tests.multiply_tests(t_tests, transport_scenarios, result)
93
 
 
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,
99
 
                TestHTTPConnections,
100
 
                TestHTTPRedirections,
101
 
                TestHTTPSilentRedirections,
102
 
                TestLimitedRangeRequestServer,
103
 
                TestPost,
104
 
                TestProxyHttpServer,
105
 
                TestRanges,
106
 
                TestSpecificRequestHandler,
107
 
                )))
108
 
    protocol_scenarios = [
109
 
            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
110
 
            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
111
 
            ]
112
 
    tp_scenarios = tests.multiply_scenarios(transport_scenarios,
113
 
                                            protocol_scenarios)
114
 
    tests.multiply_tests(tp_tests, tp_scenarios, result)
115
 
 
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((
119
 
                TestProxyAuth,
120
 
                )))
121
 
    proxy_auth_scheme_scenarios = [
122
 
        ('basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
123
 
        ('digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
124
 
        ('basicdigest',
125
 
         dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
 
83
                            _url_protocol='http+pycurl',)))
 
84
    return transport_scenarios
 
85
 
 
86
 
 
87
def vary_by_http_protocol_version():
 
88
    """Test on http/1.0 and 1.1"""
 
89
    return [
 
90
        ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
 
91
        ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
126
92
        ]
127
 
    tppa_scenarios = tests.multiply_scenarios(tp_scenarios,
128
 
                                              proxy_auth_scheme_scenarios)
129
 
    tests.multiply_tests(tppa_tests, tppa_scenarios, result)
130
 
 
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((
134
 
                TestAuth,
135
 
                )))
136
 
    auth_scheme_scenarios = [
 
93
 
 
94
 
 
95
def vary_by_http_auth_scheme():
 
96
    scenarios = [
137
97
        ('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
138
98
        ('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
139
99
        ('basicdigest',
140
 
         dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
141
 
        ]
142
 
    tpa_scenarios = tests.multiply_scenarios(tp_scenarios,
143
 
                                             auth_scheme_scenarios)
144
 
    tests.multiply_tests(tpa_tests, tpa_scenarios, result)
145
 
 
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((
149
 
                TestActivity,
150
 
                )))
 
100
            dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
 
101
        ]
 
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='')
 
107
    return scenarios
 
108
 
 
109
 
 
110
def vary_by_http_proxy_auth_scheme():
 
111
    scenarios = [
 
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)),
 
116
        ]
 
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 ')
 
122
    return scenarios
 
123
 
 
124
 
 
125
def vary_by_http_activity():
151
126
    activity_scenarios = [
152
127
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
153
 
                             _transport=_urllib.HttpTransport_urllib,)),
 
128
                            _transport=_urllib.HttpTransport_urllib,)),
154
129
        ]
155
 
    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.
 
138
        # -- vila 2012-01-20
 
139
        from bzrlib.tests import (
 
140
            ssl_certs,
 
141
            )
 
142
        class HTTPS_urllib_transport(_urllib.HttpTransport_urllib):
 
143
 
 
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'))
 
148
 
156
149
        activity_scenarios.append(
157
150
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
158
 
                                  _transport=_urllib.HttpTransport_urllib,)),)
159
 
    if pycurl_present:
160
 
        activity_scenarios.append(
161
 
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
162
 
                                 _transport=PyCurlTransport,)),)
163
 
        if tests.HTTPSServerFeature.available():
164
 
            from bzrlib.tests import (
165
 
                ssl_certs,
166
 
                )
167
 
            # FIXME: Until we have a better way to handle self-signed
168
 
            # certificates (like allowing them in a test specific
169
 
            # authentication.conf for example), we need some specialized pycurl
170
 
            # transport for tests.
 
151
                                  _transport=HTTPS_urllib_transport,)),)
 
152
        if features.pycurl.available():
171
153
            class HTTPS_pycurl_transport(PyCurlTransport):
172
154
 
173
155
                def __init__(self, base, _from_transport=None):
177
159
 
178
160
            activity_scenarios.append(
179
161
                ('pycurl,https', dict(_activity_server=ActivityHTTPSServer,
180
 
                                      _transport=HTTPS_pycurl_transport,)),)
181
 
 
182
 
    tpact_scenarios = tests.multiply_scenarios(activity_scenarios,
183
 
                                               protocol_scenarios)
184
 
    tests.multiply_tests(tpact_tests, tpact_scenarios, result)
185
 
 
186
 
    # No parametrization for the remaining tests
187
 
    result.addTests(remaining_tests)
188
 
 
189
 
    return result
 
162
                                    _transport=HTTPS_pycurl_transport,)),)
 
163
    return activity_scenarios
190
164
 
191
165
 
192
166
class FakeManager(object):
204
178
    It records the bytes sent to it, and replies with a 200.
205
179
    """
206
180
 
207
 
    def __init__(self, expect_body_tail=None):
 
181
    def __init__(self, expect_body_tail=None, scheme=''):
208
182
        """Constructor.
209
183
 
210
184
        :type expect_body_tail: str
215
189
        self.host = None
216
190
        self.port = None
217
191
        self.received_bytes = ''
218
 
 
219
 
    def setUp(self):
 
192
        self.scheme = scheme
 
193
 
 
194
    def get_url(self):
 
195
        return '%s://%s:%s/' % (self.scheme, self.host, self.port)
 
196
 
 
197
    def start_server(self):
220
198
        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
221
199
        self._sock.bind(('127.0.0.1', 0))
222
200
        self.host, self.port = self._sock.getsockname()
223
201
        self._ready = threading.Event()
224
 
        self._thread = threading.Thread(target=self._accept_read_and_reply)
225
 
        self._thread.setDaemon(True)
 
202
        self._thread = test_server.TestThread(
 
203
            sync_event=self._ready, target=self._accept_read_and_reply)
226
204
        self._thread.start()
227
 
        self._ready.wait(5)
 
205
        if 'threads' in tests.selftest_debug_flags:
 
206
            sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
 
207
        self._ready.wait()
228
208
 
229
209
    def _accept_read_and_reply(self):
230
210
        self._sock.listen(1)
231
211
        self._ready.set()
232
 
        self._sock.settimeout(5)
233
 
        try:
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)
 
212
        conn, address = self._sock.accept()
 
213
        if self._expect_body_tail is not None:
238
214
            while not self.received_bytes.endswith(self._expect_body_tail):
239
215
                self.received_bytes += conn.recv(4096)
240
216
            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.
 
217
        try:
243
218
            self._sock.close()
244
219
        except socket.error:
245
220
            # The client may have already closed the socket.
246
221
            pass
247
222
 
248
 
    def tearDown(self):
 
223
    def stop_server(self):
249
224
        try:
250
 
            self._sock.close()
 
225
            # Issue a fake connection to wake up the server and allow it to
 
226
            # finish quickly
 
227
            fake_conn = osutils.connect_socket((self.host, self.port))
 
228
            fake_conn.close()
251
229
        except socket.error:
252
230
            # We might have already closed it.  We don't care.
253
231
            pass
254
232
        self.host = None
255
233
        self.port = None
 
234
        self._thread.join()
 
235
        if 'threads' in tests.selftest_debug_flags:
 
236
            sys.stderr.write('Thread  joined: %s\n' % (self._thread.ident,))
256
237
 
257
238
 
258
239
class TestAuthHeader(tests.TestCase):
265
246
 
266
247
    def test_empty_header(self):
267
248
        scheme, remainder = self.parse_header('')
268
 
        self.assertEquals('', scheme)
 
249
        self.assertEqual('', scheme)
269
250
        self.assertIs(None, remainder)
270
251
 
271
252
    def test_negotiate_header(self):
272
253
        scheme, remainder = self.parse_header('Negotiate')
273
 
        self.assertEquals('negotiate', scheme)
 
254
        self.assertEqual('negotiate', scheme)
274
255
        self.assertIs(None, remainder)
275
256
 
276
257
    def test_basic_header(self):
277
258
        scheme, remainder = self.parse_header(
278
259
            'Basic realm="Thou should not pass"')
279
 
        self.assertEquals('basic', scheme)
280
 
        self.assertEquals('realm="Thou should not pass"', remainder)
 
260
        self.assertEqual('basic', scheme)
 
261
        self.assertEqual('realm="Thou should not pass"', remainder)
281
262
 
282
263
    def test_basic_extract_realm(self):
283
264
        scheme, remainder = self.parse_header(
285
266
            _urllib2_wrappers.BasicAuthHandler)
286
267
        match, realm = self.auth_handler.extract_realm(remainder)
287
268
        self.assertTrue(match is not None)
288
 
        self.assertEquals('Thou should not pass', realm)
 
269
        self.assertEqual('Thou should not pass', realm)
289
270
 
290
271
    def test_digest_header(self):
291
272
        scheme, remainder = self.parse_header(
292
273
            'Digest realm="Thou should not pass"')
293
 
        self.assertEquals('digest', scheme)
294
 
        self.assertEquals('realm="Thou should not pass"', remainder)
 
274
        self.assertEqual('digest', scheme)
 
275
        self.assertEqual('realm="Thou should not pass"', remainder)
 
276
 
 
277
 
 
278
class TestHTTPRangeParsing(tests.TestCase):
 
279
 
 
280
    def setUp(self):
 
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
 
287
 
 
288
        self.req_handler = RequestHandler(None, None, None)
 
289
 
 
290
    def assertRanges(self, ranges, header, file_size):
 
291
        self.assertEqual(ranges,
 
292
                          self.req_handler._parse_ranges(header, file_size))
 
293
 
 
294
    def test_simple_range(self):
 
295
        self.assertRanges([(0,2)], 'bytes=0-2', 12)
 
296
 
 
297
    def test_tail(self):
 
298
        self.assertRanges([(8, 11)], 'bytes=-4', 12)
 
299
 
 
300
    def test_tail_bigger_than_file(self):
 
301
        self.assertRanges([(0, 11)], 'bytes=-99', 12)
 
302
 
 
303
    def test_range_without_end(self):
 
304
        self.assertRanges([(4, 11)], 'bytes=4-', 12)
 
305
 
 
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)
295
310
 
296
311
 
297
312
class TestHTTPServer(tests.TestCase):
302
317
 
303
318
            protocol_version = 'HTTP/0.1'
304
319
 
305
 
        server = http_server.HttpServer(BogusRequestHandler)
306
 
        try:
307
 
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
308
 
        except:
309
 
            server.tearDown()
310
 
            self.fail('HTTP Server creation did not raise UnknownProtocol')
 
320
        self.assertRaises(httplib.UnknownProtocol,
 
321
                          http_server.HttpServer, BogusRequestHandler)
311
322
 
312
323
    def test_force_invalid_protocol(self):
313
 
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
314
 
        try:
315
 
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
316
 
        except:
317
 
            server.tearDown()
318
 
            self.fail('HTTP Server creation did not raise UnknownProtocol')
 
324
        self.assertRaises(httplib.UnknownProtocol,
 
325
                          http_server.HttpServer, protocol_version='HTTP/0.1')
319
326
 
320
327
    def test_server_start_and_stop(self):
321
328
        server = http_server.HttpServer()
322
 
        server.setUp()
323
 
        self.assertTrue(server._http_running)
324
 
        server.tearDown()
325
 
        self.assertFalse(server._http_running)
 
329
        self.addCleanup(server.stop_server)
 
330
        server.start_server()
 
331
        self.assertTrue(server.server is not None)
 
332
        self.assertTrue(server.server.serving is not None)
 
333
        self.assertTrue(server.server.serving)
326
334
 
327
335
    def test_create_http_server_one_zero(self):
328
336
        class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
330
338
            protocol_version = 'HTTP/1.0'
331
339
 
332
340
        server = http_server.HttpServer(RequestHandlerOneZero)
333
 
        server.setUp()
334
 
        self.addCleanup(server.tearDown)
335
 
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
 
341
        self.start_server(server)
 
342
        self.assertIsInstance(server.server, http_server.TestingHTTPServer)
336
343
 
337
344
    def test_create_http_server_one_one(self):
338
345
        class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
340
347
            protocol_version = 'HTTP/1.1'
341
348
 
342
349
        server = http_server.HttpServer(RequestHandlerOneOne)
343
 
        server.setUp()
344
 
        self.addCleanup(server.tearDown)
345
 
        self.assertIsInstance(server._httpd,
 
350
        self.start_server(server)
 
351
        self.assertIsInstance(server.server,
346
352
                              http_server.TestingThreadingHTTPServer)
347
353
 
348
354
    def test_create_http_server_force_one_one(self):
352
358
 
353
359
        server = http_server.HttpServer(RequestHandlerOneZero,
354
360
                                        protocol_version='HTTP/1.1')
355
 
        server.setUp()
356
 
        self.addCleanup(server.tearDown)
357
 
        self.assertIsInstance(server._httpd,
 
361
        self.start_server(server)
 
362
        self.assertIsInstance(server.server,
358
363
                              http_server.TestingThreadingHTTPServer)
359
364
 
360
365
    def test_create_http_server_force_one_zero(self):
364
369
 
365
370
        server = http_server.HttpServer(RequestHandlerOneOne,
366
371
                                        protocol_version='HTTP/1.0')
367
 
        server.setUp()
368
 
        self.addCleanup(server.tearDown)
369
 
        self.assertIsInstance(server._httpd,
 
372
        self.start_server(server)
 
373
        self.assertIsInstance(server.server,
370
374
                              http_server.TestingHTTPServer)
371
375
 
372
376
 
374
378
    """Test case to inherit from if pycurl is present"""
375
379
 
376
380
    def _get_pycurl_maybe(self):
377
 
        try:
378
 
            from bzrlib.transport.http._pycurl import PyCurlTransport
379
 
            return PyCurlTransport
380
 
        except errors.DependencyNotPresent:
381
 
            raise tests.TestSkipped('pycurl not present')
 
381
        self.requireFeature(features.pycurl)
 
382
        return PyCurlTransport
382
383
 
383
384
    _transport = property(_get_pycurl_maybe)
384
385
 
385
386
 
386
 
class TestHttpUrls(tests.TestCase):
387
 
 
388
 
    # TODO: This should be moved to authorization tests once they
389
 
    # are written.
390
 
 
391
 
    def test_url_parsing(self):
392
 
        f = FakeManager()
393
 
        url = http.extract_auth('http://example.com', f)
394
 
        self.assertEquals('http://example.com', url)
395
 
        self.assertEquals(0, len(f.credentials))
396
 
        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'],
401
 
                          f.credentials[0])
402
 
 
403
 
 
404
387
class TestHttpTransportUrls(tests.TestCase):
405
388
    """Test the http urls."""
406
389
 
 
390
    scenarios = vary_by_http_client_implementation()
 
391
 
407
392
    def test_abs_url(self):
408
393
        """Construction of absolute http URLs"""
409
 
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
 
394
        t = self._transport('http://example.com/bzr/bzr.dev/')
410
395
        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')
 
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')
414
399
        eq(t.abspath('.bzr/1//2/./3'),
415
 
           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
 
400
           'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
416
401
 
417
402
    def test_invalid_http_urls(self):
418
403
        """Trap invalid construction of urls"""
419
 
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
 
404
        self._transport('http://example.com/bzr/bzr.dev/')
420
405
        self.assertRaises(errors.InvalidURL,
421
406
                          self._transport,
422
 
                          'http://http://bazaar-vcs.org/bzr/bzr.dev/')
 
407
                          'http://http://example.com/bzr/bzr.dev/')
423
408
 
424
409
    def test_http_root_urls(self):
425
410
        """Construction of URLs from server root"""
426
 
        t = self._transport('http://bzr.ozlabs.org/')
 
411
        t = self._transport('http://example.com/')
427
412
        eq = self.assertEqualDiff
428
413
        eq(t.abspath('.bzr/tree-version'),
429
 
           'http://bzr.ozlabs.org/.bzr/tree-version')
 
414
           'http://example.com/.bzr/tree-version')
430
415
 
431
416
    def test_http_impl_urls(self):
432
417
        """There are servers which ask for particular clients to connect"""
433
418
        server = self._server()
 
419
        server.start_server()
434
420
        try:
435
 
            server.setUp()
436
421
            url = server.get_url()
437
 
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
 
422
            self.assertTrue(url.startswith('%s://' % self._url_protocol))
438
423
        finally:
439
 
            server.tearDown()
 
424
            server.stop_server()
440
425
 
441
426
 
442
427
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
451
436
        https by supplying a fake version_info that do not
452
437
        support it.
453
438
        """
454
 
        try:
455
 
            import pycurl
456
 
        except ImportError:
457
 
            raise tests.TestSkipped('pycurl not present')
 
439
        self.requireFeature(features.pycurl)
 
440
        # Import the module locally now that we now it's available.
 
441
        pycurl = features.pycurl.module
458
442
 
459
 
        version_info_orig = pycurl.version_info
460
 
        try:
461
 
            # Now that we have pycurl imported, we can fake its version_info
462
 
            # This was taken from a windows pycurl without SSL
463
 
            # (thanks to bialix)
464
 
            pycurl.version_info = lambda : (2,
465
 
                                            '7.13.2',
466
 
                                            462082,
467
 
                                            'i386-pc-win32',
468
 
                                            2576,
469
 
                                            None,
470
 
                                            0,
471
 
                                            None,
472
 
                                            ('ftp', 'gopher', 'telnet',
473
 
                                             'dict', 'ldap', 'http', 'file'),
474
 
                                            None,
475
 
                                            0,
476
 
                                            None)
477
 
            self.assertRaises(errors.DependencyNotPresent, self._transport,
478
 
                              'https://launchpad.net')
479
 
        finally:
480
 
            # Restore the right function
481
 
            pycurl.version_info = version_info_orig
 
443
        self.overrideAttr(pycurl, 'version_info',
 
444
                          # Fake the pycurl version_info This was taken from
 
445
                          # a windows pycurl without SSL (thanks to bialix)
 
446
                          lambda : (2,
 
447
                                    '7.13.2',
 
448
                                    462082,
 
449
                                    'i386-pc-win32',
 
450
                                    2576,
 
451
                                    None,
 
452
                                    0,
 
453
                                    None,
 
454
                                    ('ftp', 'gopher', 'telnet',
 
455
                                     'dict', 'ldap', 'http', 'file'),
 
456
                                    None,
 
457
                                    0,
 
458
                                    None))
 
459
        self.assertRaises(errors.DependencyNotPresent, self._transport,
 
460
                          'https://launchpad.net')
482
461
 
483
462
 
484
463
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
485
464
    """Test the http connections."""
486
465
 
 
466
    scenarios = multiply_scenarios(
 
467
        vary_by_http_client_implementation(),
 
468
        vary_by_http_protocol_version(),
 
469
        )
 
470
 
487
471
    def setUp(self):
488
 
        http_utils.TestCaseWithWebserver.setUp(self)
 
472
        super(TestHTTPConnections, self).setUp()
489
473
        self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
490
474
                        transport=self.get_transport())
491
475
 
492
476
    def test_http_has(self):
493
477
        server = self.get_readonly_server()
494
 
        t = self._transport(server.get_url())
 
478
        t = self.get_readonly_transport()
495
479
        self.assertEqual(t.has('foo/bar'), True)
496
480
        self.assertEqual(len(server.logs), 1)
497
481
        self.assertContainsRe(server.logs[0],
499
483
 
500
484
    def test_http_has_not_found(self):
501
485
        server = self.get_readonly_server()
502
 
        t = self._transport(server.get_url())
 
486
        t = self.get_readonly_transport()
503
487
        self.assertEqual(t.has('not-found'), False)
504
488
        self.assertContainsRe(server.logs[1],
505
489
            r'"HEAD /not-found HTTP/1.." 404 - "-" "bzr/')
506
490
 
507
491
    def test_http_get(self):
508
492
        server = self.get_readonly_server()
509
 
        t = self._transport(server.get_url())
 
493
        t = self.get_readonly_transport()
510
494
        fp = t.get('foo/bar')
511
495
        self.assertEqualDiff(
512
496
            fp.read(),
534
518
class TestHttpTransportRegistration(tests.TestCase):
535
519
    """Test registrations of various http implementations"""
536
520
 
 
521
    scenarios = vary_by_http_client_implementation()
 
522
 
537
523
    def test_http_registered(self):
538
 
        t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
 
524
        t = transport.get_transport_from_url(
 
525
            '%s://foo.com/' % self._url_protocol)
539
526
        self.assertIsInstance(t, transport.Transport)
540
527
        self.assertIsInstance(t, self._transport)
541
528
 
542
529
 
543
530
class TestPost(tests.TestCase):
544
531
 
 
532
    scenarios = multiply_scenarios(
 
533
        vary_by_http_client_implementation(),
 
534
        vary_by_http_protocol_version(),
 
535
        )
 
536
 
545
537
    def test_post_body_is_received(self):
546
 
        server = RecordingServer(expect_body_tail='end-of-body')
547
 
        server.setUp()
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)
 
538
        server = RecordingServer(expect_body_tail='end-of-body',
 
539
                                 scheme=self._url_protocol)
 
540
        self.start_server(server)
 
541
        url = server.get_url()
 
542
        # FIXME: needs a cleanup -- vila 20100611
 
543
        http_transport = transport.get_transport_from_url(url)
552
544
        code, response = http_transport._post('abc def end-of-body')
553
545
        self.assertTrue(
554
546
            server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
555
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())
556
550
        # The transport should not be assuming that the server can accept
557
551
        # chunked encoding the first time it connects, because HTTP/1.1, so we
558
552
        # check for the literal string.
594
588
    Daughter classes are expected to override _req_handler_class
595
589
    """
596
590
 
 
591
    scenarios = multiply_scenarios(
 
592
        vary_by_http_client_implementation(),
 
593
        vary_by_http_protocol_version(),
 
594
        )
 
595
 
597
596
    # Provide a useful default
598
597
    _req_handler_class = http_server.TestingHTTPRequestHandler
599
598
 
600
599
    def create_transport_readonly_server(self):
601
 
        return http_server.HttpServer(self._req_handler_class,
602
 
                                      protocol_version=self._protocol_version)
 
600
        server = http_server.HttpServer(self._req_handler_class,
 
601
                                        protocol_version=self._protocol_version)
 
602
        server._url_protocol = self._url_protocol
 
603
        return server
603
604
 
604
605
    def _testing_pycurl(self):
605
 
        return pycurl_present and self._transport == PyCurlTransport
 
606
        # TODO: This is duplicated for lots of the classes in this file
 
607
        return (features.pycurl.available()
 
608
                and self._transport == PyCurlTransport)
606
609
 
607
610
 
608
611
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
609
612
    """Whatever request comes in, close the connection"""
610
613
 
611
 
    def handle_one_request(self):
 
614
    def _handle_one_request(self):
612
615
        """Handle a single HTTP request, by abruptly closing the connection"""
613
616
        self.close_connection = 1
614
617
 
619
622
    _req_handler_class = WallRequestHandler
620
623
 
621
624
    def test_http_has(self):
622
 
        server = self.get_readonly_server()
623
 
        t = self._transport(server.get_url())
 
625
        t = self.get_readonly_transport()
624
626
        # Unfortunately httplib (see HTTPResponse._read_status
625
627
        # for details) make no distinction between a closed
626
628
        # socket and badly formatted status line, so we can't
627
629
        # just test for ConnectionError, we have to test
628
 
        # InvalidHttpResponse too.
629
 
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
 
630
        # InvalidHttpResponse too. And pycurl may raise ConnectionReset
 
631
        # instead of ConnectionError too.
 
632
        self.assertRaises(( errors.ConnectionError, errors.ConnectionReset,
 
633
                            errors.InvalidHttpResponse),
630
634
                          t.has, 'foo/bar')
631
635
 
632
636
    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),
 
637
        t = self.get_readonly_transport()
 
638
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
 
639
                           errors.InvalidHttpResponse),
636
640
                          t.get, 'foo/bar')
637
641
 
638
642
 
652
656
 
653
657
    _req_handler_class = BadStatusRequestHandler
654
658
 
 
659
    def setUp(self):
 
660
        super(TestBadStatusServer, self).setUp()
 
661
        # See https://bugs.launchpad.net/bzr/+bug/1451448 for details.
 
662
        # TD;LR: Running both a TCP client and server in the same process and
 
663
        # thread uncovers a race in python. The fix is to run the server in a
 
664
        # different process. Trying to fix yet another race here is not worth
 
665
        # the effort. -- vila 2015-09-06
 
666
        if 'HTTP/1.0' in self.id():
 
667
            raise tests.TestSkipped(
 
668
                'Client/Server in the same process and thread can hang')
 
669
 
655
670
    def test_http_has(self):
656
 
        server = self.get_readonly_server()
657
 
        t = self._transport(server.get_url())
658
 
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
 
671
        t = self.get_readonly_transport()
 
672
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
 
673
                           errors.InvalidHttpResponse),
 
674
                          t.has, 'foo/bar')
659
675
 
660
676
    def test_http_get(self):
661
 
        server = self.get_readonly_server()
662
 
        t = self._transport(server.get_url())
663
 
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
 
677
        t = self.get_readonly_transport()
 
678
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
 
679
                           errors.InvalidHttpResponse),
 
680
                          t.get, 'foo/bar')
664
681
 
665
682
 
666
683
class InvalidStatusRequestHandler(http_server.TestingHTTPRequestHandler):
670
687
        """Fakes handling a single HTTP request, returns a bad status"""
671
688
        ignored = http_server.TestingHTTPRequestHandler.parse_request(self)
672
689
        self.wfile.write("Invalid status line\r\n")
 
690
        # If we don't close the connection pycurl will hang. Since this is a
 
691
        # stress test we don't *have* to respect the protocol, but we don't
 
692
        # have to sabotage it too much either.
 
693
        self.close_connection = True
673
694
        return False
674
695
 
675
696
 
681
702
 
682
703
    _req_handler_class = InvalidStatusRequestHandler
683
704
 
684
 
    def test_http_has(self):
685
 
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
686
 
            raise tests.KnownFailure(
687
 
                'pycurl hangs if the server send back garbage')
688
 
        super(TestInvalidStatusServer, self).test_http_has()
689
 
 
690
 
    def test_http_get(self):
691
 
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
692
 
            raise tests.KnownFailure(
693
 
                'pycurl hangs if the server send back garbage')
694
 
        super(TestInvalidStatusServer, self).test_http_get()
695
 
 
696
705
 
697
706
class BadProtocolRequestHandler(http_server.TestingHTTPRequestHandler):
698
707
    """Whatever request comes in, returns a bad protocol version"""
714
723
    _req_handler_class = BadProtocolRequestHandler
715
724
 
716
725
    def setUp(self):
717
 
        if pycurl_present and self._transport == PyCurlTransport:
 
726
        if self._testing_pycurl():
718
727
            raise tests.TestNotApplicable(
719
728
                "pycurl doesn't check the protocol version")
720
729
        super(TestBadProtocolServer, self).setUp()
721
730
 
722
731
    def test_http_has(self):
723
 
        server = self.get_readonly_server()
724
 
        t = self._transport(server.get_url())
 
732
        t = self.get_readonly_transport()
725
733
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
726
734
 
727
735
    def test_http_get(self):
728
 
        server = self.get_readonly_server()
729
 
        t = self._transport(server.get_url())
 
736
        t = self.get_readonly_transport()
730
737
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
731
738
 
732
739
 
746
753
    _req_handler_class = ForbiddenRequestHandler
747
754
 
748
755
    def test_http_has(self):
749
 
        server = self.get_readonly_server()
750
 
        t = self._transport(server.get_url())
 
756
        t = self.get_readonly_transport()
751
757
        self.assertRaises(errors.TransportError, t.has, 'foo/bar')
752
758
 
753
759
    def test_http_get(self):
754
 
        server = self.get_readonly_server()
755
 
        t = self._transport(server.get_url())
 
760
        t = self.get_readonly_transport()
756
761
        self.assertRaises(errors.TransportError, t.get, 'foo/bar')
757
762
 
758
763
 
764
769
        self.assertEqual(None, server.host)
765
770
        self.assertEqual(None, server.port)
766
771
 
767
 
    def test_setUp_and_tearDown(self):
 
772
    def test_setUp_and_stop(self):
768
773
        server = RecordingServer(expect_body_tail=None)
769
 
        server.setUp()
 
774
        server.start_server()
770
775
        try:
771
776
            self.assertNotEqual(None, server.host)
772
777
            self.assertNotEqual(None, server.port)
773
778
        finally:
774
 
            server.tearDown()
 
779
            server.stop_server()
775
780
        self.assertEqual(None, server.host)
776
781
        self.assertEqual(None, server.port)
777
782
 
778
783
    def test_send_receive_bytes(self):
779
 
        server = RecordingServer(expect_body_tail='c')
780
 
        server.setUp()
781
 
        self.addCleanup(server.tearDown)
 
784
        server = RecordingServer(expect_body_tail='c', scheme='http')
 
785
        self.start_server(server)
782
786
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
783
787
        sock.connect((server.host, server.port))
784
788
        sock.sendall('abc')
798
802
        self.build_tree_contents([('a', '0123456789')],)
799
803
 
800
804
    def test_readv(self):
801
 
        server = self.get_readonly_server()
802
 
        t = self._transport(server.get_url())
 
805
        t = self.get_readonly_transport()
803
806
        l = list(t.readv('a', ((0, 1), (1, 1), (3, 2), (9, 1))))
804
807
        self.assertEqual(l[0], (0, '0'))
805
808
        self.assertEqual(l[1], (1, '1'))
807
810
        self.assertEqual(l[3], (9, '9'))
808
811
 
809
812
    def test_readv_out_of_order(self):
810
 
        server = self.get_readonly_server()
811
 
        t = self._transport(server.get_url())
 
813
        t = self.get_readonly_transport()
812
814
        l = list(t.readv('a', ((1, 1), (9, 1), (0, 1), (3, 2))))
813
815
        self.assertEqual(l[0], (1, '1'))
814
816
        self.assertEqual(l[1], (9, '9'))
816
818
        self.assertEqual(l[3], (3, '34'))
817
819
 
818
820
    def test_readv_invalid_ranges(self):
819
 
        server = self.get_readonly_server()
820
 
        t = self._transport(server.get_url())
 
821
        t = self.get_readonly_transport()
821
822
 
822
823
        # This is intentionally reading off the end of the file
823
824
        # since we are sure that it cannot get there
831
832
 
832
833
    def test_readv_multiple_get_requests(self):
833
834
        server = self.get_readonly_server()
834
 
        t = self._transport(server.get_url())
 
835
        t = self.get_readonly_transport()
835
836
        # force transport to issue multiple requests
836
837
        t._max_readv_combine = 1
837
838
        t._max_get_ranges = 1
845
846
 
846
847
    def test_readv_get_max_size(self):
847
848
        server = self.get_readonly_server()
848
 
        t = self._transport(server.get_url())
 
849
        t = self.get_readonly_transport()
849
850
        # force transport to issue multiple requests by limiting the number of
850
851
        # bytes by request. Note that this apply to coalesced offsets only, a
851
852
        # single range will keep its size even if bigger than the limit.
860
861
 
861
862
    def test_complete_readv_leave_pipe_clean(self):
862
863
        server = self.get_readonly_server()
863
 
        t = self._transport(server.get_url())
 
864
        t = self.get_readonly_transport()
864
865
        # force transport to issue multiple requests
865
866
        t._get_max_size = 2
866
 
        l = list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
 
867
        list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
867
868
        # The server should have issued 3 requests
868
869
        self.assertEqual(3, server.GET_request_nb)
869
870
        self.assertEqual('0123456789', t.get_bytes('a'))
871
872
 
872
873
    def test_incomplete_readv_leave_pipe_clean(self):
873
874
        server = self.get_readonly_server()
874
 
        t = self._transport(server.get_url())
 
875
        t = self.get_readonly_transport()
875
876
        # force transport to issue multiple requests
876
877
        t._get_max_size = 2
877
878
        # Don't collapse readv results into a list so that we leave unread
946
947
    def get_multiple_ranges(self, file, file_size, ranges):
947
948
        self.send_response(206)
948
949
        self.send_header('Accept-Ranges', 'bytes')
 
950
        # XXX: this is strange; the 'random' name below seems undefined and
 
951
        # yet the tests pass -- mbp 2010-10-11 bug 658773
949
952
        boundary = "%d" % random.randint(0,0x7FFFFFFF)
950
953
        self.send_header("Content-Type",
951
954
                         "multipart/byteranges; boundary=%s" % boundary)
1013
1016
                return
1014
1017
            self.send_range_content(file, start, end - start + 1)
1015
1018
            cur += 1
1016
 
        # No final boundary
 
1019
        # Final boundary
1017
1020
        self.wfile.write(boundary_line)
1018
1021
 
1019
1022
 
1027
1030
 
1028
1031
    def test_readv_with_short_reads(self):
1029
1032
        server = self.get_readonly_server()
1030
 
        t = self._transport(server.get_url())
 
1033
        t = self.get_readonly_transport()
1031
1034
        # Force separate ranges for each offset
1032
1035
        t._bytes_to_read_before_seek = 0
1033
1036
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1048
1051
        # that mode
1049
1052
        self.assertEqual('single', t._range_hint)
1050
1053
 
 
1054
 
 
1055
class TruncatedBeforeBoundaryRequestHandler(
 
1056
    http_server.TestingHTTPRequestHandler):
 
1057
    """Truncation before a boundary, like in bug 198646"""
 
1058
 
 
1059
    _truncated_ranges = 1
 
1060
 
 
1061
    def get_multiple_ranges(self, file, file_size, ranges):
 
1062
        self.send_response(206)
 
1063
        self.send_header('Accept-Ranges', 'bytes')
 
1064
        boundary = 'tagada'
 
1065
        self.send_header('Content-Type',
 
1066
                         'multipart/byteranges; boundary=%s' % boundary)
 
1067
        boundary_line = '--%s\r\n' % boundary
 
1068
        # Calculate the Content-Length
 
1069
        content_length = 0
 
1070
        for (start, end) in ranges:
 
1071
            content_length += len(boundary_line)
 
1072
            content_length += self._header_line_length(
 
1073
                'Content-type', 'application/octet-stream')
 
1074
            content_length += self._header_line_length(
 
1075
                'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))
 
1076
            content_length += len('\r\n') # end headers
 
1077
            content_length += end - start # + 1
 
1078
        content_length += len(boundary_line)
 
1079
        self.send_header('Content-length', content_length)
 
1080
        self.end_headers()
 
1081
 
 
1082
        # Send the multipart body
 
1083
        cur = 0
 
1084
        for (start, end) in ranges:
 
1085
            if cur + self._truncated_ranges >= len(ranges):
 
1086
                # Abruptly ends the response and close the connection
 
1087
                self.close_connection = 1
 
1088
                return
 
1089
            self.wfile.write(boundary_line)
 
1090
            self.send_header('Content-type', 'application/octet-stream')
 
1091
            self.send_header('Content-Range', 'bytes %d-%d/%d'
 
1092
                             % (start, end, file_size))
 
1093
            self.end_headers()
 
1094
            self.send_range_content(file, start, end - start + 1)
 
1095
            cur += 1
 
1096
        # Final boundary
 
1097
        self.wfile.write(boundary_line)
 
1098
 
 
1099
 
 
1100
class TestTruncatedBeforeBoundary(TestSpecificRequestHandler):
 
1101
    """Tests the case of bug 198646, disconnecting before a boundary."""
 
1102
 
 
1103
    _req_handler_class = TruncatedBeforeBoundaryRequestHandler
 
1104
 
 
1105
    def setUp(self):
 
1106
        super(TestTruncatedBeforeBoundary, self).setUp()
 
1107
        self.build_tree_contents([('a', '0123456789')],)
 
1108
 
 
1109
    def test_readv_with_short_reads(self):
 
1110
        server = self.get_readonly_server()
 
1111
        t = self.get_readonly_transport()
 
1112
        # Force separate ranges for each offset
 
1113
        t._bytes_to_read_before_seek = 0
 
1114
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
 
1115
        self.assertEqual((0, '0'), ireadv.next())
 
1116
        self.assertEqual((2, '2'), ireadv.next())
 
1117
        self.assertEqual((4, '45'), ireadv.next())
 
1118
        self.assertEqual((9, '9'), ireadv.next())
 
1119
 
 
1120
 
1051
1121
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1052
1122
    """Errors out when range specifiers exceed the limit"""
1053
1123
 
1077
1147
class TestLimitedRangeRequestServer(http_utils.TestCaseWithWebserver):
1078
1148
    """Tests readv requests against a server erroring out on too much ranges."""
1079
1149
 
 
1150
    scenarios = multiply_scenarios(
 
1151
        vary_by_http_client_implementation(),
 
1152
        vary_by_http_protocol_version(),
 
1153
        )
 
1154
 
1080
1155
    # Requests with more range specifiers will error out
1081
1156
    range_limit = 3
1082
1157
 
1084
1159
        return LimitedRangeHTTPServer(range_limit=self.range_limit,
1085
1160
                                      protocol_version=self._protocol_version)
1086
1161
 
1087
 
    def get_transport(self):
1088
 
        return self._transport(self.get_readonly_server().get_url())
1089
 
 
1090
1162
    def setUp(self):
1091
 
        http_utils.TestCaseWithWebserver.setUp(self)
 
1163
        super(TestLimitedRangeRequestServer, self).setUp()
1092
1164
        # We need to manipulate ranges that correspond to real chunks in the
1093
1165
        # response, so we build a content appropriately.
1094
1166
        filler = ''.join(['abcdefghij' for x in range(102)])
1096
1168
        self.build_tree_contents([('a', content)],)
1097
1169
 
1098
1170
    def test_few_ranges(self):
1099
 
        t = self.get_transport()
 
1171
        t = self.get_readonly_transport()
1100
1172
        l = list(t.readv('a', ((0, 4), (1024, 4), )))
1101
1173
        self.assertEqual(l[0], (0, '0000'))
1102
1174
        self.assertEqual(l[1], (1024, '0001'))
1103
1175
        self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1104
1176
 
1105
1177
    def test_more_ranges(self):
1106
 
        t = self.get_transport()
 
1178
        t = self.get_readonly_transport()
1107
1179
        l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1108
1180
        self.assertEqual(l[0], (0, '0000'))
1109
1181
        self.assertEqual(l[1], (1024, '0001'))
1120
1192
    Only the urllib implementation is tested here.
1121
1193
    """
1122
1194
 
1123
 
    def setUp(self):
1124
 
        tests.TestCase.setUp(self)
1125
 
        self._old_env = {}
1126
 
 
1127
 
    def tearDown(self):
1128
 
        self._restore_env()
1129
 
        tests.TestCase.tearDown(self)
1130
 
 
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)
1134
 
 
1135
 
    def _restore_env(self):
1136
 
        for name, value in self._old_env.iteritems():
1137
 
            osutils.set_or_unset_env(name, value)
1138
 
 
1139
1195
    def _proxied_request(self):
1140
1196
        handler = _urllib2_wrappers.ProxyHandler()
1141
 
        request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
 
1197
        request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
1142
1198
        handler.set_proxy(request, 'http')
1143
1199
        return request
1144
1200
 
 
1201
    def assertEvaluateProxyBypass(self, expected, host, no_proxy):
 
1202
        handler = _urllib2_wrappers.ProxyHandler()
 
1203
        self.assertEqual(expected,
 
1204
                          handler.evaluate_proxy_bypass(host, no_proxy))
 
1205
 
1145
1206
    def test_empty_user(self):
1146
 
        self._install_env({'http_proxy': 'http://bar.com'})
 
1207
        self.overrideEnv('http_proxy', 'http://bar.com')
 
1208
        request = self._proxied_request()
 
1209
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
 
1210
 
 
1211
    def test_user_with_at(self):
 
1212
        self.overrideEnv('http_proxy',
 
1213
                         'http://username@domain:password@proxy_host:1234')
1147
1214
        request = self._proxied_request()
1148
1215
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
1149
1216
 
1150
1217
    def test_invalid_proxy(self):
1151
1218
        """A proxy env variable without scheme"""
1152
 
        self._install_env({'http_proxy': 'host:1234'})
 
1219
        self.overrideEnv('http_proxy', 'host:1234')
1153
1220
        self.assertRaises(errors.InvalidURL, self._proxied_request)
1154
1221
 
 
1222
    def test_evaluate_proxy_bypass_true(self):
 
1223
        """The host is not proxied"""
 
1224
        self.assertEvaluateProxyBypass(True, 'example.com', 'example.com')
 
1225
        self.assertEvaluateProxyBypass(True, 'bzr.example.com', '*example.com')
 
1226
 
 
1227
    def test_evaluate_proxy_bypass_false(self):
 
1228
        """The host is proxied"""
 
1229
        self.assertEvaluateProxyBypass(False, 'bzr.example.com', None)
 
1230
 
 
1231
    def test_evaluate_proxy_bypass_unknown(self):
 
1232
        """The host is not explicitly proxied"""
 
1233
        self.assertEvaluateProxyBypass(None, 'example.com', 'not.example.com')
 
1234
        self.assertEvaluateProxyBypass(None, 'bzr.example.com', 'example.com')
 
1235
 
 
1236
    def test_evaluate_proxy_bypass_empty_entries(self):
 
1237
        """Ignore empty entries"""
 
1238
        self.assertEvaluateProxyBypass(None, 'example.com', '')
 
1239
        self.assertEvaluateProxyBypass(None, 'example.com', ',')
 
1240
        self.assertEvaluateProxyBypass(None, 'example.com', 'foo,,bar')
 
1241
 
1155
1242
 
1156
1243
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1157
1244
    """Tests proxy server.
1162
1249
    to the file names).
1163
1250
    """
1164
1251
 
 
1252
    scenarios = multiply_scenarios(
 
1253
        vary_by_http_client_implementation(),
 
1254
        vary_by_http_protocol_version(),
 
1255
        )
 
1256
 
1165
1257
    # FIXME: We don't have an https server available, so we don't
1166
 
    # test https connections.
 
1258
    # test https connections. --vila toolongago
1167
1259
 
1168
1260
    def setUp(self):
1169
1261
        super(TestProxyHttpServer, self).setUp()
 
1262
        self.transport_secondary_server = http_utils.ProxyServer
1170
1263
        self.build_tree_contents([('foo', 'contents of foo\n'),
1171
1264
                                  ('foo-proxied', 'proxied contents of foo\n')])
1172
1265
        # 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)
 
1266
        server = self.get_readonly_server()
 
1267
        self.server_host_port = '%s:%d' % (server.host, server.port)
1175
1268
        if self._testing_pycurl():
1176
1269
            # Oh my ! pycurl does not check for the port as part of
1177
1270
            # no_proxy :-( So we just test the host part
1178
 
            self.no_proxy_host = 'localhost'
 
1271
            self.no_proxy_host = server.host
1179
1272
        else:
1180
 
            self.no_proxy_host = self.proxy_address
 
1273
            self.no_proxy_host = self.server_host_port
1181
1274
        # The secondary server is the proxy
1182
 
        self.proxy = self.get_secondary_server()
1183
 
        self.proxy_url = self.proxy.get_url()
1184
 
        self._old_env = {}
 
1275
        self.proxy_url = self.get_secondary_url()
1185
1276
 
1186
1277
    def _testing_pycurl(self):
1187
 
        return pycurl_present and self._transport == PyCurlTransport
1188
 
 
1189
 
    def create_transport_secondary_server(self):
1190
 
        """Creates an http server that will serve files with
1191
 
        '-proxied' appended to their names.
1192
 
        """
1193
 
        return http_utils.ProxyServer(protocol_version=self._protocol_version)
1194
 
 
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)
1198
 
 
1199
 
    def _restore_env(self):
1200
 
        for name, value in self._old_env.iteritems():
1201
 
            osutils.set_or_unset_env(name, value)
1202
 
 
1203
 
    def proxied_in_env(self, env):
1204
 
        self._install_env(env)
1205
 
        url = self.server.get_url()
1206
 
        t = self._transport(url)
1207
 
        try:
1208
 
            self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1209
 
        finally:
1210
 
            self._restore_env()
1211
 
 
1212
 
    def not_proxied_in_env(self, env):
1213
 
        self._install_env(env)
1214
 
        url = self.server.get_url()
1215
 
        t = self._transport(url)
1216
 
        try:
1217
 
            self.assertEqual('contents of foo\n', t.get('foo').read())
1218
 
        finally:
1219
 
            self._restore_env()
 
1278
        # TODO: This is duplicated for lots of the classes in this file
 
1279
        return (features.pycurl.available()
 
1280
                and self._transport == PyCurlTransport)
 
1281
 
 
1282
    def assertProxied(self):
 
1283
        t = self.get_readonly_transport()
 
1284
        self.assertEqual('proxied contents of foo\n', t.get('foo').read())
 
1285
 
 
1286
    def assertNotProxied(self):
 
1287
        t = self.get_readonly_transport()
 
1288
        self.assertEqual('contents of foo\n', t.get('foo').read())
1220
1289
 
1221
1290
    def test_http_proxy(self):
1222
 
        self.proxied_in_env({'http_proxy': self.proxy_url})
 
1291
        self.overrideEnv('http_proxy', self.proxy_url)
 
1292
        self.assertProxied()
1223
1293
 
1224
1294
    def test_HTTP_PROXY(self):
1225
1295
        if self._testing_pycurl():
1228
1298
            # about. Should we ?)
1229
1299
            raise tests.TestNotApplicable(
1230
1300
                'pycurl does not check HTTP_PROXY for security reasons')
1231
 
        self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
 
1301
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
 
1302
        self.assertProxied()
1232
1303
 
1233
1304
    def test_all_proxy(self):
1234
 
        self.proxied_in_env({'all_proxy': self.proxy_url})
 
1305
        self.overrideEnv('all_proxy', self.proxy_url)
 
1306
        self.assertProxied()
1235
1307
 
1236
1308
    def test_ALL_PROXY(self):
1237
 
        self.proxied_in_env({'ALL_PROXY': self.proxy_url})
 
1309
        self.overrideEnv('ALL_PROXY', self.proxy_url)
 
1310
        self.assertProxied()
1238
1311
 
1239
1312
    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})
 
1313
        self.overrideEnv('no_proxy', self.no_proxy_host)
 
1314
        self.overrideEnv('http_proxy', self.proxy_url)
 
1315
        self.assertNotProxied()
1242
1316
 
1243
1317
    def test_HTTP_PROXY_with_NO_PROXY(self):
1244
1318
        if self._testing_pycurl():
1245
1319
            raise tests.TestNotApplicable(
1246
1320
                '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})
 
1321
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
 
1322
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
 
1323
        self.assertNotProxied()
1249
1324
 
1250
1325
    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})
 
1326
        self.overrideEnv('no_proxy', self.no_proxy_host)
 
1327
        self.overrideEnv('all_proxy', self.proxy_url)
 
1328
        self.assertNotProxied()
1253
1329
 
1254
1330
    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})
 
1331
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
 
1332
        self.overrideEnv('ALL_PROXY', self.proxy_url)
 
1333
        self.assertNotProxied()
1257
1334
 
1258
1335
    def test_http_proxy_without_scheme(self):
 
1336
        self.overrideEnv('http_proxy', self.server_host_port)
1259
1337
        if self._testing_pycurl():
1260
1338
            # pycurl *ignores* invalid proxy env variables. If that ever change
1261
1339
            # in the future, this test will fail indicating that pycurl do not
1262
1340
            # ignore anymore such variables.
1263
 
            self.not_proxied_in_env({'http_proxy': self.proxy_address})
 
1341
            self.assertNotProxied()
1264
1342
        else:
1265
 
            self.assertRaises(errors.InvalidURL,
1266
 
                              self.proxied_in_env,
1267
 
                              {'http_proxy': self.proxy_address})
 
1343
            self.assertRaises(errors.InvalidURL, self.assertProxied)
1268
1344
 
1269
1345
 
1270
1346
class TestRanges(http_utils.TestCaseWithWebserver):
1271
1347
    """Test the Range header in GET methods."""
1272
1348
 
 
1349
    scenarios = multiply_scenarios(
 
1350
        vary_by_http_client_implementation(),
 
1351
        vary_by_http_protocol_version(),
 
1352
        )
 
1353
 
1273
1354
    def setUp(self):
1274
 
        http_utils.TestCaseWithWebserver.setUp(self)
 
1355
        super(TestRanges, self).setUp()
1275
1356
        self.build_tree_contents([('a', '0123456789')],)
1276
 
        server = self.get_readonly_server()
1277
 
        self.transport = self._transport(server.get_url())
1278
1357
 
1279
1358
    def create_transport_readonly_server(self):
1280
1359
        return http_server.HttpServer(protocol_version=self._protocol_version)
1281
1360
 
1282
1361
    def _file_contents(self, relpath, ranges):
 
1362
        t = self.get_readonly_transport()
1283
1363
        offsets = [ (start, end - start + 1) for start, end in ranges]
1284
 
        coalesce = self.transport._coalesce_offsets
 
1364
        coalesce = t._coalesce_offsets
1285
1365
        coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1286
 
        code, data = self.transport._get(relpath, coalesced)
 
1366
        code, data = t._get(relpath, coalesced)
1287
1367
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1288
1368
        for start, end in ranges:
1289
1369
            data.seek(start)
1290
1370
            yield data.read(end - start + 1)
1291
1371
 
1292
1372
    def _file_tail(self, relpath, tail_amount):
1293
 
        code, data = self.transport._get(relpath, [], tail_amount)
 
1373
        t = self.get_readonly_transport()
 
1374
        code, data = t._get(relpath, [], tail_amount)
1294
1375
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1295
1376
        data.seek(-tail_amount, 2)
1296
1377
        return data.read(tail_amount)
1315
1396
class TestHTTPRedirections(http_utils.TestCaseWithRedirectedWebserver):
1316
1397
    """Test redirection between http servers."""
1317
1398
 
1318
 
    def create_transport_secondary_server(self):
1319
 
        """Create the secondary server redirecting to the primary server"""
1320
 
        new = self.get_readonly_server()
1321
 
 
1322
 
        redirecting = http_utils.HTTPServerRedirecting(
1323
 
            protocol_version=self._protocol_version)
1324
 
        redirecting.redirect_to(new.host, new.port)
1325
 
        return redirecting
 
1399
    scenarios = multiply_scenarios(
 
1400
        vary_by_http_client_implementation(),
 
1401
        vary_by_http_protocol_version(),
 
1402
        )
1326
1403
 
1327
1404
    def setUp(self):
1328
1405
        super(TestHTTPRedirections, self).setUp()
1330
1407
                                  ('bundle',
1331
1408
                                  '# Bazaar revision bundle v0.9\n#\n')
1332
1409
                                  ],)
1333
 
        # The requests to the old server will be redirected to the new server
1334
 
        self.old_transport = self._transport(self.old_server.get_url())
1335
1410
 
1336
1411
    def test_redirected(self):
1337
 
        self.assertRaises(errors.RedirectRequested, self.old_transport.get, 'a')
1338
 
        t = self._transport(self.new_server.get_url())
1339
 
        self.assertEqual('0123456789', t.get('a').read())
1340
 
 
1341
 
    def test_read_redirected_bundle_from_url(self):
1342
 
        from bzrlib.bundle import read_bundle_from_url
1343
 
        url = self.old_transport.abspath('bundle')
1344
 
        bundle = self.applyDeprecated(deprecated_in((1, 12, 0)),
1345
 
                read_bundle_from_url, url)
1346
 
        # If read_bundle_from_url was successful we get an empty bundle
1347
 
        self.assertEqual([], bundle.revisions)
 
1412
        self.assertRaises(errors.RedirectRequested,
 
1413
                          self.get_old_transport().get, 'a')
 
1414
        self.assertEqual('0123456789', self.get_new_transport().get('a').read())
1348
1415
 
1349
1416
 
1350
1417
class RedirectedRequest(_urllib2_wrappers.Request):
1363
1430
        self.follow_redirections = True
1364
1431
 
1365
1432
 
 
1433
def install_redirected_request(test):
 
1434
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
 
1435
 
 
1436
 
 
1437
def cleanup_http_redirection_connections(test):
 
1438
    # Some sockets are opened but never seen by _urllib, so we trap them at
 
1439
    # the _urllib2_wrappers level to be able to clean them up.
 
1440
    def socket_disconnect(sock):
 
1441
        try:
 
1442
            sock.shutdown(socket.SHUT_RDWR)
 
1443
            sock.close()
 
1444
        except socket.error:
 
1445
            pass
 
1446
    def connect(connection):
 
1447
        test.http_connect_orig(connection)
 
1448
        test.addCleanup(socket_disconnect, connection.sock)
 
1449
    test.http_connect_orig = test.overrideAttr(
 
1450
        _urllib2_wrappers.HTTPConnection, 'connect', connect)
 
1451
    def connect(connection):
 
1452
        test.https_connect_orig(connection)
 
1453
        test.addCleanup(socket_disconnect, connection.sock)
 
1454
    test.https_connect_orig = test.overrideAttr(
 
1455
        _urllib2_wrappers.HTTPSConnection, 'connect', connect)
 
1456
 
 
1457
 
1366
1458
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1367
1459
    """Test redirections.
1368
1460
 
1377
1469
    -- vila 20070212
1378
1470
    """
1379
1471
 
 
1472
    scenarios = multiply_scenarios(
 
1473
        vary_by_http_client_implementation(),
 
1474
        vary_by_http_protocol_version(),
 
1475
        )
 
1476
 
1380
1477
    def setUp(self):
1381
 
        if pycurl_present and self._transport == PyCurlTransport:
 
1478
        if (features.pycurl.available()
 
1479
            and self._transport == PyCurlTransport):
1382
1480
            raise tests.TestNotApplicable(
1383
 
                "pycurl doesn't redirect silently annymore")
 
1481
                "pycurl doesn't redirect silently anymore")
1384
1482
        super(TestHTTPSilentRedirections, self).setUp()
1385
 
        self.setup_redirected_request()
1386
 
        self.addCleanup(self.cleanup_redirected_request)
 
1483
        install_redirected_request(self)
 
1484
        cleanup_http_redirection_connections(self)
1387
1485
        self.build_tree_contents([('a','a'),
1388
1486
                                  ('1/',),
1389
1487
                                  ('1/a', 'redirected once'),
1397
1495
                                  ('5/a', 'redirected 5 times'),
1398
1496
                                  ],)
1399
1497
 
1400
 
        self.old_transport = self._transport(self.old_server.get_url())
1401
 
 
1402
 
    def setup_redirected_request(self):
1403
 
        self.original_class = _urllib2_wrappers.Request
1404
 
        _urllib2_wrappers.Request = RedirectedRequest
1405
 
 
1406
 
    def cleanup_redirected_request(self):
1407
 
        _urllib2_wrappers.Request = self.original_class
1408
 
 
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)
1413
 
 
1414
1498
    def test_one_redirection(self):
1415
 
        t = self.old_transport
1416
 
 
1417
 
        req = RedirectedRequest('GET', t.abspath('a'))
1418
 
        req.follow_redirections = True
 
1499
        t = self.get_old_transport()
 
1500
        req = RedirectedRequest('GET', t._remote_path('a'))
1419
1501
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1420
1502
                                       self.new_server.port)
1421
1503
        self.old_server.redirections = \
1422
1504
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1423
 
        self.assertEquals('redirected once',t._perform(req).read())
 
1505
        self.assertEqual('redirected once', t._perform(req).read())
1424
1506
 
1425
1507
    def test_five_redirections(self):
1426
 
        t = self.old_transport
1427
 
 
1428
 
        req = RedirectedRequest('GET', t.abspath('a'))
1429
 
        req.follow_redirections = True
 
1508
        t = self.get_old_transport()
 
1509
        req = RedirectedRequest('GET', t._remote_path('a'))
1430
1510
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1431
1511
                                       self.old_server.port)
1432
1512
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1438
1518
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1439
1519
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1440
1520
            ]
1441
 
        self.assertEquals('redirected 5 times',t._perform(req).read())
 
1521
        self.assertEqual('redirected 5 times', t._perform(req).read())
1442
1522
 
1443
1523
 
1444
1524
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1445
1525
    """Test transport.do_catching_redirections."""
1446
1526
 
 
1527
    scenarios = multiply_scenarios(
 
1528
        vary_by_http_client_implementation(),
 
1529
        vary_by_http_protocol_version(),
 
1530
        )
 
1531
 
1447
1532
    def setUp(self):
1448
1533
        super(TestDoCatchRedirections, self).setUp()
1449
1534
        self.build_tree_contents([('a', '0123456789'),],)
1450
 
 
1451
 
        self.old_transport = self._transport(self.old_server.get_url())
1452
 
 
1453
 
    def get_a(self, transport):
1454
 
        return transport.get('a')
 
1535
        cleanup_http_redirection_connections(self)
 
1536
 
 
1537
        self.old_transport = self.get_old_transport()
 
1538
 
 
1539
    def get_a(self, t):
 
1540
        return t.get('a')
1455
1541
 
1456
1542
    def test_no_redirection(self):
1457
 
        t = self._transport(self.new_server.get_url())
 
1543
        t = self.get_new_transport()
1458
1544
 
1459
1545
        # We use None for redirected so that we fail if redirected
1460
 
        self.assertEquals('0123456789',
1461
 
                          transport.do_catching_redirections(
 
1546
        self.assertEqual('0123456789',
 
1547
                         transport.do_catching_redirections(
1462
1548
                self.get_a, t, None).read())
1463
1549
 
1464
1550
    def test_one_redirection(self):
1465
1551
        self.redirections = 0
1466
1552
 
1467
 
        def redirected(transport, exception, redirection_notice):
 
1553
        def redirected(t, exception, redirection_notice):
1468
1554
            self.redirections += 1
1469
 
            dir, file = urlutils.split(exception.target)
1470
 
            return self._transport(dir)
 
1555
            redirected_t = t._redirected_to(exception.source, exception.target)
 
1556
            return redirected_t
1471
1557
 
1472
 
        self.assertEquals('0123456789',
1473
 
                          transport.do_catching_redirections(
 
1558
        self.assertEqual('0123456789',
 
1559
                         transport.do_catching_redirections(
1474
1560
                self.get_a, self.old_transport, redirected).read())
1475
 
        self.assertEquals(1, self.redirections)
 
1561
        self.assertEqual(1, self.redirections)
1476
1562
 
1477
1563
    def test_redirection_loop(self):
1478
1564
 
1487
1573
                          self.get_a, self.old_transport, redirected)
1488
1574
 
1489
1575
 
 
1576
def _setup_authentication_config(**kwargs):
 
1577
    conf = config.AuthenticationConfig()
 
1578
    conf._get_config().update({'httptest': kwargs})
 
1579
    conf._save()
 
1580
 
 
1581
 
 
1582
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
 
1583
    """Unit tests for glue by which urllib2 asks us for authentication"""
 
1584
 
 
1585
    def test_get_user_password_without_port(self):
 
1586
        """We cope if urllib2 doesn't tell us the port.
 
1587
 
 
1588
        See https://bugs.launchpad.net/bzr/+bug/654684
 
1589
        """
 
1590
        user = 'joe'
 
1591
        password = 'foo'
 
1592
        _setup_authentication_config(scheme='http', host='localhost',
 
1593
                                     user=user, password=password)
 
1594
        handler = _urllib2_wrappers.HTTPAuthHandler()
 
1595
        got_pass = handler.get_user_password(dict(
 
1596
            user='joe',
 
1597
            protocol='http',
 
1598
            host='localhost',
 
1599
            path='/',
 
1600
            realm='Realm',
 
1601
            ))
 
1602
        self.assertEqual((user, password), got_pass)
 
1603
 
 
1604
 
1490
1605
class TestAuth(http_utils.TestCaseWithWebserver):
1491
1606
    """Test authentication scheme"""
1492
1607
 
1493
 
    _auth_header = 'Authorization'
1494
 
    _password_prompt_prefix = ''
1495
 
    _username_prompt_prefix = ''
1496
 
    # Set by load_tests
1497
 
    _auth_server = None
 
1608
    scenarios = multiply_scenarios(
 
1609
        vary_by_http_client_implementation(),
 
1610
        vary_by_http_protocol_version(),
 
1611
        vary_by_http_auth_scheme(),
 
1612
        )
1498
1613
 
1499
1614
    def setUp(self):
1500
1615
        super(TestAuth, self).setUp()
1503
1618
                                  ('b', 'contents of b\n'),])
1504
1619
 
1505
1620
    def create_transport_readonly_server(self):
1506
 
        return self._auth_server(protocol_version=self._protocol_version)
 
1621
        server = self._auth_server(protocol_version=self._protocol_version)
 
1622
        server._url_protocol = self._url_protocol
 
1623
        return server
1507
1624
 
1508
1625
    def _testing_pycurl(self):
1509
 
        return pycurl_present and self._transport == PyCurlTransport
 
1626
        # TODO: This is duplicated for lots of the classes in this file
 
1627
        return (features.pycurl.available()
 
1628
                and self._transport == PyCurlTransport)
1510
1629
 
1511
1630
    def get_user_url(self, user, password):
1512
1631
        """Build an url embedding user and password"""
1520
1639
        return url
1521
1640
 
1522
1641
    def get_user_transport(self, user, password):
1523
 
        return self._transport(self.get_user_url(user, password))
 
1642
        t = transport.get_transport_from_url(
 
1643
            self.get_user_url(user, password))
 
1644
        return t
1524
1645
 
1525
1646
    def test_no_user(self):
1526
1647
        self.server.add_user('joe', 'foo')
1577
1698
        self.assertEqual('', ui.ui_factory.stdin.readline())
1578
1699
        stderr.seek(0)
1579
1700
        expected_prompt = self._expected_username_prompt(t._unqualified_scheme)
1580
 
        self.assertEquals(expected_prompt, stderr.read(len(expected_prompt)))
1581
 
        self.assertEquals('', stdout.getvalue())
 
1701
        self.assertEqual(expected_prompt, stderr.read(len(expected_prompt)))
 
1702
        self.assertEqual('', stdout.getvalue())
1582
1703
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1583
1704
                                    stderr.readline())
1584
1705
 
1599
1720
        self.assertEqual('', ui.ui_factory.stdin.readline())
1600
1721
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1601
1722
                                    stderr.getvalue())
1602
 
        self.assertEquals('', stdout.getvalue())
 
1723
        self.assertEqual('', stdout.getvalue())
1603
1724
        # And we shouldn't prompt again for a different request
1604
1725
        # against the same transport.
1605
1726
        self.assertEqual('contents of b\n',t.get('b').read())
1615
1736
                              % (scheme.upper(),
1616
1737
                                 user, self.server.host, self.server.port,
1617
1738
                                 self.server.auth_realm)))
1618
 
        self.assertEquals(expected_prompt, actual_prompt)
 
1739
        self.assertEqual(expected_prompt, actual_prompt)
1619
1740
 
1620
1741
    def _expected_username_prompt(self, scheme):
1621
1742
        return (self._username_prompt_prefix
1635
1756
        self.server.add_user(user, password)
1636
1757
        t = self.get_user_transport(user, None)
1637
1758
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1638
 
                                            stdout=tests.StringIOWrapper())
 
1759
                                            stderr=tests.StringIOWrapper())
1639
1760
        # Create a minimal config file with the right password
1640
 
        conf = config.AuthenticationConfig()
1641
 
        conf._get_config().update(
1642
 
            {'httptest': {'scheme': 'http', 'port': self.server.port,
1643
 
                          'user': user, 'password': password}})
1644
 
        conf._save()
 
1761
        _setup_authentication_config(scheme='http', port=self.server.port,
 
1762
                                     user=user, password=password)
1645
1763
        # Issue a request to the server to connect
1646
1764
        self.assertEqual('contents of a\n',t.get('a').read())
1647
1765
        # stdin should have  been left untouched
1649
1767
        # Only one 'Authentication Required' error should occur
1650
1768
        self.assertEqual(1, self.server.auth_required_errors)
1651
1769
 
1652
 
    def test_user_from_auth_conf(self):
1653
 
        if self._testing_pycurl():
1654
 
            raise tests.TestNotApplicable(
1655
 
                'pycurl does not support authentication.conf')
1656
 
        user = 'joe'
1657
 
        password = 'foo'
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}})
1664
 
        conf._save()
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)
1670
 
 
1671
1770
    def test_changing_nonce(self):
1672
1771
        if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1673
1772
                                     http_utils.ProxyDigestAuthServer):
1674
1773
            raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
1675
1774
        if self._testing_pycurl():
1676
 
            raise tests.KnownFailure(
 
1775
            self.knownFailure(
1677
1776
                'pycurl does not handle a nonce change')
1678
1777
        self.server.add_user('joe', 'foo')
1679
1778
        t = self.get_user_transport('joe', 'foo')
1689
1788
        # initial 'who are you' and a second 'who are you' with the new nonce)
1690
1789
        self.assertEqual(2, self.server.auth_required_errors)
1691
1790
 
 
1791
    def test_user_from_auth_conf(self):
 
1792
        if self._testing_pycurl():
 
1793
            raise tests.TestNotApplicable(
 
1794
                'pycurl does not support authentication.conf')
 
1795
        user = 'joe'
 
1796
        password = 'foo'
 
1797
        self.server.add_user(user, password)
 
1798
        _setup_authentication_config(scheme='http', port=self.server.port,
 
1799
                                     user=user, password=password)
 
1800
        t = self.get_user_transport(None, None)
 
1801
        # Issue a request to the server to connect
 
1802
        self.assertEqual('contents of a\n', t.get('a').read())
 
1803
        # Only one 'Authentication Required' error should occur
 
1804
        self.assertEqual(1, self.server.auth_required_errors)
 
1805
 
 
1806
    def test_no_credential_leaks_in_log(self):
 
1807
        self.overrideAttr(debug, 'debug_flags', set(['http']))
 
1808
        user = 'joe'
 
1809
        password = 'very-sensitive-password'
 
1810
        self.server.add_user(user, password)
 
1811
        t = self.get_user_transport(user, password)
 
1812
        # Capture the debug calls to mutter
 
1813
        self.mutters = []
 
1814
        def mutter(*args):
 
1815
            lines = args[0] % args[1:]
 
1816
            # Some calls output multiple lines, just split them now since we
 
1817
            # care about a single one later.
 
1818
            self.mutters.extend(lines.splitlines())
 
1819
        self.overrideAttr(trace, 'mutter', mutter)
 
1820
        # Issue a request to the server to connect
 
1821
        self.assertEqual(True, t.has('a'))
 
1822
        # Only one 'Authentication Required' error should occur
 
1823
        self.assertEqual(1, self.server.auth_required_errors)
 
1824
        # Since the authentification succeeded, there should be a corresponding
 
1825
        # debug line
 
1826
        sent_auth_headers = [line for line in self.mutters
 
1827
                             if line.startswith('> %s' % (self._auth_header,))]
 
1828
        self.assertLength(1, sent_auth_headers)
 
1829
        self.assertStartsWith(sent_auth_headers[0],
 
1830
                              '> %s: <masked>' % (self._auth_header,))
1692
1831
 
1693
1832
 
1694
1833
class TestProxyAuth(TestAuth):
1695
 
    """Test proxy authentication schemes."""
1696
 
 
1697
 
    _auth_header = 'Proxy-authorization'
1698
 
    _password_prompt_prefix = 'Proxy '
1699
 
    _username_prompt_prefix = 'Proxy '
 
1834
    """Test proxy authentication schemes.
 
1835
 
 
1836
    This inherits from TestAuth to tweak the setUp and filter some failing
 
1837
    tests.
 
1838
    """
 
1839
 
 
1840
    scenarios = multiply_scenarios(
 
1841
        vary_by_http_client_implementation(),
 
1842
        vary_by_http_protocol_version(),
 
1843
        vary_by_http_proxy_auth_scheme(),
 
1844
        )
1700
1845
 
1701
1846
    def setUp(self):
1702
1847
        super(TestProxyAuth, self).setUp()
1703
 
        self._old_env = {}
1704
 
        self.addCleanup(self._restore_env)
1705
1848
        # Override the contents to avoid false positives
1706
1849
        self.build_tree_contents([('a', 'not proxied contents of a\n'),
1707
1850
                                  ('b', 'not proxied contents of b\n'),
1710
1853
                                  ])
1711
1854
 
1712
1855
    def get_user_transport(self, user, password):
1713
 
        self._install_env({'all_proxy': self.get_user_url(user, password)})
1714
 
        return self._transport(self.server.get_url())
1715
 
 
1716
 
    def _install_env(self, env):
1717
 
        for name, value in env.iteritems():
1718
 
            self._old_env[name] = osutils.set_or_unset_env(name, value)
1719
 
 
1720
 
    def _restore_env(self):
1721
 
        for name, value in self._old_env.iteritems():
1722
 
            osutils.set_or_unset_env(name, value)
 
1856
        self.overrideEnv('all_proxy', self.get_user_url(user, password))
 
1857
        return TestAuth.get_user_transport(self, user, password)
1723
1858
 
1724
1859
    def test_empty_pass(self):
1725
1860
        if self._testing_pycurl():
1726
1861
            import pycurl
1727
1862
            if pycurl.version_info()[1] < '7.16.0':
1728
 
                raise tests.KnownFailure(
 
1863
                self.knownFailure(
1729
1864
                    'pycurl < 7.16.0 does not handle empty proxy passwords')
1730
1865
        super(TestProxyAuth, self).test_empty_pass()
1731
1866
 
1744
1879
        self.readfile = StringIO(socket_read_content)
1745
1880
        self.writefile = StringIO()
1746
1881
        self.writefile.close = lambda: None
 
1882
        self.close = lambda: None
1747
1883
 
1748
1884
    def makefile(self, mode='r', bufsize=None):
1749
1885
        if 'r' in mode:
1754
1890
 
1755
1891
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1756
1892
 
 
1893
    scenarios = multiply_scenarios(
 
1894
        vary_by_http_client_implementation(),
 
1895
        vary_by_http_protocol_version(),
 
1896
        )
 
1897
 
1757
1898
    def setUp(self):
1758
1899
        super(SmartHTTPTunnellingTest, self).setUp()
1759
1900
        # We use the VFS layer as part of HTTP tunnelling tests.
1760
 
        self._captureVar('BZR_NO_SMART_VFS', None)
 
1901
        self.overrideEnv('BZR_NO_SMART_VFS', None)
1761
1902
        self.transport_readonly_server = http_utils.HTTPServerWithSmarts
 
1903
        self.http_server = self.get_readonly_server()
1762
1904
 
1763
1905
    def create_transport_readonly_server(self):
1764
 
        return http_utils.HTTPServerWithSmarts(
 
1906
        server = http_utils.HTTPServerWithSmarts(
1765
1907
            protocol_version=self._protocol_version)
 
1908
        server._url_protocol = self._url_protocol
 
1909
        return server
1766
1910
 
1767
 
    def test_open_bzrdir(self):
 
1911
    def test_open_controldir(self):
1768
1912
        branch = self.make_branch('relpath')
1769
 
        http_server = self.get_readonly_server()
1770
 
        url = http_server.get_url() + 'relpath'
1771
 
        bd = bzrdir.BzrDir.open(url)
 
1913
        url = self.http_server.get_url() + 'relpath'
 
1914
        bd = controldir.ControlDir.open(url)
 
1915
        self.addCleanup(bd.transport.disconnect)
1772
1916
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1773
1917
 
1774
1918
    def test_bulk_data(self):
1776
1920
        # The 'readv' command in the smart protocol both sends and receives
1777
1921
        # bulk data, so we use that.
1778
1922
        self.build_tree(['data-file'])
1779
 
        http_server = self.get_readonly_server()
1780
 
        http_transport = self._transport(http_server.get_url())
 
1923
        http_transport = transport.get_transport_from_url(
 
1924
            self.http_server.get_url())
1781
1925
        medium = http_transport.get_smart_medium()
1782
1926
        # Since we provide the medium, the url below will be mostly ignored
1783
1927
        # during the test, as long as the path is '/'.
1791
1935
        post_body = 'hello\n'
1792
1936
        expected_reply_body = 'ok\x012\n'
1793
1937
 
1794
 
        http_server = self.get_readonly_server()
1795
 
        http_transport = self._transport(http_server.get_url())
 
1938
        http_transport = transport.get_transport_from_url(
 
1939
            self.http_server.get_url())
1796
1940
        medium = http_transport.get_smart_medium()
1797
1941
        response = medium.send_http_smart_request(post_body)
1798
1942
        reply_body = response.read()
1799
1943
        self.assertEqual(expected_reply_body, reply_body)
1800
1944
 
1801
1945
    def test_smart_http_server_post_request_handler(self):
1802
 
        httpd = self.get_readonly_server()._get_httpd()
 
1946
        httpd = self.http_server.server
1803
1947
 
1804
1948
        socket = SampleSocket(
1805
1949
            'POST /.bzr/smart %s \r\n' % self._protocol_version
1837
1981
 
1838
1982
    def test_probe_smart_server(self):
1839
1983
        """Test error handling against server refusing smart requests."""
1840
 
        server = self.get_readonly_server()
1841
 
        t = self._transport(server.get_url())
 
1984
        t = self.get_readonly_transport()
1842
1985
        # No need to build a valid smart request here, the server will not even
1843
1986
        # try to interpret it.
1844
1987
        self.assertRaises(errors.SmartProtocolError,
1845
1988
                          t.get_smart_medium().send_http_smart_request,
1846
1989
                          'whatever')
1847
1990
 
 
1991
 
1848
1992
class Test_redirected_to(tests.TestCase):
1849
1993
 
 
1994
    scenarios = vary_by_http_client_implementation()
 
1995
 
1850
1996
    def test_redirected_to_subdir(self):
1851
1997
        t = self._transport('http://www.example.com/foo')
1852
1998
        r = t._redirected_to('http://www.example.com/foo',
1853
1999
                             'http://www.example.com/foo/subdir')
1854
2000
        self.assertIsInstance(r, type(t))
1855
2001
        # Both transports share the some connection
1856
 
        self.assertEquals(t._get_connection(), r._get_connection())
 
2002
        self.assertEqual(t._get_connection(), r._get_connection())
 
2003
        self.assertEqual('http://www.example.com/foo/subdir/', r.base)
1857
2004
 
1858
2005
    def test_redirected_to_self_with_slash(self):
1859
2006
        t = self._transport('http://www.example.com/foo')
1863
2010
        # Both transports share the some connection (one can argue that we
1864
2011
        # should return the exact same transport here, but that seems
1865
2012
        # overkill).
1866
 
        self.assertEquals(t._get_connection(), r._get_connection())
 
2013
        self.assertEqual(t._get_connection(), r._get_connection())
1867
2014
 
1868
2015
    def test_redirected_to_host(self):
1869
2016
        t = self._transport('http://www.example.com/foo')
1870
2017
        r = t._redirected_to('http://www.example.com/foo',
1871
2018
                             'http://foo.example.com/foo/subdir')
1872
2019
        self.assertIsInstance(r, type(t))
 
2020
        self.assertEqual('http://foo.example.com/foo/subdir/',
 
2021
            r.external_url())
1873
2022
 
1874
2023
    def test_redirected_to_same_host_sibling_protocol(self):
1875
2024
        t = self._transport('http://www.example.com/foo')
1876
2025
        r = t._redirected_to('http://www.example.com/foo',
1877
2026
                             'https://www.example.com/foo')
1878
2027
        self.assertIsInstance(r, type(t))
 
2028
        self.assertEqual('https://www.example.com/foo/',
 
2029
            r.external_url())
1879
2030
 
1880
2031
    def test_redirected_to_same_host_different_protocol(self):
1881
2032
        t = self._transport('http://www.example.com/foo')
1882
2033
        r = t._redirected_to('http://www.example.com/foo',
1883
2034
                             'ftp://www.example.com/foo')
1884
 
        self.assertNotEquals(type(r), type(t))
 
2035
        self.assertNotEqual(type(r), type(t))
 
2036
        self.assertEqual('ftp://www.example.com/foo/', r.external_url())
 
2037
 
 
2038
    def test_redirected_to_same_host_specific_implementation(self):
 
2039
        t = self._transport('http://www.example.com/foo')
 
2040
        r = t._redirected_to('http://www.example.com/foo',
 
2041
                             'https+urllib://www.example.com/foo')
 
2042
        self.assertEqual('https://www.example.com/foo/', r.external_url())
1885
2043
 
1886
2044
    def test_redirected_to_different_host_same_user(self):
1887
2045
        t = self._transport('http://joe@www.example.com/foo')
1888
2046
        r = t._redirected_to('http://www.example.com/foo',
1889
2047
                             'https://foo.example.com/foo')
1890
2048
        self.assertIsInstance(r, type(t))
1891
 
        self.assertEquals(t._user, r._user)
 
2049
        self.assertEqual(t._parsed_url.user, r._parsed_url.user)
 
2050
        self.assertEqual('https://joe@foo.example.com/foo/', r.external_url())
1892
2051
 
1893
2052
 
1894
2053
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1903
2062
    line.
1904
2063
    """
1905
2064
 
1906
 
    def handle_one_request(self):
 
2065
    def _handle_one_request(self):
1907
2066
        tcs = self.server.test_case_server
1908
2067
        requestline = self.rfile.readline()
1909
2068
        headers = self.MessageClass(self.rfile, 0)
1947
2106
    pass
1948
2107
 
1949
2108
 
1950
 
if tests.HTTPSServerFeature.available():
 
2109
if features.HTTPSServerFeature.available():
1951
2110
    from bzrlib.tests import https_server
1952
2111
    class ActivityHTTPSServer(ActivityServerMixin, https_server.HTTPSServer):
1953
2112
        pass
1954
2113
 
1955
2114
 
1956
 
class TestActivity(tests.TestCase):
 
2115
class TestActivityMixin(object):
1957
2116
    """Test socket activity reporting.
1958
2117
 
1959
2118
    We use a special purpose server to control the bytes sent and received and
1961
2120
    """
1962
2121
 
1963
2122
    def setUp(self):
1964
 
        tests.TestCase.setUp(self)
1965
2123
        self.server = self._activity_server(self._protocol_version)
1966
 
        self.server.setUp()
1967
 
        self.activities = {}
 
2124
        self.server.start_server()
 
2125
        self.addCleanup(self.server.stop_server)
 
2126
        _activities = {} # Don't close over self and create a cycle
1968
2127
        def report_activity(t, bytes, direction):
1969
 
            count = self.activities.get(direction, 0)
 
2128
            count = _activities.get(direction, 0)
1970
2129
            count += bytes
1971
 
            self.activities[direction] = count
1972
 
 
 
2130
            _activities[direction] = count
 
2131
        self.activities = _activities
1973
2132
        # We override at class level because constructors may propagate the
1974
2133
        # bound method and render instance overriding ineffective (an
1975
2134
        # 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
1978
 
 
1979
 
    def tearDown(self):
1980
 
        self._transport._report_activity = self.orig_report_activity
1981
 
        self.server.tearDown()
1982
 
        tests.TestCase.tearDown(self)
 
2135
        self.overrideAttr(self._transport, '_report_activity', report_activity)
1983
2136
 
1984
2137
    def get_transport(self):
1985
 
        return self._transport(self.server.get_url())
 
2138
        t = self._transport(self.server.get_url())
 
2139
        # FIXME: Needs cleanup -- vila 20100611
 
2140
        return t
1986
2141
 
1987
2142
    def assertActivitiesMatch(self):
1988
2143
        self.assertEqual(self.server.bytes_read,
2093
2248
'''
2094
2249
        t = self.get_transport()
2095
2250
        # We must send a single line of body bytes, see
2096
 
        # PredefinedRequestHandler.handle_one_request
 
2251
        # PredefinedRequestHandler._handle_one_request
2097
2252
        code, f = t._post('abc def end-of-body\n')
2098
2253
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2099
2254
        self.assertActivitiesMatch()
 
2255
 
 
2256
 
 
2257
class TestActivity(tests.TestCase, TestActivityMixin):
 
2258
 
 
2259
    scenarios = multiply_scenarios(
 
2260
        vary_by_http_activity(),
 
2261
        vary_by_http_protocol_version(),
 
2262
        )
 
2263
 
 
2264
    def setUp(self):
 
2265
        super(TestActivity, self).setUp()
 
2266
        TestActivityMixin.setUp(self)
 
2267
 
 
2268
 
 
2269
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
 
2270
 
 
2271
    # Unlike TestActivity, we are really testing ReportingFileSocket and
 
2272
    # ReportingSocket, so we don't need all the parametrization. Since
 
2273
    # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
 
2274
    # test them through their use by the transport than directly (that's a
 
2275
    # bit less clean but far more simpler and effective).
 
2276
    _activity_server = ActivityHTTPServer
 
2277
    _protocol_version = 'HTTP/1.1'
 
2278
 
 
2279
    def setUp(self):
 
2280
        super(TestNoReportActivity, self).setUp()
 
2281
        self._transport =_urllib.HttpTransport_urllib
 
2282
        TestActivityMixin.setUp(self)
 
2283
 
 
2284
    def assertActivitiesMatch(self):
 
2285
        # Nothing to check here
 
2286
        pass
 
2287
 
 
2288
 
 
2289
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
 
2290
    """Test authentication on the redirected http server."""
 
2291
 
 
2292
    scenarios = vary_by_http_protocol_version()
 
2293
 
 
2294
    _auth_header = 'Authorization'
 
2295
    _password_prompt_prefix = ''
 
2296
    _username_prompt_prefix = ''
 
2297
    _auth_server = http_utils.HTTPBasicAuthServer
 
2298
    _transport = _urllib.HttpTransport_urllib
 
2299
 
 
2300
    def setUp(self):
 
2301
        super(TestAuthOnRedirected, self).setUp()
 
2302
        self.build_tree_contents([('a','a'),
 
2303
                                  ('1/',),
 
2304
                                  ('1/a', 'redirected once'),
 
2305
                                  ],)
 
2306
        new_prefix = 'http://%s:%s' % (self.new_server.host,
 
2307
                                       self.new_server.port)
 
2308
        self.old_server.redirections = [
 
2309
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
 
2310
        self.old_transport = self.get_old_transport()
 
2311
        self.new_server.add_user('joe', 'foo')
 
2312
        cleanup_http_redirection_connections(self)
 
2313
 
 
2314
    def create_transport_readonly_server(self):
 
2315
        server = self._auth_server(protocol_version=self._protocol_version)
 
2316
        server._url_protocol = self._url_protocol
 
2317
        return server
 
2318
 
 
2319
    def get_a(self, t):
 
2320
        return t.get('a')
 
2321
 
 
2322
    def test_auth_on_redirected_via_do_catching_redirections(self):
 
2323
        self.redirections = 0
 
2324
 
 
2325
        def redirected(t, exception, redirection_notice):
 
2326
            self.redirections += 1
 
2327
            redirected_t = t._redirected_to(exception.source, exception.target)
 
2328
            self.addCleanup(redirected_t.disconnect)
 
2329
            return redirected_t
 
2330
 
 
2331
        stdout = tests.StringIOWrapper()
 
2332
        stderr = tests.StringIOWrapper()
 
2333
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
 
2334
                                            stdout=stdout, stderr=stderr)
 
2335
        self.assertEqual('redirected once',
 
2336
                         transport.do_catching_redirections(
 
2337
                self.get_a, self.old_transport, redirected).read())
 
2338
        self.assertEqual(1, self.redirections)
 
2339
        # stdin should be empty
 
2340
        self.assertEqual('', ui.ui_factory.stdin.readline())
 
2341
        # stdout should be empty, stderr will contains the prompts
 
2342
        self.assertEqual('', stdout.getvalue())
 
2343
 
 
2344
    def test_auth_on_redirected_via_following_redirections(self):
 
2345
        self.new_server.add_user('joe', 'foo')
 
2346
        stdout = tests.StringIOWrapper()
 
2347
        stderr = tests.StringIOWrapper()
 
2348
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
 
2349
                                            stdout=stdout, stderr=stderr)
 
2350
        t = self.old_transport
 
2351
        req = RedirectedRequest('GET', t.abspath('a'))
 
2352
        new_prefix = 'http://%s:%s' % (self.new_server.host,
 
2353
                                       self.new_server.port)
 
2354
        self.old_server.redirections = [
 
2355
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
 
2356
        self.assertEqual('redirected once', t._perform(req).read())
 
2357
        # stdin should be empty
 
2358
        self.assertEqual('', ui.ui_factory.stdin.readline())
 
2359
        # stdout should be empty, stderr will contains the prompts
 
2360
        self.assertEqual('', stdout.getvalue())
 
2361