~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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
27
26
import httplib
28
 
import os
29
 
import select
30
27
import SimpleHTTPServer
31
28
import socket
32
29
import sys
35
32
import bzrlib
36
33
from bzrlib import (
37
34
    bzrdir,
 
35
    cethread,
38
36
    config,
 
37
    debug,
39
38
    errors,
40
39
    osutils,
41
40
    remote as _mod_remote,
42
41
    tests,
 
42
    trace,
43
43
    transport,
44
44
    ui,
45
 
    urlutils,
46
 
    )
47
 
from bzrlib.symbol_versioning import (
48
 
    deprecated_in,
49
45
    )
50
46
from bzrlib.tests import (
51
47
    features,
52
48
    http_server,
53
49
    http_utils,
 
50
    test_server,
 
51
    )
 
52
from bzrlib.tests.scenarios import (
 
53
    load_tests_apply_scenarios,
 
54
    multiply_scenarios,
54
55
    )
55
56
from bzrlib.transport import (
56
57
    http,
66
67
    from bzrlib.transport.http._pycurl import PyCurlTransport
67
68
 
68
69
 
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
 
                )))
 
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."""
80
75
    transport_scenarios = [
81
76
        ('urllib', dict(_transport=_urllib.HttpTransport_urllib,
82
77
                        _server=http_server.HttpServer_urllib,
83
 
                        _qualified_prefix='http+urllib',)),
 
78
                        _url_protocol='http+urllib',)),
84
79
        ]
85
80
    if features.pycurl.available():
86
81
        transport_scenarios.append(
87
82
            ('pycurl', dict(_transport=PyCurlTransport,
88
83
                            _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)),
 
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')),
124
93
        ]
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 = [
 
94
 
 
95
 
 
96
def vary_by_http_auth_scheme():
 
97
    scenarios = [
135
98
        ('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
136
99
        ('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
137
100
        ('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
 
                )))
 
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():
149
127
    activity_scenarios = [
150
128
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
151
 
                             _transport=_urllib.HttpTransport_urllib,)),
 
129
                            _transport=_urllib.HttpTransport_urllib,)),
152
130
        ]
153
 
    if tests.HTTPSServerFeature.available():
 
131
    if features.HTTPSServerFeature.available():
154
132
        activity_scenarios.append(
155
133
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
156
 
                                  _transport=_urllib.HttpTransport_urllib,)),)
 
134
                                _transport=_urllib.HttpTransport_urllib,)),)
157
135
    if features.pycurl.available():
158
136
        activity_scenarios.append(
159
137
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
160
 
                                 _transport=PyCurlTransport,)),)
161
 
        if tests.HTTPSServerFeature.available():
 
138
                                _transport=PyCurlTransport,)),)
 
139
        if features.HTTPSServerFeature.available():
162
140
            from bzrlib.tests import (
163
141
                ssl_certs,
164
142
                )
175
153
 
176
154
            activity_scenarios.append(
177
155
                ('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
 
156
                                    _transport=HTTPS_pycurl_transport,)),)
 
157
    return activity_scenarios
188
158
 
189
159
 
190
160
class FakeManager(object):
223
193
        self._sock.bind(('127.0.0.1', 0))
224
194
        self.host, self.port = self._sock.getsockname()
225
195
        self._ready = threading.Event()
226
 
        self._thread = threading.Thread(target=self._accept_read_and_reply)
227
 
        self._thread.setDaemon(True)
 
196
        self._thread = test_server.TestThread(
 
197
            sync_event=self._ready, target=self._accept_read_and_reply)
228
198
        self._thread.start()
229
 
        self._ready.wait(5)
 
199
        if 'threads' in tests.selftest_debug_flags:
 
200
            sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
 
201
        self._ready.wait()
230
202
 
231
203
    def _accept_read_and_reply(self):
232
204
        self._sock.listen(1)
233
205
        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)
 
206
        conn, address = self._sock.accept()
 
207
        if self._expect_body_tail is not None:
240
208
            while not self.received_bytes.endswith(self._expect_body_tail):
241
209
                self.received_bytes += conn.recv(4096)
242
210
            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.
 
211
        try:
245
212
            self._sock.close()
246
213
        except socket.error:
247
214
            # The client may have already closed the socket.
249
216
 
250
217
    def stop_server(self):
251
218
        try:
252
 
            self._sock.close()
 
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()
253
223
        except socket.error:
254
224
            # We might have already closed it.  We don't care.
255
225
            pass
256
226
        self.host = None
257
227
        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,))
258
231
 
259
232
 
260
233
class TestAuthHeader(tests.TestCase):
296
269
        self.assertEqual('realm="Thou should not pass"', remainder)
297
270
 
298
271
 
 
272
class TestHTTPRangeParsing(tests.TestCase):
 
273
 
 
274
    def setUp(self):
 
275
        super(TestHTTPRangeParsing, self).setUp()
 
276
        # We focus on range  parsing here and ignore everything else
 
277
        class RequestHandler(http_server.TestingHTTPRequestHandler):
 
278
            def setup(self): pass
 
279
            def handle(self): pass
 
280
            def finish(self): pass
 
281
 
 
282
        self.req_handler = RequestHandler(None, None, None)
 
283
 
 
284
    def assertRanges(self, ranges, header, file_size):
 
285
        self.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
 
299
306
class TestHTTPServer(tests.TestCase):
300
307
    """Test the HTTP servers implementations."""
301
308
 
304
311
 
305
312
            protocol_version = 'HTTP/0.1'
306
313
 
307
 
        server = http_server.HttpServer(BogusRequestHandler)
308
 
        try:
309
 
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
310
 
        except:
311
 
            server.stop_server()
312
 
            self.fail('HTTP Server creation did not raise UnknownProtocol')
 
314
        self.assertRaises(httplib.UnknownProtocol,
 
315
                          http_server.HttpServer, BogusRequestHandler)
313
316
 
314
317
    def test_force_invalid_protocol(self):
315
 
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
316
 
        try:
317
 
            self.assertRaises(httplib.UnknownProtocol, server.start_server)
318
 
        except:
319
 
            server.stop_server()
320
 
            self.fail('HTTP Server creation did not raise UnknownProtocol')
 
318
        self.assertRaises(httplib.UnknownProtocol,
 
319
                          http_server.HttpServer, protocol_version='HTTP/0.1')
321
320
 
322
321
    def test_server_start_and_stop(self):
323
322
        server = http_server.HttpServer()
 
323
        self.addCleanup(server.stop_server)
324
324
        server.start_server()
325
 
        try:
326
 
            self.assertTrue(server._http_running)
327
 
        finally:
328
 
            server.stop_server()
329
 
        self.assertFalse(server._http_running)
 
325
        self.assertTrue(server.server is not None)
 
326
        self.assertTrue(server.server.serving is not None)
 
327
        self.assertTrue(server.server.serving)
330
328
 
331
329
    def test_create_http_server_one_zero(self):
332
330
        class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
335
333
 
336
334
        server = http_server.HttpServer(RequestHandlerOneZero)
337
335
        self.start_server(server)
338
 
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
 
336
        self.assertIsInstance(server.server, http_server.TestingHTTPServer)
339
337
 
340
338
    def test_create_http_server_one_one(self):
341
339
        class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
344
342
 
345
343
        server = http_server.HttpServer(RequestHandlerOneOne)
346
344
        self.start_server(server)
347
 
        self.assertIsInstance(server._httpd,
 
345
        self.assertIsInstance(server.server,
348
346
                              http_server.TestingThreadingHTTPServer)
349
347
 
350
348
    def test_create_http_server_force_one_one(self):
355
353
        server = http_server.HttpServer(RequestHandlerOneZero,
356
354
                                        protocol_version='HTTP/1.1')
357
355
        self.start_server(server)
358
 
        self.assertIsInstance(server._httpd,
 
356
        self.assertIsInstance(server.server,
359
357
                              http_server.TestingThreadingHTTPServer)
360
358
 
361
359
    def test_create_http_server_force_one_zero(self):
366
364
        server = http_server.HttpServer(RequestHandlerOneOne,
367
365
                                        protocol_version='HTTP/1.0')
368
366
        self.start_server(server)
369
 
        self.assertIsInstance(server._httpd,
 
367
        self.assertIsInstance(server.server,
370
368
                              http_server.TestingHTTPServer)
371
369
 
372
370
 
401
399
class TestHttpTransportUrls(tests.TestCase):
402
400
    """Test the http urls."""
403
401
 
 
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://bazaar-vcs.org/bzr/bzr.dev/')
 
406
        t = self._transport('http://example.com/bzr/bzr.dev/')
407
407
        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')
 
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')
411
411
        eq(t.abspath('.bzr/1//2/./3'),
412
 
           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
 
412
           'http://example.com/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
 
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
 
416
        self._transport('http://example.com/bzr/bzr.dev/')
417
417
        self.assertRaises(errors.InvalidURL,
418
418
                          self._transport,
419
 
                          'http://http://bazaar-vcs.org/bzr/bzr.dev/')
 
419
                          'http://http://example.com/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://bzr.ozlabs.org/')
 
423
        t = self._transport('http://example.com/')
424
424
        eq = self.assertEqualDiff
425
425
        eq(t.abspath('.bzr/tree-version'),
426
 
           'http://bzr.ozlabs.org/.bzr/tree-version')
 
426
           'http://example.com/.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._qualified_prefix))
 
434
            self.assertTrue(url.startswith('%s://' % self._url_protocol))
435
435
        finally:
436
436
            server.stop_server()
437
437
 
475
475
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
476
476
    """Test the http connections."""
477
477
 
 
478
    scenarios = multiply_scenarios(
 
479
        vary_by_http_client_implementation(),
 
480
        vary_by_http_protocol_version(),
 
481
        )
 
482
 
478
483
    def setUp(self):
479
484
        http_utils.TestCaseWithWebserver.setUp(self)
480
485
        self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
482
487
 
483
488
    def test_http_has(self):
484
489
        server = self.get_readonly_server()
485
 
        t = self._transport(server.get_url())
 
490
        t = self.get_readonly_transport()
486
491
        self.assertEqual(t.has('foo/bar'), True)
487
492
        self.assertEqual(len(server.logs), 1)
488
493
        self.assertContainsRe(server.logs[0],
490
495
 
491
496
    def test_http_has_not_found(self):
492
497
        server = self.get_readonly_server()
493
 
        t = self._transport(server.get_url())
 
498
        t = self.get_readonly_transport()
494
499
        self.assertEqual(t.has('not-found'), False)
495
500
        self.assertContainsRe(server.logs[1],
496
501
            r'"HEAD /not-found HTTP/1.." 404 - "-" "bzr/')
497
502
 
498
503
    def test_http_get(self):
499
504
        server = self.get_readonly_server()
500
 
        t = self._transport(server.get_url())
 
505
        t = self.get_readonly_transport()
501
506
        fp = t.get('foo/bar')
502
507
        self.assertEqualDiff(
503
508
            fp.read(),
525
530
class TestHttpTransportRegistration(tests.TestCase):
526
531
    """Test registrations of various http implementations"""
527
532
 
 
533
    scenarios = vary_by_http_client_implementation()
 
534
 
528
535
    def test_http_registered(self):
529
 
        t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
 
536
        t = transport.get_transport('%s://foo.com/' % self._url_protocol)
530
537
        self.assertIsInstance(t, transport.Transport)
531
538
        self.assertIsInstance(t, self._transport)
532
539
 
533
540
 
534
541
class TestPost(tests.TestCase):
535
542
 
 
543
    scenarios = multiply_scenarios(
 
544
        vary_by_http_client_implementation(),
 
545
        vary_by_http_protocol_version(),
 
546
        )
 
547
 
536
548
    def test_post_body_is_received(self):
537
549
        server = RecordingServer(expect_body_tail='end-of-body',
538
 
            scheme=self._qualified_prefix)
 
550
                                 scheme=self._url_protocol)
539
551
        self.start_server(server)
540
552
        url = server.get_url()
541
 
        http_transport = self._transport(url)
 
553
        # FIXME: needs a cleanup -- vila 20100611
 
554
        http_transport = transport.get_transport(url)
542
555
        code, response = http_transport._post('abc def end-of-body')
543
556
        self.assertTrue(
544
557
            server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
545
558
        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())
546
561
        # The transport should not be assuming that the server can accept
547
562
        # chunked encoding the first time it connects, because HTTP/1.1, so we
548
563
        # check for the literal string.
584
599
    Daughter classes are expected to override _req_handler_class
585
600
    """
