/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

Support user.signingkey configuration variable in .git/config.

Merged from https://code.launchpad.net/~jelmer/brz/local-git-key/+merge/381000

Show diffs side-by-side

added added

removed removed

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