/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_http.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2015, 2016, 2017 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
20
20
transport implementation, http protocol versions and authentication schemes.
21
21
"""
22
22
 
23
 
# TODO: Should be renamed to bzrlib.transport.http.tests?
24
 
# TODO: What about renaming to bzrlib.tests.transport.http ?
 
23
# TODO: Should be renamed to breezy.transport.http.tests?
 
24
# TODO: What about renaming to breezy.tests.transport.http ?
25
25
 
26
 
from cStringIO import StringIO
27
 
import httplib
28
 
import os
29
 
import select
30
 
import SimpleHTTPServer
 
26
try:
 
27
    from http.client import UnknownProtocol
 
28
    from http.server import SimpleHTTPRequestHandler
 
29
except ImportError:  # python < 3
 
30
    from httplib import UnknownProtocol
 
31
    from SimpleHTTPServer import SimpleHTTPRequestHandler
 
32
import io
31
33
import socket
32
34
import sys
33
35
import threading
34
36
 
35
 
import bzrlib
36
 
from bzrlib import (
37
 
    bzrdir,
 
37
import breezy
 
38
from .. import (
38
39
    config,
 
40
    controldir,
 
41
    debug,
39
42
    errors,
40
43
    osutils,
41
 
    remote as _mod_remote,
42
44
    tests,
 
45
    trace,
43
46
    transport,
44
47
    ui,
45
48
    urlutils,
46
49
    )
47
 
from bzrlib.symbol_versioning import (
48
 
    deprecated_in,
 
50
from ..bzr import (
 
51
    remote as _mod_remote,
49
52
    )
50
 
from bzrlib.tests import (
 
53
from . import (
51
54
    features,
52
55
    http_server,
53
56
    http_utils,
54
 
    )
55
 
from bzrlib.transport import (
 
57
    test_server,
 
58
    )
 
59
from .scenarios import (
 
60
    load_tests_apply_scenarios,
 
61
    multiply_scenarios,
 
62
    )
 
63
from ..transport import (
56
64
    http,
57
65
    remote,
58
66
    )
59
 
from bzrlib.transport.http import (
60
 
    _urllib,
 
67
from ..transport.http import (
 
68
    HttpTransport,
61
69
    _urllib2_wrappers,
62
70
    )
63
71
 
64
72
 
65
 
if features.pycurl.available():
66
 
    from bzrlib.transport.http._pycurl import PyCurlTransport
67
 
 
68
 
 
69
 
def load_tests(standard_tests, module, loader):
70
 
    """Multiply tests for http clients and protocol versions."""
71
 
    result = loader.suiteClass()
72
 
 
73
 
    # one for each transport implementation
74
 
    t_tests, remaining_tests = tests.split_suite_by_condition(
75
 
        standard_tests, tests.condition_isinstance((
76
 
                TestHttpTransportRegistration,
77
 
                TestHttpTransportUrls,
78
 
                Test_redirected_to,
79
 
                )))
 
73
load_tests = load_tests_apply_scenarios
 
74
 
 
75
 
 
76
def vary_by_http_client_implementation():
 
77
    """Test the libraries we can use, currently just urllib."""
80
78
    transport_scenarios = [
81
 
        ('urllib', dict(_transport=_urllib.HttpTransport_urllib,
82
 
                        _server=http_server.HttpServer_urllib,
83
 
                        _qualified_prefix='http+urllib',)),
84
 
        ]
85
 
    if features.pycurl.available():
86
 
        transport_scenarios.append(
87
 
            ('pycurl', dict(_transport=PyCurlTransport,
88
 
                            _server=http_server.HttpServer_PyCurl,
89
 
                            _qualified_prefix='http+pycurl',)))
90
 
    tests.multiply_tests(t_tests, transport_scenarios, result)
91
 
 
92
 
    # each implementation tested with each HTTP version
93
 
    tp_tests, remaining_tests = tests.split_suite_by_condition(
94
 
        remaining_tests, tests.condition_isinstance((
95
 
                SmartHTTPTunnellingTest,
96
 
                TestDoCatchRedirections,
97
 
                TestHTTPConnections,
98
 
                TestHTTPRedirections,
99
 
                TestHTTPSilentRedirections,
100
 
                TestLimitedRangeRequestServer,
101
 
                TestPost,
102
 
                TestProxyHttpServer,
103
 
                TestRanges,
104
 
                TestSpecificRequestHandler,
105
 
                )))
106
 
    protocol_scenarios = [
107
 
            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
108
 
            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
109
 
            ]
110
 
    tp_scenarios = tests.multiply_scenarios(transport_scenarios,
111
 
                                            protocol_scenarios)
112
 
    tests.multiply_tests(tp_tests, tp_scenarios, result)
113
 
 
114
 
    # proxy auth: each auth scheme on all http versions on all implementations.
115
 
    tppa_tests, remaining_tests = tests.split_suite_by_condition(
116
 
        remaining_tests, tests.condition_isinstance((
117
 
                TestProxyAuth,
118
 
                )))
119
 
    proxy_auth_scheme_scenarios = [
120
 
        ('basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
121
 
        ('digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
122
 
        ('basicdigest',
123
 
         dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
124
 
        ]
125
 
    tppa_scenarios = tests.multiply_scenarios(tp_scenarios,
126
 
                                              proxy_auth_scheme_scenarios)
127
 
    tests.multiply_tests(tppa_tests, tppa_scenarios, result)
128
 
 
129
 
    # auth: each auth scheme on all http versions on all implementations.
130
 
    tpa_tests, remaining_tests = tests.split_suite_by_condition(
131
 
        remaining_tests, tests.condition_isinstance((
132
 
                TestAuth,
133
 
                )))
134
 
    auth_scheme_scenarios = [
 
79
        ('urllib', dict(_transport=HttpTransport,
 
80
                        _server=http_server.HttpServer,
 
81
                        _url_protocol='http',)),
 
82
        ]
 
83
    return transport_scenarios
 
84
 
 
85
 
 
86
def vary_by_http_protocol_version():
 
87
    """Test on http/1.0 and 1.1"""
 
88
    return [
 
89
        ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
 
90
        ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
 
91
        ]
 
92
 
 
93
 
 
94
def vary_by_http_auth_scheme():
 
95
    scenarios = [
135
96
        ('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
136
97
        ('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
137
98
        ('basicdigest',
138
 
         dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
139
 
        ]
140
 
    tpa_scenarios = tests.multiply_scenarios(tp_scenarios,
141
 
                                             auth_scheme_scenarios)
142
 
    tests.multiply_tests(tpa_tests, tpa_scenarios, result)
143
 
 
144
 
    # activity: on all http[s] versions on all implementations
145
 
    tpact_tests, remaining_tests = tests.split_suite_by_condition(
146
 
        remaining_tests, tests.condition_isinstance((
147
 
                TestActivity,
148
 
                )))
 
99
            dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
 
100
        ]
 
101
    # Add some attributes common to all scenarios
 
102
    for scenario_id, scenario_dict in scenarios:
 
103
        scenario_dict.update(_auth_header='Authorization',
 
104
                             _username_prompt_prefix='',
 
105
                             _password_prompt_prefix='')
 
106
    return scenarios
 
107
 
 
108
 
 
109
def vary_by_http_proxy_auth_scheme():
 
110
    scenarios = [
 
111
        ('proxy-basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
 
112
        ('proxy-digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
 
113
        ('proxy-basicdigest',
 
114
            dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
 
115
        ]
 
116
    # Add some attributes common to all scenarios
 
117
    for scenario_id, scenario_dict in scenarios:
 
118
        scenario_dict.update(_auth_header='Proxy-Authorization',
 
119
                             _username_prompt_prefix='Proxy ',
 
120
                             _password_prompt_prefix='Proxy ')
 
121
    return scenarios
 
122
 
 
123
 
 
124
def vary_by_http_activity():
149
125
    activity_scenarios = [
150
126
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
151
 
                             _transport=_urllib.HttpTransport_urllib,)),
 
127
                            _transport=HttpTransport,)),
152
128
        ]
153
 
    if tests.HTTPSServerFeature.available():
 
129
    if features.HTTPSServerFeature.available():
 
130
        # FIXME: Until we have a better way to handle self-signed certificates
 
131
        # (like allowing them in a test specific authentication.conf for
 
132
        # example), we need some specialized urllib transport for tests.
 
133
        # -- vila 2012-01-20
 
134
        from . import (
 
135
            ssl_certs,
 
136
            )
 
137
        class HTTPS_transport(HttpTransport):
 
138
 
 
139
            def __init__(self, base, _from_transport=None):
 
140
                super(HTTPS_transport, self).__init__(
 
141
                    base, _from_transport=_from_transport,
 
142
                    ca_certs=ssl_certs.build_path('ca.crt'))
 
143
 
154
144
        activity_scenarios.append(
155
145
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
156
 
                                  _transport=_urllib.HttpTransport_urllib,)),)
157
 
    if features.pycurl.available():
158
 
        activity_scenarios.append(
159
 
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
160
 
                                 _transport=PyCurlTransport,)),)
161
 
        if tests.HTTPSServerFeature.available():
162
 
            from bzrlib.tests import (
163
 
                ssl_certs,
164
 
                )
165
 
            # FIXME: Until we have a better way to handle self-signed
166
 
            # certificates (like allowing them in a test specific
167
 
            # authentication.conf for example), we need some specialized pycurl
168
 
            # transport for tests.
169
 
            class HTTPS_pycurl_transport(PyCurlTransport):
170
 
 
171
 
                def __init__(self, base, _from_transport=None):
172
 
                    super(HTTPS_pycurl_transport, self).__init__(
173
 
                        base, _from_transport)
174
 
                    self.cabundle = str(ssl_certs.build_path('ca.crt'))
175
 
 
176
 
            activity_scenarios.append(
177
 
                ('pycurl,https', dict(_activity_server=ActivityHTTPSServer,
178
 
                                      _transport=HTTPS_pycurl_transport,)),)
179
 
 
180
 
    tpact_scenarios = tests.multiply_scenarios(activity_scenarios,
181
 
                                               protocol_scenarios)
182
 
    tests.multiply_tests(tpact_tests, tpact_scenarios, result)
183
 
 
184
 
    # No parametrization for the remaining tests
185
 
    result.addTests(remaining_tests)
186
 
 
187
 
    return result
 
146
                                  _transport=HTTPS_transport,)),)
 
147
    return activity_scenarios
188
148
 
189
149
 
190
150
class FakeManager(object):
223
183
        self._sock.bind(('127.0.0.1', 0))
224
184
        self.host, self.port = self._sock.getsockname()
225
185
        self._ready = threading.Event()
226
 
        self._thread = threading.Thread(target=self._accept_read_and_reply)
227
 
        self._thread.setDaemon(True)
 
186
        self._thread = test_server.TestThread(
 
187
            sync_event=self._ready, target=self._accept_read_and_reply)
228
188
        self._thread.start()
229
 
        self._ready.wait(5)
 
189
        if 'threads' in tests.selftest_debug_flags:
 
190
            sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
 
191
        self._ready.wait()
230
192
 
231
193
    def _accept_read_and_reply(self):
232
194
        self._sock.listen(1)
233
195
        self._ready.set()
234
 
        self._sock.settimeout(5)
235
 
        try:
236
 
            conn, address = self._sock.accept()
237
 
            # On win32, the accepted connection will be non-blocking to start
238
 
            # with because we're using settimeout.
239
 
            conn.setblocking(True)
 
196
        conn, address = self._sock.accept()
 
197
        if self._expect_body_tail is not None:
240
198
            while not self.received_bytes.endswith(self._expect_body_tail):
241
199
                self.received_bytes += conn.recv(4096)
242
200
            conn.sendall('HTTP/1.1 200 OK\r\n')
243
 
        except socket.timeout:
244
 
            # Make sure the client isn't stuck waiting for us to e.g. accept.
 
201
        try:
245
202
            self._sock.close()
246
203
        except socket.error:
247
204
            # The client may have already closed the socket.
249
206
 
250
207
    def stop_server(self):
251
208
        try:
252
 
            self._sock.close()
 
209
            # Issue a fake connection to wake up the server and allow it to
 
210
            # finish quickly
 
211
            fake_conn = osutils.connect_socket((self.host, self.port))
 
212
            fake_conn.close()
253
213
        except socket.error:
254
214
            # We might have already closed it.  We don't care.
255
215
            pass
256
216
        self.host = None
257
217
        self.port = None
 
218
        self._thread.join()
 
219
        if 'threads' in tests.selftest_debug_flags:
 
220
            sys.stderr.write('Thread  joined: %s\n' % (self._thread.ident,))
258
221
 
259
222
 
260
223
class TestAuthHeader(tests.TestCase):
281
244
        self.assertEqual('basic', scheme)
282
245
        self.assertEqual('realm="Thou should not pass"', remainder)
283
246
 
 
247
    def test_build_basic_header_with_long_creds(self):
 
248
        handler = _urllib2_wrappers.BasicAuthHandler()
 
249
        user = 'user' * 10  # length 40
 
250
        password = 'password' * 5  # length 40
 
251
        header = handler.build_auth_header(
 
252
            dict(user=user, password=password), None)
 
253
        # https://bugs.launchpad.net/bzr/+bug/1606203 was caused by incorrectly
 
254
        # creating a header value with an embedded '\n'
 
255
        self.assertFalse('\n' in header)
 
256
 
284
257
    def test_basic_extract_realm(self):
285
258
        scheme, remainder = self.parse_header(
286
259
            'Basic realm="Thou should not pass"',
296
269
        self.assertEqual('realm="Thou should not pass"', remainder)
297
270
 
298
271
 
 
272
class TestHTTPRangeParsing(tests.TestCase):
 
273
 
 
274
    def setUp(self):
 
275
        super(TestHTTPRangeParsing, self).setUp()
 
276
        # We focus on range  parsing here and ignore everything else
 
277
        class RequestHandler(http_server.TestingHTTPRequestHandler):
 
278
            def setup(self): pass
 
279
            def handle(self): pass
 
280
            def finish(self): pass
 
281
 
 
282
        self.req_handler = RequestHandler(None, None, None)
 
283
 
 
284
    def assertRanges(self, ranges, header, file_size):
 
285
        self.assertEqual(ranges,
 
286
                          self.req_handler._parse_ranges(header, file_size))
 
287
 
 
288
    def test_simple_range(self):
 
289
        self.assertRanges([(0, 2)], 'bytes=0-2', 12)
 
290
 
 
291
    def test_tail(self):
 
292
        self.assertRanges([(8, 11)], 'bytes=-4', 12)
 
293
 
 
294
    def test_tail_bigger_than_file(self):
 
295
        self.assertRanges([(0, 11)], 'bytes=-99', 12)
 
296
 
 
297
    def test_range_without_end(self):
 
298
        self.assertRanges([(4, 11)], 'bytes=4-', 12)
 
299
 
 
300
    def test_invalid_ranges(self):
 
301
        self.assertRanges(None, 'bytes=12-22', 12)
 
302
        self.assertRanges(None, 'bytes=1-3,12-22', 12)
 
303
        self.assertRanges(None, 'bytes=-', 12)
 
304
 
 
305
 
299
306
class TestHTTPServer(tests.TestCase):
300
307
    """Test the HTTP servers implementations."""
301
308
 
304
311
 
305
312
            protocol_version = 'HTTP/0.1'
306
313
 
307
 
        server = http_server.HttpServer(BogusRequestHandler)
308
 
        try:
309
 
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
310
 
        except:
311
 
            server.stop_server()
312
 
            self.fail('HTTP Server creation did not raise UnknownProtocol')
 
314
        self.assertRaises(UnknownProtocol,
 
315
                          http_server.HttpServer, BogusRequestHandler)
313
316
 
314
317
    def test_force_invalid_protocol(self):
315
 
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
316
 
        try:
317
 
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
318
 
        except:
319
 
            server.stop_server()
320
 
            self.fail('HTTP Server creation did not raise UnknownProtocol')
 
318
        self.assertRaises(UnknownProtocol,
 
319
                          http_server.HttpServer, protocol_version='HTTP/0.1')
321
320
 
322
321
    def test_server_start_and_stop(self):
323
322
        server = http_server.HttpServer()
 
323
        self.addCleanup(server.stop_server)
324
324
        server.start_server()
325
 
        try:
326
 
            self.assertTrue(server._http_running)
327
 
        finally:
328
 
            server.stop_server()
329
 
        self.assertFalse(server._http_running)
 
325
        self.assertTrue(server.server is not None)
 
326
        self.assertTrue(server.server.serving is not None)
 
327
        self.assertTrue(server.server.serving)
330
328
 
331
329
    def test_create_http_server_one_zero(self):
332
330
        class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
335
333
 
336
334
        server = http_server.HttpServer(RequestHandlerOneZero)
337
335
        self.start_server(server)
338
 
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
 
336
        self.assertIsInstance(server.server, http_server.TestingHTTPServer)
339
337
 
340
338
    def test_create_http_server_one_one(self):
341
339
        class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
344
342
 
345
343
        server = http_server.HttpServer(RequestHandlerOneOne)
346
344
        self.start_server(server)
347
 
        self.assertIsInstance(server._httpd,
 
345
        self.assertIsInstance(server.server,
348
346
                              http_server.TestingThreadingHTTPServer)
349
347
 
350
348
    def test_create_http_server_force_one_one(self):
355
353
        server = http_server.HttpServer(RequestHandlerOneZero,
356
354
                                        protocol_version='HTTP/1.1')
357
355
        self.start_server(server)
358
 
        self.assertIsInstance(server._httpd,
 
356
        self.assertIsInstance(server.server,
359
357
                              http_server.TestingThreadingHTTPServer)
360
358
 
361
359
    def test_create_http_server_force_one_zero(self):
366
364
        server = http_server.HttpServer(RequestHandlerOneOne,
367
365
                                        protocol_version='HTTP/1.0')
368
366
        self.start_server(server)
369
 
        self.assertIsInstance(server._httpd,
 
367
        self.assertIsInstance(server.server,
370
368
                              http_server.TestingHTTPServer)
371
369
 
372
370
 
373
 
class TestWithTransport_pycurl(object):
374
 
    """Test case to inherit from if pycurl is present"""
375
 
 
376
 
    def _get_pycurl_maybe(self):
377
 
        self.requireFeature(features.pycurl)
378
 
        return PyCurlTransport
379
 
 
380
 
    _transport = property(_get_pycurl_maybe)
381
 
 
382
 
 
383
 
class TestHttpUrls(tests.TestCase):
384
 
 
385
 
    # TODO: This should be moved to authorization tests once they
386
 
    # are written.
387
 
 
388
 
    def test_url_parsing(self):
389
 
        f = FakeManager()
390
 
        url = http.extract_auth('http://example.com', f)
391
 
        self.assertEqual('http://example.com', url)
392
 
        self.assertEqual(0, len(f.credentials))
393
 
        url = http.extract_auth(
394
 
            'http://user:pass@example.com/bzr/bzr.dev', f)
395
 
        self.assertEqual('http://example.com/bzr/bzr.dev', url)
396
 
        self.assertEqual(1, len(f.credentials))
397
 
        self.assertEqual([None, 'example.com', 'user', 'pass'],
398
 
                         f.credentials[0])
399
 
 
400
 
 
401
371
class TestHttpTransportUrls(tests.TestCase):
402
372
    """Test the http urls."""
403
373
 
 
374
    scenarios = vary_by_http_client_implementation()
 
375
 
404
376
    def test_abs_url(self):
405
377
        """Construction of absolute http URLs"""
406
 
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
 
378
        t = self._transport('http://example.com/bzr/bzr.dev/')
407
379
        eq = self.assertEqualDiff
408
 
        eq(t.abspath('.'), 'http://bazaar-vcs.org/bzr/bzr.dev')
409
 
        eq(t.abspath('foo/bar'), 'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
410
 
        eq(t.abspath('.bzr'), 'http://bazaar-vcs.org/bzr/bzr.dev/.bzr')
 
380
        eq(t.abspath('.'), 'http://example.com/bzr/bzr.dev')
 
381
        eq(t.abspath('foo/bar'), 'http://example.com/bzr/bzr.dev/foo/bar')
 
382
        eq(t.abspath('.bzr'), 'http://example.com/bzr/bzr.dev/.bzr')
411
383
        eq(t.abspath('.bzr/1//2/./3'),
412
 
           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
 
384
           'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
413
385
 
414
386
    def test_invalid_http_urls(self):
415
387
        """Trap invalid construction of urls"""
416
 
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
417
 
        self.assertRaises(errors.InvalidURL,
 
388
        self._transport('http://example.com/bzr/bzr.dev/')
 
389
        self.assertRaises(urlutils.InvalidURL,
418
390
                          self._transport,
419
 
                          'http://http://bazaar-vcs.org/bzr/bzr.dev/')
 
391
                          'http://http://example.com/bzr/bzr.dev/')
420
392
 
421
393
    def test_http_root_urls(self):
422
394
        """Construction of URLs from server root"""
423
 
        t = self._transport('http://bzr.ozlabs.org/')
 
395
        t = self._transport('http://example.com/')
424
396
        eq = self.assertEqualDiff
425
397
        eq(t.abspath('.bzr/tree-version'),
426
 
           'http://bzr.ozlabs.org/.bzr/tree-version')
 
398
           'http://example.com/.bzr/tree-version')
427
399
 
428
400
    def test_http_impl_urls(self):
429
401
        """There are servers which ask for particular clients to connect"""
431
403
        server.start_server()
432
404
        try:
433
405
            url = server.get_url()
434
 
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
 
406
            self.assertTrue(url.startswith('%s://' % self._url_protocol))
435
407
        finally:
436
408
            server.stop_server()
437
409
 
438
410
 
439
 
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
440
 
 
441
 
    # TODO: This should really be moved into another pycurl
442
 
    # specific test. When https tests will be implemented, take
443
 
    # this one into account.
444
 
    def test_pycurl_without_https_support(self):
445
 
        """Test that pycurl without SSL do not fail with a traceback.
