/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: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

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