586
601
 
 
602
    scenarios = multiply_scenarios(
 
603
        vary_by_http_client_implementation(),
 
604
        vary_by_http_protocol_version(),
 
605
        )
 
606
 
587
607
    # Provide a useful default
588
608
    _req_handler_class = http_server.TestingHTTPRequestHandler
589
609
 
590
610
    def create_transport_readonly_server(self):
591
 
        return http_server.HttpServer(self._req_handler_class,
592
 
                                      protocol_version=self._protocol_version)
 
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
593
615
 
594
616
    def _testing_pycurl(self):
595
617
        # TODO: This is duplicated for lots of the classes in this file
600
622
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
601
623
    """Whatever request comes in, close the connection"""
602
624
 
603
 
    def handle_one_request(self):
 
625
    def _handle_one_request(self):
604
626
        """Handle a single HTTP request, by abruptly closing the connection"""
605
627
        self.close_connection = 1
606
628
 
611
633
    _req_handler_class = WallRequestHandler
612
634
 
613
635
    def test_http_has(self):
614
 
        server = self.get_readonly_server()
615
 
        t = self._transport(server.get_url())
 
636
        t = self.get_readonly_transport()
616
637
        # Unfortunately httplib (see HTTPResponse._read_status
617
638
        # for details) make no distinction between a closed