446
 
 
447
 
        For the purpose of the test, we force pycurl to ignore
448
 
        https by supplying a fake version_info that do not
449
 
        support it.
450
 
        """
451
 
        self.requireFeature(features.pycurl)
452
 
        # Import the module locally now that we now it's available.
453
 
        pycurl = features.pycurl.module
454
 
 
455
 
        self.overrideAttr(pycurl, 'version_info',
456
 
                          # Fake the pycurl version_info This was taken from
457
 
                          # a windows pycurl without SSL (thanks to bialix)
458
 
                          lambda : (2,
459
 
                                    '7.13.2',
460
 
                                    462082,
461
 
                                    'i386-pc-win32',
462
 
                                    2576,
463
 
                                    None,
464
 
                                    0,
465
 
                                    None,
466
 
                                    ('ftp', 'gopher', 'telnet',
467
 
                                     'dict', 'ldap', 'http', 'file'),
468
 
                                    None,
469
 
                                    0,
470
 
                                    None))
471
 
        self.assertRaises(errors.DependencyNotPresent, self._transport,
472
 
                          'https://launchpad.net')
473
 
 
474
 
 
475
411
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
476
412
    """Test the http connections."""
477
413
 
 
414
    scenarios = multiply_scenarios(
 
415
        vary_by_http_client_implementation(),
 
416
        vary_by_http_protocol_version(),
 
417
        )
 
418
 
478
419
    def setUp(self):
479
 
        http_utils.TestCaseWithWebserver.setUp(self)
 
420
        super(TestHTTPConnections, self).setUp()
480
421
        self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
481
422
                        transport=self.get_transport())
482
423
 
483
424
    def test_http_has(self):
484
425
        server = self.get_readonly_server()
485
 
        t = self._transport(server.get_url())
 
426
        t = self.get_readonly_transport()
486
427
        self.assertEqual(t.has('foo/bar'), True)
487
428
        self.assertEqual(len(server.logs), 1)
488
429
        self.assertContainsRe(server.logs[0],
489
 
            r'"HEAD /foo/bar HTTP/1.." (200|302) - "-" "bzr/')
 
430
            r'"HEAD /foo/bar HTTP/1.." (200|302) - "-" "Breezy/')
490
431
 
491
432
    def test_http_has_not_found(self):
492
433
        server = self.get_readonly_server()
493
 
        t = self._transport(server.get_url())
 
434
        t = self.get_readonly_transport()
494
435
        self.assertEqual(t.has('not-found'), False)
495
436
        self.assertContainsRe(server.logs[1],
496
 
            r'"HEAD /not-found HTTP/1.." 404 - "-" "bzr/')
 
437
            r'"HEAD /not-found HTTP/1.." 404 - "-" "Breezy/')
497
438
 
498
439
    def test_http_get(self):
499
440
        server = self.get_readonly_server()
500
 
        t = self._transport(server.get_url())
 
441
        t = self.get_readonly_transport()
501
442
        fp = t.get('foo/bar')
502
443
        self.assertEqualDiff(
503
444
            fp.read(),
504
445
            'contents of foo/bar\n')
505
446
        self.assertEqual(len(server.logs), 1)
506
447
        self.assertTrue(server.logs[0].find(
507
 
            '"GET /foo/bar HTTP/1.1" 200 - "-" "bzr/%s'
508
 
            % bzrlib.__version__) > -1)
 
448
            '"GET /foo/bar HTTP/1.1" 200 - "-" "Breezy/%s'
 
449
            % breezy.__version__) > -1)
509
450
 
510
451
    def test_has_on_bogus_host(self):
511
452
        # Get a free address and don't 'accept' on it, so that we
525
466
class TestHttpTransportRegistration(tests.TestCase):
526
467
    """Test registrations of various http implementations"""
527
468
 
 
469
    scenarios = vary_by_http_client_implementation()
 
470
 
528
471
    def test_http_registered(self):
529
 
        t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
 
472
        t = transport.get_transport_from_url(
 
473
            '%s://foo.com/' % self._url_protocol)
530
474
        self.assertIsInstance(t, transport.Transport)
531
475
        self.assertIsInstance(t, self._transport)
532
476
 
533
477
 
534
478
class TestPost(tests.TestCase):
535
479
 
 
480
    scenarios = multiply_scenarios(
 
481
        vary_by_http_client_implementation(),
 
482
        vary_by_http_protocol_version(),
 
483
        )
 
484
 
536
485
    def test_post_body_is_received(self):
537
486
        server = RecordingServer(expect_body_tail='end-of-body',
538
 
            scheme=self._qualified_prefix)
 
487
                                 scheme=self._url_protocol)
539
488
        self.start_server(server)
540
489
        url = server.get_url()
541
 
        http_transport = self._transport(url)
 
490
        # FIXME: needs a cleanup -- vila 20100611
 
491
        http_transport = transport.get_transport_from_url(url)
542
492
        code, response = http_transport._post('abc def end-of-body')
543
493
        self.assertTrue(
544
494
            server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
545
495
        self.assertTrue('content-length: 19\r' in server.received_bytes.lower())
 
496
        self.assertTrue('content-type: application/octet-stream\r'
 
497
                        in server.received_bytes.lower())
546
498
        # The transport should not be assuming that the server can accept
547
499
        # chunked encoding the first time it connects, because HTTP/1.1, so we
548
500
        # check for the literal string.
557
509
        offsets = [ (start, end - start + 1) for start, end in ranges]
558
510
        coalesce = transport.Transport._coalesce_offsets
559
511
        coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
560
 
        range_header = http.HttpTransportBase._range_header
 
512
        range_header = http.HttpTransport._range_header
561
513
        self.assertEqual(value, range_header(coalesced, tail))
562
514
 
563
515
    def test_range_header_single(self):
564
 
        self.check_header('0-9', ranges=[(0,9)])
565
 
        self.check_header('100-109', ranges=[(100,109)])
 
516
        self.check_header('0-9', ranges=[(0, 9)])
 
517
        self.check_header('100-109', ranges=[(100, 109)])
566
518
 
567
519
    def test_range_header_tail(self):
568
520
        self.check_header('-10', tail=10)
570
522
 
571
523
    def test_range_header_multi(self):
572
524
        self.check_header('0-9,100-200,300-5000',
573
 
                          ranges=[(0,9), (100, 200), (300,5000)])
 
525
                          ranges=[(0, 9), (100, 200), (300, 5000)])
574
526
 
575
527
    def test_range_header_mixed(self):
576
528
        self.check_header('0-9,300-5000,-50',
577
 
                          ranges=[(0,9), (300,5000)],
 
529
                          ranges=[(0, 9), (300, 5000)],
578
530
                          tail=50)
579
531
 
580
532
 
584
536
    Daughter classes are expected to override _req_handler_class
585
537
    """
