~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
23
23
# TODO: Should be renamed to bzrlib.transport.http.tests?
24
24
# TODO: What about renaming to bzrlib.tests.transport.http ?
25
25
 
 
26
from cStringIO import StringIO
26
27
import httplib
 
28
import os
 
29
import select
27
30
import SimpleHTTPServer
28
31
import socket
29
32
import sys
32
35
import bzrlib
33
36
from bzrlib import (
34
37
    bzrdir,
35
 
    cethread,
36
38
    config,
37
 
    debug,
38
39
    errors,
39
40
    osutils,
40
41
    remote as _mod_remote,
41
42
    tests,
42
 
    trace,
43
43
    transport,
44
44
    ui,
 
45
    urlutils,
 
46
    )
 
47
from bzrlib.symbol_versioning import (
 
48
    deprecated_in,
45
49
    )
46
50
from bzrlib.tests import (
47
51
    features,
48
52
    http_server,
49
53
    http_utils,
50
 
    test_server,
51
 
    )
52
 
from bzrlib.tests.scenarios import (
53
 
    load_tests_apply_scenarios,
54
 
    multiply_scenarios,
55
54
    )
56
55
from bzrlib.transport import (
57
56
    http,
67
66
    from bzrlib.transport.http._pycurl import PyCurlTransport
68
67
 
69
68
 
70
 
load_tests = load_tests_apply_scenarios
71
 
 
72
 
 
73
 
def vary_by_http_client_implementation():
74
 
    """Test the two libraries we can use, pycurl and urllib."""
 
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
                )))
75
80
    transport_scenarios = [
76
81
        ('urllib', dict(_transport=_urllib.HttpTransport_urllib,
77
82
                        _server=http_server.HttpServer_urllib,
78
 
                        _url_protocol='http+urllib',)),
 
83
                        _qualified_prefix='http+urllib',)),
79
84
        ]
80
85
    if features.pycurl.available():
81
86
        transport_scenarios.append(
82
87
            ('pycurl', dict(_transport=PyCurlTransport,
83
88
                            _server=http_server.HttpServer_PyCurl,
84
 
                            _url_protocol='http+pycurl',)))
85
 
    return transport_scenarios
86
 
 
87
 
 
88
 
def vary_by_http_protocol_version():
89
 
    """Test on http/1.0 and 1.1"""
90
 
    return [
91
 
        ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
92
 
        ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
 
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)),
93
124
        ]
94
 
 
95
 
 
96
 
def vary_by_http_auth_scheme():
97
 
    scenarios = [
 
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 = [
98
135
        ('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
99
136
        ('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
100
137
        ('basicdigest',
101
 
            dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
102
 
        ]
103
 
    # Add some attributes common to all scenarios
104
 
    for scenario_id, scenario_dict in scenarios:
105
 
        scenario_dict.update(_auth_header='Authorization',
106
 
                             _username_prompt_prefix='',
107
 
                             _password_prompt_prefix='')
108
 
    return scenarios
109
 
 
110
 
 
111
 
def vary_by_http_proxy_auth_scheme():
112
 
    scenarios = [
113
 
        ('proxy-basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
114
 
        ('proxy-digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
115
 
        ('proxy-basicdigest',
116
 
            dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
117
 
        ]
118
 
    # Add some attributes common to all scenarios
119
 
    for scenario_id, scenario_dict in scenarios:
120
 
        scenario_dict.update(_auth_header='Proxy-Authorization',
121
 
                             _username_prompt_prefix='Proxy ',
122
 
                             _password_prompt_prefix='Proxy ')
123
 
    return scenarios
124
 
 
125
 
 
126
 
def vary_by_http_activity():
 
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
                )))
127
149
    activity_scenarios = [
128
150
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
129
 
                            _transport=_urllib.HttpTransport_urllib,)),
 
151
                             _transport=_urllib.HttpTransport_urllib,)),
130
152
        ]
131
 
    if features.HTTPSServerFeature.available():
 
153
    if tests.HTTPSServerFeature.available():
132
154
        activity_scenarios.append(
133
155
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
134
 
                                _transport=_urllib.HttpTransport_urllib,)),)
 
156
                                  _transport=_urllib.HttpTransport_urllib,)),)
135
157
    if features.pycurl.available():
136
158
        activity_scenarios.append(
137
159
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
138
 
                                _transport=PyCurlTransport,)),)
139
 
        if features.HTTPSServerFeature.available():
 
160
                                 _transport=PyCurlTransport,)),)
 
161
        if tests.HTTPSServerFeature.available():
140
162
            from bzrlib.tests import (
141
163
                ssl_certs,
142
164
                )
153
175
 
154
176
            activity_scenarios.append(
155
177
                ('pycurl,https', dict(_activity_server=ActivityHTTPSServer,
156
 
                                    _transport=HTTPS_pycurl_transport,)),)
157
 
    return activity_scenarios
 
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
158
188
 
159
189
 
160
190
class FakeManager(object):
193
223
        self._sock.bind(('127.0.0.1', 0))
194
224
        self.host, self.port = self._sock.getsockname()
195
225
        self._ready = threading.Event()
196
 
        self._thread = test_server.TestThread(
197
 
            sync_event=self._ready, target=self._accept_read_and_reply)
 
226
        self._thread = threading.Thread(target=self._accept_read_and_reply)
 
227
        self._thread.setDaemon(True)
198
228
        self._thread.start()
199
 
        if 'threads' in tests.selftest_debug_flags:
200
 
            sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
201
 
        self._ready.wait()
 
229
        self._ready.wait(5)
202
230
 
203
231
    def _accept_read_and_reply(self):
204
232
        self._sock.listen(1)
205
233
        self._ready.set()
206
 
        conn, address = self._sock.accept()
207
 
        if self._expect_body_tail is not None:
 
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)
208
240
            while not self.received_bytes.endswith(self._expect_body_tail):
209
241
                self.received_bytes += conn.recv(4096)
210
242
            conn.sendall('HTTP/1.1 200 OK\r\n')
211
 
        try:
 
243
        except socket.timeout:
 
244
            # Make sure the client isn't stuck waiting for us to e.g. accept.
212
245
            self._sock.close()
213
246
        except socket.error:
214
247
            # The client may have already closed the socket.
216
249
 
217
250
    def stop_server(self):
218
251
        try:
219
 
            # Issue a fake connection to wake up the server and allow it to
220
 
            # finish quickly
221
 
            fake_conn = osutils.connect_socket((self.host, self.port))
222
 
            fake_conn.close()
 
252
            self._sock.close()
223
253
        except socket.error:
224
254
            # We might have already closed it.  We don't care.
225
255
            pass
226
256
        self.host = None
227
257
        self.port = None
228
 
        self._thread.join()
229
 
        if 'threads' in tests.selftest_debug_flags:
230
 
            sys.stderr.write('Thread  joined: %s\n' % (self._thread.ident,))
231
258
 
232
259
 
233
260
class TestAuthHeader(tests.TestCase):
269
296
        self.assertEqual('realm="Thou should not pass"', remainder)
270
297
 
271
298
 
272
 
class TestHTTPRangeParsing(tests.TestCase):
273
 
 
274
 
    def setUp(self):
275
 
        super(TestHTTPRangeParsing, self).setUp()
276
 
        # We focus on range  parsing here and ignore everything else
277
 
        class RequestHandler(http_server.TestingHTTPRequestHandler):
278
 
            def setup(self): pass
279
 
            def handle(self): pass
280
 
            def finish(self): pass
281
 
 
282
 
        self.req_handler = RequestHandler(None, None, None)
283
 
 
284
 
    def assertRanges(self, ranges, header, file_size):
285
 
        self.assertEquals(ranges,
286
 
                          self.req_handler._parse_ranges(header, file_size))
287
 
 
288
 
    def test_simple_range(self):
289
 
        self.assertRanges([(0,2)], 'bytes=0-2', 12)
290
 
 
291
 
    def test_tail(self):
292
 
        self.assertRanges([(8, 11)], 'bytes=-4', 12)
293
 
 
294
 
    def test_tail_bigger_than_file(self):
295
 
        self.assertRanges([(0, 11)], 'bytes=-99', 12)
296
 
 
297
 
    def test_range_without_end(self):
298
 
        self.assertRanges([(4, 11)], 'bytes=4-', 12)
299
 
 
300
 
    def test_invalid_ranges(self):
301
 
        self.assertRanges(None, 'bytes=12-22', 12)
302
 
        self.assertRanges(None, 'bytes=1-3,12-22', 12)
303
 
        self.assertRanges(None, 'bytes=-', 12)
304
 
 
305
 
 
306
299
class TestHTTPServer(tests.TestCase):
307
300
    """Test the HTTP servers implementations."""
308
301
 
311
304
 
312
305
            protocol_version = 'HTTP/0.1'
313
306
 
314
 
        self.assertRaises(httplib.UnknownProtocol,
315
 
                          http_server.HttpServer, BogusRequestHandler)
 
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')
316
313
 
317
314
    def test_force_invalid_protocol(self):
318
 
        self.assertRaises(httplib.UnknownProtocol,
319
 
                          http_server.HttpServer, protocol_version='HTTP/0.1')
 
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')
320
321
 
321
322
    def test_server_start_and_stop(self):
322
323
        server = http_server.HttpServer()
323
 
        self.addCleanup(server.stop_server)
324
324
        server.start_server()
325
 
        self.assertTrue(server.server is not None)
326
 
        self.assertTrue(server.server.serving is not None)
327
 
        self.assertTrue(server.server.serving)
 
325
        try:
 
326
            self.assertTrue(server._http_running)
 