618
639
        # socket and badly formatted status line, so we can't
624
645
                          t.has, 'foo/bar')
625
646
 
626
647
    def test_http_get(self):
627
 
        server = self.get_readonly_server()
628
 
        t = self._transport(server.get_url())
 
648
        t = self.get_readonly_transport()
629
649
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
630
650
                           errors.InvalidHttpResponse),
631
651
                          t.get, 'foo/bar')
648
668
    _req_handler_class = BadStatusRequestHandler
649
669
 
650
670
    def test_http_has(self):
651
 
        server = self.get_readonly_server()
652
 
        t = self._transport(server.get_url())
 
671
        t = self.get_readonly_transport()
653
672
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
654
673
 
655
674
    def test_http_get(self):
656
 
        server = self.get_readonly_server()
657
 
        t = self._transport(server.get_url())
 
675
        t = self.get_readonly_transport()
658
676
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
659
677
 
660
678
 
665
683
        """Fakes handling a single HTTP request, returns a bad status"""
666
684
        ignored = http_server.TestingHTTPRequestHandler.parse_request(self)
667
685
        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
668
690
        return False
669
691
 
670
692
 
676
698
 
677
699
    _req_handler_class = InvalidStatusRequestHandler
678
700
 
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
701
 
692
702
class BadProtocolRequestHandler(http_server.TestingHTTPRequestHandler):
693
703
    """Whatever request comes in, returns a bad protocol version"""
715
725
        super(TestBadProtocolServer, self).setUp()
716
726
 
717
727
    def test_http_has(self):
718
 
        server = self.get_readonly_server()
719
 
        t = self._transport(server.get_url())
 
728
        t = self.get_readonly_transport()
720
729
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
721
730
 
722
731
    def test_http_get(self):
723
 
        server = self.get_readonly_server()
724
 
        t = self._transport(server.get_url())
 
732
        t = self.get_readonly_transport()
725
733
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
726
734
 
727
735
 
741
749
    _req_handler_class = ForbiddenRequestHandler
742
750
 
743
751
    def test_http_has(self):
744
 
        server = self.get_readonly_server()
745
 
        t = self._transport(server.get_url())
 
752
        t = self.get_readonly_transport()
746
753
        self.assertRaises(errors.TransportError, t.has, 'foo/bar')
747
754
 
748
755
    def test_http_get(self):
749
 
        server = self.get_readonly_server()
750
 
        t = self._transport(server.get_url())
 
756
        t = self.get_readonly_transport()
751
757
        self.assertRaises(errors.TransportError, t.get, 'foo/bar')
752
758
 
753
759
 
792
798
        self.build_tree_contents([('a', '0123456789')],)
793
799
 
794
800
    def test_readv(self):
795
 
        server = self.get_readonly_server()
796
 
        t = self._transport(server.get_url())
 
801
        t = self.get_readonly_transport()
797
802
        l = list(t.readv('a', ((0, 1), (1, 1), (3, 2), (9, 1))))
798
803
        self.assertEqual(l[0], (0, '0'))
799
804
        self.assertEqual(l[1], (1, '1'))
801
806
        self.assertEqual(l[3], (9, '9'))
802
807
 
803
808
    def test_readv_out_of_order(self):
804
 
        server = self.get_readonly_server()
805
 
        t = self._transport(server.get_url())
 
809
        t = self.get_readonly_transport()
806
810
        l = list(t.readv('a', ((1, 1), (9, 1), (0, 1), (3, 2))))
807
811
        self.assertEqual(l[0], (1, '1'))
808
812
        self.assertEqual(l[1], (9, '9'))
810
814
        self.assertEqual(l[3], (3, '34'))
811
815
 
812
816
    def test_readv_invalid_ranges(self):
813
 
        server = self.get_readonly_server()
814
 
        t = self._transport(server.get_url())
 
817
        t = self.get_readonly_transport()
815
818
 
816
819
        # This is intentionally reading off the end of the file
817
820
        # since we are sure that it cannot get there
825
828
 
826
829
    def test_readv_multiple_get_requests(self):
827
830
        server = self.get_readonly_server()
828
 
        t = self._transport(server.get_url())
 
831
        t = self.get_readonly_transport()
829
832
        # force transport to issue multiple requests
830
833
        t._max_readv_combine = 1
831
834
        t._max_get_ranges = 1
839
842
 
840
843
    def test_readv_get_max_size(self):
841
844
        server = self.get_readonly_server()
842
 
        t = self._transport(server.get_url())
 
845
        t = self.get_readonly_transport()
843
846
        # force transport to issue multiple requests by limiting the number of
844
847
        # bytes by request. Note that this apply to coalesced offsets only, a
845
848
        # single range will keep its size even if bigger than the limit.