586
538
 
 
539
    scenarios = multiply_scenarios(
 
540
        vary_by_http_client_implementation(),
 
541
        vary_by_http_protocol_version(),
 
542
        )
 
543
 
587
544
    # Provide a useful default
588
545
    _req_handler_class = http_server.TestingHTTPRequestHandler
589
546
 
590
547
    def create_transport_readonly_server(self):
591
 
        return http_server.HttpServer(self._req_handler_class,
592
 
                                      protocol_version=self._protocol_version)
593
 
 
594
 
    def _testing_pycurl(self):
595
 
        # TODO: This is duplicated for lots of the classes in this file
596
 
        return (features.pycurl.available()
597
 
                and self._transport == PyCurlTransport)
 
548
        server = http_server.HttpServer(self._req_handler_class,
 
549
                                        protocol_version=self._protocol_version)
 
550
        server._url_protocol = self._url_protocol
 
551
        return server
598
552
 
599
553
 
600
554
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
601
555
    """Whatever request comes in, close the connection"""
602
556
 
603
 
    def handle_one_request(self):
 
557
    def _handle_one_request(self):
604
558
        """Handle a single HTTP request, by abruptly closing the connection"""
605
559
        self.close_connection = 1
606
560
 
611
565
    _req_handler_class = WallRequestHandler
612
566
 
613
567
    def test_http_has(self):
614
 
        server = self.get_readonly_server()
615
 
        t = self._transport(server.get_url())
 
568
        t = self.get_readonly_transport()
616
569
        # Unfortunately httplib (see HTTPResponse._read_status
617
570
        # for details) make no distinction between a closed
618
571
        # socket and badly formatted status line, so we can't
619
572
        # just test for ConnectionError, we have to test
620
 
        # InvalidHttpResponse too. And pycurl may raise ConnectionReset
621
 
        # instead of ConnectionError too.
622
 
        self.assertRaises(( errors.ConnectionError, errors.ConnectionReset,
623
 
                            errors.InvalidHttpResponse),
 
573
        # InvalidHttpResponse too.
 
574
        self.assertRaises((errors.ConnectionError,
 
575
                           errors.InvalidHttpResponse),
624
576
                          t.has, 'foo/bar')
625
577
 
626
578
    def test_http_get(self):
627
 
        server = self.get_readonly_server()
628
 
        t = self._transport(server.get_url())
 
579
        t = self.get_readonly_transport()
629
580
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
630
581
                           errors.InvalidHttpResponse),
631
582
                          t.get, 'foo/bar')
647
598
 
648
599
    _req_handler_class = BadStatusRequestHandler
649
600
 
 
601
    def setUp(self):
 
602
        super(TestBadStatusServer, self).setUp()
 
603
        # See https://bugs.launchpad.net/bzr/+bug/1451448 for details.
 
604
        # TD;LR: Running both a TCP client and server in the same process and
 
605
        # thread uncovers a race in python. The fix is to run the server in a
 
606
        # different process. Trying to fix yet another race here is not worth
 
607
        # the effort. -- vila 2015-09-06
 
608
        if 'HTTP/1.0' in self.id():
 
609
            raise tests.TestSkipped(
 
610
                'Client/Server in the same process and thread can hang')
 
611
 
650
612
    def test_http_has(self):
651
 
        server = self.get_readonly_server()
652
 
        t = self._transport(server.get_url())
653
 
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
 
613
        t = self.get_readonly_transport()
 
614
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
 
615
                           errors.InvalidHttpResponse),
 
616
                          t.has, 'foo/bar')
654
617
 
655
618
    def test_http_get(self):
656
 
        server = self.get_readonly_server()
657
 
        t = self._transport(server.get_url())
658
 
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
 
619
        t = self.get_readonly_transport()
 
620
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
 
621
                           errors.InvalidHttpResponse),
 
622
                          t.get, 'foo/bar')
659
623
 
660
624
 
661
625
class InvalidStatusRequestHandler(http_server.TestingHTTPRequestHandler):
665
629
        """Fakes handling a single HTTP request, returns a bad status"""
666
630
        ignored = http_server.TestingHTTPRequestHandler.parse_request(self)
667
631
        self.wfile.write("Invalid status line\r\n")
 
632
        # If we don't close the connection pycurl will hang. Since this is a
 
633
        # stress test we don't *have* to respect the protocol, but we don't
 
634
        # have to sabotage it too much either.
 
635
        self.close_connection = True
668
636
        return False
669
637
 
670
638
 
676
644
 
677
645
    _req_handler_class = InvalidStatusRequestHandler
678
646
 
679
 
    def test_http_has(self):
680
 
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
681
 
            raise tests.KnownFailure(
682
 
                'pycurl hangs if the server send back garbage')
683
 
        super(TestInvalidStatusServer, self).test_http_has()
684
 
 
685
 
    def test_http_get(self):
686
 
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
687
 
            raise tests.KnownFailure(
688
 
                'pycurl hangs if the server send back garbage')
689
 
        super(TestInvalidStatusServer, self).test_http_get()
690
 
 
691
647
 
692
648
class BadProtocolRequestHandler(http_server.TestingHTTPRequestHandler):
693
649
    """Whatever request comes in, returns a bad protocol version"""
708
664
 
709
665
    _req_handler_class = BadProtocolRequestHandler
710
666
 
711
 
    def setUp(self):
712
 
        if self._testing_pycurl():
713
 
            raise tests.TestNotApplicable(
714
 
                "pycurl doesn't check the protocol version")
715
 
        super(TestBadProtocolServer, self).setUp()
716
 
 
717
667
    def test_http_has(self):
718
 
        server = self.get_readonly_server()
719
 
        t = self._transport(server.get_url())
 
668
        t = self.get_readonly_transport()
720
669
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
721
670
 
722
671
    def test_http_get(self):
723
 
        server = self.get_readonly_server()
724
 
        t = self._transport(server.get_url())
 
672
        t = self.get_readonly_transport()
725
673
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
726
674
 
727
675
 
741
689
    _req_handler_class = ForbiddenRequestHandler
742
690
 
743
691
    def test_http_has(self):
744
 
        server = self.get_readonly_server()
745
 
        t = self._transport(server.get_url())
 
692
        t = self.get_readonly_transport()
746
693
        self.assertRaises(errors.TransportError, t.has, 'foo/bar')
747
694
 
748
695
    def test_http_get(self):
749
 
        server = self.get_readonly_server()
750
 
        t = self._transport(server.get_url())
 
696
        t = self.get_readonly_transport()
751
697
        self.assertRaises(errors.TransportError, t.get, 'foo/bar')
752
698
 
753
699
 
789
735
 
790
736
    def setUp(self):
791
737
        super(TestRangeRequestServer, self).setUp()
792
 
        self.build_tree_contents([('a', '0123456789')],)
 
738
        self.build_tree_contents([('a', b'0123456789')],)
793
739
 
794
740
    def test_readv(self):
795
 
        server = self.get_readonly_server()
796
 
        t = self._transport(server.get_url())
 
741
        t = self.get_readonly_transport()
797
742
        l = list(t.readv('a', ((0, 1), (1, 1), (3, 2), (9, 1))))
798
743
        self.assertEqual(l[0], (0, '0'))
799
744
        self.assertEqual(l[1], (1, '1'))
801
746
        self.assertEqual(l[3], (9, '9'))
802
747
 
803
748
    def test_readv_out_of_order(self):
804
 
        server = self.get_readonly_server()
805
 
        t = self._transport(server.get_url())
 
749
        t = self.get_readonly_transport()
806
750
        l = list(t.readv('a', ((1, 1), (9, 1), (0, 1), (3, 2))))
807
751
        self.assertEqual(l[0], (1, '1'))
808
752
        self.assertEqual(l[1], (9, '9'))
810
754
        self.assertEqual(l[3], (3, '34'))
811
755
 
812
756
    def test_readv_invalid_ranges(self):
813
 
        server = self.get_readonly_server()
814
 
        t = self._transport(server.get_url())
 
757
        t = self.get_readonly_transport()
815
758
 
816
759
        # This is intentionally reading off the end of the file
817
760
        # since we are sure that it cannot get there
818
761
        self.assertListRaises((errors.InvalidRange, errors.ShortReadvError,),
819
 
                              t.readv, 'a', [(1,1), (8,10)])
 
762
                              t.readv, 'a', [(1, 1), (8, 10)])
820
763
 
821
764
        # This is trying to seek past the end of the file, it should
822
765
        # also raise a special error
823
766
        self.assertListRaises((errors.InvalidRange, errors.ShortReadvError,),
824
 
                              t.readv, 'a', [(12,2)])
 
767
                              t.readv, 'a', [(12, 2)])
825
768
 
826
769
    def test_readv_multiple_get_requests(self):
827
770
        server = self.get_readonly_server()
828
 
        t = self._transport(server.get_url())
 
771
        t = self.get_readonly_transport()
829
772
        # force transport to issue multiple requests
830
773
        t._max_readv_combine = 1
831
774
        t._max_get_ranges = 1
839
782
 
840
783
    def test_readv_get_max_size(self):
841
784
        server = self.get_readonly_server()
842
 
        t = self._transport(server.get_url())
 
785
        t = self.get_readonly_transport()
843
786
        # force transport to issue multiple requests by limiting the number of
844
787
        # bytes by request. Note that this apply to coalesced offsets only, a
845
788
        # single range will keep its size even if bigger than the limit.
854
797
 
855
798
    def test_complete_readv_leave_pipe_clean(self):
856
799
        server = self.get_readonly_server()
857
 
        t = self._transport(server.get_url())
 
800
        t = self.get_readonly_transport()
858
801
        # force transport to issue multiple requests
859
802
        t._get_max_size = 2
860
 
        l = list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
 
803
        list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
861
804
        # The server should have issued 3 requests
862
805
        self.assertEqual(3, server.GET_request_nb)
863
806
        self.assertEqual('0123456789', t.get_bytes('a'))
865
808
 
866
809
    def test_incomplete_readv_leave_pipe_clean(self):
867
810
        server = self.get_readonly_server()
868
 
        t = self._transport(server.get_url())
 
811
        t = self.get_readonly_transport()
869
812
        # force transport to issue multiple requests
870
813
        t._get_max_size = 2
871
814
        # Don't collapse readv results into a list so that we leave unread
872
815
        # bytes on the socket
873
816
        ireadv = iter(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
874
 
        self.assertEqual((0, '0'), ireadv.next())
 
817
        self.assertEqual((0, '0'), next(ireadv))
875
818
        # The server should have issued one request so far
876
819
        self.assertEqual(1, server.GET_request_nb)
877
820
        self.assertEqual('0123456789', t.get_bytes('a'))
924
867
        # Update the statistics
925
868
        self.server.test_case_server.GET_request_nb += 1
926
869
        # Just bypass the range handling done by TestingHTTPRequestHandler
927
 
        return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self)
 
870
        return SimpleHTTPRequestHandler.do_GET(self)
928
871
 
929
872
 
930
873
class TestNoRangeRequestServer(TestRangeRequestServer):
940
883
    def get_multiple_ranges(self, file, file_size, ranges):
941
884
        self.send_response(206)
942
885
        self.send_header('Accept-Ranges', 'bytes')
943
 
        boundary = "%d" % random.randint(0,0x7FFFFFFF)
 
886
        # XXX: this is strange; the 'random' name below seems undefined and
 
887
        # yet the tests pass -- mbp 2010-10-11 bug 658773
 
888
        boundary = "%d" % random.randint(0, 0x7FFFFFFF)
944
889
        self.send_header("Content-Type",
945
890
                         "multipart/byteranges; boundary=%s" % boundary)
946
891
        self.end_headers()
1007
952
                return
1008
953
            self.send_range_content(file, start, end - start + 1)
1009
954
            cur += 1
1010
 
        # No final boundary
 
955
        # Final boundary
1011
956
        self.wfile.write(boundary_line)
1012
957
 