327
        finally:
 
328
            server.stop_server()
 
329
        self.assertFalse(server._http_running)
328
330
 
329
331
    def test_create_http_server_one_zero(self):
330
332
        class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
333
335
 
334
336
        server = http_server.HttpServer(RequestHandlerOneZero)
335
337
        self.start_server(server)
336
 
        self.assertIsInstance(server.server, http_server.TestingHTTPServer)
 
338
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
337
339
 
338
340
    def test_create_http_server_one_one(self):
339
341
        class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
342
344
 
343
345
        server = http_server.HttpServer(RequestHandlerOneOne)
344
346
        self.start_server(server)
345
 
        self.assertIsInstance(server.server,
 
347
        self.assertIsInstance(server._httpd,
346
348
                              http_server.TestingThreadingHTTPServer)
347
349
 
348
350
    def test_create_http_server_force_one_one(self):
353
355
        server = http_server.HttpServer(RequestHandlerOneZero,
354
356
                                        protocol_version='HTTP/1.1')
355
357
        self.start_server(server)
356
 
        self.assertIsInstance(server.server,
 
358
        self.assertIsInstance(server._httpd,
357
359
                              http_server.TestingThreadingHTTPServer)
358
360
 
359
361
    def test_create_http_server_force_one_zero(self):
364
366
        server = http_server.HttpServer(RequestHandlerOneOne,
365
367
                                        protocol_version='HTTP/1.0')
366
368
        self.start_server(server)
367
 
        self.assertIsInstance(server.server,
 
369
        self.assertIsInstance(server._httpd,
368
370
                              http_server.TestingHTTPServer)
369
371
 
370
372
 
389
391
        self.assertEqual('http://example.com', url)
390
392
        self.assertEqual(0, len(f.credentials))
391
393
        url = http.extract_auth(
392
 
            'http://user:pass@example.com/bzr/bzr.dev', f)
393
 
        self.assertEqual('http://example.com/bzr/bzr.dev', url)
 
394
            'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
 
395
        self.assertEqual('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
394
396
        self.assertEqual(1, len(f.credentials))
395
 
        self.assertEqual([None, 'example.com', 'user', 'pass'],
 
397
        self.assertEqual([None, 'www.bazaar-vcs.org', 'user', 'pass'],
396
398
                         f.credentials[0])
397
399
 
398
400
 
399
401
class TestHttpTransportUrls(tests.TestCase):
400
402
    """Test the http urls."""
401
403
 
402
 
    scenarios = vary_by_http_client_implementation()
403
 
 
404
404
    def test_abs_url(self):
405
405
        """Construction of absolute http URLs"""
406
 
        t = self._transport('http://example.com/bzr/bzr.dev/')
 
406
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
407
407
        eq = self.assertEqualDiff
408
 
        eq(t.abspath('.'), 'http://example.com/bzr/bzr.dev')
409
 
        eq(t.abspath('foo/bar'), 'http://example.com/bzr/bzr.dev/foo/bar')
410
 
        eq(t.abspath('.bzr'), 'http://example.com/bzr/bzr.dev/.bzr')
 
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')
411
411
        eq(t.abspath('.bzr/1//2/./3'),
412
 
           'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
 
412
           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
413
413
 
414
414
    def test_invalid_http_urls(self):
415
415
        """Trap invalid construction of urls"""
416
 
        self._transport('http://example.com/bzr/bzr.dev/')
 
416
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
417
417
        self.assertRaises(errors.InvalidURL,
418
418
                          self._transport,
419
 
                          'http://http://example.com/bzr/bzr.dev/')
 
419
                          'http://http://bazaar-vcs.org/bzr/bzr.dev/')
420
420
 
421
421
    def test_http_root_urls(self):
422
422
        """Construction of URLs from server root"""
423
 
        t = self._transport('http://example.com/')
 
423
        t = self._transport('http://bzr.ozlabs.org/')
424
424
        eq = self.assertEqualDiff
425
425
        eq(t.abspath('.bzr/tree-version'),
426
 
           'http://example.com/.bzr/tree-version')
 
426
           'http://bzr.ozlabs.org/.bzr/tree-version')
427
427
 
428
428
    def test_http_impl_urls(self):
429
429
        """There are servers which ask for particular clients to connect"""
431
431
        server.start_server()
432
432
        try:
433
433
            url = server.get_url()
434
 
            self.assertTrue(url.startswith('%s://' % self._url_protocol))
 
434
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
435
435
        finally:
436
436
            server.stop_server()
437
437
 
452
452
        # Import the module locally now that we now it's available.
453
453
        pycurl = features.pycurl.module
454
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))
 
455
        version_info_orig = pycurl.version_info
 
456
        def restore():
 
457
            pycurl.version_info = version_info_orig
 
458
        self.addCleanup(restore)
 
459
 
 
460
        # Fake the pycurl version_info This was taken from a windows pycurl
 
461
        # without SSL (thanks to bialix)
 
462
        pycurl.version_info = lambda : (2,
 
463
                                        '7.13.2',
 
464
                                        462082,
 
465
                                        'i386-pc-win32',
 
466
                                        2576,
 
467
                                        None,
 
468
                                        0,
 
469
                                        None,
 
470
                                        ('ftp', 'gopher', 'telnet',
 
471
                                         'dict', 'ldap', 'http', 'file'),
 
472
                                        None,
 
473
                                        0,
 
474
                                        None)
471
475
        self.assertRaises(errors.DependencyNotPresent, self._transport,
472
476
                          'https://launchpad.net')
473
477
 
475
479
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
476
480
    """Test the http connections."""
477
481
 
478
 
    scenarios = multiply_scenarios(
479
 
        vary_by_http_client_implementation(),
480
 
        vary_by_http_protocol_version(),
481
 
        )
482
 
 
483
482
    def setUp(self):
484
483
        http_utils.TestCaseWithWebserver.setUp(self)
485
484
        self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
487
486
 
488
487
    def test_http_has(self):
489
488
        server = self.get_readonly_server()
490
 
        t = self.get_readonly_transport()
 
489
        t = self._transport(server.get_url())
491
490
        self.assertEqual(t.has('foo/bar'), True)
492
491
        self.assertEqual(len(server.logs), 1)
493
492
        self.assertContainsRe(server.logs[0],
495
494
 
496
495
    def test_http_has_not_found(self):
497
496
        server = self.get_readonly_server()
498
 
        t = self.get_readonly_transport()
 
497
        t = self._transport(server.get_url())
499
498
        self.assertEqual(t.has('not-found'), False)
500
499
        self.assertContainsRe(server.logs[1],
501
500
            r'"HEAD /not-found HTTP/1.." 404 - "-" "bzr/')
502
501
 
503
502
    def test_http_get(self):
504
503
        server = self.get_readonly_server()
505
 
        t = self.get_readonly_transport()
 
504
        t = self._transport(server.get_url())
506
505
        fp = t.get('foo/bar')
507
506
        self.assertEqualDiff(
508
507
            fp.read(),
530
529
class TestHttpTransportRegistration(tests.TestCase):
531
530
    """Test registrations of various http implementations"""
532
531
 
533
 
    scenarios = vary_by_http_client_implementation()
534
 
 
535
532
    def test_http_registered(self):
536
 
        t = transport.get_transport('%s://foo.com/' % self._url_protocol)
 
533
        t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
537
534
        self.assertIsInstance(t, transport.Transport)
538
535
        self.assertIsInstance(t, self._transport)
539
536
 
540
537
 
541
538
class TestPost(tests.TestCase):
542
539
 
543
 
    scenarios = multiply_scenarios(
544
 
        vary_by_http_client_implementation(),
545
 
        vary_by_http_protocol_version(),
546
 
        )
547
 
 
548
540
    def test_post_body_is_received(self):
549
541
        server = RecordingServer(expect_body_tail='end-of-body',
550
 
                                 scheme=self._url_protocol)
 
542
            scheme=self._qualified_prefix)
551
543
        self.start_server(server)
552
544
        url = server.get_url()
553
 
        # FIXME: needs a cleanup -- vila 20100611
554
 
        http_transport = transport.get_transport(url)
 
545
        http_transport = self._transport(url)
555
546
        code, response = http_transport._post('abc def end-of-body')
556
547
        self.assertTrue(
557
548
            server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
558
549
        self.assertTrue('content-length: 19\r' in server.received_bytes.lower())
559
 
        self.assertTrue('content-type: application/octet-stream\r'
560
 
                        in server.received_bytes.lower())
561
550
        # The transport should not be assuming that the server can accept
562
551
        # chunked encoding the first time it connects, because HTTP/1.1, so we
563
552
        # check for the literal string.
599
588
    Daughter classes are expected to override _req_handler_class
600
589
    """
601
590
 
602
 
    scenarios = multiply_scenarios(
603
 
        vary_by_http_client_implementation(),
604
 
        vary_by_http_protocol_version(),
605
 
        )
606
 
 
607
591
    # Provide a useful default
608
592
    _req_handler_class = http_server.TestingHTTPRequestHandler
609
593
 
610
594
    def create_transport_readonly_server(self):
611
 
        server = http_server.HttpServer(self._req_handler_class,
612
 
                                        protocol_version=self._protocol_version)
613
 
        server._url_protocol = self._url_protocol
614
 
        return server
 
595
        return http_server.HttpServer(self._req_handler_class,
 
596
                                      protocol_version=self._protocol_version)
615
597
 
616
598
    def _testing_pycurl(self):
617
599
        # TODO: This is duplicated for lots of the classes in this file
622
604
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
623
605
    """Whatever request comes in, close the connection"""
624
606
 
625
 
    def _handle_one_request(self):
 
607
    def handle_one_request(self):
626
608
        """Handle a single HTTP request, by abruptly closing the connection"""
627
609
        self.close_connection = 1
628
610
 
633
615
    _req_handler_class = WallRequestHandler
634
616
 
635
617
    def test_http_has(self):
636
 
        t = self.get_readonly_transport()
 
618
        server = self.get_readonly_server()
 
619
        t = self._transport(server.get_url())
637
620
        # Unfortunately httplib (see HTTPResponse._read_status
638
621
        # for details) make no distinction between a closed
639
622
        # socket and badly formatted status line, so we can't
645
628
                          t.has, 'foo/bar')
646
629
 
647
630
    def test_http_get(self):
648
 
        t = self.get_readonly_transport()
 
631
        server = self.get_readonly_server()
 
632
        t = self._transport(server.get_url())
649
633
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
650
634
                           errors.InvalidHttpResponse),
651
635
                          t.get, 'foo/bar')
668
652
    _req_handler_class = BadStatusRequestHandler
669
653
 
670
654
    def test_http_has(self):
671
 
        t = self.get_readonly_transport()
 
655
        server = self.get_readonly_server()
 
656
        t = self._transport(server.get_url())
672
657
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
673
658
 
674
659
    def test_http_get(self):
675
 
        t = self.get_readonly_transport()
 
660
        server = self.get_readonly_server()
 
661
        t = self._transport(server.get_url())
676
662
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
677
663
 
678
664
 
683
669
        """Fakes handling a single HTTP request, returns a bad status"""
684
670
        ignored = http_server.TestingHTTPRequestHandler.parse_request(self)
685
671
        self.wfile.write("Invalid status line\r\n")
686
 
        # If we don't close the connection pycurl will hang. Since this is a
687
 
        # stress test we don't *have* to respect the protocol, but we don't
688
 
        # have to sabotage it too much either.
689
 
        self.close_connection = True
690
672
        return False
691
673
 
692
674
 
698
680
 
699
681
    _req_handler_class = InvalidStatusRequestHandler
700
682
 
 
683
    def test_http_has(self):
 
684
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
 
685
            raise tests.KnownFailure(
 
686
                'pycurl hangs if the server send back garbage')
 
687
        super(TestInvalidStatusServer, self).test_http_has()
 
688
 
 
689
    def test_http_get(self):
 
690
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
 
691
            raise tests.KnownFailure(
 
692
                'pycurl hangs if the server send back garbage')
 
693
        super(TestInvalidStatusServer, self).test_http_get()
 
694
 
701
695
 
702
696
class BadProtocolRequestHandler(http_server.TestingHTTPRequestHandler):
703
697
    """Whatever request comes in, returns a bad protocol version"""
725
719
        super(TestBadProtocolServer, self).setUp()
726
720
 
727
721
    def test_http_has(self):
728
 
        t = self.get_readonly_transport()
 
722
        server = self.get_readonly_server()
 
723
        t = self._transport(server.get_url())
729
724
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
730
725
 
731
726
    def test_http_get(self):
732
 
        t = self.get_readonly_transport()
 
727
        server = self.get_readonly_server()
 
728
        t = self._transport(server.get_url())
733
729
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
734
730
 
735
731
 
749
745
    _req_handler_class = ForbiddenRequestHandler
750
746
 
751
747
    def test_http_has(self):
752
 
        t = self.get_readonly_transport()
 
748
        server = self.get_readonly_server()
 
749
        t = self._transport(server.get_url())
753
750
        self.assertRaises(errors.TransportError, t.has, 'foo/bar')
754
751
 
755
752
    def test_http_get(self):
756
 
        t = self.get_readonly_transport()
 
753
        server = self.get_readonly_server()
 
754
        t = self._transport(server.get_url())
757
755
        self.assertRaises(errors.TransportError, t.get, 'foo/bar')
758
756
 
759
757
 
798
796
        self.build_tree_contents([('a', '0123456789')],)
799
797
 
800
798
    def test_readv(self):
801
 
        t = self.get_readonly_transport()
 
799
        server = self.get_readonly_server()
 
800
        t = self._transport(server.get_url())
802
801
        l = list(t.readv('a', ((0, 1), (1, 1), (3, 2), (9, 1))))
803
802
        self.assertEqual(l[0], (0, '0'))
804
803
        self.assertEqual(l[1], (1, '1'))
806
805
        self.assertEqual(l[3], (9, '9'))
807
806
 
808
807
    def test_readv_out_of_order(self):
809
 
        t = self.get_readonly_transport()
 
808
        server = self.get_readonly_server()
 
809
        t = self._transport(server.get_url())
810
810
        l = list(t.readv('a', ((1, 1), (9, 1), (0, 1), (3, 2))))
811
811
        self.assertEqual(l[0], (1, '1'))
812
812
        self.assertEqual(l[1], (9, '9'))
814
814
        self.assertEqual(l[3], (3, '34'))
815
815
 
816
816
    def test_readv_invalid_ranges(self):
817
 
        t = self.get_readonly_transport()
 
817
        server = self.get_readonly_server()
 
818
        t = self._transport(server.get_url())
818
819
 
819
820
        # This is intentionally reading off the end of the file
820
821
        # since we are sure that it cannot get there
828
829
 
829
830
    def test_readv_multiple_get_requests(self):
830
831
        server = self.get_readonly_server()
831
 
        t = self.get_readonly_transport()
 
832
        t = self._transport(server.get_url())
832
833
        # force transport to issue multiple requests
833
834
        t._max_readv_combine = 1
834
835
        t._max_get_ranges = 1
842
843
 
843
844
    def test_readv_get_max_size(self):
844
845
        server = self.get_readonly_server()
845
 
        t = self.get_readonly_transport()
 
846
        t = self._transport(server.get_url())
846
847
        # force transport to issue multiple requests by limiting the number of
847
848
        # bytes by request. Note that this apply to coalesced offsets only, a
848
849
        # single range will keep its size even if bigger than the limit.
857
858
 
858
859
    def test_complete_readv_leave_pipe_clean(self):
859
860
        server = self.get_readonly_server()
860
 
        t = self.get_readonly_transport()
 
861
        t = self._transport(server.get_url())
861
862
        # force transport to issue multiple requests
862
863
        t._get_max_size = 2
863
 
        list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
 
864
        l = list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
864
865
        # The server should have issued 3 requests
865
866
        self.assertEqual(3, server.GET_request_nb)
866
867
        self.assertEqual('0123456789', t.get_bytes('a'))
868
869
 
869
870
    def test_incomplete_readv_leave_pipe_clean(self):
870
871
        server = self.get_readonly_server()
871
 
        t = self.get_readonly_transport()
 
872
        t = self._transport(server.get_url())
872
873
        # force transport to issue multiple requests
873
874
        t._get_max_size = 2
874
875
        # Don't collapse readv results into a list so that we leave unread
943
944
    def get_multiple_ranges(self, file, file_size, ranges):
944
945
        self.send_response(206)
945
946
        self.send_header('Accept-Ranges', 'bytes')
946
 
        # XXX: this is strange; the 'random' name below seems undefined and
947
 
        # yet the tests pass -- mbp 2010-10-11 bug 658773
948
947
        boundary = "%d" % random.randint(0,0x7FFFFFFF)
949
948
        self.send_header("Content-Type",
950
949
                         "multipart/byteranges; boundary=%s" % boundary)
1012
1011
                return
1013
1012
            self.send_range_content(file, start, end - start + 1)
1014
1013
            cur += 1
1015
 
        # Final boundary
 
1014
        # No final boundary
1016
1015
        self.wfile.write(boundary_line)
1017
1016
 
1018
1017
 
1026
1025
 
1027
1026
    def test_readv_with_short_reads(self):
1028
1027
        server = self.get_readonly_server()
1029
 
        t = self.get_readonly_transport()
 
1028
        t = self._transport(server.get_url())
1030
1029
        # Force separate ranges for each offset
1031
1030
        t._bytes_to_read_before_seek = 0
1032
1031
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1047
1046
        # that mode
1048
1047
        self.assertEqual('single', t._range_hint)
1049
1048
 
1050
 
 
1051
 
class TruncatedBeforeBoundaryRequestHandler(
1052
 
    http_server.TestingHTTPRequestHandler):
1053
 
    """Truncation before a boundary, like in bug 198646"""
1054
 
 
1055
 
    _truncated_ranges = 1
1056
 
 
1057
 
    def get_multiple_ranges(self, file, file_size, ranges):
1058
 
        self.send_response(206)
1059
 
        self.send_header('Accept-Ranges', 'bytes')
1060
 
        boundary = 'tagada'
1061
 
        self.send_header('Content-Type',
1062
 
                         'multipart/byteranges; boundary=%s' % boundary)
1063
 
        boundary_line = '--%s\r\n' % boundary
1064
 
        # Calculate the Content-Length
1065
 
        content_length = 0
1066
 
        for (start, end) in ranges:
1067
 
            content_length += len(boundary_line)
1068
 
            content_length += self._header_line_length(
1069
 
                'Content-type', 'application/octet-stream')
1070
 
            content_length += self._header_line_length(
1071
 
                'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))
1072
 
            content_length += len('\r\n') # end headers
1073
 
            content_length += end - start # + 1
1074
 
        content_length += len(boundary_line)
1075
 
        self.send_header('Content-length', content_length)
1076
 
        self.end_headers()
1077
 
 
1078
 
        # Send the multipart body
1079
 
        cur = 0
1080
 
        for (start, end) in ranges:
1081
 
            if cur + self._truncated_ranges >= len(ranges):
1082
 
                # Abruptly ends the response and close the connection
1083
 
                self.close_connection = 1
1084
 
                return
1085
 
            self.wfile.write(boundary_line)
1086
 
            self.send_header('Content-type', 'application/octet-stream')
1087
 
            self.send_header('Content-Range', 'bytes %d-%d/%d'
1088
 
                             % (start, end, file_size))
1089
 
            self.end_headers()
1090
 
            self.send_range_content(file, start, end - start + 1)
1091
 
            cur += 1
1092
 
        # Final boundary
1093
 
        self.wfile.write(boundary_line)
1094
 
 
1095
 
 
1096
 
class TestTruncatedBeforeBoundary(TestSpecificRequestHandler):
1097
 
    """Tests the case of bug 198646, disconnecting before a boundary."""
1098
 
 
1099
 
    _req_handler_class = TruncatedBeforeBoundaryRequestHandler
1100
 
 
1101
 
    def setUp(self):
1102
 
        super(TestTruncatedBeforeBoundary, self).setUp()
1103
 
        self.build_tree_contents([('a', '0123456789')],)
1104
 
 
1105
 
    def test_readv_with_short_reads(self):
1106
 
        server = self.get_readonly_server()
1107
 
        t = self.get_readonly_transport()
1108
 
        # Force separate ranges for each offset
1109
 
        t._bytes_to_read_before_seek = 0
1110
 
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1111
 
        self.assertEqual((0, '0'), ireadv.next())
1112
 
        self.assertEqual((2, '2'), ireadv.next())
1113
 
        self.assertEqual((4, '45'), ireadv.next())
1114
 
        self.assertEqual((9, '9'), ireadv.next())
1115
 
 
1116
 
 
1117
1049
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1118
1050
    """Errors out when range specifiers exceed the limit"""
1119
1051
 
1143
1075
class TestLimitedRangeRequestServer(http_utils.TestCaseWithWebserver):
1144
1076
    """Tests readv requests against a server erroring out on too much ranges."""
1145
1077
 
1146
 
    scenarios = multiply_scenarios(
1147
 
        vary_by_http_client_implementation(),
1148
 
        vary_by_http_protocol_version(),
1149
 
        )
1150
 
 
1151
1078
    # Requests with more range specifiers will error out
1152
1079
    range_limit = 3
1153
1080
 
1155
1082
        return LimitedRangeHTTPServer(range_limit=self.range_limit,
1156
1083
                                      protocol_version=self._protocol_version)
1157
1084
 
 
1085
    def get_transport(self):
 
1086
        return self._transport(self.get_readonly_server().get_url())
 
1087
 
1158
1088
    def setUp(self):
1159
1089
        http_utils.TestCaseWithWebserver.setUp(self)
1160
1090
        # We need to manipulate ranges that correspond to real chunks in the
1164
1094
        self.build_tree_contents([('a', content)],)
1165
1095
 
1166
1096
    def test_few_ranges(self):
1167
 
        t = self.get_readonly_transport()
 
1097
        t = self.get_transport()
1168
1098
        l = list(t.readv('a', ((0, 4), (1024, 4), )))
1169
1099
        self.assertEqual(l[0], (0, '0000'))
1170
1100
        self.assertEqual(l[1], (1024, '0001'))
1171
1101
        self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1172
1102
 
1173
1103
    def test_more_ranges(self):
1174
 
        t = self.get_readonly_transport()
 
1104
        t = self.get_transport()
1175
1105
        l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1176
1106
        self.assertEqual(l[0], (0, '0000'))
1177
1107
        self.assertEqual(l[1], (1024, '0001'))
1188
1118
    Only the urllib implementation is tested here.
1189
1119
    """
1190
1120
 
 
1121
    def setUp(self):
 
1122
        tests.TestCase.setUp(self)
 
1123
        self._old_env = {}
 
1124
 
 
1125
    def tearDown(self):
 
1126
        self._restore_env()
 
1127
        tests.TestCase.tearDown(self)
 
1128
 
 
1129
    def _install_env(self, env):
 
1130
        for name, value in env.iteritems():
 
1131
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1132
 
 
1133
    def _restore_env(self):
 
1134
        for name, value in self._old_env.iteritems():
 
1135
            osutils.set_or_unset_env(name, value)
 
1136
 
1191
1137
    def _proxied_request(self):
1192
1138
        handler = _urllib2_wrappers.ProxyHandler()
1193
 
        request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
 
1139
        request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
1194
1140
        handler.set_proxy(request, 'http')
1195
1141
        return request
1196
1142
 
1197
 
    def assertEvaluateProxyBypass(self, expected, host, no_proxy):
1198
 
        handler = _urllib2_wrappers.ProxyHandler()
1199
 
        self.assertEquals(expected,
1200
 
                          handler.evaluate_proxy_bypass(host, no_proxy))
1201
 
 
1202
1143
    def test_empty_user(self):
1203
 
        self.overrideEnv('http_proxy', 'http://bar.com')
1204
 
        request = self._proxied_request()
1205
 
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
1206
 
 
1207
 
    def test_user_with_at(self):
1208
 
        self.overrideEnv('http_proxy',
1209
 
                         'http://username@domain:password@proxy_host:1234')
 
1144
        self._install_env({'http_proxy': 'http://bar.com'})
1210
1145
        request = self._proxied_request()
1211
1146
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
1212
1147
 
1213
1148
    def test_invalid_proxy(self):
1214
1149
        """A proxy env variable without scheme"""
1215
 
        self.overrideEnv('http_proxy', 'host:1234')
 
1150
        self._install_env({'http_proxy': 'host:1234'})
1216
1151
        self.assertRaises(errors.InvalidURL, self._proxied_request)
1217
1152
 
1218
 
    def test_evaluate_proxy_bypass_true(self):
1219
 
        """The host is not proxied"""
1220
 
        self.assertEvaluateProxyBypass(True, 'example.com', 'example.com')
1221
 
        self.assertEvaluateProxyBypass(True, 'bzr.example.com', '*example.com')
1222
 
 
1223
 
    def test_evaluate_proxy_bypass_false(self):
1224
 
        """The host is proxied"""
1225
 
        self.assertEvaluateProxyBypass(False, 'bzr.example.com', None)
1226
 
 
1227
 
    def test_evaluate_proxy_bypass_unknown(self):
1228
 
        """The host is not explicitly proxied"""
1229
 
        self.assertEvaluateProxyBypass(None, 'example.com', 'not.example.com')
1230
 
        self.assertEvaluateProxyBypass(None, 'bzr.example.com', 'example.com')
1231
 
 
1232
 
    def test_evaluate_proxy_bypass_empty_entries(self):
1233
 
        """Ignore empty entries"""
1234
 
        self.assertEvaluateProxyBypass(None, 'example.com', '')
1235
 
        self.assertEvaluateProxyBypass(None, 'example.com', ',')
1236
 
        self.assertEvaluateProxyBypass(None, 'example.com', 'foo,,bar')
1237
 
 
1238
1153
 
1239
1154
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1240
1155
    """Tests proxy server.
1245
1160
    to the file names).
1246
1161
    """
1247
1162
 
1248
 
    scenarios = multiply_scenarios(
1249
 
        vary_by_http_client_implementation(),
1250
 
        vary_by_http_protocol_version(),
1251
 
        )
1252
 
 
1253
1163
    # FIXME: We don't have an https server available, so we don't
1254
 
    # test https connections. --vila toolongago
 
1164
    # test https connections.
1255
1165
 
1256
1166
    def setUp(self):
1257
1167
        super(TestProxyHttpServer, self).setUp()
1258
 
        self.transport_secondary_server = http_utils.ProxyServer
1259
1168
        self.build_tree_contents([('foo', 'contents of foo\n'),
1260
1169
                                  ('foo-proxied', 'proxied contents of foo\n')])
1261
1170
        # Let's setup some attributes for tests
1262
 
        server = self.get_readonly_server()
1263
 
        self.server_host_port = '%s:%d' % (server.host, server.port)
 
1171
        self.server = self.get_readonly_server()
 
1172
        self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
1264
1173
        if self._testing_pycurl():
1265
1174
            # Oh my ! pycurl does not check for the port as part of
1266
1175
            # no_proxy :-( So we just test the host part
1267
 
            self.no_proxy_host = server.host
 
1176
            self.no_proxy_host = self.server.host
1268
1177
        else:
1269
 
            self.no_proxy_host = self.server_host_port
 
1178
            self.no_proxy_host = self.proxy_address
1270
1179
        # The secondary server is the proxy
1271
 
        self.proxy_url = self.get_secondary_url()
 
1180
        self.proxy = self.get_secondary_server()
 
1181
        self.proxy_url = self.proxy.get_url()
 
1182
        self._old_env = {}
1272
1183
 
1273
1184
    def _testing_pycurl(self):
1274
1185
        # TODO: This is duplicated for lots of the classes in this file
1275
1186
        return (features.pycurl.available()
1276
1187
                and self._transport == PyCurlTransport)
1277
1188
 
1278
 
    def assertProxied(self):
1279
 
        t = self.get_readonly_transport()
1280
 
        self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1281
 
 
1282
 
    def assertNotProxied(self):
1283
 
        t = self.get_readonly_transport()
1284
 
        self.assertEqual('contents of foo\n', t.get('foo').read())
 
1189
    def create_transport_secondary_server(self):
 
1190
        """Creates an http server that will serve files with
 
1191
        '-proxied' appended to their names.
 
1192
        """
 
1193
        return http_utils.ProxyServer(protocol_version=self._protocol_version)
 
1194
 
 
1195
    def _install_env(self, env):
 
1196
        for name, value in env.iteritems():
 
1197
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1198
 
 
1199
    def _restore_env(self):
 
1200
        for name, value in self._old_env.iteritems():
 
1201
            osutils.set_or_unset_env(name, value)
 
1202
 
 
1203
    def proxied_in_env(self, env):
 
1204
        self._install_env(env)
 
1205
        url = self.server.get_url()
 
1206
        t = self._transport(url)
 
1207
        try:
 
1208
            self.assertEqual('proxied contents of foo\n', t.get('foo').read())
 
1209
        finally:
 
1210
            self._restore_env()
 
1211
 
 
1212
    def not_proxied_in_env(self, env):
 
1213
        self._install_env(env)
 
1214
        url = self.server.get_url()
 
1215
        t = self._transport(url)
 
1216
        try:
 
1217
            self.assertEqual('contents of foo\n', t.get('foo').read())
 
1218
        finally:
 
1219
            self._restore_env()
1285
1220
 
1286
1221
    def test_http_proxy(self):
1287
 
        self.overrideEnv('http_proxy', self.proxy_url)
1288
 
        self.assertProxied()
 
1222
        self.proxied_in_env({'http_proxy': self.proxy_url})
1289
1223
 
1290
1224
    def test_HTTP_PROXY(self):
1291
1225
        if self._testing_pycurl():
1294
1228
            # about. Should we ?)
1295
1229
            raise tests.TestNotApplicable(
1296
1230
                'pycurl does not check HTTP_PROXY for security reasons')
1297
 
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
1298
 
        self.assertProxied()
 
1231
        self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
1299
1232
 
1300
1233
    def test_all_proxy(self):
1301
 
        self.overrideEnv('all_proxy', self.proxy_url)
1302
 
        self.assertProxied()
 
1234
        self.proxied_in_env({'all_proxy': self.proxy_url})
1303
1235
 
1304
1236
    def test_ALL_PROXY(self):
1305
 
        self.overrideEnv('ALL_PROXY', self.proxy_url)
1306
 
        self.assertProxied()
 
1237
        self.proxied_in_env({'ALL_PROXY': self.proxy_url})
1307
1238
 
1308
1239
    def test_http_proxy_with_no_proxy(self):
1309
 
        self.overrideEnv('no_proxy', self.no_proxy_host)
1310
 
        self.overrideEnv('http_proxy', self.proxy_url)
1311
 
        self.assertNotProxied()
 
1240
        self.not_proxied_in_env({'http_proxy': self.proxy_url,
 
1241
                                 'no_proxy': self.no_proxy_host})
1312
1242
 
1313
1243
    def test_HTTP_PROXY_with_NO_PROXY(self):
1314
1244
        if self._testing_pycurl():
1315
1245
            raise tests.TestNotApplicable(
1316
1246
                'pycurl does not check HTTP_PROXY for security reasons')
1317
 
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
1318
 
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
1319
 
        self.assertNotProxied()
 
1247
        self.not_proxied_in_env({'HTTP_PROXY': self.proxy_url,
 
1248
                                 'NO_PROXY': self.no_proxy_host})
1320
1249
 
1321
1250
    def test_all_proxy_with_no_proxy(self):
1322
 
        self.overrideEnv('no_proxy', self.no_proxy_host)
1323
 
        self.overrideEnv('all_proxy', self.proxy_url)
1324
 
        self.assertNotProxied()
 
1251
        self.not_proxied_in_env({'all_proxy': self.proxy_url,
 
1252
                                 'no_proxy': self.no_proxy_host})
1325
1253
 
1326
1254
    def test_ALL_PROXY_with_NO_PROXY(self):
1327
 
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
1328
 
        self.overrideEnv('ALL_PROXY', self.proxy_url)
1329
 
        self.assertNotProxied()
 
1255
        self.not_proxied_in_env({'ALL_PROXY': self.proxy_url,
 
1256
                                 'NO_PROXY': self.no_proxy_host})
1330
1257
 
1331
1258
    def test_http_proxy_without_scheme(self):
1332
 
        self.overrideEnv('http_proxy', self.server_host_port)
1333
1259
        if self._testing_pycurl():
1334
1260
            # pycurl *ignores* invalid proxy env variables. If that ever change
1335
1261
            # in the future, this test will fail indicating that pycurl do not
1336
1262
            # ignore anymore such variables.
1337
 
            self.assertNotProxied()
 
1263
            self.not_proxied_in_env({'http_proxy': self.proxy_address})
1338
1264
        else:
1339
 
            self.assertRaises(errors.InvalidURL, self.assertProxied)
 
1265
            self.assertRaises(errors.InvalidURL,
 
1266
                              self.proxied_in_env,
 
1267
                              {'http_proxy': self.proxy_address})
1340
1268
 
1341
1269
 
1342
1270
class TestRanges(http_utils.TestCaseWithWebserver):
1343
1271
    """Test the Range header in GET methods."""
1344
1272
 
1345
 
    scenarios = multiply_scenarios(
1346
 
        vary_by_http_client_implementation(),
1347
 
        vary_by_http_protocol_version(),
1348
 
        )
1349
 
 
1350
1273
    def setUp(self):
1351
1274
        http_utils.TestCaseWithWebserver.setUp(self)
1352
1275
        self.build_tree_contents([('a', '0123456789')],)
 
1276
        server = self.get_readonly_server()
 
1277
        self.transport = self._transport(server.get_url())
1353
1278
 
1354
1279
    def create_transport_readonly_server(self):
1355
1280
        return http_server.HttpServer(protocol_version=self._protocol_version)
1356
1281
 
1357
1282
    def _file_contents(self, relpath, ranges):
1358
 
        t = self.get_readonly_transport()
1359
1283
        offsets = [ (start, end - start + 1) for start, end in ranges]
1360
 
        coalesce = t._coalesce_offsets
 
1284
        coalesce = self.transport._coalesce_offsets
1361
1285
        coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1362
 
        code, data = t._get(relpath, coalesced)
 
1286
        code, data = self.transport._get(relpath, coalesced)
1363
1287
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1364
1288
        for start, end in ranges:
1365
1289
            data.seek(start)
1366
1290
            yield data.read(end - start + 1)
1367
1291
 
1368
1292
    def _file_tail(self, relpath, tail_amount):
1369
 
        t = self.get_readonly_transport()
1370
 
        code, data = t._get(relpath, [], tail_amount)
 
1293
        code, data = self.transport._get(relpath, [], tail_amount)
1371
1294
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1372
1295
        data.seek(-tail_amount, 2)
1373
1296
        return data.read(tail_amount)
1392
1315
class TestHTTPRedirections(http_utils.TestCaseWithRedirectedWebserver):
1393
1316
    """Test redirection between http servers."""
1394
1317
 
1395
 
    scenarios = multiply_scenarios(
1396
 
        vary_by_http_client_implementation(),
1397
 
        vary_by_http_protocol_version(),
1398
 
        )
 
1318
    def create_transport_secondary_server(self):
 
1319
        """Create the secondary server redirecting to the primary server"""
 
1320
        new = self.get_readonly_server()
 
1321
 
 
1322
        redirecting = http_utils.HTTPServerRedirecting(
 
1323
            protocol_version=self._protocol_version)
 
1324
        redirecting.redirect_to(new.host, new.port)
 
1325
        return redirecting
1399
1326
 
1400
1327
    def setUp(self):
1401
1328
        super(TestHTTPRedirections, self).setUp()
1403
1330
                                  ('bundle',
1404
1331
                                  '# Bazaar revision bundle v0.9\n#\n')
1405
1332
                                  ],)
 
1333
        # The requests to the old server will be redirected to the new server
 
1334
        self.old_transport = self._transport(self.old_server.get_url())
1406
1335
 
1407
1336
    def test_redirected(self):
1408
 
        self.assertRaises(errors.RedirectRequested,
1409
 
                          self.get_old_transport().get, 'a')
1410
 
        self.assertEqual('0123456789', self.get_new_transport().get('a').read())
 
1337
        self.assertRaises(errors.RedirectRequested, self.old_transport.get, 'a')
 
1338
        t = self._transport(self.new_server.get_url())
 
1339
        self.assertEqual('0123456789', t.get('a').read())
 
1340
 
 
1341
    def test_read_redirected_bundle_from_url(self):
 
1342
        from bzrlib.bundle import read_bundle_from_url
 
1343
        url = self.old_transport.abspath('bundle')
 
1344
        bundle = self.applyDeprecated(deprecated_in((1, 12, 0)),
 
1345
                read_bundle_from_url, url)
 
1346
        # If read_bundle_from_url was successful we get an empty bundle
 
1347
        self.assertEqual([], bundle.revisions)
1411
1348
 
1412
1349
 
1413
1350
class RedirectedRequest(_urllib2_wrappers.Request):
1427
1364
 
1428
1365
 
1429
1366
def install_redirected_request(test):
1430
 
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
1431
 
 
1432
 
 
1433
 
def cleanup_http_redirection_connections(test):
1434
 
    # Some sockets are opened but never seen by _urllib, so we trap them at
1435
 
    # the _urllib2_wrappers level to be able to clean them up.
1436
 
    def socket_disconnect(sock):
1437
 
        try:
1438
 
            sock.shutdown(socket.SHUT_RDWR)
1439
 
            sock.close()
1440
 
        except socket.error:
1441
 
            pass
1442
 
    def connect(connection):
1443
 
        test.http_connect_orig(connection)
1444
 
        test.addCleanup(socket_disconnect, connection.sock)
1445
 
    test.http_connect_orig = test.overrideAttr(
1446
 
        _urllib2_wrappers.HTTPConnection, 'connect', connect)
1447
 
    def connect(connection):
1448
 
        test.https_connect_orig(connection)
1449
 
        test.addCleanup(socket_disconnect, connection.sock)
1450
 
    test.https_connect_orig = test.overrideAttr(
1451
 
        _urllib2_wrappers.HTTPSConnection, 'connect', connect)
 
1367
    test.original_class = _urllib2_wrappers.Request
 
1368
    def restore():
 
1369
        _urllib2_wrappers.Request = test.original_class
 
1370
    _urllib2_wrappers.Request = RedirectedRequest
 
1371
    test.addCleanup(restore)
1452
1372
 
1453
1373
 
1454
1374
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1465
1385
    -- vila 20070212
1466
1386
    """
1467
1387
 
1468
 
    scenarios = multiply_scenarios(
1469
 
        vary_by_http_client_implementation(),
1470
 
        vary_by_http_protocol_version(),
1471
 
        )
1472
 
 
1473
1388
    def setUp(self):
1474
1389
        if (features.pycurl.available()
1475
1390
            and self._transport == PyCurlTransport):
1476
1391
            raise tests.TestNotApplicable(
1477
 
                "pycurl doesn't redirect silently anymore")
 
1392
                "pycurl doesn't redirect silently annymore")
1478
1393
        super(TestHTTPSilentRedirections, self).setUp()
1479
1394
        install_redirected_request(self)
1480
 
        cleanup_http_redirection_connections(self)
1481
1395
        self.build_tree_contents([('a','a'),
1482
1396
                                  ('1/',),
1483
1397
                                  ('1/a', 'redirected once'),
1491
1405
                                  ('5/a', 'redirected 5 times'),
1492
1406
                                  ],)
1493
1407
 
 
1408
        self.old_transport = self._transport(self.old_server.get_url())
 
1409
 
 
1410
    def create_transport_secondary_server(self):
 
1411
        """Create the secondary server, redirections are defined in the tests"""
 
1412
        return http_utils.HTTPServerRedirecting(
 
1413
            protocol_version=self._protocol_version)
 
1414
 
1494
1415
    def test_one_redirection(self):
1495
 
        t = self.get_old_transport()
1496
 
        req = RedirectedRequest('GET', t._remote_path('a'))
 
1416
        t = self.old_transport
 
1417
 
 
1418
        req = RedirectedRequest('GET', t.abspath('a'))
1497
1419
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1498
1420
                                       self.new_server.port)
1499
1421
        self.old_server.redirections = \
1500
1422
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1501
 
        self.assertEqual('redirected once', t._perform(req).read())
 
1423
        self.assertEqual('redirected once',t._perform(req).read())
1502
1424
 
1503
1425
    def test_five_redirections(self):
1504
 
        t = self.get_old_transport()
1505
 
        req = RedirectedRequest('GET', t._remote_path('a'))
 
1426
        t = self.old_transport
 
1427
 
 
1428
        req = RedirectedRequest('GET', t.abspath('a'))
1506
1429
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1507
1430
                                       self.old_server.port)
1508
1431
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1514
1437
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1515
1438
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1516
1439
            ]
1517
 
        self.assertEqual('redirected 5 times', t._perform(req).read())
 
1440
        self.assertEqual('redirected 5 times',t._perform(req).read())
1518
1441
 
1519
1442
 
1520
1443
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1521
1444
    """Test transport.do_catching_redirections."""
1522
1445
 
1523
 
    scenarios = multiply_scenarios(
1524
 
        vary_by_http_client_implementation(),
1525
 
        vary_by_http_protocol_version(),
1526
 
        )
1527
 
 
1528
1446
    def setUp(self):
1529
1447
        super(TestDoCatchRedirections, self).setUp()
1530
1448
        self.build_tree_contents([('a', '0123456789'),],)
1531
 
        cleanup_http_redirection_connections(self)
1532
 
 
1533
 
        self.old_transport = self.get_old_transport()
1534
 
 
1535
 
    def get_a(self, t):
1536
 
        return t.get('a')
 
1449
 
 
1450
        self.old_transport = self._transport(self.old_server.get_url())
 
1451
 
 
1452
    def get_a(self, transport):
 
1453
        return transport.get('a')
1537
1454
 
1538
1455
    def test_no_redirection(self):
1539
 
        t = self.get_new_transport()
 
1456
        t = self._transport(self.new_server.get_url())
1540
1457
 
1541
1458
        # We use None for redirected so that we fail if redirected
1542
1459
        self.assertEqual('0123456789',
1546
1463
    def test_one_redirection(self):
1547
1464
        self.redirections = 0
1548
1465
 
1549
 
        def redirected(t, exception, redirection_notice):
 
1466
        def redirected(transport, exception, redirection_notice):
1550
1467
            self.redirections += 1
1551
 
            redirected_t = t._redirected_to(exception.source, exception.target)
1552
 
            return redirected_t
 
1468
            dir, file = urlutils.split(exception.target)
 
1469
            return self._transport(dir)
1553
1470
 
1554
1471
        self.assertEqual('0123456789',
1555
1472
                         transport.do_catching_redirections(
1569
1486
                          self.get_a, self.old_transport, redirected)
1570
1487
 
1571
1488
 
1572
 
def _setup_authentication_config(**kwargs):
1573
 
    conf = config.AuthenticationConfig()
1574
 
    conf._get_config().update({'httptest': kwargs})
1575
 
    conf._save()
1576
 
 
1577
 
 
1578
 
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
1579
 
    """Unit tests for glue by which urllib2 asks us for authentication"""
1580
 
 
1581
 
    def test_get_user_password_without_port(self):
1582
 
        """We cope if urllib2 doesn't tell us the port.
1583
 
 
1584
 
        See https://bugs.launchpad.net/bzr/+bug/654684
1585
 
        """
1586
 
        user = 'joe'
1587
 
        password = 'foo'
1588
 
        _setup_authentication_config(scheme='http', host='localhost',
1589
 
                                     user=user, password=password)
1590
 
        handler = _urllib2_wrappers.HTTPAuthHandler()
1591
 
        got_pass = handler.get_user_password(dict(
1592
 
            user='joe',
1593
 
            protocol='http',
1594
 
            host='localhost',
1595
 
            path='/',
1596
 
            realm='Realm',
1597
 
            ))
1598
 
        self.assertEquals((user, password), got_pass)
1599
 
 
1600
 
 
1601
1489
class TestAuth(http_utils.TestCaseWithWebserver):
1602
1490
    """Test authentication scheme"""
1603
1491
 
1604
 
    scenarios = multiply_scenarios(
1605
 
        vary_by_http_client_implementation(),
1606
 
        vary_by_http_protocol_version(),
1607
 
        vary_by_http_auth_scheme(),
1608
 
        )
 
1492
    _auth_header = 'Authorization'
 
1493
    _password_prompt_prefix = ''
 
1494
    _username_prompt_prefix = ''
 
1495
    # Set by load_tests
 
1496
    _auth_server = None
1609
1497
 
1610
1498
    def setUp(self):
1611
1499
        super(TestAuth, self).setUp()
1614
1502
                                  ('b', 'contents of b\n'),])
1615
1503
 
1616
1504
    def create_transport_readonly_server(self):
1617
 
        server = self._auth_server(protocol_version=self._protocol_version)
1618
 
        server._url_protocol = self._url_protocol
1619
 
        return server
 
1505
        return self._auth_server(protocol_version=self._protocol_version)
1620
1506
 
1621
1507
    def _testing_pycurl(self):
1622
1508
        # TODO: This is duplicated for lots of the classes in this file
1635
1521
        return url
1636
1522
 
1637
1523
    def get_user_transport(self, user, password):
1638
 
        t = transport.get_transport(self.get_user_url(user, password))
1639
 
        return t
 
1524
        return self._transport(self.get_user_url(user, password))
1640
1525
 
1641
1526
    def test_no_user(self):
1642
1527
        self.server.add_user('joe', 'foo')
1753
1638
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1754
1639
                                            stderr=tests.StringIOWrapper())
1755
1640
        # Create a minimal config file with the right password
1756
 
        _setup_authentication_config(scheme='http', port=self.server.port,
1757
 
                                     user=user, password=password)
 
1641
        conf = config.AuthenticationConfig()
 
1642
        conf._get_config().update(
 
1643
            {'httptest': {'scheme': 'http', 'port': self.server.port,
 
1644
                          'user': user, 'password': password}})
 
1645
        conf._save()
1758
1646
        # Issue a request to the server to connect
1759
1647
        self.assertEqual('contents of a\n',t.get('a').read())
1760
1648
        # stdin should have  been left untouched
1762
1650
        # Only one 'Authentication Required' error should occur
1763
1651
        self.assertEqual(1, self.server.auth_required_errors)
1764
1652
 
 
1653
    def test_user_from_auth_conf(self):
 
1654
        if self._testing_pycurl():
 
1655
            raise tests.TestNotApplicable(
 
1656
                'pycurl does not support authentication.conf')
 
1657
        user = 'joe'
 
1658
        password = 'foo'
 
1659
        self.server.add_user(user, password)
 
1660
        # Create a minimal config file with the right password
 
1661
        conf = config.AuthenticationConfig()
 
1662
        conf._get_config().update(
 
1663
            {'httptest': {'scheme': 'http', 'port': self.server.port,
 
1664
                          'user': user, 'password': password}})
 
1665
        conf._save()
 
1666
        t = self.get_user_transport(None, None)
 
1667
        # Issue a request to the server to connect
 
1668
        self.assertEqual('contents of a\n', t.get('a').read())
 
1669
        # Only one 'Authentication Required' error should occur
 
1670
        self.assertEqual(1, self.server.auth_required_errors)
 
1671
 
1765
1672
    def test_changing_nonce(self):
1766
1673
        if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1767
1674
                                     http_utils.ProxyDigestAuthServer):
1768
1675
            raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
1769
1676
        if self._testing_pycurl():
1770
 
            self.knownFailure(
 
1677
            raise tests.KnownFailure(
1771
1678
                'pycurl does not handle a nonce change')
1772
1679
        self.server.add_user('joe', 'foo')
1773
1680
        t = self.get_user_transport('joe', 'foo')
1783
1690
        # initial 'who are you' and a second 'who are you' with the new nonce)
1784
1691
        self.assertEqual(2, self.server.auth_required_errors)
1785
1692
 
1786
 
    def test_user_from_auth_conf(self):
1787
 
        if self._testing_pycurl():
1788
 
            raise tests.TestNotApplicable(
1789
 
                'pycurl does not support authentication.conf')
1790
 
        user = 'joe'
1791
 
        password = 'foo'
1792
 
        self.server.add_user(user, password)
1793
 
        _setup_authentication_config(scheme='http', port=self.server.port,
1794
 
                                     user=user, password=password)
1795
 
        t = self.get_user_transport(None, None)
1796
 
        # Issue a request to the server to connect
1797
 
        self.assertEqual('contents of a\n', t.get('a').read())
1798
 
        # Only one 'Authentication Required' error should occur
1799
 
        self.assertEqual(1, self.server.auth_required_errors)
1800
 
 
1801
 
    def test_no_credential_leaks_in_log(self):
1802
 
        self.overrideAttr(debug, 'debug_flags', set(['http']))
1803
 
        user = 'joe'
1804
 
        password = 'very-sensitive-password'
1805
 
        self.server.add_user(user, password)
1806
 
        t = self.get_user_transport(user, password)
1807
 
        # Capture the debug calls to mutter
1808
 
        self.mutters = []
1809
 
        def mutter(*args):
1810
 
            lines = args[0] % args[1:]
1811
 
            # Some calls output multiple lines, just split them now since we
1812
 
            # care about a single one later.
1813
 
            self.mutters.extend(lines.splitlines())
1814
 
        self.overrideAttr(trace, 'mutter', mutter)
1815
 
        # Issue a request to the server to connect
1816
 
        self.assertEqual(True, t.has('a'))
1817
 
        # Only one 'Authentication Required' error should occur
1818
 
        self.assertEqual(1, self.server.auth_required_errors)
1819
 
        # Since the authentification succeeded, there should be a corresponding
1820
 
        # debug line
1821
 
        sent_auth_headers = [line for line in self.mutters
1822
 
                             if line.startswith('> %s' % (self._auth_header,))]
1823
 
        self.assertLength(1, sent_auth_headers)
1824
 
        self.assertStartsWith(sent_auth_headers[0],
1825
 
                              '> %s: <masked>' % (self._auth_header,))
1826
1693
 
1827
1694
 
1828
1695
class TestProxyAuth(TestAuth):
1829
 
    """Test proxy authentication schemes.
1830
 
 
1831
 
    This inherits from TestAuth to tweak the setUp and filter some failing
1832
 
    tests.
1833
 
    """
1834
 
 
1835
 
    scenarios = multiply_scenarios(
1836
 
        vary_by_http_client_implementation(),
1837
 
        vary_by_http_protocol_version(),
1838
 
        vary_by_http_proxy_auth_scheme(),
1839
 
        )
 
1696
    """Test proxy authentication schemes."""
 
1697
 
 
1698
    _auth_header = 'Proxy-authorization'
 
1699
    _password_prompt_prefix = 'Proxy '
 
1700
    _username_prompt_prefix = 'Proxy '
1840
1701
 
1841
1702
    def setUp(self):
1842
1703
        super(TestProxyAuth, self).setUp()
 
1704
        self._old_env = {}
 
1705
        self.addCleanup(self._restore_env)
1843
1706
        # Override the contents to avoid false positives
1844
1707
        self.build_tree_contents([('a', 'not proxied contents of a\n'),
1845
1708
                                  ('b', 'not proxied contents of b\n'),
1848
1711
                                  ])
1849
1712
 
1850
1713
    def get_user_transport(self, user, password):
1851
 
        self.overrideEnv('all_proxy', self.get_user_url(user, password))
1852
 
        return TestAuth.get_user_transport(self, user, password)
 
1714
        self._install_env({'all_proxy': self.get_user_url(user, password)})
 
1715
        return self._transport(self.server.get_url())
 
1716
 
 
1717
    def _install_env(self, env):
 
1718
        for name, value in env.iteritems():
 
1719
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1720
 
 
1721
    def _restore_env(self):
 
1722
        for name, value in self._old_env.iteritems():
 
1723
            osutils.set_or_unset_env(name, value)
1853
1724
 
1854
1725
    def test_empty_pass(self):
1855
1726
        if self._testing_pycurl():
1856
1727
            import pycurl
1857
1728
            if pycurl.version_info()[1] < '7.16.0':
1858
 
                self.knownFailure(
 
1729
                raise tests.KnownFailure(
1859
1730
                    'pycurl < 7.16.0 does not handle empty proxy passwords')
1860
1731
        super(TestProxyAuth, self).test_empty_pass()
1861
1732
 
1874
1745
        self.readfile = StringIO(socket_read_content)
1875
1746
        self.writefile = StringIO()
1876
1747
        self.writefile.close = lambda: None
1877
 
        self.close = lambda: None
1878
1748
 
1879
1749
    def makefile(self, mode='r', bufsize=None):
1880
1750
        if 'r' in mode:
1885
1755
 
1886
1756
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1887
1757
 
1888
 
    scenarios = multiply_scenarios(
1889
 
        vary_by_http_client_implementation(),
1890
 
        vary_by_http_protocol_version(),
1891
 
        )
1892
 
 
1893
1758
    def setUp(self):
1894
1759
        super(SmartHTTPTunnellingTest, self).setUp()
1895
1760
        # We use the VFS layer as part of HTTP tunnelling tests.
1896
 
        self.overrideEnv('BZR_NO_SMART_VFS', None)
 
1761
        self._captureVar('BZR_NO_SMART_VFS', None)
1897
1762
        self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1898
 
        self.http_server = self.get_readonly_server()
1899
1763
 
1900
1764
    def create_transport_readonly_server(self):
1901
 
        server = http_utils.HTTPServerWithSmarts(
 
1765
        return http_utils.HTTPServerWithSmarts(
1902
1766
            protocol_version=self._protocol_version)
1903
 
        server._url_protocol = self._url_protocol
1904
 
        return server
1905
1767
 
1906
1768
    def test_open_bzrdir(self):
1907
1769
        branch = self.make_branch('relpath')
1908
 
        url = self.http_server.get_url() + 'relpath'
 
1770
        http_server = self.get_readonly_server()
 
1771
        url = http_server.get_url() + 'relpath'
1909
1772
        bd = bzrdir.BzrDir.open(url)
1910
 
        self.addCleanup(bd.transport.disconnect)
1911
1773
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1912
1774
 
1913
1775
    def test_bulk_data(self):
1915
1777
        # The 'readv' command in the smart protocol both sends and receives
1916
1778
        # bulk data, so we use that.
1917
1779
        self.build_tree(['data-file'])
1918
 
        http_transport = transport.get_transport(self.http_server.get_url())
 
1780
        http_server = self.get_readonly_server()
 
1781
        http_transport = self._transport(http_server.get_url())
1919
1782
        medium = http_transport.get_smart_medium()
1920
1783
        # Since we provide the medium, the url below will be mostly ignored
1921
1784
        # during the test, as long as the path is '/'.
1929
1792
        post_body = 'hello\n'
1930
1793
        expected_reply_body = 'ok\x012\n'
1931
1794
 
1932
 
        http_transport = transport.get_transport(self.http_server.get_url())
 
1795
        http_server = self.get_readonly_server()
 
1796
        http_transport = self._transport(http_server.get_url())
1933
1797
        medium = http_transport.get_smart_medium()
1934
1798
        response = medium.send_http_smart_request(post_body)
1935
1799
        reply_body = response.read()
1936
1800
        self.assertEqual(expected_reply_body, reply_body)
1937
1801
 
1938
1802
    def test_smart_http_server_post_request_handler(self):
1939
 
        httpd = self.http_server.server
 
1803
        httpd = self.get_readonly_server()._get_httpd()
1940
1804
 
1941
1805
        socket = SampleSocket(
1942
1806
            'POST /.bzr/smart %s \r\n' % self._protocol_version
1974
1838
 
1975
1839
    def test_probe_smart_server(self):
1976
1840
        """Test error handling against server refusing smart requests."""
1977
 
        t = self.get_readonly_transport()
 
1841
        server = self.get_readonly_server()
 
1842
        t = self._transport(server.get_url())
1978
1843
        # No need to build a valid smart request here, the server will not even
1979
1844
        # try to interpret it.
1980
1845
        self.assertRaises(errors.SmartProtocolError,
1981
1846
                          t.get_smart_medium().send_http_smart_request,
1982
1847
                          'whatever')
1983
1848
 
1984
 
 
1985
1849
class Test_redirected_to(tests.TestCase):
1986
1850
 
1987
 
    scenarios = vary_by_http_client_implementation()
1988
 
 
1989
1851
    def test_redirected_to_subdir(self):
1990
1852
        t = self._transport('http://www.example.com/foo')
1991
1853
        r = t._redirected_to('http://www.example.com/foo',
2027
1889
        r = t._redirected_to('http://www.example.com/foo',
2028
1890
                             'https://foo.example.com/foo')
2029
1891
        self.assertIsInstance(r, type(t))
2030
 
        self.assertEqual(t._parsed_url.user, r._parsed_url.user)
 
1892
        self.assertEqual(t._user, r._user)
2031
1893
 
2032
1894
 
2033
1895
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
2042
1904
    line.
2043
1905
    """
2044
1906
 
2045
 
    def _handle_one_request(self):
 
1907
    def handle_one_request(self):
2046
1908
        tcs = self.server.test_case_server
2047
1909
        requestline = self.rfile.readline()
2048
1910
        headers = self.MessageClass(self.rfile, 0)
2086
1948
    pass
2087
1949
 
2088
1950
 
2089
 
if features.HTTPSServerFeature.available():
 
1951
if tests.HTTPSServerFeature.available():
2090
1952
    from bzrlib.tests import https_server
2091
1953
    class ActivityHTTPSServer(ActivityServerMixin, https_server.HTTPSServer):
2092
1954
        pass
2103
1965
        tests.TestCase.setUp(self)
2104
1966
        self.server = self._activity_server(self._protocol_version)
2105
1967
        self.server.start_server()
2106
 
        _activities = {} # Don't close over self and create a cycle
 
1968
        self.activities = {}
2107
1969
        def report_activity(t, bytes, direction):
2108
 
            count = _activities.get(direction, 0)
 
1970
            count = self.activities.get(direction, 0)
2109
1971
            count += bytes
2110
 
            _activities[direction] = count
2111
 
        self.activities = _activities
 
1972
            self.activities[direction] = count
2112
1973
 
2113
1974
        # We override at class level because constructors may propagate the
2114
1975
        # bound method and render instance overriding ineffective (an
2115
1976
        # alternative would be to define a specific ui factory instead...)
2116
 
        self.overrideAttr(self._transport, '_report_activity', report_activity)
2117
 
        self.addCleanup(self.server.stop_server)
 
1977
        self.orig_report_activity = self._transport._report_activity
 
1978
        self._transport._report_activity = report_activity
 
1979
 
 
1980
    def tearDown(self):
 
1981
        self._transport._report_activity = self.orig_report_activity
 
1982
        self.server.stop_server()
 
1983
        tests.TestCase.tearDown(self)
2118
1984
 
2119
1985
    def get_transport(self):
2120
 
        t = self._transport(self.server.get_url())
2121
 
        # FIXME: Needs cleanup -- vila 20100611
2122
 
        return t
 
1986
        return self._transport(self.server.get_url())
2123
1987
 
2124
1988
    def assertActivitiesMatch(self):
2125
1989
        self.assertEqual(self.server.bytes_read,
2230
2094
'''
2231
2095
        t = self.get_transport()
2232
2096
        # We must send a single line of body bytes, see
2233
 
        # PredefinedRequestHandler._handle_one_request
 
2097
        # PredefinedRequestHandler.handle_one_request
2234
2098
        code, f = t._post('abc def end-of-body\n')
2235
2099
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2236
2100
        self.assertActivitiesMatch()
2238
2102
 
2239
2103
class TestActivity(tests.TestCase, TestActivityMixin):
2240
2104
 
2241
 
    scenarios = multiply_scenarios(
2242
 
        vary_by_http_activity(),
2243
 
        vary_by_http_protocol_version(),
2244
 
        )
2245
 
 
2246
2105
    def setUp(self):
2247
 
        TestActivityMixin.setUp(self)
 
2106
        tests.TestCase.setUp(self)
 
2107
        self.server = self._activity_server(self._protocol_version)
 
2108
        self.server.start_server()
 
2109
        self.activities = {}
 
2110
        def report_activity(t, bytes, direction):
 
2111
            count = self.activities.get(direction, 0)
 
2112
            count += bytes
 
2113
            self.activities[direction] = count
 
2114
 
 
2115
        # We override at class level because constructors may propagate the
 
2116
        # bound method and render instance overriding ineffective (an
 
2117
        # alternative would be to define a specific ui factory instead...)
 
2118
        self.orig_report_activity = self._transport._report_activity
 
2119
        self._transport._report_activity = report_activity
 
2120
 
 
2121
    def tearDown(self):
 
2122
        self._transport._report_activity = self.orig_report_activity
 
2123
        self.server.stop_server()
 
2124
        tests.TestCase.tearDown(self)
2248
2125
 
2249
2126
 
2250
2127
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2251
2128
 
2252
 
    # Unlike TestActivity, we are really testing ReportingFileSocket and
2253
 
    # ReportingSocket, so we don't need all the parametrization. Since
2254
 
    # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2255
 
    # test them through their use by the transport than directly (that's a
2256
 
    # bit less clean but far more simpler and effective).
2257
 
    _activity_server = ActivityHTTPServer
2258
 
    _protocol_version = 'HTTP/1.1'
2259
 
 
2260
2129
    def setUp(self):
2261
 
        self._transport =_urllib.HttpTransport_urllib
2262
 
        TestActivityMixin.setUp(self)
 
2130
        tests.TestCase.setUp(self)
 
2131
        # Unlike TestActivity, we are really testing ReportingFileSocket and
 
2132
        # ReportingSocket, so we don't need all the parametrization. Since
 
2133
        # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
 
2134
        # test them through their use by the transport than directly (that's a
 
2135
        # bit less clean but far more simpler and effective).
 
2136
        self.server = ActivityHTTPServer('HTTP/1.1')
 
2137
        self._transport=_urllib.HttpTransport_urllib
 
2138
 
 
2139
        self.server.start_server()
 
2140
 
 
2141
        # We override at class level because constructors may propagate the
 
2142
        # bound method and render instance overriding ineffective (an
 
2143
        # alternative would be to define a specific ui factory instead...)
 
2144
        self.orig_report_activity = self._transport._report_activity
 
2145
        self._transport._report_activity = None
 
2146
 
 
2147
    def tearDown(self):
 
2148
        self._transport._report_activity = self.orig_report_activity
 
2149
        self.server.stop_server()
 
2150
        tests.TestCase.tearDown(self)
2263
2151
 
2264
2152
    def assertActivitiesMatch(self):
2265
2153
        # Nothing to check here
2269
2157
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
2270
2158
    """Test authentication on the redirected http server."""
2271
2159
 
2272
 
    scenarios = vary_by_http_protocol_version()
2273
 
 
2274
2160
    _auth_header = 'Authorization'
2275
2161
    _password_prompt_prefix = ''
2276
2162
    _username_prompt_prefix = ''
2277
2163
    _auth_server = http_utils.HTTPBasicAuthServer
2278
2164
    _transport = _urllib.HttpTransport_urllib
2279
2165
 
 
2166
    def create_transport_readonly_server(self):
 
2167
        return self._auth_server()
 
2168
 
 
2169
    def create_transport_secondary_server(self):
 
2170
        """Create the secondary server redirecting to the primary server"""
 
2171
        new = self.get_readonly_server()
 
2172
 
 
2173
        redirecting = http_utils.HTTPServerRedirecting()
 
2174
        redirecting.redirect_to(new.host, new.port)
 
2175
        return redirecting
 
2176
 
2280
2177
    def setUp(self):
2281
2178
        super(TestAuthOnRedirected, self).setUp()
2282
2179
        self.build_tree_contents([('a','a'),
2287
2184
                                       self.new_server.port)
2288
2185
        self.old_server.redirections = [
2289
2186
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2290
 
        self.old_transport = self.get_old_transport()
 
2187
        self.old_transport = self._transport(self.old_server.get_url())
2291
2188
        self.new_server.add_user('joe', 'foo')
2292
 
        cleanup_http_redirection_connections(self)
2293
 
 
2294
 
    def create_transport_readonly_server(self):
2295
 
        server = self._auth_server(protocol_version=self._protocol_version)
2296
 
        server._url_protocol = self._url_protocol
2297
 
        return server
2298
 
 
2299
 
    def get_a(self, t):
2300
 
        return t.get('a')
 
2189
 
 
2190
    def get_a(self, transport):
 
2191
        return transport.get('a')
2301
2192
 
2302
2193
    def test_auth_on_redirected_via_do_catching_redirections(self):
2303
2194
        self.redirections = 0
2304
2195
 
2305
 
        def redirected(t, exception, redirection_notice):
 
2196
        def redirected(transport, exception, redirection_notice):
2306
2197
            self.redirections += 1
2307
 
            redirected_t = t._redirected_to(exception.source, exception.target)
2308
 
            self.addCleanup(redirected_t.disconnect)
2309
 
            return redirected_t
 
2198
            dir, file = urlutils.split(exception.target)
 
2199
            return self._transport(dir)
2310
2200
 
2311
2201
        stdout = tests.StringIOWrapper()
2312
2202
        stderr = tests.StringIOWrapper()
2333
2223
                                       self.new_server.port)
2334
2224
        self.old_server.redirections = [
2335
2225
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2336
 
        self.assertEqual('redirected once', t._perform(req).read())
 
2226
        self.assertEqual('redirected once',t._perform(req).read())
2337
2227
        # stdin should be empty
2338
2228
        self.assertEqual('', ui.ui_factory.stdin.readline())
2339
2229
        # stdout should be empty, stderr will contains the prompts
2340
2230
        self.assertEqual('', stdout.getvalue())
2341
2231
 
 
2232