854
857
 
855
858
    def test_complete_readv_leave_pipe_clean(self):
856
859
        server = self.get_readonly_server()
857
 
        t = self._transport(server.get_url())
 
860
        t = self.get_readonly_transport()
858
861
        # force transport to issue multiple requests
859
862
        t._get_max_size = 2
860
 
        l = list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
 
863
        list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
861
864
        # The server should have issued 3 requests
862
865
        self.assertEqual(3, server.GET_request_nb)
863
866
        self.assertEqual('0123456789', t.get_bytes('a'))
865
868
 
866
869
    def test_incomplete_readv_leave_pipe_clean(self):
867
870
        server = self.get_readonly_server()
868
 
        t = self._transport(server.get_url())
 
871
        t = self.get_readonly_transport()
869
872
        # force transport to issue multiple requests
870
873
        t._get_max_size = 2
871
874
        # Don't collapse readv results into a list so that we leave unread
940
943
    def get_multiple_ranges(self, file, file_size, ranges):
941
944
        self.send_response(206)
942
945
        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
943
948
        boundary = "%d" % random.randint(0,0x7FFFFFFF)
944
949
        self.send_header("Content-Type",
945
950
                         "multipart/byteranges; boundary=%s" % boundary)
1007
1012
                return
1008
1013
            self.send_range_content(file, start, end - start + 1)
1009
1014
            cur += 1
1010
 
        # No final boundary
 
1015
        # Final boundary
1011
1016
        self.wfile.write(boundary_line)
1012
1017
 
1013
1018
 
1021
1026
 
1022
1027
    def test_readv_with_short_reads(self):
1023
1028
        server = self.get_readonly_server()
1024
 
        t = self._transport(server.get_url())
 
1029
        t = self.get_readonly_transport()
1025
1030
        # Force separate ranges for each offset
1026
1031
        t._bytes_to_read_before_seek = 0
1027
1032
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1042
1047
        # that mode
1043
1048
        self.assertEqual('single', t._range_hint)
1044
1049
 
 
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
 
1045
1117
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1046
1118
    """Errors out when range specifiers exceed the limit"""
1047
1119
 
1071
1143
class TestLimitedRangeRequestServer(http_utils.TestCaseWithWebserver):
1072
1144
    """Tests readv requests against a server erroring out on too much ranges."""
1073
1145
 
 
1146
    scenarios = multiply_scenarios(
 
1147
        vary_by_http_client_implementation(),
 
1148
        vary_by_http_protocol_version(),
 
1149
        )
 
1150
 
1074
1151
    # Requests with more range specifiers will error out
1075
1152
    range_limit = 3
1076
1153
 
1078
1155
        return LimitedRangeHTTPServer(range_limit=self.range_limit,
1079
1156
                                      protocol_version=self._protocol_version)
1080
1157
 
1081
 
    def get_transport(self):
1082
 
        return self._transport(self.get_readonly_server().get_url())
1083
 
 
1084
1158
    def setUp(self):
1085
1159
        http_utils.TestCaseWithWebserver.setUp(self)
1086
1160
        # We need to manipulate ranges that correspond to real chunks in the
1090
1164
        self.build_tree_contents([('a', content)],)
1091
1165
 
1092
1166
    def test_few_ranges(self):
1093
 
        t = self.get_transport()
 
1167
        t = self.get_readonly_transport()
1094
1168
        l = list(t.readv('a', ((0, 4), (1024, 4), )))
1095
1169
        self.assertEqual(l[0], (0, '0000'))
1096
1170
        self.assertEqual(l[1], (1024, '0001'))
1097
1171
        self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1098
1172
 
1099
1173
    def test_more_ranges(self):
1100
 
        t = self.get_transport()
 
1174
        t = self.get_readonly_transport()
1101
1175
        l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1102
1176
        self.assertEqual(l[0], (0, '0000'))
1103
1177
        self.assertEqual(l[1], (1024, '0001'))
1114
1188
    Only the urllib implementation is tested here.
1115
1189
    """
1116
1190
 
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
1191
    def _proxied_request(self):
1134
1192
        handler = _urllib2_wrappers.ProxyHandler()
1135
 
        request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
 
1193
        request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
1136
1194
        handler.set_proxy(request, 'http')
1137
1195
        return request
1138
1196
 
 
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
 
1139
1202
    def test_empty_user(self):
1140
 
        self._install_env({'http_proxy': 'http://bar.com'})
 
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')
1141
1210
        request = self._proxied_request()
1142
1211
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
1143
1212
 
1144
1213
    def test_invalid_proxy(self):
1145
1214
        """A proxy env variable without scheme"""
1146
 
        self._install_env({'http_proxy': 'host:1234'})
 
1215
        self.overrideEnv('http_proxy', 'host:1234')
1147
1216
        self.assertRaises(errors.InvalidURL, self._proxied_request)
1148
1217
 
 
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
 
1149
1238
 
1150
1239
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1151
1240
    """Tests proxy server.
1156
1245
    to the file names).