1013
958
 
1017
962
 
1018
963
    def setUp(self):
1019
964
        super(TestTruncatedMultipleRangeServer, self).setUp()
1020
 
        self.build_tree_contents([('a', '0123456789')],)
 
965
        self.build_tree_contents([('a', b'0123456789')],)
1021
966
 
1022
967
    def test_readv_with_short_reads(self):
1023
968
        server = self.get_readonly_server()
1024
 
        t = self._transport(server.get_url())
 
969
        t = self.get_readonly_transport()
1025
970
        # Force separate ranges for each offset
1026
971
        t._bytes_to_read_before_seek = 0
1027
972
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1028
 
        self.assertEqual((0, '0'), ireadv.next())
1029
 
        self.assertEqual((2, '2'), ireadv.next())
1030
 
        if not self._testing_pycurl():
1031
 
            # Only one request have been issued so far (except for pycurl that
1032
 
            # try to read the whole response at once)
1033
 
            self.assertEqual(1, server.GET_request_nb)
1034
 
        self.assertEqual((4, '45'), ireadv.next())
1035
 
        self.assertEqual((9, '9'), ireadv.next())
1036
 
        # Both implementations issue 3 requests but:
1037
 
        # - urllib does two multiple (4 ranges, then 2 ranges) then a single
1038
 
        #   range,
1039
 
        # - pycurl does two multiple (4 ranges, 4 ranges) then a single range
 
973
        self.assertEqual((0, '0'), next(ireadv))
 
974
        self.assertEqual((2, '2'), next(ireadv))
 
975
        # Only one request have been issued so far
 
976
        self.assertEqual(1, server.GET_request_nb)
 
977
        self.assertEqual((4, '45'), next(ireadv))
 
978
        self.assertEqual((9, '9'), next(ireadv))
 
979
        # We issue 3 requests: two multiple (4 ranges, then 2 ranges) then a
 
980
        # single range.
1040
981
        self.assertEqual(3, server.GET_request_nb)
1041
982
        # Finally the client have tried a single range request and stays in
1042
983
        # that mode
1043
984
        self.assertEqual('single', t._range_hint)
1044
985
 
 
986
 
 
987
class TruncatedBeforeBoundaryRequestHandler(
 
988
    http_server.TestingHTTPRequestHandler):
 
989
    """Truncation before a boundary, like in bug 198646"""
 
990
 
 
991
    _truncated_ranges = 1
 
992
 
 
993
    def get_multiple_ranges(self, file, file_size, ranges):
 
994
        self.send_response(206)
 
995
        self.send_header('Accept-Ranges', 'bytes')
 
996
        boundary = 'tagada'
 
997
        self.send_header('Content-Type',
 
998
                         'multipart/byteranges; boundary=%s' % boundary)
 
999
        boundary_line = '--%s\r\n' % boundary
 
1000
        # Calculate the Content-Length
 
1001
        content_length = 0
 
1002
        for (start, end) in ranges:
 
1003
            content_length += len(boundary_line)
 
1004
            content_length += self._header_line_length(
 
1005
                'Content-type', 'application/octet-stream')
 
1006
            content_length += self._header_line_length(
 
1007
                'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))
 
1008
            content_length += len('\r\n') # end headers
 
1009
            content_length += end - start # + 1
 
1010
        content_length += len(boundary_line)
 
1011
        self.send_header('Content-length', content_length)
 
1012
        self.end_headers()
 
1013
 
 
1014
        # Send the multipart body
 
1015
        cur = 0
 
1016
        for (start, end) in ranges:
 
1017
            if cur + self._truncated_ranges >= len(ranges):
 
1018
                # Abruptly ends the response and close the connection
 
1019
                self.close_connection = 1
 
1020
                return
 
1021
            self.wfile.write(boundary_line)
 
1022
            self.send_header('Content-type', 'application/octet-stream')
 
1023
            self.send_header('Content-Range', 'bytes %d-%d/%d'
 
1024
                             % (start, end, file_size))
 
1025
            self.end_headers()
 
1026
            self.send_range_content(file, start, end - start + 1)
 
1027
            cur += 1
 
1028
        # Final boundary
 
1029
        self.wfile.write(boundary_line)
 
1030
 
 
1031
 
 
1032
class TestTruncatedBeforeBoundary(TestSpecificRequestHandler):
 
1033
    """Tests the case of bug 198646, disconnecting before a boundary."""
 
1034
 
 
1035
    _req_handler_class = TruncatedBeforeBoundaryRequestHandler
 
1036
 
 
1037
    def setUp(self):
 
1038
        super(TestTruncatedBeforeBoundary, self).setUp()
 
1039
        self.build_tree_contents([('a', b'0123456789')],)
 
1040
 
 
1041
    def test_readv_with_short_reads(self):
 
1042
        server = self.get_readonly_server()
 
1043
        t = self.get_readonly_transport()
 
1044
        # Force separate ranges for each offset
 
1045
        t._bytes_to_read_before_seek = 0
 
1046
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
 
1047
        self.assertEqual((0, '0'), next(ireadv))
 
1048
        self.assertEqual((2, '2'), next(ireadv))
 
1049
        self.assertEqual((4, '45'), next(ireadv))
 
1050
        self.assertEqual((9, '9'), next(ireadv))
 
1051
 
 
1052
 
1045
1053
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1046
1054
    """Errors out when range specifiers exceed the limit"""
1047
1055
 
1071
1079
class TestLimitedRangeRequestServer(http_utils.TestCaseWithWebserver):
1072
1080
    """Tests readv requests against a server erroring out on too much ranges."""
1073
1081
 
 
1082
    scenarios = multiply_scenarios(
 
1083
        vary_by_http_client_implementation(),
 
1084
        vary_by_http_protocol_version(),
 
1085
        )
 
1086
 
1074
1087
    # Requests with more range specifiers will error out
1075
1088
    range_limit = 3
1076
1089
 
1078
1091
        return LimitedRangeHTTPServer(range_limit=self.range_limit,
1079
1092
                                      protocol_version=self._protocol_version)
1080
1093
 
1081
 
    def get_transport(self):
1082
 
        return self._transport(self.get_readonly_server().get_url())
1083
 
 
1084
1094
    def setUp(self):
1085
 
        http_utils.TestCaseWithWebserver.setUp(self)
 
1095
        super(TestLimitedRangeRequestServer, self).setUp()
1086
1096
        # We need to manipulate ranges that correspond to real chunks in the
1087
1097
        # response, so we build a content appropriately.
1088
 
        filler = ''.join(['abcdefghij' for x in range(102)])
1089
 
        content = ''.join(['%04d' % v + filler for v in range(16)])
 
1098
        filler = b''.join([b'abcdefghij' for x in range(102)])
 
1099
        content = b''.join([b'%04d' % v + filler for v in range(16)])
1090
1100
        self.build_tree_contents([('a', content)],)
1091
1101
 
1092
1102
    def test_few_ranges(self):
1093
 
        t = self.get_transport()
 
1103
        t = self.get_readonly_transport()
1094
1104
        l = list(t.readv('a', ((0, 4), (1024, 4), )))
1095
1105
        self.assertEqual(l[0], (0, '0000'))
1096
1106
        self.assertEqual(l[1], (1024, '0001'))
1097
1107
        self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1098
1108
 
1099
1109
    def test_more_ranges(self):
1100
 
        t = self.get_transport()
 
1110
        t = self.get_readonly_transport()
1101
1111
        l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1102
1112
        self.assertEqual(l[0], (0, '0000'))
1103
1113
        self.assertEqual(l[1], (1024, '0001'))
1114
1124
    Only the urllib implementation is tested here.
1115
1125
    """
1116
1126
 
1117
 
    def setUp(self):
1118
 
        tests.TestCase.setUp(self)
1119
 
        self._old_env = {}
1120
 
 
1121
 
    def tearDown(self):
1122
 
        self._restore_env()
1123
 
        tests.TestCase.tearDown(self)
1124
 
 
1125
 
    def _install_env(self, env):
1126
 
        for name, value in env.iteritems():
1127
 
            self._old_env[name] = osutils.set_or_unset_env(name, value)
1128
 
 
1129
 
    def _restore_env(self):
1130
 
        for name, value in self._old_env.iteritems():
1131
 
            osutils.set_or_unset_env(name, value)
1132
 
 
1133
1127
    def _proxied_request(self):
1134
1128
        handler = _urllib2_wrappers.ProxyHandler()
1135
 
        request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
 
1129
        request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
1136
1130
        handler.set_proxy(request, 'http')
1137
1131
        return request
1138
1132
 
 
1133
    def assertEvaluateProxyBypass(self, expected, host, no_proxy):
 
1134
        handler = _urllib2_wrappers.ProxyHandler()
 
1135
        self.assertEqual(expected,
 
1136
                          handler.evaluate_proxy_bypass(host, no_proxy))
 
1137
 
1139
1138
    def test_empty_user(self):
1140
 
        self._install_env({'http_proxy': 'http://bar.com'})
1141
 
        request = self._proxied_request()
1142
 
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
 
1139
        self.overrideEnv('http_proxy', 'http://bar.com')
 
1140
        request = self._proxied_request()
 
1141
        self.assertFalse('Proxy-authorization' in request.headers)
 
1142
 
 
1143
    def test_user_with_at(self):
 
1144
        self.overrideEnv('http_proxy',
 
1145
                         'http://username@domain:password@proxy_host:1234')
 
1146
        request = self._proxied_request()
 
1147
        self.assertFalse('Proxy-authorization' in request.headers)
1143
1148
 
1144
1149
    def test_invalid_proxy(self):
1145
1150
        """A proxy env variable without scheme"""
1146
 
        self._install_env({'http_proxy': 'host:1234'})
1147
 
        self.assertRaises(errors.InvalidURL, self._proxied_request)
 
1151
        self.overrideEnv('http_proxy', 'host:1234')
 
1152
        self.assertRaises(urlutils.InvalidURL, self._proxied_request)
 
1153
 
 
1154
    def test_evaluate_proxy_bypass_true(self):
 
1155
        """The host is not proxied"""
 
1156
        self.assertEvaluateProxyBypass(True, 'example.com', 'example.com')
 
1157
        self.assertEvaluateProxyBypass(True, 'bzr.example.com', '*example.com')
 
1158
 
 
1159
    def test_evaluate_proxy_bypass_false(self):
 
1160
        """The host is proxied"""
 
1161
        self.assertEvaluateProxyBypass(False, 'bzr.example.com', None)
 
1162
 
 
1163
    def test_evaluate_proxy_bypass_unknown(self):
 
1164
        """The host is not explicitly proxied"""
 
1165
        self.assertEvaluateProxyBypass(None, 'example.com', 'not.example.com')
 
1166
        self.assertEvaluateProxyBypass(None, 'bzr.example.com', 'example.com')
 
1167
 
 
1168
    def test_evaluate_proxy_bypass_empty_entries(self):
 
1169
        """Ignore empty entries"""
 
1170
        self.assertEvaluateProxyBypass(None, 'example.com', '')
 
1171
        self.assertEvaluateProxyBypass(None, 'example.com', ',')
 
1172
        self.assertEvaluateProxyBypass(None, 'example.com', 'foo,,bar')
1148
1173
 
1149
1174
 
1150
1175
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1156
1181
    to the file names).
1157
1182
    """
1158
1183
 
 
1184
    scenarios = multiply_scenarios(
 
1185
        vary_by_http_client_implementation(),
 
1186
        vary_by_http_protocol_version(),
 
1187
        )
 
1188
 
1159
1189
    # FIXME: We don't have an https server available, so we don't
1160
 
    # test https connections.
 
1190
    # test https connections. --vila toolongago
1161
1191
 
1162
1192
    def setUp(self):
1163
1193
        super(TestProxyHttpServer, self).setUp()
1164
 
        self.build_tree_contents([('foo', 'contents of foo\n'),
1165
 
                                  ('foo-proxied', 'proxied contents of foo\n')])
 
1194
        self.transport_secondary_server = http_utils.ProxyServer
 
1195
        self.build_tree_contents([('foo', b'contents of foo\n'),
 
1196
                                  ('foo-proxied', b'proxied contents of foo\n')])
1166
1197
        # Let's setup some attributes for tests
1167
 
        self.server = self.get_readonly_server()
1168
 
        self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
1169
 
        if self._testing_pycurl():
1170
 
            # Oh my ! pycurl does not check for the port as part of
1171
 
            # no_proxy :-( So we just test the host part
1172
 
            self.no_proxy_host = self.server.host
1173
 
        else:
1174
 
            self.no_proxy_host = self.proxy_address
 
1198
        server = self.get_readonly_server()
 
1199
        self.server_host_port = '%s:%d' % (server.host, server.port)
 
1200
        self.no_proxy_host = self.server_host_port
1175
1201
        # The secondary server is the proxy
1176
 
        self.proxy = self.get_secondary_server()
1177
 
        self.proxy_url = self.proxy.get_url()
1178
 
        self._old_env = {}
1179
 
 
1180
 
    def _testing_pycurl(self):
1181
 
        # TODO: This is duplicated for lots of the classes in this file
1182
 
        return (features.pycurl.available()
1183
 
                and self._transport == PyCurlTransport)
1184
 
 
1185
 
    def create_transport_secondary_server(self):
1186
 
        """Creates an http server that will serve files with
1187
 
        '-proxied' appended to their names.
1188
 
        """
1189
 
        return http_utils.ProxyServer(protocol_version=self._protocol_version)
1190
 
 
1191
 
    def _install_env(self, env):
1192
 
        for name, value in env.iteritems():
1193
 
            self._old_env[name] = osutils.set_or_unset_env(name, value)
1194
 
 
1195
 
    def _restore_env(self):
1196
 
        for name, value in self._old_env.iteritems():
1197
 
            osutils.set_or_unset_env(name, value)
1198
 
 
1199
 
    def proxied_in_env(self, env):
1200
 
        self._install_env(env)
1201
 
        url = self.server.get_url()
1202
 
        t = self._transport(url)
1203
 
        try:
1204
 
            self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1205
 
        finally:
1206
 
            self._restore_env()
1207
 
 
1208
 
    def not_proxied_in_env(self, env):
1209
 
        self._install_env(env)
1210
 
        url = self.server.get_url()
1211
 
        t = self._transport(url)
1212
 
        try:
1213
 
            self.assertEqual('contents of foo\n', t.get('foo').read())
1214
 
        finally:
1215
 
            self._restore_env()
 
1202
        self.proxy_url = self.get_secondary_url()
 
1203
 
 
1204
    def assertProxied(self):
 
1205
        t = self.get_readonly_transport()
 
1206
        self.assertEqual(b'proxied contents of foo\n', t.get('foo').read())
 
1207
 
 
1208
    def assertNotProxied(self):
 
1209
        t = self.get_readonly_transport()
 
1210
        self.assertEqual(b'contents of foo\n', t.get('foo').read())
1216
1211
 
1217
1212
    def test_http_proxy(self):
1218
 
        self.proxied_in_env({'http_proxy': self.proxy_url})
 
1213
        self.overrideEnv('http_proxy', self.proxy_url)
 
1214
        self.assertProxied()
1219
1215
 
1220
1216
    def test_HTTP_PROXY(self):
1221
 
        if self._testing_pycurl():
1222
 
            # pycurl does not check HTTP_PROXY for security reasons
1223
 
            # (for use in a CGI context that we do not care
1224
 
            # about. Should we ?)
1225
 
            raise tests.TestNotApplicable(
1226
 
                'pycurl does not check HTTP_PROXY for security reasons')
1227
 
        self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
 
1217
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
 
1218
        self.assertProxied()
1228
1219
 
1229
1220
    def test_all_proxy(self):
1230
 
        self.proxied_in_env({'all_proxy': self.proxy_url})
 
1221
        self.overrideEnv('all_proxy', self.proxy_url)
 
1222
        self.assertProxied()
1231
1223
 
1232
1224
    def test_ALL_PROXY(self):
1233
 
        self.proxied_in_env({'ALL_PROXY': self.proxy_url})
 
1225
        self.overrideEnv('ALL_PROXY', self.proxy_url)
 
1226
        self.assertProxied()
1234
1227
 
1235
1228
    def test_http_proxy_with_no_proxy(self):
1236
 
        self.not_proxied_in_env({'http_proxy': self.proxy_url,
1237
 
                                 'no_proxy': self.no_proxy_host})
 
1229
        self.overrideEnv('no_proxy', self.no_proxy_host)
 
1230
        self.overrideEnv('http_proxy', self.proxy_url)
 
1231
        self.assertNotProxied()
1238
1232
 
1239
1233
    def test_HTTP_PROXY_with_NO_PROXY(self):
1240
 
        if self._testing_pycurl():
1241
 
            raise tests.TestNotApplicable(
1242
 
                'pycurl does not check HTTP_PROXY for security reasons')
1243
 
        self.not_proxied_in_env({'HTTP_PROXY': self.proxy_url,
1244
 
                                 'NO_PROXY': self.no_proxy_host})
 
1234
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
 
1235
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
 
1236
        self.assertNotProxied()
1245
1237
 
1246
1238
    def test_all_proxy_with_no_proxy(self):
1247
 
        self.not_proxied_in_env({'all_proxy': self.proxy_url,
1248
 
                                 'no_proxy': self.no_proxy_host})
 
1239
        self.overrideEnv('no_proxy', self.no_proxy_host)
 
1240
        self.overrideEnv('all_proxy', self.proxy_url)
 
1241
        self.assertNotProxied()
1249
1242
 
1250
1243
    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})
 
