/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-01-03 20:21:48 UTC
  • mfrom: (7235.1.1 autodoc-python3)
  • Revision ID: breezy.the.bot@gmail.com-20190103202148-nz78enpakwe3ib8h
Fix autodoc_rstx generation on python 3.

Merged from https://code.launchpad.net/~jelmer/brz/autodoc-python3/+merge/361367

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