1157
1246
    """
1158
1247
 
 
1248
    scenarios = multiply_scenarios(
 
1249
        vary_by_http_client_implementation(),
 
1250
        vary_by_http_protocol_version(),
 
1251
        )
 
1252
 
1159
1253
    # FIXME: We don't have an https server available, so we don't
1160
 
    # test https connections.
 
1254
    # test https connections. --vila toolongago
1161
1255
 
1162
1256
    def setUp(self):
1163
1257
        super(TestProxyHttpServer, self).setUp()
 
1258
        self.transport_secondary_server = http_utils.ProxyServer
1164
1259
        self.build_tree_contents([('foo', 'contents of foo\n'),
1165
1260
                                  ('foo-proxied', 'proxied contents of foo\n')])
1166
1261
        # 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)
 
1262
        server = self.get_readonly_server()
 
1263
        self.server_host_port = '%s:%d' % (server.host, server.port)
1169
1264
        if self._testing_pycurl():
1170
1265
            # Oh my ! pycurl does not check for the port as part of
1171
1266
            # no_proxy :-( So we just test the host part
1172
 
            self.no_proxy_host = self.server.host
 
1267
            self.no_proxy_host = server.host
1173
1268
        else:
1174
 
            self.no_proxy_host = self.proxy_address
 
1269
            self.no_proxy_host = self.server_host_port
1175
1270
        # 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 = {}
 
1271
        self.proxy_url = self.get_secondary_url()
1179
1272
 
1180
1273
    def _testing_pycurl(self):
1181
1274
        # TODO: This is duplicated for lots of the classes in this file
1182
1275
        return (features.pycurl.available()
1183
1276
                and self._transport == PyCurlTransport)
1184
1277
 
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()
 
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())
1216
1285
 
1217
1286
    def test_http_proxy(self):
1218
 
        self.proxied_in_env({'http_proxy': self.proxy_url})
 
1287
        self.overrideEnv('http_proxy', self.proxy_url)
 
1288
        self.assertProxied()
1219
1289
 
1220
1290
    def test_HTTP_PROXY(self):
1221
1291
        if self._testing_pycurl():
1224
1294
            # about. Should we ?)
1225
1295
            raise tests.TestNotApplicable(
1226
1296
                'pycurl does not check HTTP_PROXY for security reasons')
1227
 
        self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
 
1297
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
 
1298
        self.assertProxied()
1228
1299
 
1229
1300
    def test_all_proxy(self):
1230
 
        self.proxied_in_env({'all_proxy': self.proxy_url})
 
1301
        self.overrideEnv('all_proxy', self.proxy_url)
 
1302
        self.assertProxied()
1231
1303
 
1232
1304
    def test_ALL_PROXY(self):
1233
 
        self.proxied_in_env({'ALL_PROXY': self.proxy_url})
 
1305
        self.overrideEnv('ALL_PROXY', self.proxy_url)
 
1306
        self.assertProxied()
1234
1307
 
1235
1308
    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})
 
1309
        self.overrideEnv('no_proxy', self.no_proxy_host)
 
1310
        self.overrideEnv('http_proxy', self.proxy_url)
 
1311
        self.assertNotProxied()
1238
1312
 
1239
1313
    def test_HTTP_PROXY_with_NO_PROXY(self):
1240
1314
        if self._testing_pycurl():
1241
1315
            raise tests.TestNotApplicable(
1242
1316
                '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})
 
1317
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
 
1318
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
 
1319
        self.assertNotProxied()
1245
1320
 
1246
1321
    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})
 
1322
        self.overrideEnv('no_proxy', self.no_proxy_host)
 
1323
        self.overrideEnv('all_proxy', self.proxy_url)
 
1324
        self.assertNotProxied()
1249
1325
 
1250
1326
    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})
 
1327
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
 
1328
        self.overrideEnv('ALL_PROXY', self.proxy_url)
 
1329
        self.assertNotProxied()
1253
1330
 
1254
1331
    def test_http_proxy_without_scheme(self):
 
1332
        self.overrideEnv('http_proxy', self.server_host_port)
1255
1333
        if self._testing_pycurl():
1256
1334
            # pycurl *ignores* invalid proxy env variables. If that ever change
1257
1335
            # in the future, this test will fail indicating that pycurl do not
1258
1336
            # ignore anymore such variables.
1259
 
            self.not_proxied_in_env({'http_proxy': self.proxy_address})
 
1337
            self.assertNotProxied()
1260
1338
        else:
1261
 
            self.assertRaises(errors.InvalidURL,
1262
 
                              self.proxied_in_env,
1263
 
                              {'http_proxy': self.proxy_address})
 
1339
            self.assertRaises(errors.InvalidURL, self.assertProxied)
1264
1340
 
1265
1341
 
1266
1342
class TestRanges(http_utils.TestCaseWithWebserver):
1267
1343
    """Test the Range header in GET methods."""
1268
1344
 
 
1345
    scenarios = multiply_scenarios(
 
1346
        vary_by_http_client_implementation(),
 
1347
        vary_by_http_protocol_version(),
 
1348
        )
 
1349
 
1269
1350
    def setUp(self):
1270
1351
        http_utils.TestCaseWithWebserver.setUp(self)
1271
1352
        self.build_tree_contents([('a', '0123456789')],)
1272
 
        server = self.get_readonly_server()
1273
 
        self.transport = self._transport(server.get_url())
1274
1353
 
1275
1354
    def create_transport_readonly_server(self):
1276
1355
        return http_server.HttpServer(protocol_version=self._protocol_version)
1277
1356
 
1278
1357
    def _file_contents(self, relpath, ranges):
 
1358
        t = self.get_readonly_transport()
1279
1359
        offsets = [ (start, end - start + 1) for start, end in ranges]
1280
 
        coalesce = self.transport._coalesce_offsets
 
1360
        coalesce = t._coalesce_offsets
1281
1361
        coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1282
 
        code, data = self.transport._get(relpath, coalesced)
 
1362
        code, data = t._get(relpath, coalesced)
1283
1363
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1284
1364
        for start, end in ranges:
1285
1365
            data.seek(start)
1286
1366
            yield data.read(end - start + 1)
1287
1367
 
1288
1368
    def _file_tail(self, relpath, tail_amount):
1289
 
        code, data = self.transport._get(relpath, [], tail_amount)
 
1369
        t = self.get_readonly_transport()
 
1370
        code, data = t._get(relpath, [], tail_amount)
1290
1371
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1291
1372
        data.seek(-tail_amount, 2)
1292
1373
        return data.read(tail_amount)
1311
1392
class TestHTTPRedirections(http_utils.TestCaseWithRedirectedWebserver):
1312
1393
    """Test redirection between http servers."""
1313
1394
 
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
 
1395
    scenarios = multiply_scenarios(
 
1396
        vary_by_http_client_implementation(),
 
1397
        vary_by_http_protocol_version(),
 
1398
        )
1322
1399
 
1323
1400
    def setUp(self):
1324
1401
        super(TestHTTPRedirections, self).setUp()
1326
1403
                                  ('bundle',
1327
1404
                                  '# Bazaar revision bundle v0.9\n#\n')
1328
1405
                                  ],)
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
1406
 
1332
1407
    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)
 
1408
        self.assertRaises(errors.RedirectRequested,
 
1409
                          self.get_old_transport().get, 'a')
 
1410
        self.assertEqual('0123456789', self.get_new_transport().get('a').read())
1344
1411
 
1345
1412
 
1346
1413
class RedirectedRequest(_urllib2_wrappers.Request):
1363
1430
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
1364
1431
 
1365
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)
 
1452
 
 
1453
 
1366
1454
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1367
1455
    """Test redirections.