1244
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
 
1245
        self.overrideEnv('ALL_PROXY', self.proxy_url)
 
1246
        self.assertNotProxied()
1253
1247
 
1254
1248
    def test_http_proxy_without_scheme(self):
1255
 
        if self._testing_pycurl():
1256
 
            # pycurl *ignores* invalid proxy env variables. If that ever change
1257
 
            # in the future, this test will fail indicating that pycurl do not
1258
 
            # ignore anymore such variables.
1259
 
            self.not_proxied_in_env({'http_proxy': self.proxy_address})
1260
 
        else:
1261
 
            self.assertRaises(errors.InvalidURL,
1262
 
                              self.proxied_in_env,
1263
 
                              {'http_proxy': self.proxy_address})
 
1249
        self.overrideEnv('http_proxy', self.server_host_port)
 
1250
        self.assertRaises(urlutils.InvalidURL, self.assertProxied)
1264
1251
 
1265
1252
 
1266
1253
class TestRanges(http_utils.TestCaseWithWebserver):
1267
1254
    """Test the Range header in GET methods."""
1268
1255
 
 
1256
    scenarios = multiply_scenarios(
 
1257
        vary_by_http_client_implementation(),
 
1258
        vary_by_http_protocol_version(),
 
1259
        )
 
1260
 
1269
1261
    def setUp(self):
1270
 
        http_utils.TestCaseWithWebserver.setUp(self)
1271
 
        self.build_tree_contents([('a', '0123456789')],)
1272
 
        server = self.get_readonly_server()
1273
 
        self.transport = self._transport(server.get_url())
 
1262
        super(TestRanges, self).setUp()
 
1263
        self.build_tree_contents([('a', b'0123456789')],)
1274
1264
 
1275
1265
    def create_transport_readonly_server(self):
1276
1266
        return http_server.HttpServer(protocol_version=self._protocol_version)
1277
1267
 
1278
1268
    def _file_contents(self, relpath, ranges):
 
1269
        t = self.get_readonly_transport()
1279
1270
        offsets = [ (start, end - start + 1) for start, end in ranges]
1280
 
        coalesce = self.transport._coalesce_offsets
 
1271
        coalesce = t._coalesce_offsets
1281
1272
        coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1282
 
        code, data = self.transport._get(relpath, coalesced)
1283
 
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
 
1273
        code, data = t._get(relpath, coalesced)
 
1274
        self.assertTrue(code in (200, 206), '_get returns: %d' % code)
1284
1275
        for start, end in ranges:
1285
1276
            data.seek(start)
1286
1277
            yield data.read(end - start + 1)
1287
1278
 
1288
1279
    def _file_tail(self, relpath, tail_amount):
1289
 
        code, data = self.transport._get(relpath, [], tail_amount)
1290
 
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
 
1280
        t = self.get_readonly_transport()
 
1281
        code, data = t._get(relpath, [], tail_amount)
 
1282
        self.assertTrue(code in (200, 206), '_get returns: %d' % code)
1291
1283
        data.seek(-tail_amount, 2)
1292
1284
        return data.read(tail_amount)
1293
1285
 
1294
1286
    def test_range_header(self):
1295
1287
        # Valid ranges
1296
 
        map(self.assertEqual,['0', '234'],
1297
 
            list(self._file_contents('a', [(0,0), (2,4)])),)
 
1288
        self.assertEqual(
 
1289
            ['0', '234'], list(self._file_contents('a', [(0, 0), (2, 4)])))
1298
1290
 
1299
1291
    def test_range_header_tail(self):
1300
1292
        self.assertEqual('789', self._file_tail('a', 3))
1311
1303
class TestHTTPRedirections(http_utils.TestCaseWithRedirectedWebserver):
1312
1304
    """Test redirection between http servers."""
1313
1305
 
1314
 
    def create_transport_secondary_server(self):
1315
 
        """Create the secondary server redirecting to the primary server"""
1316
 
        new = self.get_readonly_server()
1317
 
 
1318
 
        redirecting = http_utils.HTTPServerRedirecting(
1319
 
            protocol_version=self._protocol_version)
1320
 
        redirecting.redirect_to(new.host, new.port)
1321
 
        return redirecting
 
1306
    scenarios = multiply_scenarios(
 
1307
        vary_by_http_client_implementation(),
 
1308
        vary_by_http_protocol_version(),
 
1309
        )
1322
1310
 
1323
1311
    def setUp(self):
1324
1312
        super(TestHTTPRedirections, self).setUp()
1325
 
        self.build_tree_contents([('a', '0123456789'),
 
1313
        self.build_tree_contents([('a', b'0123456789'),
1326
1314
                                  ('bundle',
1327
 
                                  '# Bazaar revision bundle v0.9\n#\n')
 
1315
                                  b'# Bazaar revision bundle v0.9\n#\n')
1328
1316
                                  ],)
1329
 
        # The requests to the old server will be redirected to the new server
1330
 
        self.old_transport = self._transport(self.old_server.get_url())
1331
1317
 
1332
1318
    def test_redirected(self):
1333
 
        self.assertRaises(errors.RedirectRequested, self.old_transport.get, 'a')
1334
 
        t = self._transport(self.new_server.get_url())
1335
 
        self.assertEqual('0123456789', t.get('a').read())
1336
 
 
1337
 
    def test_read_redirected_bundle_from_url(self):
1338
 
        from bzrlib.bundle import read_bundle_from_url
1339
 
        url = self.old_transport.abspath('bundle')
1340
 
        bundle = self.applyDeprecated(deprecated_in((1, 12, 0)),
1341
 
                read_bundle_from_url, url)
1342
 
        # If read_bundle_from_url was successful we get an empty bundle
1343
 
        self.assertEqual([], bundle.revisions)
 
1319
        self.assertRaises(errors.RedirectRequested,
 
1320
                          self.get_old_transport().get, 'a')
 
1321
        self.assertEqual('0123456789', self.get_new_transport().get('a').read())
1344
1322
 
1345
1323
 
1346
1324
class RedirectedRequest(_urllib2_wrappers.Request):
1363
1341
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
1364
1342
 
1365
1343
 
 
1344
def cleanup_http_redirection_connections(test):
 
1345
    # Some sockets are opened but never seen by _urllib, so we trap them at
 
1346
    # the _urllib2_wrappers level to be able to clean them up.
 
1347
    def socket_disconnect(sock):
 
1348
        try:
 
1349
            sock.shutdown(socket.SHUT_RDWR)
 
1350
            sock.close()
 
1351
        except socket.error:
 
1352
            pass
 
1353
    def connect(connection):
 
1354
        test.http_connect_orig(connection)
 
1355
        test.addCleanup(socket_disconnect, connection.sock)
 
1356
    test.http_connect_orig = test.overrideAttr(
 
1357
        _urllib2_wrappers.HTTPConnection, 'connect', connect)
 
1358
    def connect(connection):
 
1359
        test.https_connect_orig(connection)
 
1360
        test.addCleanup(socket_disconnect, connection.sock)
 
1361
    test.https_connect_orig = test.overrideAttr(
 
1362
        _urllib2_wrappers.HTTPSConnection, 'connect', connect)
 
1363
 
 
1364
 
1366
1365
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1367
1366
    """Test redirections.
1368
1367
 
1370
1369
    do not redirect at all in fact). The mechanism is still in
1371
1370
    place at the _urllib2_wrappers.Request level and these tests
1372
1371
    exercise it.
1373
 
 
1374
 
    For the pycurl implementation
1375
 
    the redirection have been deleted as we may deprecate pycurl
1376
 
    and I have no place to keep a working implementation.
1377
 
    -- vila 20070212
1378
1372
    """
1379
1373
 
 
1374
    scenarios = multiply_scenarios(
 
1375
        vary_by_http_client_implementation(),
 
1376
        vary_by_http_protocol_version(),
 
1377
        )
 
1378
 
1380
1379
    def setUp(self):
1381
 
        if (features.pycurl.available()
1382
 
            and self._transport == PyCurlTransport):
1383
 
            raise tests.TestNotApplicable(
1384
 
                "pycurl doesn't redirect silently annymore")
1385
1380
        super(TestHTTPSilentRedirections, self).setUp()
1386
1381
        install_redirected_request(self)
1387
 
        self.build_tree_contents([('a','a'),
 
1382
        cleanup_http_redirection_connections(self)
 
1383
        self.build_tree_contents([('a', b'a'),
1388
1384
                                  ('1/',),
1389
 
                                  ('1/a', 'redirected once'),
 
1385
                                  ('1/a', b'redirected once'),
1390
1386
                                  ('2/',),
1391
 
                                  ('2/a', 'redirected twice'),
 
1387
                                  ('2/a', b'redirected twice'),
1392
1388
                                  ('3/',),
1393
 
                                  ('3/a', 'redirected thrice'),
 
1389
                                  ('3/a', b'redirected thrice'),
1394
1390
                                  ('4/',),
1395
 
                                  ('4/a', 'redirected 4 times'),
 
1391
                                  ('4/a', b'redirected 4 times'),
1396
1392
                                  ('5/',),
1397
 
                                  ('5/a', 'redirected 5 times'),
 
1393
                                  ('5/a', b'redirected 5 times'),
1398
1394
                                  ],)
1399
1395
 
1400
 
        self.old_transport = self._transport(self.old_server.get_url())
1401
 
 
1402
 
    def create_transport_secondary_server(self):
1403
 
        """Create the secondary server, redirections are defined in the tests"""
1404
 
        return http_utils.HTTPServerRedirecting(
1405
 
            protocol_version=self._protocol_version)
1406
 
 
1407
1396
    def test_one_redirection(self):
1408
 
        t = self.old_transport
1409
 
 
1410
 
        req = RedirectedRequest('GET', t.abspath('a'))
 
1397
        t = self.get_old_transport()
 
1398
        req = RedirectedRequest('GET', t._remote_path('a'))
1411
1399
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1412
1400
                                       self.new_server.port)
1413
1401
        self.old_server.redirections = \
1414
1402
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1415
 
        self.assertEqual('redirected once',t._perform(req).read())
 
1403
        self.assertEqual('redirected once', t._perform(req).read())
1416
1404
 
1417
1405
    def test_five_redirections(self):
1418
 
        t = self.old_transport
1419
 
 
1420
 
        req = RedirectedRequest('GET', t.abspath('a'))
 
1406
        t = self.get_old_transport()
 
1407
        req = RedirectedRequest('GET', t._remote_path('a'))
1421
1408
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1422
1409
                                       self.old_server.port)
1423
1410
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1429
1416
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1430
1417
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1431
1418
            ]