1368
1456
 
1377
1465
    -- vila 20070212
1378
1466
    """
1379
1467
 
 
1468
    scenarios = multiply_scenarios(
 
1469
        vary_by_http_client_implementation(),
 
1470
        vary_by_http_protocol_version(),
 
1471
        )
 
1472
 
1380
1473
    def setUp(self):
1381
1474
        if (features.pycurl.available()
1382
1475
            and self._transport == PyCurlTransport):
1383
1476
            raise tests.TestNotApplicable(
1384
 
                "pycurl doesn't redirect silently annymore")
 
1477
                "pycurl doesn't redirect silently anymore")
1385
1478
        super(TestHTTPSilentRedirections, self).setUp()
1386
1479
        install_redirected_request(self)
 
1480
        cleanup_http_redirection_connections(self)
1387
1481
        self.build_tree_contents([('a','a'),
1388
1482
                                  ('1/',),
1389
1483
                                  ('1/a', 'redirected once'),
1397
1491
                                  ('5/a', 'redirected 5 times'),
1398
1492
                                  ],)
1399
1493
 
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
1494
    def test_one_redirection(self):
1408
 
        t = self.old_transport
1409
 
 
1410
 
        req = RedirectedRequest('GET', t.abspath('a'))
 
1495
        t = self.get_old_transport()
 
1496
        req = RedirectedRequest('GET', t._remote_path('a'))
1411
1497
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1412
1498
                                       self.new_server.port)
1413
1499
        self.old_server.redirections = \
1414
1500
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1415
 
        self.assertEqual('redirected once',t._perform(req).read())
 
1501
        self.assertEqual('redirected once', t._perform(req).read())
1416
1502
 
1417
1503
    def test_five_redirections(self):
1418
 
        t = self.old_transport
1419
 
 
1420
 
        req = RedirectedRequest('GET', t.abspath('a'))
 
1504
        t = self.get_old_transport()
 
1505
        req = RedirectedRequest('GET', t._remote_path('a'))
1421
1506
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1422
1507
                                       self.old_server.port)
1423
1508
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1429
1514
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1430
1515
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1431
1516
            ]
1432
 
        self.assertEqual('redirected 5 times',t._perform(req).read())
 
1517
        self.assertEqual('redirected 5 times', t._perform(req).read())
1433
1518
 
1434
1519
 
1435
1520
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1436
1521
    """Test transport.do_catching_redirections."""
1437
1522
 
 
1523
    scenarios = multiply_scenarios(
 
1524
        vary_by_http_client_implementation(),
 
1525
        vary_by_http_protocol_version(),
 
1526
        )
 
1527
 
1438
1528
    def setUp(self):
1439
1529
        super(TestDoCatchRedirections, self).setUp()
1440
1530
        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')
 
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')
1446
1537
 
1447
1538
    def test_no_redirection(self):
1448
 
        t = self._transport(self.new_server.get_url())
 
1539
        t = self.get_new_transport()
1449
1540
 
1450
1541
        # We use None for redirected so that we fail if redirected
1451
1542
        self.assertEqual('0123456789',
1455
1546
    def test_one_redirection(self):
1456
1547
        self.redirections = 0
1457
1548
 
1458
 
        def redirected(transport, exception, redirection_notice):
 
1549
        def redirected(t, exception, redirection_notice):
1459
1550
            self.redirections += 1
1460
 
            dir, file = urlutils.split(exception.target)
1461
 
            return self._transport(dir)
 
1551
            redirected_t = t._redirected_to(exception.source, exception.target)
 
1552
            return redirected_t
1462
1553
 
1463
1554
        self.assertEqual('0123456789',
1464
1555
                         transport.do_catching_redirections(
1478
1569
                          self.get_a, self.old_transport, redirected)
1479
1570
 
1480
1571
 
 
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
 
1481
1601
class TestAuth(http_utils.TestCaseWithWebserver):
1482
1602
    """Test authentication scheme"""
1483
1603
 
1484
 
    _auth_header = 'Authorization'
1485
 
    _password_prompt_prefix = ''
1486
 
    _username_prompt_prefix = ''
1487
 
    # Set by load_tests
1488
 
    _auth_server = None
 
1604
    scenarios = multiply_scenarios(
 
1605
        vary_by_http_client_implementation(),
 
1606
        vary_by_http_protocol_version(),
 
1607
        vary_by_http_auth_scheme(),
 
1608
        )
1489
1609
 
1490
1610
    def setUp(self):
1491
1611
        super(TestAuth, self).setUp()
1494
1614
                                  ('b', 'contents of b\n'),])
1495
1615
 
1496
1616
    def create_transport_readonly_server(self):
1497
 
        return self._auth_server(protocol_version=self._protocol_version)
 
1617
        server = self._auth_server(protocol_version=self._protocol_version)
 
1618
        server._url_protocol = self._url_protocol
 
1619
        return server
1498
1620
 
1499
1621
    def _testing_pycurl(self):
1500
1622
        # TODO: This is duplicated for lots of the classes in this file
1513
1635
        return url
1514
1636
 
1515
1637
    def get_user_transport(self, user, password):
1516
 
        return self._transport(self.get_user_url(user, password))
 
1638
        t = transport.get_transport(self.get_user_url(user, password))
 
1639
        return t
1517
1640
 
1518
1641
    def test_no_user(self):
1519
1642
        self.server.add_user('joe', 'foo')
1630
1753
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1631
1754
                                            stderr=tests.StringIOWrapper())
1632
1755
        # 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()
 
1756
        _setup_authentication_config(scheme='http', port=self.server.port,
 
1757
                                     user=user, password=password)
1638
1758
        # Issue a request to the server to connect
1639
1759
        self.assertEqual('contents of a\n',t.get('a').read())
1640
1760
        # stdin should have  been left untouched
1642
1762
        # Only one 'Authentication Required' error should occur
1643
1763
        self.assertEqual(1, self.server.auth_required_errors)
1644
1764
 
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
1765
    def test_changing_nonce(self):
1665
1766
        if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1666
1767
                                     http_utils.ProxyDigestAuthServer):
1667
1768
            raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
1668
1769
        if self._testing_pycurl():
1669
 
            raise tests.KnownFailure(
 
1770
            self.knownFailure(
1670
1771
                'pycurl does not handle a nonce change')
1671
1772
        self.server.add_user('joe', 'foo')
1672
1773
        t = self.get_user_transport('joe', 'foo')
1682
1783
        # initial 'who are you' and a second 'who are you' with the new nonce)
1683
1784
        self.assertEqual(2, self.server.auth_required_errors)
1684
1785
 
 
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,))
1685
1826
 
1686
1827
 
1687
1828
class TestProxyAuth(TestAuth):
1688
 
    """Test proxy authentication schemes."""
1689
 
 
1690
 
    _auth_header = 'Proxy-authorization'
1691
 
    _password_prompt_prefix = 'Proxy '
1692
 
    _username_prompt_prefix = 'Proxy '
 
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
        )
1693
1840
 
1694
1841
    def setUp(self):
1695
1842
        super(TestProxyAuth, self).setUp()
1696
 
        self._old_env = {}
1697
 
        self.addCleanup(self._restore_env)
1698
1843
        # Override the contents to avoid false positives
1699
1844
        self.build_tree_contents([('a', 'not proxied contents of a\n'),
1700
1845
                                  ('b', 'not proxied contents of b\n'),
1703
1848
                                  ])
1704
1849
 
1705
1850
    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)
 
1851
        self.overrideEnv('all_proxy', self.get_user_url(user, password))
 
1852
        return TestAuth.get_user_transport(self, user, password)
1716
1853
 
1717
1854
    def test_empty_pass(self):
1718
1855
        if self._testing_pycurl():
1719
1856
            import pycurl
1720
1857
            if pycurl.version_info()[1] < '7.16.0':
1721
 
                raise tests.KnownFailure(
 
1858
                self.knownFailure(
1722
1859
                    'pycurl < 7.16.0 does not handle empty proxy passwords')
1723
1860
        super(TestProxyAuth, self).test_empty_pass()
1724
1861
 
1737
1874
        self.readfile = StringIO(socket_read_content)
1738
1875
        self.writefile = StringIO()
1739
1876
        self.writefile.close = lambda: None
 
1877
        self.close = lambda: None
1740
1878
 
1741
1879
    def makefile(self, mode='r', bufsize=None):
1742
1880
        if 'r' in mode:
1747
1885
 
1748
1886
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1749
1887
 
 
1888
    scenarios = multiply_scenarios(
 
1889
        vary_by_http_client_implementation(),
 
1890
        vary_by_http_protocol_version(),
 
1891
        )
 
1892
 
1750
1893
    def setUp(self):
1751
1894
        super(SmartHTTPTunnellingTest, self).setUp()
1752
1895
        # We use the VFS layer as part of HTTP tunnelling tests.
1753
 
        self._captureVar('BZR_NO_SMART_VFS', None)
 
1896
        self.overrideEnv('BZR_NO_SMART_VFS', None)
1754
1897
        self.transport_readonly_server = http_utils.HTTPServerWithSmarts
 
1898
        self.http_server = self.get_readonly_server()
1755
1899
 
1756
1900
    def create_transport_readonly_server(self):
1757
 
        return http_utils.HTTPServerWithSmarts(
 
1901
        server = http_utils.HTTPServerWithSmarts(
1758
1902
            protocol_version=self._protocol_version)
 
1903
        server._url_protocol = self._url_protocol
 
1904
        return server
1759
1905
 
1760
1906
    def test_open_bzrdir(self):
1761
1907
        branch = self.make_branch('relpath')
1762
 
        http_server = self.get_readonly_server()
1763
 
        url = http_server.get_url() + 'relpath'
 
1908
        url = self.http_server.get_url() + 'relpath'
1764
1909
        bd = bzrdir.BzrDir.open(url)
 
1910
        self.addCleanup(bd.transport.disconnect)
1765
1911
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1766
1912
 
1767
1913
    def test_bulk_data(self):
1769
1915
        # The 'readv' command in the smart protocol both sends and receives
1770
1916
        # bulk data, so we use that.
1771
1917
        self.build_tree(['data-file'])
1772
 
        http_server = self.get_readonly_server()
1773
 
        http_transport = self._transport(http_server.get_url())
 
1918
        http_transport = transport.get_transport(self.http_server.get_url())
1774
1919
        medium = http_transport.get_smart_medium()
1775
1920
        # Since we provide the medium, the url below will be mostly ignored
1776
1921
        # during the test, as long as the path is '/'.
1784
1929
        post_body = 'hello\n'
1785
1930
        expected_reply_body = 'ok\x012\n'
1786
1931
 
1787
 
        http_server = self.get_readonly_server()
1788
 
        http_transport = self._transport(http_server.get_url())
 
1932
        http_transport = transport.get_transport(self.http_server.get_url())
1789
1933
        medium = http_transport.get_smart_medium()
1790
1934
        response = medium.send_http_smart_request(post_body)
1791
1935
        reply_body = response.read()
1792
1936
        self.assertEqual(expected_reply_body, reply_body)
1793
1937
 
1794
1938
    def test_smart_http_server_post_request_handler(self):
1795
 
        httpd = self.get_readonly_server()._get_httpd()
 
1939
        httpd = self.http_server.server
1796
1940
 
1797
1941
        socket = SampleSocket(
1798
1942
            'POST /.bzr/smart %s \r\n' % self._protocol_version
1830
1974
 
1831
1975
    def test_probe_smart_server(self):
1832
1976
        """Test error handling against server refusing smart requests."""
1833
 
        server = self.get_readonly_server()
1834
 
        t = self._transport(server.get_url())
 
1977
        t = self.get_readonly_transport()
1835
1978
        # No need to build a valid smart request here, the server will not even
1836
1979
        # try to interpret it.
1837
1980
        self.assertRaises(errors.SmartProtocolError,
1838
1981
                          t.get_smart_medium().send_http_smart_request,
1839
1982
                          'whatever')
1840
1983
 
 
1984
 
1841
1985
class Test_redirected_to(tests.TestCase):
1842
1986
 
 
1987
    scenarios = vary_by_http_client_implementation()
 
1988
 
1843
1989
    def test_redirected_to_subdir(self):
1844
1990
        t = self._transport('http://www.example.com/foo')
1845
1991
        r = t._redirected_to('http://www.example.com/foo',
1881
2027
        r = t._redirected_to('http://www.example.com/foo',
1882
2028
                             'https://foo.example.com/foo')
1883
2029
        self.assertIsInstance(r, type(t))
1884
 
        self.assertEqual(t._user, r._user)
 
2030
        self.assertEqual(t._parsed_url.user, r._parsed_url.user)
1885
2031
 
1886
2032
 
1887
2033
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1896
2042
    line.
1897
2043
    """
1898
2044
 
1899
 
    def handle_one_request(self):
 
2045
    def _handle_one_request(self):
1900
2046
        tcs = self.server.test_case_server
1901
2047
        requestline = self.rfile.readline()
1902
2048
        headers = self.MessageClass(self.rfile, 0)
1940
2086
    pass
1941
2087
 
1942
2088
 
1943
 
if tests.HTTPSServerFeature.available():
 
2089
if features.HTTPSServerFeature.available():
1944
2090
    from bzrlib.tests import https_server
1945
2091
    class ActivityHTTPSServer(ActivityServerMixin, https_server.HTTPSServer):
1946
2092
        pass
1957
2103
        tests.TestCase.setUp(self)
1958
2104
        self.server = self._activity_server(self._protocol_version)
1959
2105
        self.server.start_server()
1960
 
        self.activities = {}
 
2106
        _activities = {} # Don't close over self and create a cycle
1961
2107
        def report_activity(t, bytes, direction):
1962
 
            count = self.activities.get(direction, 0)
 
2108
            count = _activities.get(direction, 0)
1963
2109
            count += bytes
1964
 
            self.activities[direction] = count
 
2110
            _activities[direction] = count
 
2111
        self.activities = _activities
1965
2112
 
1966
2113
        # We override at class level because constructors may propagate the