1432
 
        self.assertEqual('redirected 5 times',t._perform(req).read())
 
1419
        self.assertEqual('redirected 5 times', t._perform(req).read())
1433
1420
 
1434
1421
 
1435
1422
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1436
1423
    """Test transport.do_catching_redirections."""
1437
1424
 
 
1425
    scenarios = multiply_scenarios(
 
1426
        vary_by_http_client_implementation(),
 
1427
        vary_by_http_protocol_version(),
 
1428
        )
 
1429
 
1438
1430
    def setUp(self):
1439
1431
        super(TestDoCatchRedirections, self).setUp()
1440
 
        self.build_tree_contents([('a', '0123456789'),],)
1441
 
 
1442
 
        self.old_transport = self._transport(self.old_server.get_url())
1443
 
 
1444
 
    def get_a(self, transport):
1445
 
        return transport.get('a')
 
1432
        self.build_tree_contents([('a', b'0123456789'),],)
 
1433
        cleanup_http_redirection_connections(self)
 
1434
 
 
1435
        self.old_transport = self.get_old_transport()
 
1436
 
 
1437
    def get_a(self, t):
 
1438
        return t.get('a')
1446
1439
 
1447
1440
    def test_no_redirection(self):
1448
 
        t = self._transport(self.new_server.get_url())
 
1441
        t = self.get_new_transport()
1449
1442
 
1450
1443
        # We use None for redirected so that we fail if redirected
1451
1444
        self.assertEqual('0123456789',
1455
1448
    def test_one_redirection(self):
1456
1449
        self.redirections = 0
1457
1450
 
1458
 
        def redirected(transport, exception, redirection_notice):
 
1451
        def redirected(t, exception, redirection_notice):
1459
1452
            self.redirections += 1
1460
 
            dir, file = urlutils.split(exception.target)
1461
 
            return self._transport(dir)
 
1453
            redirected_t = t._redirected_to(exception.source, exception.target)
 
1454
            return redirected_t
1462
1455
 
1463
1456
        self.assertEqual('0123456789',
1464
1457
                         transport.do_catching_redirections(
1478
1471
                          self.get_a, self.old_transport, redirected)
1479
1472
 
1480
1473
 
 
1474
def _setup_authentication_config(**kwargs):
 
1475
    conf = config.AuthenticationConfig()
 
1476
    conf._get_config().update({'httptest': kwargs})
 
1477
    conf._save()
 
1478
 
 
1479
 
 
1480
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
 
1481
    """Unit tests for glue by which urllib2 asks us for authentication"""
 
1482
 
 
1483
    def test_get_user_password_without_port(self):
 
1484
        """We cope if urllib2 doesn't tell us the port.
 
1485
 
 
1486
        See https://bugs.launchpad.net/bzr/+bug/654684
 
1487
        """
 
1488
        user = 'joe'
 
1489
        password = 'foo'
 
1490
        _setup_authentication_config(scheme='http', host='localhost',
 
1491
                                     user=user, password=password)
 
1492
        handler = _urllib2_wrappers.HTTPAuthHandler()
 
1493
        got_pass = handler.get_user_password(dict(
 
1494
            user='joe',
 
1495
            protocol='http',
 
1496
            host='localhost',
 
1497
            path='/',
 
1498
            realm='Realm',
 
1499
            ))
 
1500
        self.assertEqual((user, password), got_pass)
 
1501
 
 
1502
 
1481
1503
class TestAuth(http_utils.TestCaseWithWebserver):
1482
1504
    """Test authentication scheme"""
1483
1505
 
1484
 
    _auth_header = 'Authorization'
1485
 
    _password_prompt_prefix = ''
1486
 
    _username_prompt_prefix = ''
1487
 
    # Set by load_tests
1488
 
    _auth_server = None
 
1506
    scenarios = multiply_scenarios(
 
1507
        vary_by_http_client_implementation(),
 
1508
        vary_by_http_protocol_version(),
 
1509
        vary_by_http_auth_scheme(),
 
1510
        )
1489
1511
 
1490
1512
    def setUp(self):
1491
1513
        super(TestAuth, self).setUp()
1492
1514
        self.server = self.get_readonly_server()
1493
 
        self.build_tree_contents([('a', 'contents of a\n'),
1494
 
                                  ('b', 'contents of b\n'),])
 
1515
        self.build_tree_contents([('a', b'contents of a\n'),
 
1516
                                  ('b', b'contents of b\n'),])
1495
1517
 
1496
1518
    def create_transport_readonly_server(self):
1497
 
        return self._auth_server(protocol_version=self._protocol_version)
1498
 
 
1499
 
    def _testing_pycurl(self):
1500
 
        # TODO: This is duplicated for lots of the classes in this file
1501
 
        return (features.pycurl.available()
1502
 
                and self._transport == PyCurlTransport)
 
1519
        server = self._auth_server(protocol_version=self._protocol_version)
 
1520
        server._url_protocol = self._url_protocol
 
1521
        return server
1503
1522
 
1504
1523
    def get_user_url(self, user, password):
1505
1524
        """Build an url embedding user and password"""
1513
1532
        return url
1514
1533
 
1515
1534
    def get_user_transport(self, user, password):
1516
 
        return self._transport(self.get_user_url(user, password))
 
1535
        t = transport.get_transport_from_url(
 
1536
            self.get_user_url(user, password))
 
1537
        return t
1517
1538
 
1518
1539
    def test_no_user(self):
1519
1540
        self.server.add_user('joe', 'foo')
1554
1575
        self.assertEqual(2, self.server.auth_required_errors)
1555
1576
 
1556
1577
    def test_prompt_for_username(self):
1557
 
        if self._testing_pycurl():
1558
 
            raise tests.TestNotApplicable(
1559
 
                'pycurl cannot prompt, it handles auth by embedding'
1560
 
                ' user:pass in urls only')
1561
 
 
1562
1578
        self.server.add_user('joe', 'foo')
1563
1579
        t = self.get_user_transport(None, None)
1564
 
        stdout = tests.StringIOWrapper()
1565
 
        stderr = tests.StringIOWrapper()
1566
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
1567
 
                                            stdout=stdout, stderr=stderr)
1568
 
        self.assertEqual('contents of a\n',t.get('a').read())
 
1580
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n')
 
1581
        stdout, stderr = ui.ui_factory.stdout, ui.ui_factory.stderr
 
1582
        self.assertEqual('contents of a\n', t.get('a').read())
1569
1583
        # stdin should be empty
1570
1584
        self.assertEqual('', ui.ui_factory.stdin.readline())
1571
1585
        stderr.seek(0)
1576
1590
                                    stderr.readline())
1577
1591
 
1578
1592
    def test_prompt_for_password(self):
1579
 
        if self._testing_pycurl():
1580
 
            raise tests.TestNotApplicable(
1581
 
                'pycurl cannot prompt, it handles auth by embedding'
1582
 
                ' user:pass in urls only')
1583
 
 
1584
1593
        self.server.add_user('joe', 'foo')
1585
1594
        t = self.get_user_transport('joe', None)
1586
 
        stdout = tests.StringIOWrapper()
1587
 
        stderr = tests.StringIOWrapper()
1588
 
        ui.ui_factory = tests.TestUIFactory(stdin='foo\n',
1589
 
                                            stdout=stdout, stderr=stderr)
 
1595
        ui.ui_factory = tests.TestUIFactory(stdin='foo\n')
 
1596
        stdout, stderr = ui.ui_factory.stdout, ui.ui_factory.stderr
1590
1597
        self.assertEqual('contents of a\n', t.get('a').read())
1591
1598
        # stdin should be empty
1592
1599
        self.assertEqual('', ui.ui_factory.stdin.readline())
1595
1602
        self.assertEqual('', stdout.getvalue())
1596
1603
        # And we shouldn't prompt again for a different request
1597
1604
        # against the same transport.
1598
 
        self.assertEqual('contents of b\n',t.get('b').read())
 
1605
        self.assertEqual('contents of b\n', t.get('b').read())
1599
1606
        t2 = t.clone()
1600
1607
        # And neither against a clone
1601
 
        self.assertEqual('contents of b\n',t2.get('b').read())
 
1608
        self.assertEqual('contents of b\n', t2.get('b').read())
1602
1609
        # Only one 'Authentication Required' error should occur
1603
1610
        self.assertEqual(1, self.server.auth_required_errors)
1604
1611
 
1617
1624
                                 self.server.auth_realm))
1618
1625
 
1619
1626
    def test_no_prompt_for_password_when_using_auth_config(self):
1620
 
        if self._testing_pycurl():
1621
 
            raise tests.TestNotApplicable(
1622
 
                'pycurl does not support authentication.conf'
1623
 
                ' since it cannot prompt')
1624
 
 
1625
1627
        user =' joe'
1626
1628
        password = 'foo'
1627
1629
        stdin_content = 'bar\n'  # Not the right password
1628
1630
        self.server.add_user(user, password)
1629
1631
        t = self.get_user_transport(user, None)
1630
 
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1631
 
                                            stderr=tests.StringIOWrapper())
 
1632
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content)
1632
1633
        # Create a minimal config file with the right password
1633
 
        conf = config.AuthenticationConfig()
1634
 
        conf._get_config().update(
1635
 
            {'httptest': {'scheme': 'http', 'port': self.server.port,
1636
 
                          'user': user, 'password': password}})
1637
 
        conf._save()
 
1634
        _setup_authentication_config(scheme='http', port=self.server.port,
 
1635
                                     user=user, password=password)
1638
1636
        # Issue a request to the server to connect
1639
 
        self.assertEqual('contents of a\n',t.get('a').read())
 
1637
        self.assertEqual('contents of a\n', t.get('a').read())
1640
1638
        # stdin should have  been left untouched
1641
1639
        self.assertEqual(stdin_content, ui.ui_factory.stdin.readline())
1642
1640
        # Only one 'Authentication Required' error should occur
1643
1641
        self.assertEqual(1, self.server.auth_required_errors)
1644
1642
 
1645
 
    def test_user_from_auth_conf(self):
1646
 
        if self._testing_pycurl():
1647
 
            raise tests.TestNotApplicable(
1648
 
                'pycurl does not support authentication.conf')
1649
 
        user = 'joe'
1650
 
        password = 'foo'
1651
 
        self.server.add_user(user, password)
1652
 
        # Create a minimal config file with the right password
1653
 
        conf = config.AuthenticationConfig()
1654
 
        conf._get_config().update(
1655
 
            {'httptest': {'scheme': 'http', 'port': self.server.port,
1656
 
                          'user': user, 'password': password}})
1657
 
        conf._save()
1658
 
        t = self.get_user_transport(None, None)
1659
 
        # Issue a request to the server to connect
1660
 
        self.assertEqual('contents of a\n', t.get('a').read())
1661
 
        # Only one 'Authentication Required' error should occur
1662
 
        self.assertEqual(1, self.server.auth_required_errors)
1663
 
 
1664
1643
    def test_changing_nonce(self):
1665
1644
        if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1666
1645
                                     http_utils.ProxyDigestAuthServer):
1667
1646
            raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
1668
 
        if self._testing_pycurl():
1669
 
            raise tests.KnownFailure(
1670
 
                'pycurl does not handle a nonce change')
1671
1647
        self.server.add_user('joe', 'foo')
1672
1648
        t = self.get_user_transport('joe', 'foo')
1673
1649
        self.assertEqual('contents of a\n', t.get('a').read())
1682
1658
        # initial 'who are you' and a second 'who are you' with the new nonce)
1683
1659
        self.assertEqual(2, self.server.auth_required_errors)
1684
1660
 
 
1661
    def test_user_from_auth_conf(self):
 
1662
        user = 'joe'
 
1663
        password = 'foo'
 
1664
        self.server.add_user(user, password)
 
1665
        _setup_authentication_config(scheme='http', port=self.server.port,
 
1666
                                     user=user, password=password)
 
1667
        t = self.get_user_transport(None, None)
 
1668
        # Issue a request to the server to connect
 
1669
        self.assertEqual('contents of a\n', t.get('a').read())
 
1670
        # Only one 'Authentication Required' error should occur
 
1671
        self.assertEqual(1, self.server.auth_required_errors)
 
1672
 
 
1673
    def test_no_credential_leaks_in_log(self):
 
1674
        self.overrideAttr(debug, 'debug_flags', {'http'})
 
1675
        user = 'joe'
 
1676
        password = 'very-sensitive-password'
 
1677
        self.server.add_user(user, password)
 
1678
        t = self.get_user_transport(user, password)
 
1679
        # Capture the debug calls to mutter
 
1680
        self.mutters = []
 
1681
        def mutter(*args):
 
1682
            lines = args[0] % args[1:]
 
1683
            # Some calls output multiple lines, just split them now since we
 
1684
            # care about a single one later.
 
1685
            self.mutters.extend(lines.splitlines())
 
1686
        self.overrideAttr(trace, 'mutter', mutter)
 
1687
        # Issue a request to the server to connect
 
1688
        self.assertEqual(True, t.has('a'))
 
1689
        # Only one 'Authentication Required' error should occur
 
1690
        self.assertEqual(1, self.server.auth_required_errors)
 
1691
        # Since the authentification succeeded, there should be a corresponding
 
1692
        # debug line
 
1693
        sent_auth_headers = [line for line in self.mutters
 
1694
                             if line.startswith('> %s' % (self._auth_header,))]
 
1695
        self.assertLength(1, sent_auth_headers)
 
1696
        self.assertStartsWith(sent_auth_headers[0],
 
1697
                              '> %s: <masked>' % (self._auth_header,))
1685
1698
 
1686
1699
 
1687
1700
class TestProxyAuth(TestAuth):
1688
 
    """Test proxy authentication schemes."""
1689
 
 
1690
 
    _auth_header = 'Proxy-authorization'
1691
 
    _password_prompt_prefix = 'Proxy '
1692
 
    _username_prompt_prefix = 'Proxy '
 
1701
    """Test proxy authentication schemes.
 
1702
 
 
1703
    This inherits from TestAuth to tweak the setUp and filter some failing
 
1704
    tests.
 
1705
    """
 
1706
 
 
1707
    scenarios = multiply_scenarios(
 
1708
        vary_by_http_client_implementation(),
 
1709
        vary_by_http_protocol_version(),
 
1710
        vary_by_http_proxy_auth_scheme(),
 
1711
        )
1693
1712
 
1694
1713
    def setUp(self):
1695
1714
        super(TestProxyAuth, self).setUp()
1696
 
        self._old_env = {}
1697
 
        self.addCleanup(self._restore_env)
1698
1715
        # Override the contents to avoid false positives