1967
2114
        # bound method and render instance overriding ineffective (an
1968
2115
        # 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)
 
2116
        self.overrideAttr(self._transport, '_report_activity', report_activity)
 
2117
        self.addCleanup(self.server.stop_server)
1976
2118
 
1977
2119
    def get_transport(self):
1978
 
        return self._transport(self.server.get_url())
 
2120
        t = self._transport(self.server.get_url())
 
2121
        # FIXME: Needs cleanup -- vila 20100611
 
2122
        return t
1979
2123
 
1980
2124
    def assertActivitiesMatch(self):
1981
2125
        self.assertEqual(self.server.bytes_read,
2086
2230
'''
2087
2231
        t = self.get_transport()
2088
2232
        # We must send a single line of body bytes, see
2089
 
        # PredefinedRequestHandler.handle_one_request
 
2233
        # PredefinedRequestHandler._handle_one_request
2090
2234
        code, f = t._post('abc def end-of-body\n')
2091
2235
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2092
2236
        self.assertActivitiesMatch()
2094
2238
 
2095
2239
class TestActivity(tests.TestCase, TestActivityMixin):
2096
2240
 
 
2241
    scenarios = multiply_scenarios(
 
2242
        vary_by_http_activity(),
 
2243
        vary_by_http_protocol_version(),
 
2244
        )
 
2245
 
2097
2246
    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)
 
2247
        TestActivityMixin.setUp(self)
2117
2248
 
2118
2249
 
2119
2250
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2120
2251
 
 
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
 
2121
2260
    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)
 
2261
        self._transport =_urllib.HttpTransport_urllib
 
2262
        TestActivityMixin.setUp(self)
2143
2263
 
2144
2264
    def assertActivitiesMatch(self):
2145
2265
        # Nothing to check here
2149
2269
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
2150
2270
    """Test authentication on the redirected http server."""
2151
2271
 
 
2272
    scenarios = vary_by_http_protocol_version()
 
2273
 
2152
2274
    _auth_header = 'Authorization'
2153
2275
    _password_prompt_prefix = ''
2154
2276
    _username_prompt_prefix = ''
2155
2277
    _auth_server = http_utils.HTTPBasicAuthServer
2156
2278
    _transport = _urllib.HttpTransport_urllib
2157
2279
 
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
2168
 
 
2169
2280
    def setUp(self):
2170
2281
        super(TestAuthOnRedirected, self).setUp()
2171
2282
        self.build_tree_contents([('a','a'),
2176
2287
                                       self.new_server.port)
2177
2288
        self.old_server.redirections = [
2178
2289
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2179
 
        self.old_transport = self._transport(self.old_server.get_url())
 
2290
        self.old_transport = self.get_old_transport()
2180
2291
        self.new_server.add_user('joe', 'foo')
2181
 
 
2182
 
    def get_a(self, transport):
2183
 
        return transport.get('a')
 
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')
2184
2301
 
2185
2302
    def test_auth_on_redirected_via_do_catching_redirections(self):
2186
2303
        self.redirections = 0
2187
2304
 
2188
 
        def redirected(transport, exception, redirection_notice):
 
2305
        def redirected(t, exception, redirection_notice):
2189
2306
            self.redirections += 1
2190
 
            dir, file = urlutils.split(exception.target)
2191
 
            return self._transport(dir)
 
2307
            redirected_t = t._redirected_to(exception.source, exception.target)
 
2308
            self.addCleanup(redirected_t.disconnect)
 
2309
            return redirected_t
2192
2310
 
2193
2311
        stdout = tests.StringIOWrapper()
2194
2312
        stderr = tests.StringIOWrapper()
2215
2333
                                       self.new_server.port)
2216
2334
        self.old_server.redirections = [
2217
2335
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2218
 
        self.assertEqual('redirected once',t._perform(req).read())
 
2336
        self.assertEqual('redirected once', t._perform(req).read())
2219
2337
        # stdin should be empty
2220
2338
        self.assertEqual('', ui.ui_factory.stdin.readline())
2221
2339
        # stdout should be empty, stderr will contains the prompts
2222
2340
        self.assertEqual('', stdout.getvalue())
2223
2341
 
2224