1699
 
        self.build_tree_contents([('a', 'not proxied contents of a\n'),
1700
 
                                  ('b', 'not proxied contents of b\n'),
1701
 
                                  ('a-proxied', 'contents of a\n'),
1702
 
                                  ('b-proxied', 'contents of b\n'),
 
1716
        self.build_tree_contents([('a', b'not proxied contents of a\n'),
 
1717
                                  ('b', b'not proxied contents of b\n'),
 
1718
                                  ('a-proxied', b'contents of a\n'),
 
1719
                                  ('b-proxied', b'contents of b\n'),
1703
1720
                                  ])
1704
1721
 
1705
1722
    def get_user_transport(self, user, password):
1706
 
        self._install_env({'all_proxy': self.get_user_url(user, password)})
1707
 
        return self._transport(self.server.get_url())
1708
 
 
1709
 
    def _install_env(self, env):
1710
 
        for name, value in env.iteritems():
1711
 
            self._old_env[name] = osutils.set_or_unset_env(name, value)
1712
 
 
1713
 
    def _restore_env(self):
1714
 
        for name, value in self._old_env.iteritems():
1715
 
            osutils.set_or_unset_env(name, value)
1716
 
 
1717
 
    def test_empty_pass(self):
1718
 
        if self._testing_pycurl():
1719
 
            import pycurl
1720
 
            if pycurl.version_info()[1] < '7.16.0':
1721
 
                raise tests.KnownFailure(
1722
 
                    'pycurl < 7.16.0 does not handle empty proxy passwords')
1723
 
        super(TestProxyAuth, self).test_empty_pass()
 
1723
        proxy_url = self.get_user_url(user, password)
 
1724
        self.overrideEnv('all_proxy', proxy_url)
 
1725
        return TestAuth.get_user_transport(self, user, password)
 
1726
 
 
1727
 
 
1728
class NonClosingBytesIO(io.BytesIO):
 
1729
 
 
1730
    def close(self):
 
1731
        """Ignore and leave file open."""
1724
1732
 
1725
1733
 
1726
1734
class SampleSocket(object):
1731
1739
 
1732
1740
        :param socket_read_content: a byte sequence
1733
1741
        """
1734
 
        # Use plain python StringIO so we can monkey-patch the close method to
1735
 
        # not discard the contents.
1736
 
        from StringIO import StringIO
1737
 
        self.readfile = StringIO(socket_read_content)
1738
 
        self.writefile = StringIO()
1739
 
        self.writefile.close = lambda: None
 
1742
        self.readfile = io.BytesIO(socket_read_content)
 
1743
        self.writefile = NonClosingBytesIO()
 
1744
 
 
1745
    def close(self):
 
1746
        """Ignore and leave files alone."""
 
1747
 
 
1748
    def sendall(self, bytes):
 
1749
        self.writefile.write(bytes)
1740
1750
 
1741
1751
    def makefile(self, mode='r', bufsize=None):
1742
1752
        if 'r' in mode:
1747
1757
 
1748
1758
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1749
1759
 
 
1760
    scenarios = multiply_scenarios(
 
1761
        vary_by_http_client_implementation(),
 
1762
        vary_by_http_protocol_version(),
 
1763
        )
 
1764
 
1750
1765
    def setUp(self):
1751
1766
        super(SmartHTTPTunnellingTest, self).setUp()
1752
1767
        # We use the VFS layer as part of HTTP tunnelling tests.
1753
 
        self._captureVar('BZR_NO_SMART_VFS', None)
 
1768
        self.overrideEnv('BRZ_NO_SMART_VFS', None)
1754
1769
        self.transport_readonly_server = http_utils.HTTPServerWithSmarts
 
1770
        self.http_server = self.get_readonly_server()
1755
1771
 
1756
1772
    def create_transport_readonly_server(self):
1757
 
        return http_utils.HTTPServerWithSmarts(
 
1773
        server = http_utils.HTTPServerWithSmarts(
1758
1774
            protocol_version=self._protocol_version)
 
1775
        server._url_protocol = self._url_protocol
 
1776
        return server
1759
1777
 
1760
 
    def test_open_bzrdir(self):
 
1778
    def test_open_controldir(self):
1761
1779
        branch = self.make_branch('relpath')
1762
 
        http_server = self.get_readonly_server()
1763
 
        url = http_server.get_url() + 'relpath'
1764
 
        bd = bzrdir.BzrDir.open(url)
 
1780
        url = self.http_server.get_url() + 'relpath'
 
1781
        bd = controldir.ControlDir.open(url)
 
1782
        self.addCleanup(bd.transport.disconnect)
1765
1783
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1766
1784
 
1767
1785
    def test_bulk_data(self):
1769
1787
        # The 'readv' command in the smart protocol both sends and receives
1770
1788
        # bulk data, so we use that.
1771
1789
        self.build_tree(['data-file'])
1772
 
        http_server = self.get_readonly_server()
1773
 
        http_transport = self._transport(http_server.get_url())
 
1790
        http_transport = transport.get_transport_from_url(
 
1791
            self.http_server.get_url())
1774
1792
        medium = http_transport.get_smart_medium()
1775
1793
        # Since we provide the medium, the url below will be mostly ignored
1776
1794
        # during the test, as long as the path is '/'.
1777
1795
        remote_transport = remote.RemoteTransport('bzr://fake_host/',
1778
1796
                                                  medium=medium)
1779
1797
        self.assertEqual(
1780
 
            [(0, "c")], list(remote_transport.readv("data-file", [(0,1)])))
 
1798
            [(0, b"c")], list(remote_transport.readv("data-file", [(0, 1)])))
1781
1799
 
1782
1800
    def test_http_send_smart_request(self):
1783
1801
 
1784
 
        post_body = 'hello\n'
1785
 
        expected_reply_body = 'ok\x012\n'
 
1802
        post_body = b'hello\n'
 
1803
        expected_reply_body = b'ok\x012\n'
1786
1804
 
1787
 
        http_server = self.get_readonly_server()
1788
 
        http_transport = self._transport(http_server.get_url())
 
1805
        http_transport = transport.get_transport_from_url(
 
1806
            self.http_server.get_url())
1789
1807
        medium = http_transport.get_smart_medium()
1790
1808
        response = medium.send_http_smart_request(post_body)
1791
1809
        reply_body = response.read()
1792
1810
        self.assertEqual(expected_reply_body, reply_body)
1793
1811
 
1794
1812
    def test_smart_http_server_post_request_handler(self):
1795
 
        httpd = self.get_readonly_server()._get_httpd()
 
1813
        httpd = self.http_server.server
1796
1814
 
1797
1815
        socket = SampleSocket(
1798
 
            'POST /.bzr/smart %s \r\n' % self._protocol_version
 
1816
            b'POST /.bzr/smart %s \r\n' % self._protocol_version.encode('ascii')
1799
1817
            # HTTP/1.1 posts must have a Content-Length (but it doesn't hurt
1800
1818
            # for 1.0)
1801
 
            + 'Content-Length: 6\r\n'
1802
 
            '\r\n'
1803
 
            'hello\n')
 
1819
            + b'Content-Length: 6\r\n'
 
1820
            b'\r\n'
 
1821
            b'hello\n')
1804
1822
        # Beware: the ('localhost', 80) below is the
1805
1823
        # client_address parameter, but we don't have one because
1806
1824
        # we have defined a socket which is not bound to an
1810
1828
                                                         ('localhost', 80),
1811
1829
                                                         httpd)
1812
1830
        response = socket.writefile.getvalue()
1813
 
        self.assertStartsWith(response, '%s 200 ' % self._protocol_version)
 
1831
        self.assertStartsWith(
 
1832
                response,
 
1833
                b'%s 200 ' % self._protocol_version.encode('ascii'))
1814
1834
        # This includes the end of the HTTP headers, and all the body.
1815
 
        expected_end_of_response = '\r\n\r\nok\x012\n'
 
1835
        expected_end_of_response = b'\r\n\r\nok\x012\n'
1816
1836
        self.assertEndsWith(response, expected_end_of_response)
1817
1837
 
1818
1838
 
1830
1850
 
1831
1851
    def test_probe_smart_server(self):
1832
1852
        """Test error handling against server refusing smart requests."""
1833
 
        server = self.get_readonly_server()
1834
 
        t = self._transport(server.get_url())
 
1853
        t = self.get_readonly_transport()
1835
1854
        # No need to build a valid smart request here, the server will not even
1836
1855
        # try to interpret it.
1837
1856
        self.assertRaises(errors.SmartProtocolError,
1838
1857
                          t.get_smart_medium().send_http_smart_request,
1839
 
                          'whatever')
 
1858
                          b'whatever')
 
1859
 
1840
1860
 
1841
1861
class Test_redirected_to(tests.TestCase):
1842
1862
 
 
1863
    scenarios = vary_by_http_client_implementation()
 
1864
 
1843
1865
    def test_redirected_to_subdir(self):
1844
1866
        t = self._transport('http://www.example.com/foo')
1845
1867
        r = t._redirected_to('http://www.example.com/foo',
1847
1869
        self.assertIsInstance(r, type(t))
1848
1870
        # Both transports share the some connection
1849
1871
        self.assertEqual(t._get_connection(), r._get_connection())
 
1872
        self.assertEqual('http://www.example.com/foo/subdir/', r.base)
1850
1873
 
1851
1874
    def test_redirected_to_self_with_slash(self):
1852
1875
        t = self._transport('http://www.example.com/foo')
1863
1886
        r = t._redirected_to('http://www.example.com/foo',
1864
1887
                             'http://foo.example.com/foo/subdir')
1865
1888
        self.assertIsInstance(r, type(t))
 
1889
        self.assertEqual('http://foo.example.com/foo/subdir/',
 
1890
            r.external_url())
1866
1891
 
1867
1892
    def test_redirected_to_same_host_sibling_protocol(self):
1868
1893
        t = self._transport('http://www.example.com/foo')
1869
1894
        r = t._redirected_to('http://www.example.com/foo',
1870
1895
                             'https://www.example.com/foo')
1871
1896
        self.assertIsInstance(r, type(t))
 
1897
        self.assertEqual('https://www.example.com/foo/',
 
1898
            r.external_url())
1872
1899
 
1873
1900
    def test_redirected_to_same_host_different_protocol(self):
1874
1901
        t = self._transport('http://www.example.com/foo')
1875
1902
        r = t._redirected_to('http://www.example.com/foo',
1876
 
                             'ftp://www.example.com/foo')
1877
 
        self.assertNotEquals(type(r), type(t))
 
1903
                             'bzr://www.example.com/foo')
 
1904
        self.assertNotEqual(type(r), type(t))
 
1905
        self.assertEqual('bzr://www.example.com/foo/', r.external_url())
 
1906
 
 
1907
    def test_redirected_to_same_host_specific_implementation(self):
 
1908
        t = self._transport('http://www.example.com/foo')
 
1909
        r = t._redirected_to('http://www.example.com/foo',
 
1910
                             'https+urllib://www.example.com/foo')
 
1911
        self.assertEqual('https://www.example.com/foo/', r.external_url())
1878
1912
 
1879
1913
    def test_redirected_to_different_host_same_user(self):
1880
1914
        t = self._transport('http://joe@www.example.com/foo')
1881
1915
        r = t._redirected_to('http://www.example.com/foo',
1882
1916
                             'https://foo.example.com/foo')
1883
1917
        self.assertIsInstance(r, type(t))
1884
 
        self.assertEqual(t._user, r._user)
 
1918
        self.assertEqual(t._parsed_url.user, r._parsed_url.user)
 
1919
        self.assertEqual('https://joe@foo.example.com/foo/', r.external_url())
1885
1920
 
1886
1921
 
1887
1922
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1896
1931
    line.
1897
1932
    """
1898
1933
 
1899
 
    def handle_one_request(self):
 
1934
    def _handle_one_request(self):
1900
1935
        tcs = self.server.test_case_server
1901
1936
        requestline = self.rfile.readline()
1902
1937
        headers = self.MessageClass(self.rfile, 0)
1905
1940
        bytes_read = len(requestline)
1906
1941
        for line in headers.headers:
1907
1942
            bytes_read += len(line)
1908
 
        bytes_read += len('\r\n')
 
1943
        bytes_read += len(b'\r\n')
1909
1944
        if requestline.startswith('POST'):
1910
1945
            # The body should be a single line (or we don't know where it ends
1911
1946
            # and we don't want to issue a blocking read)
1940
1975
    pass
1941
1976
 
1942
1977
 
1943
 
if tests.HTTPSServerFeature.available():
1944
 
    from bzrlib.tests import https_server
 
1978
if features.HTTPSServerFeature.available():
 
1979
    from . import https_server
1945
1980
    class ActivityHTTPSServer(ActivityServerMixin, https_server.HTTPSServer):
1946
1981
        pass
1947
1982
 
1954
1989
    """
1955
1990
 
1956
1991
    def setUp(self):
1957
 
        tests.TestCase.setUp(self)
1958
1992
        self.server = self._activity_server(self._protocol_version)
1959
1993
        self.server.start_server()
1960
 
        self.activities = {}
 
1994
        self.addCleanup(self.server.stop_server)
 
1995
        _activities = {} # Don't close over self and create a cycle
1961
1996
        def report_activity(t, bytes, direction):
1962
 
            count = self.activities.get(direction, 0)
 
1997
            count = _activities.get(direction, 0)
1963
1998
            count += bytes
1964
 
            self.activities[direction] = count
1965
 
 
 
1999
            _activities[direction] = count
 
2000
        self.activities = _activities
1966
2001
        # We override at class level because constructors may propagate the
1967
2002
        # bound method and render instance overriding ineffective (an
1968
2003
        # alternative would be to define a specific ui factory instead...)
1969
 
        self.orig_report_activity = self._transport._report_activity
1970
 
        self._transport._report_activity = report_activity
1971
 
 
1972
 
    def tearDown(self):
1973
 
        self._transport._report_activity = self.orig_report_activity
1974
 
        self.server.stop_server()
1975
 
        tests.TestCase.tearDown(self)
 
2004
        self.overrideAttr(self._transport, '_report_activity', report_activity)
1976
2005
 
1977
2006
    def get_transport(self):
1978
 
        return self._transport(self.server.get_url())
 
2007
        t = self._transport(self.server.get_url())
 
2008
        # FIXME: Needs cleanup -- vila 20100611
 
2009
        return t
1979
2010
 
1980
2011
    def assertActivitiesMatch(self):
1981
2012
        self.assertEqual(self.server.bytes_read,
1984
2015
                         self.activities.get('read', 0), 'read bytes')
1985
2016
 
1986
2017
    def test_get(self):
1987
 
        self.server.canned_response = '''HTTP/1.1 200 OK\r
 
2018
        self.server.canned_response = b'''HTTP/1.1 200 OK\r
1988
2019
Date: Tue, 11 Jul 2006 04:32:56 GMT\r
1989
2020
Server: Apache/2.0.54 (Fedora)\r
1990
2021
Last-Modified: Sun, 23 Apr 2006 19:35:20 GMT\r
2002
2033
        self.assertActivitiesMatch()
2003
2034
 
2004
2035
    def test_has(self):
2005
 
        self.server.canned_response = '''HTTP/1.1 200 OK\r
 
2036
        self.server.canned_response = b'''HTTP/1.1 200 OK\r
2006
2037
Server: SimpleHTTP/0.6 Python/2.5.2\r
2007
2038
Date: Thu, 29 Jan 2009 20:21:47 GMT\r
2008
2039
Content-type: application/octet-stream\r
2015
2046
        self.assertActivitiesMatch()
2016
2047
 
2017
2048
    def test_readv(self):
2018
 
        self.server.canned_response = '''HTTP/1.1 206 Partial Content\r
 
2049
        self.server.canned_response = b'''HTTP/1.1 206 Partial Content\r
2019
2050
Date: Tue, 11 Jul 2006 04:49:48 GMT\r
2020
2051
Server: Apache/2.0.54 (Fedora)\r
2021
2052
Last-Modified: Thu, 06 Jul 2006 20:22:05 GMT\r
2072
2103
        self.assertActivitiesMatch()
2073
2104
 
2074
2105
    def test_post(self):
2075
 
        self.server.canned_response = '''HTTP/1.1 200 OK\r
 
2106
        self.server.canned_response = b'''HTTP/1.1 200 OK\r
2076
2107
Date: Tue, 11 Jul 2006 04:32:56 GMT\r
2077
2108
Server: Apache/2.0.54 (Fedora)\r
2078
2109
Last-Modified: Sun, 23 Apr 2006 19:35:20 GMT\r
2086
2117
'''
2087
2118
        t = self.get_transport()
2088
2119
        # We must send a single line of body bytes, see
2089
 
        # PredefinedRequestHandler.handle_one_request
2090
 
        code, f = t._post('abc def end-of-body\n')
2091
 
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
 
2120
        # PredefinedRequestHandler._handle_one_request
 
2121
        code, f = t._post(b'abc def end-of-body\n')
 
2122
        self.assertEqual(b'lalala whatever as long as itsssss\n', f.read())
2092
2123
        self.assertActivitiesMatch()
2093
2124
 
2094
2125
 
2095
2126
class TestActivity(tests.TestCase, TestActivityMixin):
2096
2127
 
 
2128
    scenarios = multiply_scenarios(
 
2129
        vary_by_http_activity(),
 
2130
        vary_by_http_protocol_version(),
 
2131
        )
 
2132
 
2097
2133
    def setUp(self):
2098
 
        tests.TestCase.setUp(self)
2099
 
        self.server = self._activity_server(self._protocol_version)
2100
 
        self.server.start_server()
2101
 
        self.activities = {}
2102
 
        def report_activity(t, bytes, direction):
2103
 
            count = self.activities.get(direction, 0)
2104
 
            count += bytes
2105
 
            self.activities[direction] = count
2106
 
 
2107
 
        # We override at class level because constructors may propagate the
2108
 
        # bound method and render instance overriding ineffective (an
2109
 
        # alternative would be to define a specific ui factory instead...)
2110
 
        self.orig_report_activity = self._transport._report_activity
2111
 
        self._transport._report_activity = report_activity
2112
 
 
2113
 
    def tearDown(self):
2114
 
        self._transport._report_activity = self.orig_report_activity
2115
 
        self.server.stop_server()
2116
 
        tests.TestCase.tearDown(self)
 
2134
        super(TestActivity, self).setUp()
 
2135
        TestActivityMixin.setUp(self)
2117
2136
 
2118
2137
 
2119
2138
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2120
2139
 
 
2140
    # Unlike TestActivity, we are really testing ReportingFileSocket and
 
2141
    # ReportingSocket, so we don't need all the parametrization. Since
 
2142
    # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
 
2143
    # test them through their use by the transport than directly (that's a
 
2144
    # bit less clean but far more simpler and effective).
 
2145
    _activity_server = ActivityHTTPServer
 
2146
    _protocol_version = 'HTTP/1.1'
 
2147
 
2121
2148
    def setUp(self):
2122
 
        tests.TestCase.setUp(self)
2123
 
        # Unlike TestActivity, we are really testing ReportingFileSocket and
2124
 
        # ReportingSocket, so we don't need all the parametrization. Since
2125
 
        # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2126
 
        # test them through their use by the transport than directly (that's a
2127
 
        # bit less clean but far more simpler and effective).
2128
 
        self.server = ActivityHTTPServer('HTTP/1.1')
2129
 
        self._transport=_urllib.HttpTransport_urllib
2130
 
 
2131
 
        self.server.start_server()
2132
 
 
2133
 
        # We override at class level because constructors may propagate the
2134
 
        # bound method and render instance overriding ineffective (an
2135
 
        # alternative would be to define a specific ui factory instead...)
2136
 
        self.orig_report_activity = self._transport._report_activity
2137
 
        self._transport._report_activity = None
2138
 
 
2139
 
    def tearDown(self):
2140
 
        self._transport._report_activity = self.orig_report_activity
2141
 
        self.server.stop_server()
2142
 
        tests.TestCase.tearDown(self)
 
2149
        super(TestNoReportActivity, self).setUp()
 
2150
        self._transport =HttpTransport
 
2151
        TestActivityMixin.setUp(self)
2143
2152
 
2144
2153
    def assertActivitiesMatch(self):
2145
2154
        # Nothing to check here
2149
2158
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
2150
2159
    """Test authentication on the redirected http server."""
2151
2160
 
 
2161
    scenarios = vary_by_http_protocol_version()
 
2162
 
2152
2163
    _auth_header = 'Authorization'
2153
2164
    _password_prompt_prefix = ''
2154
2165
    _username_prompt_prefix = ''
2155
2166
    _auth_server = http_utils.HTTPBasicAuthServer
2156
 
    _transport = _urllib.HttpTransport_urllib
2157
 
 
2158
 
    def create_transport_readonly_server(self):
2159
 
        return self._auth_server()
2160
 
 
2161
 
    def create_transport_secondary_server(self):
2162
 
        """Create the secondary server redirecting to the primary server"""
2163
 
        new = self.get_readonly_server()
2164
 
 
2165
 
        redirecting = http_utils.HTTPServerRedirecting()
2166
 
        redirecting.redirect_to(new.host, new.port)
2167
 
        return redirecting
 
2167
    _transport = HttpTransport
2168
2168
 
2169
2169
    def setUp(self):
2170
2170
        super(TestAuthOnRedirected, self).setUp()
2171
 
        self.build_tree_contents([('a','a'),
 
2171
        self.build_tree_contents([('a', b'a'),
2172
2172
                                  ('1/',),
2173
 
                                  ('1/a', 'redirected once'),
 
2173
                                  ('1/a', b'redirected once'),
2174
2174
                                  ],)
2175
2175
        new_prefix = 'http://%s:%s' % (self.new_server.host,
2176
2176
                                       self.new_server.port)
2177
2177
        self.old_server.redirections = [
2178
2178
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2179
 
        self.old_transport = self._transport(self.old_server.get_url())
 
2179
        self.old_transport = self.get_old_transport()
2180
2180
        self.new_server.add_user('joe', 'foo')
2181
 
 
2182
 
    def get_a(self, transport):
2183
 
        return transport.get('a')
 
2181
        cleanup_http_redirection_connections(self)
 
2182
 
 
2183
    def create_transport_readonly_server(self):
 
2184
        server = self._auth_server(protocol_version=self._protocol_version)
 
2185
        server._url_protocol = self._url_protocol
 
2186
        return server
 
2187
 
 
2188
    def get_a(self, t):
 
2189
        return t.get('a')
2184
2190
 
2185
2191
    def test_auth_on_redirected_via_do_catching_redirections(self):
2186
2192
        self.redirections = 0
2187
2193
 
2188
 
        def redirected(transport, exception, redirection_notice):
 
2194
        def redirected(t, exception, redirection_notice):
2189
2195
            self.redirections += 1
2190
 
            dir, file = urlutils.split(exception.target)
2191
 
            return self._transport(dir)
 
2196
            redirected_t = t._redirected_to(exception.source, exception.target)
 
2197
            self.addCleanup(redirected_t.disconnect)
 
2198
            return redirected_t
2192
2199
 
2193
 
        stdout = tests.StringIOWrapper()
2194
 
        stderr = tests.StringIOWrapper()
2195
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2196
 
                                            stdout=stdout, stderr=stderr)
 
2200
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n')
2197
2201
        self.assertEqual('redirected once',
2198
2202
                         transport.do_catching_redirections(
2199
2203
                self.get_a, self.old_transport, redirected).read())
2201
2205
        # stdin should be empty
2202
2206
        self.assertEqual('', ui.ui_factory.stdin.readline())
2203
2207
        # stdout should be empty, stderr will contains the prompts
2204
 
        self.assertEqual('', stdout.getvalue())
 
2208
        self.assertEqual('', ui.ui_factory.stdout.getvalue())
2205
2209
 
2206
2210
    def test_auth_on_redirected_via_following_redirections(self):
2207
2211
        self.new_server.add_user('joe', 'foo')
2208
 
        stdout = tests.StringIOWrapper()
2209
 
        stderr = tests.StringIOWrapper()
2210
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2211
 
                                            stdout=stdout, stderr=stderr)
 
2212
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n')
2212
2213
        t = self.old_transport
2213
2214
        req = RedirectedRequest('GET', t.abspath('a'))
2214
2215
        new_prefix = 'http://%s:%s' % (self.new_server.host,
2215
2216
                                       self.new_server.port)
2216
2217
        self.old_server.redirections = [
2217
2218
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2218
 
        self.assertEqual('redirected once',t._perform(req).read())
 
2219
        self.assertEqual('redirected once', t._perform(req).read())
2219
2220
        # stdin should be empty
2220
2221
        self.assertEqual('', ui.ui_factory.stdin.readline())
2221
2222
        # stdout should be empty, stderr will contains the prompts
2222
 
        self.assertEqual('', stdout.getvalue())
2223
 
 
 
2223
        self.assertEqual('', ui.ui_factory.stdout.getvalue())
2224
2224