~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Johan Walles
  • Date: 2009-05-07 05:08:46 UTC
  • mfrom: (4342 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090507050846-nkwvcyauf1eh653q
MergeĀ fromĀ upstream.

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
 
    features,
48
51
    http_server,
49
52
    http_utils,
50
 
    test_server,
51
 
    )
52
 
from bzrlib.tests.scenarios import (
53
 
    load_tests_apply_scenarios,
54
 
    multiply_scenarios,
55
53
    )
56
54
from bzrlib.transport import (
57
55
    http,
63
61
    )
64
62
 
65
63
 
66
 
if features.pycurl.available():
 
64
try:
67
65
    from bzrlib.transport.http._pycurl import PyCurlTransport
68
 
 
69
 
 
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."""
 
66
    pycurl_present = True
 
67
except errors.DependencyNotPresent:
 
68
    pycurl_present = False
 
69
 
 
70
 
 
71
def load_tests(standard_tests, module, loader):
 
72
    """Multiply tests for http clients and protocol versions."""
 
73
    result = loader.suiteClass()
 
74
 
 
75
    # one for each transport implementation
 
76
    t_tests, remaining_tests = tests.split_suite_by_condition(
 
77
        standard_tests, tests.condition_isinstance((
 
78
                TestHttpTransportRegistration,
 
79
                TestHttpTransportUrls,
 
80
                Test_redirected_to,
 
81
                )))
75
82
    transport_scenarios = [
76
83
        ('urllib', dict(_transport=_urllib.HttpTransport_urllib,
77
84
                        _server=http_server.HttpServer_urllib,
78
 
                        _url_protocol='http+urllib',)),
 
85
                        _qualified_prefix='http+urllib',)),
79
86
        ]
80
 
    if features.pycurl.available():
 
87
    if pycurl_present:
81
88
        transport_scenarios.append(
82
89
            ('pycurl', dict(_transport=PyCurlTransport,
83
90
                            _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')),
93
 
        ]
94
 
 
95
 
 
96
 
def vary_by_http_auth_scheme():
97
 
    scenarios = [
98
 
        ('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
99
 
        ('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
100
 
        ('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():
 
91
                            _qualified_prefix='http+pycurl',)))
 
92
    tests.multiply_tests(t_tests, transport_scenarios, result)
 
93
 
 
94
    # each implementation tested with each HTTP version
 
95
    tp_tests, remaining_tests = tests.split_suite_by_condition(
 
96
        remaining_tests, tests.condition_isinstance((
 
97
                SmartHTTPTunnellingTest,
 
98
                TestDoCatchRedirections,
 
99
                TestHTTPConnections,
 
100
                TestHTTPRedirections,
 
101
                TestHTTPSilentRedirections,
 
102
                TestLimitedRangeRequestServer,
 
103
                TestPost,
 
104
                TestProxyHttpServer,
 
105
                TestRanges,
 
106
                TestSpecificRequestHandler,
 
107
                )))
 
108
    protocol_scenarios = [
 
109
            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
 
110
            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
 
111
            ]
 
112
    tp_scenarios = tests.multiply_scenarios(transport_scenarios,
 
113
                                            protocol_scenarios)
 
114
    tests.multiply_tests(tp_tests, tp_scenarios, result)
 
115
 
 
116
    # auth: each auth scheme on all http versions on all implementations.
 
117
    tpa_tests, remaining_tests = tests.split_suite_by_condition(
 
118
        remaining_tests, tests.condition_isinstance((
 
119
                TestAuth,
 
120
                )))
 
121
    auth_scheme_scenarios = [
 
122
        ('basic', dict(_auth_scheme='basic')),
 
123
        ('digest', dict(_auth_scheme='digest')),
 
124
        ]
 
125
    tpa_scenarios = tests.multiply_scenarios(tp_scenarios,
 
126
        auth_scheme_scenarios)
 
127
    tests.multiply_tests(tpa_tests, tpa_scenarios, result)
 
128
 
 
129
    # activity: activity on all http versions on all implementations
 
130
    tpact_tests, remaining_tests = tests.split_suite_by_condition(
 
131
        remaining_tests, tests.condition_isinstance((
 
132
                TestActivity,
 
133
                )))
127
134
    activity_scenarios = [
128
 
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
129
 
                            _transport=_urllib.HttpTransport_urllib,)),
 
135
        ('http', dict(_activity_server=ActivityHTTPServer)),
130
136
        ]
131
137
    if tests.HTTPSServerFeature.available():
132
138
        activity_scenarios.append(
133
 
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
134
 
                                _transport=_urllib.HttpTransport_urllib,)),)
135
 
    if features.pycurl.available():
136
 
        activity_scenarios.append(
137
 
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
138
 
                                _transport=PyCurlTransport,)),)
139
 
        if tests.HTTPSServerFeature.available():
140
 
            from bzrlib.tests import (
141
 
                ssl_certs,
142
 
                )
143
 
            # FIXME: Until we have a better way to handle self-signed
144
 
            # certificates (like allowing them in a test specific
145
 
            # authentication.conf for example), we need some specialized pycurl
146
 
            # transport for tests.
147
 
            class HTTPS_pycurl_transport(PyCurlTransport):
148
 
 
149
 
                def __init__(self, base, _from_transport=None):
150
 
                    super(HTTPS_pycurl_transport, self).__init__(
151
 
                        base, _from_transport)
152
 
                    self.cabundle = str(ssl_certs.build_path('ca.crt'))
153
 
 
154
 
            activity_scenarios.append(
155
 
                ('pycurl,https', dict(_activity_server=ActivityHTTPSServer,
156
 
                                    _transport=HTTPS_pycurl_transport,)),)
157
 
    return activity_scenarios
 
139
            ('https', dict(_activity_server=ActivityHTTPSServer)))
 
140
    tpact_scenarios = tests.multiply_scenarios(tp_scenarios,
 
141
        activity_scenarios)
 
142
    tests.multiply_tests(tpact_tests, tpact_scenarios, result)
 
143
 
 
144
    # No parametrization for the remaining tests
 
145
    result.addTests(remaining_tests)
 
146
 
 
147
    return result
158
148
 
159
149
 
160
150
class FakeManager(object):
172
162
    It records the bytes sent to it, and replies with a 200.
173
163
    """
174
164
 
175
 
    def __init__(self, expect_body_tail=None, scheme=''):
 
165
    def __init__(self, expect_body_tail=None):
176
166
        """Constructor.
177
167
 
178
168
        :type expect_body_tail: str
183
173
        self.host = None
184
174
        self.port = None
185
175
        self.received_bytes = ''
186
 
        self.scheme = scheme
187
 
 
188
 
    def get_url(self):
189
 
        return '%s://%s:%s/' % (self.scheme, self.host, self.port)
190
 
 
191
 
    def start_server(self):
 
176
 
 
177
    def setUp(self):
192
178
        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
193
179
        self._sock.bind(('127.0.0.1', 0))
194
180
        self.host, self.port = self._sock.getsockname()
195
181
        self._ready = threading.Event()
196
 
        self._thread = test_server.TestThread(
197
 
            sync_event=self._ready, target=self._accept_read_and_reply)
 
182
        self._thread = threading.Thread(target=self._accept_read_and_reply)
 
183
        self._thread.setDaemon(True)
198
184
        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()
 
185
        self._ready.wait(5)
202
186
 
203
187
    def _accept_read_and_reply(self):
204
188
        self._sock.listen(1)
205
189
        self._ready.set()
206
 
        conn, address = self._sock.accept()
207
 
        if self._expect_body_tail is not None:
 
190
        self._sock.settimeout(5)
 
191
        try:
 
192
            conn, address = self._sock.accept()
 
193
            # On win32, the accepted connection will be non-blocking to start
 
194
            # with because we're using settimeout.
 
195
            conn.setblocking(True)
208
196
            while not self.received_bytes.endswith(self._expect_body_tail):
209
197
                self.received_bytes += conn.recv(4096)
210
198
            conn.sendall('HTTP/1.1 200 OK\r\n')
211
 
        try:
 
199
        except socket.timeout:
 
200
            # Make sure the client isn't stuck waiting for us to e.g. accept.
212
201
            self._sock.close()
213
202
        except socket.error:
214
203
            # The client may have already closed the socket.
215
204
            pass
216
205
 
217
 
    def stop_server(self):
 
206
    def tearDown(self):
218
207
        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()
 
208
            self._sock.close()
223
209
        except socket.error:
224
210
            # We might have already closed it.  We don't care.
225
211
            pass
226
212
        self.host = None
227
213
        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
214
 
232
215
 
233
216
class TestAuthHeader(tests.TestCase):
240
223
 
241
224
    def test_empty_header(self):
242
225
        scheme, remainder = self.parse_header('')
243
 
        self.assertEqual('', scheme)
 
226
        self.assertEquals('', scheme)
244
227
        self.assertIs(None, remainder)
245
228
 
246
229
    def test_negotiate_header(self):
247
230
        scheme, remainder = self.parse_header('Negotiate')
248
 
        self.assertEqual('negotiate', scheme)
 
231
        self.assertEquals('negotiate', scheme)
249
232
        self.assertIs(None, remainder)
250
233
 
251
234
    def test_basic_header(self):
252
235
        scheme, remainder = self.parse_header(
253
236
            'Basic realm="Thou should not pass"')
254
 
        self.assertEqual('basic', scheme)
255
 
        self.assertEqual('realm="Thou should not pass"', remainder)
 
237
        self.assertEquals('basic', scheme)
 
238
        self.assertEquals('realm="Thou should not pass"', remainder)
256
239
 
257
240
    def test_basic_extract_realm(self):
258
241
        scheme, remainder = self.parse_header(
260
243
            _urllib2_wrappers.BasicAuthHandler)
261
244
        match, realm = self.auth_handler.extract_realm(remainder)
262
245
        self.assertTrue(match is not None)
263
 
        self.assertEqual('Thou should not pass', realm)
 
246
        self.assertEquals('Thou should not pass', realm)
264
247
 
265
248
    def test_digest_header(self):
266
249
        scheme, remainder = self.parse_header(
267
250
            'Digest realm="Thou should not pass"')
268
 
        self.assertEqual('digest', scheme)
269
 
        self.assertEqual('realm="Thou should not pass"', remainder)
270
 
 
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)
 
251
        self.assertEquals('digest', scheme)
 
252
        self.assertEquals('realm="Thou should not pass"', remainder)
304
253
 
305
254
 
306
255
class TestHTTPServer(tests.TestCase):
311
260
 
312
261
            protocol_version = 'HTTP/0.1'
313
262
 
314
 
        self.assertRaises(httplib.UnknownProtocol,
315
 
                          http_server.HttpServer, BogusRequestHandler)
 
263
        server = http_server.HttpServer(BogusRequestHandler)
 
264
        try:
 
265
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
 
266
        except:
 
267
            server.tearDown()
 
268
            self.fail('HTTP Server creation did not raise UnknownProtocol')
316
269
 
317
270
    def test_force_invalid_protocol(self):
318
 
        self.assertRaises(httplib.UnknownProtocol,
319
 
                          http_server.HttpServer, protocol_version='HTTP/0.1')
 
271
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
 
272
        try:
 
273
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
 
274
        except:
 
275
            server.tearDown()
 
276
            self.fail('HTTP Server creation did not raise UnknownProtocol')
320
277
 
321
278
    def test_server_start_and_stop(self):
322
279
        server = http_server.HttpServer()
323
 
        self.addCleanup(server.stop_server)
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)
 
280
        server.setUp()
 
281
        self.assertTrue(server._http_running)
 
282
        server.tearDown()
 
283
        self.assertFalse(server._http_running)
328
284
 
329
285
    def test_create_http_server_one_zero(self):
330
286
        class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
332
288
            protocol_version = 'HTTP/1.0'
333
289
 
334
290
        server = http_server.HttpServer(RequestHandlerOneZero)
335
 
        self.start_server(server)
336
 
        self.assertIsInstance(server.server, http_server.TestingHTTPServer)
 
291
        server.setUp()
 
292
        self.addCleanup(server.tearDown)
 
293
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
337
294
 
338
295
    def test_create_http_server_one_one(self):
339
296
        class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
341
298
            protocol_version = 'HTTP/1.1'
342
299
 
343
300
        server = http_server.HttpServer(RequestHandlerOneOne)
344
 
        self.start_server(server)
345
 
        self.assertIsInstance(server.server,
 
301
        server.setUp()
 
302
        self.addCleanup(server.tearDown)
 
303
        self.assertIsInstance(server._httpd,
346
304
                              http_server.TestingThreadingHTTPServer)
347
305
 
348
306
    def test_create_http_server_force_one_one(self):
352
310
 
353
311
        server = http_server.HttpServer(RequestHandlerOneZero,
354
312
                                        protocol_version='HTTP/1.1')
355
 
        self.start_server(server)
356
 
        self.assertIsInstance(server.server,
 
313
        server.setUp()
 
314
        self.addCleanup(server.tearDown)
 
315
        self.assertIsInstance(server._httpd,
357
316
                              http_server.TestingThreadingHTTPServer)
358
317
 
359
318
    def test_create_http_server_force_one_zero(self):
363
322
 
364
323
        server = http_server.HttpServer(RequestHandlerOneOne,
365
324
                                        protocol_version='HTTP/1.0')
366
 
        self.start_server(server)
367
 
        self.assertIsInstance(server.server,
 
325
        server.setUp()
 
326
        self.addCleanup(server.tearDown)
 
327
        self.assertIsInstance(server._httpd,
368
328
                              http_server.TestingHTTPServer)
369
329
 
370
330
 
372
332
    """Test case to inherit from if pycurl is present"""
373
333
 
374
334
    def _get_pycurl_maybe(self):
375
 
        self.requireFeature(features.pycurl)
376
 
        return PyCurlTransport
 
335
        try:
 
336
            from bzrlib.transport.http._pycurl import PyCurlTransport
 
337
            return PyCurlTransport
 
338
        except errors.DependencyNotPresent:
 
339
            raise tests.TestSkipped('pycurl not present')
377
340
 
378
341
    _transport = property(_get_pycurl_maybe)
379
342
 
386
349
    def test_url_parsing(self):
387
350
        f = FakeManager()
388
351
        url = http.extract_auth('http://example.com', f)
389
 
        self.assertEqual('http://example.com', url)
390
 
        self.assertEqual(0, len(f.credentials))
 
352
        self.assertEquals('http://example.com', url)
 
353
        self.assertEquals(0, len(f.credentials))
391
354
        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
 
        self.assertEqual(1, len(f.credentials))
395
 
        self.assertEqual([None, 'example.com', 'user', 'pass'],
396
 
                         f.credentials[0])
 
355
            'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
 
356
        self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
 
357
        self.assertEquals(1, len(f.credentials))
 
358
        self.assertEquals([None, 'www.bazaar-vcs.org', 'user', 'pass'],
 
359
                          f.credentials[0])
397
360
 
398
361
 
399
362
class TestHttpTransportUrls(tests.TestCase):
400
363
    """Test the http urls."""
401
364
 
402
 
    scenarios = vary_by_http_client_implementation()
403
 
 
404
365
    def test_abs_url(self):
405
366
        """Construction of absolute http URLs"""
406
 
        t = self._transport('http://example.com/bzr/bzr.dev/')
 
367
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
407
368
        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')
 
369
        eq(t.abspath('.'), 'http://bazaar-vcs.org/bzr/bzr.dev')
 
370
        eq(t.abspath('foo/bar'), 'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
 
371
        eq(t.abspath('.bzr'), 'http://bazaar-vcs.org/bzr/bzr.dev/.bzr')
411
372
        eq(t.abspath('.bzr/1//2/./3'),
412
 
           'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
 
373
           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
413
374
 
414
375
    def test_invalid_http_urls(self):
415
376
        """Trap invalid construction of urls"""
416
 
        self._transport('http://example.com/bzr/bzr.dev/')
 
377
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
417
378
        self.assertRaises(errors.InvalidURL,
418
379
                          self._transport,
419
 
                          'http://http://example.com/bzr/bzr.dev/')
 
380
                          'http://http://bazaar-vcs.org/bzr/bzr.dev/')
420
381
 
421
382
    def test_http_root_urls(self):
422
383
        """Construction of URLs from server root"""
423
 
        t = self._transport('http://example.com/')
 
384
        t = self._transport('http://bzr.ozlabs.org/')
424
385
        eq = self.assertEqualDiff
425
386
        eq(t.abspath('.bzr/tree-version'),
426
 
           'http://example.com/.bzr/tree-version')
 
387
           'http://bzr.ozlabs.org/.bzr/tree-version')
427
388
 
428
389
    def test_http_impl_urls(self):
429
390
        """There are servers which ask for particular clients to connect"""
430
391
        server = self._server()
431
 
        server.start_server()
432
392
        try:
 
393
            server.setUp()
433
394
            url = server.get_url()
434
 
            self.assertTrue(url.startswith('%s://' % self._url_protocol))
 
395
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
435
396
        finally:
436
 
            server.stop_server()
 
397
            server.tearDown()
437
398
 
438
399
 
439
400
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
448
409
        https by supplying a fake version_info that do not
449
410
        support it.
450
411
        """
451
 
        self.requireFeature(features.pycurl)
452
 
        # Import the module locally now that we now it's available.
453
 
        pycurl = features.pycurl.module
 
412
        try:
 
413
            import pycurl
 
414
        except ImportError:
 
415
            raise tests.TestSkipped('pycurl not present')
454
416
 
455
 
        self.overrideAttr(pycurl, 'version_info',
456
 
                          # Fake the pycurl version_info This was taken from
457
 
                          # a windows pycurl without SSL (thanks to bialix)
458
 
                          lambda : (2,
459
 
                                    '7.13.2',
460
 
                                    462082,
461
 
                                    'i386-pc-win32',
462
 
                                    2576,
463
 
                                    None,
464
 
                                    0,
465
 
                                    None,
466
 
                                    ('ftp', 'gopher', 'telnet',
467
 
                                     'dict', 'ldap', 'http', 'file'),
468
 
                                    None,
469
 
                                    0,
470
 
                                    None))
471
 
        self.assertRaises(errors.DependencyNotPresent, self._transport,
472
 
                          'https://launchpad.net')
 
417
        version_info_orig = pycurl.version_info
 
418
        try:
 
419
            # Now that we have pycurl imported, we can fake its version_info
 
420
            # This was taken from a windows pycurl without SSL
 
421
            # (thanks to bialix)
 
422
            pycurl.version_info = lambda : (2,
 
423
                                            '7.13.2',
 
424
                                            462082,
 
425
                                            'i386-pc-win32',
 
426
                                            2576,
 
427
                                            None,
 
428
                                            0,
 
429
                                            None,
 
430
                                            ('ftp', 'gopher', 'telnet',
 
431
                                             'dict', 'ldap', 'http', 'file'),
 
432
                                            None,
 
433
                                            0,
 
434
                                            None)
 
435
            self.assertRaises(errors.DependencyNotPresent, self._transport,
 
436
                              'https://launchpad.net')
 
437
        finally:
 
438
            # Restore the right function
 
439
            pycurl.version_info = version_info_orig
473
440
 
474
441
 
475
442
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
476
443
    """Test the http connections."""
477
444
 
478
 
    scenarios = multiply_scenarios(
479
 
        vary_by_http_client_implementation(),
480
 
        vary_by_http_protocol_version(),
481
 
        )
482
 
 
483
445
    def setUp(self):
484
446
        http_utils.TestCaseWithWebserver.setUp(self)
485
447
        self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
487
449
 
488
450
    def test_http_has(self):
489
451
        server = self.get_readonly_server()
490
 
        t = self.get_readonly_transport()
 
452
        t = self._transport(server.get_url())
491
453
        self.assertEqual(t.has('foo/bar'), True)
492
454
        self.assertEqual(len(server.logs), 1)
493
455
        self.assertContainsRe(server.logs[0],
495
457
 
496
458
    def test_http_has_not_found(self):
497
459
        server = self.get_readonly_server()
498
 
        t = self.get_readonly_transport()
 
460
        t = self._transport(server.get_url())
499
461
        self.assertEqual(t.has('not-found'), False)
500
462
        self.assertContainsRe(server.logs[1],
501
463
            r'"HEAD /not-found HTTP/1.." 404 - "-" "bzr/')
502
464
 
503
465
    def test_http_get(self):
504
466
        server = self.get_readonly_server()
505
 
        t = self.get_readonly_transport()
 
467
        t = self._transport(server.get_url())
506
468
        fp = t.get('foo/bar')
507
469
        self.assertEqualDiff(
508
470
            fp.read(),
530
492
class TestHttpTransportRegistration(tests.TestCase):
531
493
    """Test registrations of various http implementations"""
532
494
 
533
 
    scenarios = vary_by_http_client_implementation()
534
 
 
535
495
    def test_http_registered(self):
536
 
        t = transport.get_transport('%s://foo.com/' % self._url_protocol)
 
496
        t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
537
497
        self.assertIsInstance(t, transport.Transport)
538
498
        self.assertIsInstance(t, self._transport)
539
499
 
540
500
 
541
501
class TestPost(tests.TestCase):
542
502
 
543
 
    scenarios = multiply_scenarios(
544
 
        vary_by_http_client_implementation(),
545
 
        vary_by_http_protocol_version(),
546
 
        )
547
 
 
548
503
    def test_post_body_is_received(self):
549
 
        server = RecordingServer(expect_body_tail='end-of-body',
550
 
                                 scheme=self._url_protocol)
551
 
        self.start_server(server)
552
 
        url = server.get_url()
553
 
        # FIXME: needs a cleanup -- vila 20100611
554
 
        http_transport = transport.get_transport(url)
 
504
        server = RecordingServer(expect_body_tail='end-of-body')
 
505
        server.setUp()
 
506
        self.addCleanup(server.tearDown)
 
507
        scheme = self._qualified_prefix
 
508
        url = '%s://%s:%s/' % (scheme, server.host, server.port)
 
509
        http_transport = self._transport(url)
555
510
        code, response = http_transport._post('abc def end-of-body')
556
511
        self.assertTrue(
557
512
            server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
558
513
        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
514
        # The transport should not be assuming that the server can accept
562
515
        # chunked encoding the first time it connects, because HTTP/1.1, so we
563
516
        # check for the literal string.
599
552
    Daughter classes are expected to override _req_handler_class
600
553
    """
601
554
 
602
 
    scenarios = multiply_scenarios(
603
 
        vary_by_http_client_implementation(),
604
 
        vary_by_http_protocol_version(),
605
 
        )
606
 
 
607
555
    # Provide a useful default
608
556
    _req_handler_class = http_server.TestingHTTPRequestHandler
609
557
 
610
558
    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
 
559
        return http_server.HttpServer(self._req_handler_class,
 
560
                                      protocol_version=self._protocol_version)
615
561
 
616
562
    def _testing_pycurl(self):
617
 
        # TODO: This is duplicated for lots of the classes in this file
618
 
        return (features.pycurl.available()
619
 
                and self._transport == PyCurlTransport)
 
563
        return pycurl_present and self._transport == PyCurlTransport
620
564
 
621
565
 
622
566
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
623
567
    """Whatever request comes in, close the connection"""
624
568
 
625
 
    def _handle_one_request(self):
 
569
    def handle_one_request(self):
626
570
        """Handle a single HTTP request, by abruptly closing the connection"""
627
571
        self.close_connection = 1
628
572
 
633
577
    _req_handler_class = WallRequestHandler
634
578
 
635
579
    def test_http_has(self):
636
 
        t = self.get_readonly_transport()
 
580
        server = self.get_readonly_server()
 
581
        t = self._transport(server.get_url())
637
582
        # Unfortunately httplib (see HTTPResponse._read_status
638
583
        # for details) make no distinction between a closed
639
584
        # socket and badly formatted status line, so we can't
640
585
        # just test for ConnectionError, we have to test
641
 
        # InvalidHttpResponse too. And pycurl may raise ConnectionReset
642
 
        # instead of ConnectionError too.
643
 
        self.assertRaises(( errors.ConnectionError, errors.ConnectionReset,
644
 
                            errors.InvalidHttpResponse),
 
586
        # InvalidHttpResponse too.
 
587
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
645
588
                          t.has, 'foo/bar')
646
589
 
647
590
    def test_http_get(self):
648
 
        t = self.get_readonly_transport()
649
 
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
650
 
                           errors.InvalidHttpResponse),
 
591
        server = self.get_readonly_server()
 
592
        t = self._transport(server.get_url())
 
593
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
651
594
                          t.get, 'foo/bar')
652
595
 
653
596
 
668
611
    _req_handler_class = BadStatusRequestHandler
669
612
 
670
613
    def test_http_has(self):
671
 
        t = self.get_readonly_transport()
 
614
        server = self.get_readonly_server()
 
615
        t = self._transport(server.get_url())
672
616
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
673
617
 
674
618
    def test_http_get(self):
675
 
        t = self.get_readonly_transport()
 
619
        server = self.get_readonly_server()
 
620
        t = self._transport(server.get_url())
676
621
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
677
622
 
678
623
 
683
628
        """Fakes handling a single HTTP request, returns a bad status"""
684
629
        ignored = http_server.TestingHTTPRequestHandler.parse_request(self)
685
630
        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
631
        return False
691
632
 
692
633
 
698
639
 
699
640
    _req_handler_class = InvalidStatusRequestHandler
700
641
 
 
642
    def test_http_has(self):
 
643
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
 
644
            raise tests.KnownFailure(
 
645
                'pycurl hangs if the server send back garbage')
 
646
        super(TestInvalidStatusServer, self).test_http_has()
 
647
 
 
648
    def test_http_get(self):
 
649
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
 
650
            raise tests.KnownFailure(
 
651
                'pycurl hangs if the server send back garbage')
 
652
        super(TestInvalidStatusServer, self).test_http_get()
 
653
 
701
654
 
702
655
class BadProtocolRequestHandler(http_server.TestingHTTPRequestHandler):
703
656
    """Whatever request comes in, returns a bad protocol version"""
719
672
    _req_handler_class = BadProtocolRequestHandler
720
673
 
721
674
    def setUp(self):
722
 
        if self._testing_pycurl():
 
675
        if pycurl_present and self._transport == PyCurlTransport:
723
676
            raise tests.TestNotApplicable(
724
677
                "pycurl doesn't check the protocol version")
725
678
        super(TestBadProtocolServer, self).setUp()
726
679
 
727
680
    def test_http_has(self):
728
 
        t = self.get_readonly_transport()
 
681
        server = self.get_readonly_server()
 
682
        t = self._transport(server.get_url())
729
683
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
730
684
 
731
685
    def test_http_get(self):
732
 
        t = self.get_readonly_transport()
 
686
        server = self.get_readonly_server()
 
687
        t = self._transport(server.get_url())
733
688
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
734
689
 
735
690
 
749
704
    _req_handler_class = ForbiddenRequestHandler
750
705
 
751
706
    def test_http_has(self):
752
 
        t = self.get_readonly_transport()
 
707
        server = self.get_readonly_server()
 
708
        t = self._transport(server.get_url())
753
709
        self.assertRaises(errors.TransportError, t.has, 'foo/bar')
754
710
 
755
711
    def test_http_get(self):
756
 
        t = self.get_readonly_transport()
 
712
        server = self.get_readonly_server()
 
713
        t = self._transport(server.get_url())
757
714
        self.assertRaises(errors.TransportError, t.get, 'foo/bar')
758
715
 
759
716
 
765
722
        self.assertEqual(None, server.host)
766
723
        self.assertEqual(None, server.port)
767
724
 
768
 
    def test_setUp_and_stop(self):
 
725
    def test_setUp_and_tearDown(self):
769
726
        server = RecordingServer(expect_body_tail=None)
770
 
        server.start_server()
 
727
        server.setUp()
771
728
        try:
772
729
            self.assertNotEqual(None, server.host)
773
730
            self.assertNotEqual(None, server.port)
774
731
        finally:
775
 
            server.stop_server()
 
732
            server.tearDown()
776
733
        self.assertEqual(None, server.host)
777
734
        self.assertEqual(None, server.port)
778
735
 
779
736
    def test_send_receive_bytes(self):
780
 
        server = RecordingServer(expect_body_tail='c', scheme='http')
781
 
        self.start_server(server)
 
737
        server = RecordingServer(expect_body_tail='c')
 
738
        server.setUp()
 
739
        self.addCleanup(server.tearDown)
782
740
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
783
741
        sock.connect((server.host, server.port))
784
742
        sock.sendall('abc')
798
756
        self.build_tree_contents([('a', '0123456789')],)
799
757
 
800
758
    def test_readv(self):
801
 
        t = self.get_readonly_transport()
 
759
        server = self.get_readonly_server()
 
760
        t = self._transport(server.get_url())
802
761
        l = list(t.readv('a', ((0, 1), (1, 1), (3, 2), (9, 1))))
803
762
        self.assertEqual(l[0], (0, '0'))
804
763
        self.assertEqual(l[1], (1, '1'))
806
765
        self.assertEqual(l[3], (9, '9'))
807
766
 
808
767
    def test_readv_out_of_order(self):
809
 
        t = self.get_readonly_transport()
 
768
        server = self.get_readonly_server()
 
769
        t = self._transport(server.get_url())
810
770
        l = list(t.readv('a', ((1, 1), (9, 1), (0, 1), (3, 2))))
811
771
        self.assertEqual(l[0], (1, '1'))
812
772
        self.assertEqual(l[1], (9, '9'))
814
774
        self.assertEqual(l[3], (3, '34'))
815
775
 
816
776
    def test_readv_invalid_ranges(self):
817
 
        t = self.get_readonly_transport()
 
777
        server = self.get_readonly_server()
 
778
        t = self._transport(server.get_url())
818
779
 
819
780
        # This is intentionally reading off the end of the file
820
781
        # since we are sure that it cannot get there
828
789
 
829
790
    def test_readv_multiple_get_requests(self):
830
791
        server = self.get_readonly_server()
831
 
        t = self.get_readonly_transport()
 
792
        t = self._transport(server.get_url())
832
793
        # force transport to issue multiple requests
833
794
        t._max_readv_combine = 1
834
795
        t._max_get_ranges = 1
842
803
 
843
804
    def test_readv_get_max_size(self):
844
805
        server = self.get_readonly_server()
845
 
        t = self.get_readonly_transport()
 
806
        t = self._transport(server.get_url())
846
807
        # force transport to issue multiple requests by limiting the number of
847
808
        # bytes by request. Note that this apply to coalesced offsets only, a
848
809
        # single range will keep its size even if bigger than the limit.
857
818
 
858
819
    def test_complete_readv_leave_pipe_clean(self):
859
820
        server = self.get_readonly_server()
860
 
        t = self.get_readonly_transport()
 
821
        t = self._transport(server.get_url())
861
822
        # force transport to issue multiple requests
862
823
        t._get_max_size = 2
863
 
        list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
 
824
        l = list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
864
825
        # The server should have issued 3 requests
865
826
        self.assertEqual(3, server.GET_request_nb)
866
827
        self.assertEqual('0123456789', t.get_bytes('a'))
868
829
 
869
830
    def test_incomplete_readv_leave_pipe_clean(self):
870
831
        server = self.get_readonly_server()
871
 
        t = self.get_readonly_transport()
 
832
        t = self._transport(server.get_url())
872
833
        # force transport to issue multiple requests
873
834
        t._get_max_size = 2
874
835
        # Don't collapse readv results into a list so that we leave unread
943
904
    def get_multiple_ranges(self, file, file_size, ranges):
944
905
        self.send_response(206)
945
906
        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
907
        boundary = "%d" % random.randint(0,0x7FFFFFFF)
949
908
        self.send_header("Content-Type",
950
909
                         "multipart/byteranges; boundary=%s" % boundary)
1012
971
                return
1013
972
            self.send_range_content(file, start, end - start + 1)
1014
973
            cur += 1
1015
 
        # Final boundary
 
974
        # No final boundary
1016
975
        self.wfile.write(boundary_line)
1017
976
 
1018
977
 
1026
985
 
1027
986
    def test_readv_with_short_reads(self):
1028
987
        server = self.get_readonly_server()
1029
 
        t = self.get_readonly_transport()
 
988
        t = self._transport(server.get_url())
1030
989
        # Force separate ranges for each offset
1031
990
        t._bytes_to_read_before_seek = 0
1032
991
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1047
1006
        # that mode
1048
1007
        self.assertEqual('single', t._range_hint)
1049
1008
 
1050
 
 
1051
1009
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1052
1010
    """Errors out when range specifiers exceed the limit"""
1053
1011
 
1077
1035
class TestLimitedRangeRequestServer(http_utils.TestCaseWithWebserver):
1078
1036
    """Tests readv requests against a server erroring out on too much ranges."""
1079
1037
 
1080
 
    scenarios = multiply_scenarios(
1081
 
        vary_by_http_client_implementation(),
1082
 
        vary_by_http_protocol_version(),
1083
 
        )
1084
 
 
1085
1038
    # Requests with more range specifiers will error out
1086
1039
    range_limit = 3
1087
1040
 
1089
1042
        return LimitedRangeHTTPServer(range_limit=self.range_limit,
1090
1043
                                      protocol_version=self._protocol_version)
1091
1044
 
 
1045
    def get_transport(self):
 
1046
        return self._transport(self.get_readonly_server().get_url())
 
1047
 
1092
1048
    def setUp(self):
1093
1049
        http_utils.TestCaseWithWebserver.setUp(self)
1094
1050
        # We need to manipulate ranges that correspond to real chunks in the
1098
1054
        self.build_tree_contents([('a', content)],)
1099
1055
 
1100
1056
    def test_few_ranges(self):
1101
 
        t = self.get_readonly_transport()
 
1057
        t = self.get_transport()
1102
1058
        l = list(t.readv('a', ((0, 4), (1024, 4), )))
1103
1059
        self.assertEqual(l[0], (0, '0000'))
1104
1060
        self.assertEqual(l[1], (1024, '0001'))
1105
1061
        self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1106
1062
 
1107
1063
    def test_more_ranges(self):
1108
 
        t = self.get_readonly_transport()
 
1064
        t = self.get_transport()
1109
1065
        l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1110
1066
        self.assertEqual(l[0], (0, '0000'))
1111
1067
        self.assertEqual(l[1], (1024, '0001'))
1122
1078
    Only the urllib implementation is tested here.
1123
1079
    """
1124
1080
 
 
1081
    def setUp(self):
 
1082
        tests.TestCase.setUp(self)
 
1083
        self._old_env = {}
 
1084
 
 
1085
    def tearDown(self):
 
1086
        self._restore_env()
 
1087
        tests.TestCase.tearDown(self)
 
1088
 
 
1089
    def _install_env(self, env):
 
1090
        for name, value in env.iteritems():
 
1091
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1092
 
 
1093
    def _restore_env(self):
 
1094
        for name, value in self._old_env.iteritems():
 
1095
            osutils.set_or_unset_env(name, value)
 
1096
 
1125
1097
    def _proxied_request(self):
1126
1098
        handler = _urllib2_wrappers.ProxyHandler()
1127
 
        request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
 
1099
        request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
1128
1100
        handler.set_proxy(request, 'http')
1129
1101
        return request
1130
1102
 
1131
 
    def assertEvaluateProxyBypass(self, expected, host, no_proxy):
1132
 
        handler = _urllib2_wrappers.ProxyHandler()
1133
 
        self.assertEquals(expected,
1134
 
                          handler.evaluate_proxy_bypass(host, no_proxy))
1135
 
 
1136
1103
    def test_empty_user(self):
1137
 
        self.overrideEnv('http_proxy', 'http://bar.com')
1138
 
        request = self._proxied_request()
1139
 
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
1140
 
 
1141
 
    def test_user_with_at(self):
1142
 
        self.overrideEnv('http_proxy',
1143
 
                         'http://username@domain:password@proxy_host:1234')
 
1104
        self._install_env({'http_proxy': 'http://bar.com'})
1144
1105
        request = self._proxied_request()
1145
1106
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
1146
1107
 
1147
1108
    def test_invalid_proxy(self):
1148
1109
        """A proxy env variable without scheme"""
1149
 
        self.overrideEnv('http_proxy', 'host:1234')
 
1110
        self._install_env({'http_proxy': 'host:1234'})
1150
1111
        self.assertRaises(errors.InvalidURL, self._proxied_request)
1151
1112
 
1152
 
    def test_evaluate_proxy_bypass_true(self):
1153
 
        """The host is not proxied"""
1154
 
        self.assertEvaluateProxyBypass(True, 'example.com', 'example.com')
1155
 
        self.assertEvaluateProxyBypass(True, 'bzr.example.com', '*example.com')
1156
 
 
1157
 
    def test_evaluate_proxy_bypass_false(self):
1158
 
        """The host is proxied"""
1159
 
        self.assertEvaluateProxyBypass(False, 'bzr.example.com', None)
1160
 
 
1161
 
    def test_evaluate_proxy_bypass_unknown(self):
1162
 
        """The host is not explicitly proxied"""
1163
 
        self.assertEvaluateProxyBypass(None, 'example.com', 'not.example.com')
1164
 
        self.assertEvaluateProxyBypass(None, 'bzr.example.com', 'example.com')
1165
 
 
1166
 
    def test_evaluate_proxy_bypass_empty_entries(self):
1167
 
        """Ignore empty entries"""
1168
 
        self.assertEvaluateProxyBypass(None, 'example.com', '')
1169
 
        self.assertEvaluateProxyBypass(None, 'example.com', ',')
1170
 
        self.assertEvaluateProxyBypass(None, 'example.com', 'foo,,bar')
1171
 
 
1172
1113
 
1173
1114
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1174
1115
    """Tests proxy server.
1179
1120
    to the file names).
1180
1121
    """
1181
1122
 
1182
 
    scenarios = multiply_scenarios(
1183
 
        vary_by_http_client_implementation(),
1184
 
        vary_by_http_protocol_version(),
1185
 
        )
1186
 
 
1187
1123
    # FIXME: We don't have an https server available, so we don't
1188
 
    # test https connections. --vila toolongago
 
1124
    # test https connections.
1189
1125
 
1190
1126
    def setUp(self):
1191
1127
        super(TestProxyHttpServer, self).setUp()
1192
 
        self.transport_secondary_server = http_utils.ProxyServer
1193
1128
        self.build_tree_contents([('foo', 'contents of foo\n'),
1194
1129
                                  ('foo-proxied', 'proxied contents of foo\n')])
1195
1130
        # Let's setup some attributes for tests
1196
 
        server = self.get_readonly_server()
1197
 
        self.server_host_port = '%s:%d' % (server.host, server.port)
 
1131
        self.server = self.get_readonly_server()
 
1132
        self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
1198
1133
        if self._testing_pycurl():
1199
1134
            # Oh my ! pycurl does not check for the port as part of
1200
1135
            # no_proxy :-( So we just test the host part
1201
 
            self.no_proxy_host = server.host
 
1136
            self.no_proxy_host = 'localhost'
1202
1137
        else:
1203
 
            self.no_proxy_host = self.server_host_port
 
1138
            self.no_proxy_host = self.proxy_address
1204
1139
        # The secondary server is the proxy
1205
 
        self.proxy_url = self.get_secondary_url()
 
1140
        self.proxy = self.get_secondary_server()
 
1141
        self.proxy_url = self.proxy.get_url()
 
1142
        self._old_env = {}
1206
1143
 
1207
1144
    def _testing_pycurl(self):
1208
 
        # TODO: This is duplicated for lots of the classes in this file
1209
 
        return (features.pycurl.available()
1210
 
                and self._transport == PyCurlTransport)
1211
 
 
1212
 
    def assertProxied(self):
1213
 
        t = self.get_readonly_transport()
1214
 
        self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1215
 
 
1216
 
    def assertNotProxied(self):
1217
 
        t = self.get_readonly_transport()
1218
 
        self.assertEqual('contents of foo\n', t.get('foo').read())
 
1145
        return pycurl_present and self._transport == PyCurlTransport
 
1146
 
 
1147
    def create_transport_secondary_server(self):
 
1148
        """Creates an http server that will serve files with
 
1149
        '-proxied' appended to their names.
 
1150
        """
 
1151
        return http_utils.ProxyServer(protocol_version=self._protocol_version)
 
1152
 
 
1153
    def _install_env(self, env):
 
1154
        for name, value in env.iteritems():
 
1155
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1156
 
 
1157
    def _restore_env(self):
 
1158
        for name, value in self._old_env.iteritems():
 
1159
            osutils.set_or_unset_env(name, value)
 
1160
 
 
1161
    def proxied_in_env(self, env):
 
1162
        self._install_env(env)
 
1163
        url = self.server.get_url()
 
1164
        t = self._transport(url)
 
1165
        try:
 
1166
            self.assertEqual('proxied contents of foo\n', t.get('foo').read())
 
1167
        finally:
 
1168
            self._restore_env()
 
1169
 
 
1170
    def not_proxied_in_env(self, env):
 
1171
        self._install_env(env)
 
1172
        url = self.server.get_url()
 
1173
        t = self._transport(url)
 
1174
        try:
 
1175
            self.assertEqual('contents of foo\n', t.get('foo').read())
 
1176
        finally:
 
1177
            self._restore_env()
1219
1178
 
1220
1179
    def test_http_proxy(self):
1221
 
        self.overrideEnv('http_proxy', self.proxy_url)
1222
 
        self.assertProxied()
 
1180
        self.proxied_in_env({'http_proxy': self.proxy_url})
1223
1181
 
1224
1182
    def test_HTTP_PROXY(self):
1225
1183
        if self._testing_pycurl():
1228
1186
            # about. Should we ?)
1229
1187
            raise tests.TestNotApplicable(
1230
1188
                'pycurl does not check HTTP_PROXY for security reasons')
1231
 
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
1232
 
        self.assertProxied()
 
1189
        self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
1233
1190
 
1234
1191
    def test_all_proxy(self):
1235
 
        self.overrideEnv('all_proxy', self.proxy_url)
1236
 
        self.assertProxied()
 
1192
        self.proxied_in_env({'all_proxy': self.proxy_url})
1237
1193
 
1238
1194
    def test_ALL_PROXY(self):
1239
 
        self.overrideEnv('ALL_PROXY', self.proxy_url)
1240
 
        self.assertProxied()
 
1195
        self.proxied_in_env({'ALL_PROXY': self.proxy_url})
1241
1196
 
1242
1197
    def test_http_proxy_with_no_proxy(self):
1243
 
        self.overrideEnv('no_proxy', self.no_proxy_host)
1244
 
        self.overrideEnv('http_proxy', self.proxy_url)
1245
 
        self.assertNotProxied()
 
1198
        self.not_proxied_in_env({'http_proxy': self.proxy_url,
 
1199
                                 'no_proxy': self.no_proxy_host})
1246
1200
 
1247
1201
    def test_HTTP_PROXY_with_NO_PROXY(self):
1248
1202
        if self._testing_pycurl():
1249
1203
            raise tests.TestNotApplicable(
1250
1204
                'pycurl does not check HTTP_PROXY for security reasons')
1251
 
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
1252
 
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
1253
 
        self.assertNotProxied()
 
1205
        self.not_proxied_in_env({'HTTP_PROXY': self.proxy_url,
 
1206
                                 'NO_PROXY': self.no_proxy_host})
1254
1207
 
1255
1208
    def test_all_proxy_with_no_proxy(self):
1256
 
        self.overrideEnv('no_proxy', self.no_proxy_host)
1257
 
        self.overrideEnv('all_proxy', self.proxy_url)
1258
 
        self.assertNotProxied()
 
1209
        self.not_proxied_in_env({'all_proxy': self.proxy_url,
 
1210
                                 'no_proxy': self.no_proxy_host})
1259
1211
 
1260
1212
    def test_ALL_PROXY_with_NO_PROXY(self):
1261
 
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
1262
 
        self.overrideEnv('ALL_PROXY', self.proxy_url)
1263
 
        self.assertNotProxied()
 
1213
        self.not_proxied_in_env({'ALL_PROXY': self.proxy_url,
 
1214
                                 'NO_PROXY': self.no_proxy_host})
1264
1215
 
1265
1216
    def test_http_proxy_without_scheme(self):
1266
 
        self.overrideEnv('http_proxy', self.server_host_port)
1267
1217
        if self._testing_pycurl():
1268
1218
            # pycurl *ignores* invalid proxy env variables. If that ever change
1269
1219
            # in the future, this test will fail indicating that pycurl do not
1270
1220
            # ignore anymore such variables.
1271
 
            self.assertNotProxied()
 
1221
            self.not_proxied_in_env({'http_proxy': self.proxy_address})
1272
1222
        else:
1273
 
            self.assertRaises(errors.InvalidURL, self.assertProxied)
 
1223
            self.assertRaises(errors.InvalidURL,
 
1224
                              self.proxied_in_env,
 
1225
                              {'http_proxy': self.proxy_address})
1274
1226
 
1275
1227
 
1276
1228
class TestRanges(http_utils.TestCaseWithWebserver):
1277
1229
    """Test the Range header in GET methods."""
1278
1230
 
1279
 
    scenarios = multiply_scenarios(
1280
 
        vary_by_http_client_implementation(),
1281
 
        vary_by_http_protocol_version(),
1282
 
        )
1283
 
 
1284
1231
    def setUp(self):
1285
1232
        http_utils.TestCaseWithWebserver.setUp(self)
1286
1233
        self.build_tree_contents([('a', '0123456789')],)
 
1234
        server = self.get_readonly_server()
 
1235
        self.transport = self._transport(server.get_url())
1287
1236
 
1288
1237
    def create_transport_readonly_server(self):
1289
1238
        return http_server.HttpServer(protocol_version=self._protocol_version)
1290
1239
 
1291
1240
    def _file_contents(self, relpath, ranges):
1292
 
        t = self.get_readonly_transport()
1293
1241
        offsets = [ (start, end - start + 1) for start, end in ranges]
1294
 
        coalesce = t._coalesce_offsets
 
1242
        coalesce = self.transport._coalesce_offsets
1295
1243
        coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1296
 
        code, data = t._get(relpath, coalesced)
 
1244
        code, data = self.transport._get(relpath, coalesced)
1297
1245
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1298
1246
        for start, end in ranges:
1299
1247
            data.seek(start)
1300
1248
            yield data.read(end - start + 1)
1301
1249
 
1302
1250
    def _file_tail(self, relpath, tail_amount):
1303
 
        t = self.get_readonly_transport()
1304
 
        code, data = t._get(relpath, [], tail_amount)
 
1251
        code, data = self.transport._get(relpath, [], tail_amount)
1305
1252
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1306
1253
        data.seek(-tail_amount, 2)
1307
1254
        return data.read(tail_amount)
1326
1273
class TestHTTPRedirections(http_utils.TestCaseWithRedirectedWebserver):
1327
1274
    """Test redirection between http servers."""
1328
1275
 
1329
 
    scenarios = multiply_scenarios(
1330
 
        vary_by_http_client_implementation(),
1331
 
        vary_by_http_protocol_version(),
1332
 
        )
 
1276
    def create_transport_secondary_server(self):
 
1277
        """Create the secondary server redirecting to the primary server"""
 
1278
        new = self.get_readonly_server()
 
1279
 
 
1280
        redirecting = http_utils.HTTPServerRedirecting(
 
1281
            protocol_version=self._protocol_version)
 
1282
        redirecting.redirect_to(new.host, new.port)
 
1283
        return redirecting
1333
1284
 
1334
1285
    def setUp(self):
1335
1286
        super(TestHTTPRedirections, self).setUp()
1337
1288
                                  ('bundle',
1338
1289
                                  '# Bazaar revision bundle v0.9\n#\n')
1339
1290
                                  ],)
 
1291
        # The requests to the old server will be redirected to the new server
 
1292
        self.old_transport = self._transport(self.old_server.get_url())
1340
1293
 
1341
1294
    def test_redirected(self):
1342
 
        self.assertRaises(errors.RedirectRequested,
1343
 
                          self.get_old_transport().get, 'a')
1344
 
        self.assertEqual('0123456789', self.get_new_transport().get('a').read())
 
1295
        self.assertRaises(errors.RedirectRequested, self.old_transport.get, 'a')
 
1296
        t = self._transport(self.new_server.get_url())
 
1297
        self.assertEqual('0123456789', t.get('a').read())
 
1298
 
 
1299
    def test_read_redirected_bundle_from_url(self):
 
1300
        from bzrlib.bundle import read_bundle_from_url
 
1301
        url = self.old_transport.abspath('bundle')
 
1302
        bundle = self.applyDeprecated(deprecated_in((1, 12, 0)),
 
1303
                read_bundle_from_url, url)
 
1304
        # If read_bundle_from_url was successful we get an empty bundle
 
1305
        self.assertEqual([], bundle.revisions)
1345
1306
 
1346
1307
 
1347
1308
class RedirectedRequest(_urllib2_wrappers.Request):
1360
1321
        self.follow_redirections = True
1361
1322
 
1362
1323
 
1363
 
def install_redirected_request(test):
1364
 
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
1365
 
 
1366
 
 
1367
 
def cleanup_http_redirection_connections(test):
1368
 
    # Some sockets are opened but never seen by _urllib, so we trap them at
1369
 
    # the _urllib2_wrappers level to be able to clean them up.
1370
 
    def socket_disconnect(sock):
1371
 
        try:
1372
 
            sock.shutdown(socket.SHUT_RDWR)
1373
 
            sock.close()
1374
 
        except socket.error:
1375
 
            pass
1376
 
    def connect(connection):
1377
 
        test.http_connect_orig(connection)
1378
 
        test.addCleanup(socket_disconnect, connection.sock)
1379
 
    test.http_connect_orig = test.overrideAttr(
1380
 
        _urllib2_wrappers.HTTPConnection, 'connect', connect)
1381
 
    def connect(connection):
1382
 
        test.https_connect_orig(connection)
1383
 
        test.addCleanup(socket_disconnect, connection.sock)
1384
 
    test.https_connect_orig = test.overrideAttr(
1385
 
        _urllib2_wrappers.HTTPSConnection, 'connect', connect)
1386
 
 
1387
 
 
1388
1324
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1389
1325
    """Test redirections.
1390
1326
 
1399
1335
    -- vila 20070212
1400
1336
    """
1401
1337
 
1402
 
    scenarios = multiply_scenarios(
1403
 
        vary_by_http_client_implementation(),
1404
 
        vary_by_http_protocol_version(),
1405
 
        )
1406
 
 
1407
1338
    def setUp(self):
1408
 
        if (features.pycurl.available()
1409
 
            and self._transport == PyCurlTransport):
 
1339
        if pycurl_present and self._transport == PyCurlTransport:
1410
1340
            raise tests.TestNotApplicable(
1411
 
                "pycurl doesn't redirect silently anymore")
 
1341
                "pycurl doesn't redirect silently annymore")
1412
1342
        super(TestHTTPSilentRedirections, self).setUp()
1413
 
        install_redirected_request(self)
1414
 
        cleanup_http_redirection_connections(self)
 
1343
        self.setup_redirected_request()
 
1344
        self.addCleanup(self.cleanup_redirected_request)
1415
1345
        self.build_tree_contents([('a','a'),
1416
1346
                                  ('1/',),
1417
1347
                                  ('1/a', 'redirected once'),
1425
1355
                                  ('5/a', 'redirected 5 times'),
1426
1356
                                  ],)
1427
1357
 
 
1358
        self.old_transport = self._transport(self.old_server.get_url())
 
1359
 
 
1360
    def setup_redirected_request(self):
 
1361
        self.original_class = _urllib2_wrappers.Request
 
1362
        _urllib2_wrappers.Request = RedirectedRequest
 
1363
 
 
1364
    def cleanup_redirected_request(self):
 
1365
        _urllib2_wrappers.Request = self.original_class
 
1366
 
 
1367
    def create_transport_secondary_server(self):
 
1368
        """Create the secondary server, redirections are defined in the tests"""
 
1369
        return http_utils.HTTPServerRedirecting(
 
1370
            protocol_version=self._protocol_version)
 
1371
 
1428
1372
    def test_one_redirection(self):
1429
 
        t = self.get_old_transport()
1430
 
        req = RedirectedRequest('GET', t._remote_path('a'))
 
1373
        t = self.old_transport
 
1374
 
 
1375
        req = RedirectedRequest('GET', t.abspath('a'))
 
1376
        req.follow_redirections = True
1431
1377
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1432
1378
                                       self.new_server.port)
1433
1379
        self.old_server.redirections = \
1434
1380
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1435
 
        self.assertEqual('redirected once', t._perform(req).read())
 
1381
        self.assertEquals('redirected once',t._perform(req).read())
1436
1382
 
1437
1383
    def test_five_redirections(self):
1438
 
        t = self.get_old_transport()
1439
 
        req = RedirectedRequest('GET', t._remote_path('a'))
 
1384
        t = self.old_transport
 
1385
 
 
1386
        req = RedirectedRequest('GET', t.abspath('a'))
 
1387
        req.follow_redirections = True
1440
1388
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1441
1389
                                       self.old_server.port)
1442
1390
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1448
1396
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1449
1397
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1450
1398
            ]
1451
 
        self.assertEqual('redirected 5 times', t._perform(req).read())
 
1399
        self.assertEquals('redirected 5 times',t._perform(req).read())
1452
1400
 
1453
1401
 
1454
1402
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1455
1403
    """Test transport.do_catching_redirections."""
1456
1404
 
1457
 
    scenarios = multiply_scenarios(
1458
 
        vary_by_http_client_implementation(),
1459
 
        vary_by_http_protocol_version(),
1460
 
        )
1461
 
 
1462
1405
    def setUp(self):
1463
1406
        super(TestDoCatchRedirections, self).setUp()
1464
1407
        self.build_tree_contents([('a', '0123456789'),],)
1465
 
        cleanup_http_redirection_connections(self)
1466
 
 
1467
 
        self.old_transport = self.get_old_transport()
1468
 
 
1469
 
    def get_a(self, t):
1470
 
        return t.get('a')
 
1408
 
 
1409
        self.old_transport = self._transport(self.old_server.get_url())
 
1410
 
 
1411
    def get_a(self, transport):
 
1412
        return transport.get('a')
1471
1413
 
1472
1414
    def test_no_redirection(self):
1473
 
        t = self.get_new_transport()
 
1415
        t = self._transport(self.new_server.get_url())
1474
1416
 
1475
1417
        # We use None for redirected so that we fail if redirected
1476
 
        self.assertEqual('0123456789',
1477
 
                         transport.do_catching_redirections(
 
1418
        self.assertEquals('0123456789',
 
1419
                          transport.do_catching_redirections(
1478
1420
                self.get_a, t, None).read())
1479
1421
 
1480
1422
    def test_one_redirection(self):
1481
1423
        self.redirections = 0
1482
1424
 
1483
 
        def redirected(t, exception, redirection_notice):
 
1425
        def redirected(transport, exception, redirection_notice):
1484
1426
            self.redirections += 1
1485
 
            redirected_t = t._redirected_to(exception.source, exception.target)
1486
 
            return redirected_t
 
1427
            dir, file = urlutils.split(exception.target)
 
1428
            return self._transport(dir)
1487
1429
 
1488
 
        self.assertEqual('0123456789',
1489
 
                         transport.do_catching_redirections(
 
1430
        self.assertEquals('0123456789',
 
1431
                          transport.do_catching_redirections(
1490
1432
                self.get_a, self.old_transport, redirected).read())
1491
 
        self.assertEqual(1, self.redirections)
 
1433
        self.assertEquals(1, self.redirections)
1492
1434
 
1493
1435
    def test_redirection_loop(self):
1494
1436
 
1503
1445
                          self.get_a, self.old_transport, redirected)
1504
1446
 
1505
1447
 
1506
 
def _setup_authentication_config(**kwargs):
1507
 
    conf = config.AuthenticationConfig()
1508
 
    conf._get_config().update({'httptest': kwargs})
1509
 
    conf._save()
1510
 
 
1511
 
 
1512
 
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
1513
 
    """Unit tests for glue by which urllib2 asks us for authentication"""
1514
 
 
1515
 
    def test_get_user_password_without_port(self):
1516
 
        """We cope if urllib2 doesn't tell us the port.
1517
 
 
1518
 
        See https://bugs.launchpad.net/bzr/+bug/654684
1519
 
        """
1520
 
        user = 'joe'
1521
 
        password = 'foo'
1522
 
        _setup_authentication_config(scheme='http', host='localhost',
1523
 
                                     user=user, password=password)
1524
 
        handler = _urllib2_wrappers.HTTPAuthHandler()
1525
 
        got_pass = handler.get_user_password(dict(
1526
 
            user='joe',
1527
 
            protocol='http',
1528
 
            host='localhost',
1529
 
            path='/',
1530
 
            realm='Realm',
1531
 
            ))
1532
 
        self.assertEquals((user, password), got_pass)
1533
 
 
1534
 
 
1535
1448
class TestAuth(http_utils.TestCaseWithWebserver):
1536
1449
    """Test authentication scheme"""
1537
1450
 
1538
 
    scenarios = multiply_scenarios(
1539
 
        vary_by_http_client_implementation(),
1540
 
        vary_by_http_protocol_version(),
1541
 
        vary_by_http_auth_scheme(),
1542
 
        )
 
1451
    _auth_header = 'Authorization'
 
1452
    _password_prompt_prefix = ''
 
1453
    _username_prompt_prefix = ''
1543
1454
 
1544
1455
    def setUp(self):
1545
1456
        super(TestAuth, self).setUp()
1548
1459
                                  ('b', 'contents of b\n'),])
1549
1460
 
1550
1461
    def create_transport_readonly_server(self):
1551
 
        server = self._auth_server(protocol_version=self._protocol_version)
1552
 
        server._url_protocol = self._url_protocol
 
1462
        if self._auth_scheme == 'basic':
 
1463
            server = http_utils.HTTPBasicAuthServer(
 
1464
                protocol_version=self._protocol_version)
 
1465
        else:
 
1466
            if self._auth_scheme != 'digest':
 
1467
                raise AssertionError('Unknown auth scheme: %r'
 
1468
                                     % self._auth_scheme)
 
1469
            server = http_utils.HTTPDigestAuthServer(
 
1470
                protocol_version=self._protocol_version)
1553
1471
        return server
1554
1472
 
1555
1473
    def _testing_pycurl(self):
1556
 
        # TODO: This is duplicated for lots of the classes in this file
1557
 
        return (features.pycurl.available()
1558
 
                and self._transport == PyCurlTransport)
 
1474
        return pycurl_present and self._transport == PyCurlTransport
1559
1475
 
1560
1476
    def get_user_url(self, user, password):
1561
1477
        """Build an url embedding user and password"""
1569
1485
        return url
1570
1486
 
1571
1487
    def get_user_transport(self, user, password):
1572
 
        t = transport.get_transport(self.get_user_url(user, password))
1573
 
        return t
 
1488
        return self._transport(self.get_user_url(user, password))
1574
1489
 
1575
1490
    def test_no_user(self):
1576
1491
        self.server.add_user('joe', 'foo')
1619
1534
        self.server.add_user('joe', 'foo')
1620
1535
        t = self.get_user_transport(None, None)
1621
1536
        stdout = tests.StringIOWrapper()
1622
 
        stderr = tests.StringIOWrapper()
1623
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
1624
 
                                            stdout=stdout, stderr=stderr)
 
1537
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n', stdout=stdout)
1625
1538
        self.assertEqual('contents of a\n',t.get('a').read())
1626
1539
        # stdin should be empty
1627
1540
        self.assertEqual('', ui.ui_factory.stdin.readline())
1628
 
        stderr.seek(0)
 
1541
        stdout.seek(0)
1629
1542
        expected_prompt = self._expected_username_prompt(t._unqualified_scheme)
1630
 
        self.assertEqual(expected_prompt, stderr.read(len(expected_prompt)))
1631
 
        self.assertEqual('', stdout.getvalue())
 
1543
        self.assertEquals(expected_prompt, stdout.read(len(expected_prompt)))
1632
1544
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1633
 
                                    stderr.readline())
 
1545
                                    stdout.readline())
1634
1546
 
1635
1547
    def test_prompt_for_password(self):
1636
1548
        if self._testing_pycurl():
1641
1553
        self.server.add_user('joe', 'foo')
1642
1554
        t = self.get_user_transport('joe', None)
1643
1555
        stdout = tests.StringIOWrapper()
1644
 
        stderr = tests.StringIOWrapper()
1645
 
        ui.ui_factory = tests.TestUIFactory(stdin='foo\n',
1646
 
                                            stdout=stdout, stderr=stderr)
1647
 
        self.assertEqual('contents of a\n', t.get('a').read())
 
1556
        ui.ui_factory = tests.TestUIFactory(stdin='foo\n', stdout=stdout)
 
1557
        self.assertEqual('contents of a\n',t.get('a').read())
1648
1558
        # stdin should be empty
1649
1559
        self.assertEqual('', ui.ui_factory.stdin.readline())
1650
1560
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1651
 
                                    stderr.getvalue())
1652
 
        self.assertEqual('', stdout.getvalue())
 
1561
                                    stdout.getvalue())
1653
1562
        # And we shouldn't prompt again for a different request
1654
1563
        # against the same transport.
1655
1564
        self.assertEqual('contents of b\n',t.get('b').read())
1665
1574
                              % (scheme.upper(),
1666
1575
                                 user, self.server.host, self.server.port,
1667
1576
                                 self.server.auth_realm)))
1668
 
        self.assertEqual(expected_prompt, actual_prompt)
 
1577
        self.assertEquals(expected_prompt, actual_prompt)
1669
1578
 
1670
1579
    def _expected_username_prompt(self, scheme):
1671
1580
        return (self._username_prompt_prefix
1685
1594
        self.server.add_user(user, password)
1686
1595
        t = self.get_user_transport(user, None)
1687
1596
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1688
 
                                            stderr=tests.StringIOWrapper())
 
1597
                                            stdout=tests.StringIOWrapper())
1689
1598
        # Create a minimal config file with the right password
1690
 
        _setup_authentication_config(scheme='http', port=self.server.port,
1691
 
                                     user=user, password=password)
 
1599
        conf = config.AuthenticationConfig()
 
1600
        conf._get_config().update(
 
1601
            {'httptest': {'scheme': 'http', 'port': self.server.port,
 
1602
                          'user': user, 'password': password}})
 
1603
        conf._save()
1692
1604
        # Issue a request to the server to connect
1693
1605
        self.assertEqual('contents of a\n',t.get('a').read())
1694
1606
        # stdin should have  been left untouched
1696
1608
        # Only one 'Authentication Required' error should occur
1697
1609
        self.assertEqual(1, self.server.auth_required_errors)
1698
1610
 
 
1611
    def test_user_from_auth_conf(self):
 
1612
        if self._testing_pycurl():
 
1613
            raise tests.TestNotApplicable(
 
1614
                'pycurl does not support authentication.conf')
 
1615
        user = 'joe'
 
1616
        password = 'foo'
 
1617
        self.server.add_user(user, password)
 
1618
        # Create a minimal config file with the right password
 
1619
        conf = config.AuthenticationConfig()
 
1620
        conf._get_config().update(
 
1621
            {'httptest': {'scheme': 'http', 'port': self.server.port,
 
1622
                          'user': user, 'password': password}})
 
1623
        conf._save()
 
1624
        t = self.get_user_transport(None, None)
 
1625
        # Issue a request to the server to connect
 
1626
        self.assertEqual('contents of a\n', t.get('a').read())
 
1627
        # Only one 'Authentication Required' error should occur
 
1628
        self.assertEqual(1, self.server.auth_required_errors)
 
1629
 
1699
1630
    def test_changing_nonce(self):
1700
 
        if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1701
 
                                     http_utils.ProxyDigestAuthServer):
1702
 
            raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
 
1631
        if self._auth_scheme != 'digest':
 
1632
            raise tests.TestNotApplicable('HTTP auth digest only test')
1703
1633
        if self._testing_pycurl():
1704
1634
            raise tests.KnownFailure(
1705
1635
                'pycurl does not handle a nonce change')
1717
1647
        # initial 'who are you' and a second 'who are you' with the new nonce)
1718
1648
        self.assertEqual(2, self.server.auth_required_errors)
1719
1649
 
1720
 
    def test_user_from_auth_conf(self):
1721
 
        if self._testing_pycurl():
1722
 
            raise tests.TestNotApplicable(
1723
 
                'pycurl does not support authentication.conf')
1724
 
        user = 'joe'
1725
 
        password = 'foo'
1726
 
        self.server.add_user(user, password)
1727
 
        _setup_authentication_config(scheme='http', port=self.server.port,
1728
 
                                     user=user, password=password)
1729
 
        t = self.get_user_transport(None, None)
1730
 
        # Issue a request to the server to connect
1731
 
        self.assertEqual('contents of a\n', t.get('a').read())
1732
 
        # Only one 'Authentication Required' error should occur
1733
 
        self.assertEqual(1, self.server.auth_required_errors)
1734
 
 
1735
 
    def test_no_credential_leaks_in_log(self):
1736
 
        self.overrideAttr(debug, 'debug_flags', set(['http']))
1737
 
        user = 'joe'
1738
 
        password = 'very-sensitive-password'
1739
 
        self.server.add_user(user, password)
1740
 
        t = self.get_user_transport(user, password)
1741
 
        # Capture the debug calls to mutter
1742
 
        self.mutters = []
1743
 
        def mutter(*args):
1744
 
            lines = args[0] % args[1:]
1745
 
            # Some calls output multiple lines, just split them now since we
1746
 
            # care about a single one later.
1747
 
            self.mutters.extend(lines.splitlines())
1748
 
        self.overrideAttr(trace, 'mutter', mutter)
1749
 
        # Issue a request to the server to connect
1750
 
        self.assertEqual(True, t.has('a'))
1751
 
        # Only one 'Authentication Required' error should occur
1752
 
        self.assertEqual(1, self.server.auth_required_errors)
1753
 
        # Since the authentification succeeded, there should be a corresponding
1754
 
        # debug line
1755
 
        sent_auth_headers = [line for line in self.mutters
1756
 
                             if line.startswith('> %s' % (self._auth_header,))]
1757
 
        self.assertLength(1, sent_auth_headers)
1758
 
        self.assertStartsWith(sent_auth_headers[0],
1759
 
                              '> %s: <masked>' % (self._auth_header,))
1760
1650
 
1761
1651
 
1762
1652
class TestProxyAuth(TestAuth):
1763
 
    """Test proxy authentication schemes.
1764
 
 
1765
 
    This inherits from TestAuth to tweak the setUp and filter some failing
1766
 
    tests.
1767
 
    """
1768
 
 
1769
 
    scenarios = multiply_scenarios(
1770
 
        vary_by_http_client_implementation(),
1771
 
        vary_by_http_protocol_version(),
1772
 
        vary_by_http_proxy_auth_scheme(),
1773
 
        )
 
1653
    """Test proxy authentication schemes."""
 
1654
 
 
1655
    _auth_header = 'Proxy-authorization'
 
1656
    _password_prompt_prefix = 'Proxy '
 
1657
    _username_prompt_prefix = 'Proxy '
1774
1658
 
1775
1659
    def setUp(self):
1776
1660
        super(TestProxyAuth, self).setUp()
 
1661
        self._old_env = {}
 
1662
        self.addCleanup(self._restore_env)
1777
1663
        # Override the contents to avoid false positives
1778
1664
        self.build_tree_contents([('a', 'not proxied contents of a\n'),
1779
1665
                                  ('b', 'not proxied contents of b\n'),
1781
1667
                                  ('b-proxied', 'contents of b\n'),
1782
1668
                                  ])
1783
1669
 
 
1670
    def create_transport_readonly_server(self):
 
1671
        if self._auth_scheme == 'basic':
 
1672
            server = http_utils.ProxyBasicAuthServer(
 
1673
                protocol_version=self._protocol_version)
 
1674
        else:
 
1675
            if self._auth_scheme != 'digest':
 
1676
                raise AssertionError('Unknown auth scheme: %r'
 
1677
                                     % self._auth_scheme)
 
1678
            server = http_utils.ProxyDigestAuthServer(
 
1679
                protocol_version=self._protocol_version)
 
1680
        return server
 
1681
 
1784
1682
    def get_user_transport(self, user, password):
1785
 
        self.overrideEnv('all_proxy', self.get_user_url(user, password))
1786
 
        return TestAuth.get_user_transport(self, user, password)
 
1683
        self._install_env({'all_proxy': self.get_user_url(user, password)})
 
1684
        return self._transport(self.server.get_url())
 
1685
 
 
1686
    def _install_env(self, env):
 
1687
        for name, value in env.iteritems():
 
1688
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1689
 
 
1690
    def _restore_env(self):
 
1691
        for name, value in self._old_env.iteritems():
 
1692
            osutils.set_or_unset_env(name, value)
1787
1693
 
1788
1694
    def test_empty_pass(self):
1789
1695
        if self._testing_pycurl():
1808
1714
        self.readfile = StringIO(socket_read_content)
1809
1715
        self.writefile = StringIO()
1810
1716
        self.writefile.close = lambda: None
1811
 
        self.close = lambda: None
1812
1717
 
1813
1718
    def makefile(self, mode='r', bufsize=None):
1814
1719
        if 'r' in mode:
1819
1724
 
1820
1725
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1821
1726
 
1822
 
    scenarios = multiply_scenarios(
1823
 
        vary_by_http_client_implementation(),
1824
 
        vary_by_http_protocol_version(),
1825
 
        )
1826
 
 
1827
1727
    def setUp(self):
1828
1728
        super(SmartHTTPTunnellingTest, self).setUp()
1829
1729
        # We use the VFS layer as part of HTTP tunnelling tests.
1830
 
        self.overrideEnv('BZR_NO_SMART_VFS', None)
 
1730
        self._captureVar('BZR_NO_SMART_VFS', None)
1831
1731
        self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1832
 
        self.http_server = self.get_readonly_server()
1833
1732
 
1834
1733
    def create_transport_readonly_server(self):
1835
 
        server = http_utils.HTTPServerWithSmarts(
 
1734
        return http_utils.HTTPServerWithSmarts(
1836
1735
            protocol_version=self._protocol_version)
1837
 
        server._url_protocol = self._url_protocol
1838
 
        return server
1839
1736
 
1840
1737
    def test_open_bzrdir(self):
1841
1738
        branch = self.make_branch('relpath')
1842
 
        url = self.http_server.get_url() + 'relpath'
 
1739
        http_server = self.get_readonly_server()
 
1740
        url = http_server.get_url() + 'relpath'
1843
1741
        bd = bzrdir.BzrDir.open(url)
1844
 
        self.addCleanup(bd.transport.disconnect)
1845
1742
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1846
1743
 
1847
1744
    def test_bulk_data(self):
1849
1746
        # The 'readv' command in the smart protocol both sends and receives
1850
1747
        # bulk data, so we use that.
1851
1748
        self.build_tree(['data-file'])
1852
 
        http_transport = transport.get_transport(self.http_server.get_url())
 
1749
        http_server = self.get_readonly_server()
 
1750
        http_transport = self._transport(http_server.get_url())
1853
1751
        medium = http_transport.get_smart_medium()
1854
1752
        # Since we provide the medium, the url below will be mostly ignored
1855
1753
        # during the test, as long as the path is '/'.
1863
1761
        post_body = 'hello\n'
1864
1762
        expected_reply_body = 'ok\x012\n'
1865
1763
 
1866
 
        http_transport = transport.get_transport(self.http_server.get_url())
 
1764
        http_server = self.get_readonly_server()
 
1765
        http_transport = self._transport(http_server.get_url())
1867
1766
        medium = http_transport.get_smart_medium()
1868
1767
        response = medium.send_http_smart_request(post_body)
1869
1768
        reply_body = response.read()
1870
1769
        self.assertEqual(expected_reply_body, reply_body)
1871
1770
 
1872
1771
    def test_smart_http_server_post_request_handler(self):
1873
 
        httpd = self.http_server.server
 
1772
        httpd = self.get_readonly_server()._get_httpd()
1874
1773
 
1875
1774
        socket = SampleSocket(
1876
1775
            'POST /.bzr/smart %s \r\n' % self._protocol_version
1908
1807
 
1909
1808
    def test_probe_smart_server(self):
1910
1809
        """Test error handling against server refusing smart requests."""
1911
 
        t = self.get_readonly_transport()
 
1810
        server = self.get_readonly_server()
 
1811
        t = self._transport(server.get_url())
1912
1812
        # No need to build a valid smart request here, the server will not even
1913
1813
        # try to interpret it.
1914
1814
        self.assertRaises(errors.SmartProtocolError,
1915
1815
                          t.get_smart_medium().send_http_smart_request,
1916
1816
                          'whatever')
1917
1817
 
1918
 
 
1919
1818
class Test_redirected_to(tests.TestCase):
1920
1819
 
1921
 
    scenarios = vary_by_http_client_implementation()
1922
 
 
1923
1820
    def test_redirected_to_subdir(self):
1924
1821
        t = self._transport('http://www.example.com/foo')
1925
1822
        r = t._redirected_to('http://www.example.com/foo',
1926
1823
                             'http://www.example.com/foo/subdir')
1927
1824
        self.assertIsInstance(r, type(t))
1928
1825
        # Both transports share the some connection
1929
 
        self.assertEqual(t._get_connection(), r._get_connection())
 
1826
        self.assertEquals(t._get_connection(), r._get_connection())
1930
1827
 
1931
1828
    def test_redirected_to_self_with_slash(self):
1932
1829
        t = self._transport('http://www.example.com/foo')
1936
1833
        # Both transports share the some connection (one can argue that we
1937
1834
        # should return the exact same transport here, but that seems
1938
1835
        # overkill).
1939
 
        self.assertEqual(t._get_connection(), r._get_connection())
 
1836
        self.assertEquals(t._get_connection(), r._get_connection())
1940
1837
 
1941
1838
    def test_redirected_to_host(self):
1942
1839
        t = self._transport('http://www.example.com/foo')
1961
1858
        r = t._redirected_to('http://www.example.com/foo',
1962
1859
                             'https://foo.example.com/foo')
1963
1860
        self.assertIsInstance(r, type(t))
1964
 
        self.assertEqual(t._user, r._user)
 
1861
        self.assertEquals(t._user, r._user)
1965
1862
 
1966
1863
 
1967
1864
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1976
1873
    line.
1977
1874
    """
1978
1875
 
1979
 
    def _handle_one_request(self):
 
1876
    def handle_one_request(self):
1980
1877
        tcs = self.server.test_case_server
1981
1878
        requestline = self.rfile.readline()
1982
1879
        headers = self.MessageClass(self.rfile, 0)
2026
1923
        pass
2027
1924
 
2028
1925
 
2029
 
class TestActivityMixin(object):
 
1926
class TestActivity(tests.TestCase):
2030
1927
    """Test socket activity reporting.
2031
1928
 
2032
1929
    We use a special purpose server to control the bytes sent and received and
2036
1933
    def setUp(self):
2037
1934
        tests.TestCase.setUp(self)
2038
1935
        self.server = self._activity_server(self._protocol_version)
2039
 
        self.server.start_server()
2040
 
        _activities = {} # Don't close over self and create a cycle
 
1936
        self.server.setUp()
 
1937
        self.activities = {}
2041
1938
        def report_activity(t, bytes, direction):
2042
 
            count = _activities.get(direction, 0)
 
1939
            count = self.activities.get(direction, 0)
2043
1940
            count += bytes
2044
 
            _activities[direction] = count
2045
 
        self.activities = _activities
 
1941
            self.activities[direction] = count
2046
1942
 
2047
1943
        # We override at class level because constructors may propagate the
2048
1944
        # bound method and render instance overriding ineffective (an
2049
1945
        # alternative would be to define a specific ui factory instead...)
2050
 
        self.overrideAttr(self._transport, '_report_activity', report_activity)
2051
 
        self.addCleanup(self.server.stop_server)
 
1946
        self.orig_report_activity = self._transport._report_activity
 
1947
        self._transport._report_activity = report_activity
 
1948
 
 
1949
    def tearDown(self):
 
1950
        self._transport._report_activity = self.orig_report_activity
 
1951
        self.server.tearDown()
 
1952
        tests.TestCase.tearDown(self)
2052
1953
 
2053
1954
    def get_transport(self):
2054
 
        t = self._transport(self.server.get_url())
2055
 
        # FIXME: Needs cleanup -- vila 20100611
2056
 
        return t
 
1955
        return self._transport(self.server.get_url())
2057
1956
 
2058
1957
    def assertActivitiesMatch(self):
2059
1958
        self.assertEqual(self.server.bytes_read,
2164
2063
'''
2165
2064
        t = self.get_transport()
2166
2065
        # We must send a single line of body bytes, see
2167
 
        # PredefinedRequestHandler._handle_one_request
 
2066
        # PredefinedRequestHandler.handle_one_request
2168
2067
        code, f = t._post('abc def end-of-body\n')
2169
2068
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2170
2069
        self.assertActivitiesMatch()
2171
 
 
2172
 
 
2173
 
class TestActivity(tests.TestCase, TestActivityMixin):
2174
 
 
2175
 
    scenarios = multiply_scenarios(
2176
 
        vary_by_http_activity(),
2177
 
        vary_by_http_protocol_version(),
2178
 
        )
2179
 
 
2180
 
    def setUp(self):
2181
 
        TestActivityMixin.setUp(self)
2182
 
 
2183
 
 
2184
 
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2185
 
 
2186
 
    # Unlike TestActivity, we are really testing ReportingFileSocket and
2187
 
    # ReportingSocket, so we don't need all the parametrization. Since
2188
 
    # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2189
 
    # test them through their use by the transport than directly (that's a
2190
 
    # bit less clean but far more simpler and effective).
2191
 
    _activity_server = ActivityHTTPServer
2192
 
    _protocol_version = 'HTTP/1.1'
2193
 
 
2194
 
    def setUp(self):
2195
 
        self._transport =_urllib.HttpTransport_urllib
2196
 
        TestActivityMixin.setUp(self)
2197
 
 
2198
 
    def assertActivitiesMatch(self):
2199
 
        # Nothing to check here
2200
 
        pass
2201
 
 
2202
 
 
2203
 
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
2204
 
    """Test authentication on the redirected http server."""
2205
 
 
2206
 
    scenarios = vary_by_http_protocol_version()
2207
 
 
2208
 
    _auth_header = 'Authorization'
2209
 
    _password_prompt_prefix = ''
2210
 
    _username_prompt_prefix = ''
2211
 
    _auth_server = http_utils.HTTPBasicAuthServer
2212
 
    _transport = _urllib.HttpTransport_urllib
2213
 
 
2214
 
    def setUp(self):
2215
 
        super(TestAuthOnRedirected, self).setUp()
2216
 
        self.build_tree_contents([('a','a'),
2217
 
                                  ('1/',),
2218
 
                                  ('1/a', 'redirected once'),
2219
 
                                  ],)
2220
 
        new_prefix = 'http://%s:%s' % (self.new_server.host,
2221
 
                                       self.new_server.port)
2222
 
        self.old_server.redirections = [
2223
 
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2224
 
        self.old_transport = self.get_old_transport()
2225
 
        self.new_server.add_user('joe', 'foo')
2226
 
        cleanup_http_redirection_connections(self)
2227
 
 
2228
 
    def create_transport_readonly_server(self):
2229
 
        server = self._auth_server(protocol_version=self._protocol_version)
2230
 
        server._url_protocol = self._url_protocol
2231
 
        return server
2232
 
 
2233
 
    def get_a(self, t):
2234
 
        return t.get('a')
2235
 
 
2236
 
    def test_auth_on_redirected_via_do_catching_redirections(self):
2237
 
        self.redirections = 0
2238
 
 
2239
 
        def redirected(t, exception, redirection_notice):
2240
 
            self.redirections += 1
2241
 
            redirected_t = t._redirected_to(exception.source, exception.target)
2242
 
            self.addCleanup(redirected_t.disconnect)
2243
 
            return redirected_t
2244
 
 
2245
 
        stdout = tests.StringIOWrapper()
2246
 
        stderr = tests.StringIOWrapper()
2247
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2248
 
                                            stdout=stdout, stderr=stderr)
2249
 
        self.assertEqual('redirected once',
2250
 
                         transport.do_catching_redirections(
2251
 
                self.get_a, self.old_transport, redirected).read())
2252
 
        self.assertEqual(1, self.redirections)
2253
 
        # stdin should be empty
2254
 
        self.assertEqual('', ui.ui_factory.stdin.readline())
2255
 
        # stdout should be empty, stderr will contains the prompts
2256
 
        self.assertEqual('', stdout.getvalue())
2257
 
 
2258
 
    def test_auth_on_redirected_via_following_redirections(self):
2259
 
        self.new_server.add_user('joe', 'foo')
2260
 
        stdout = tests.StringIOWrapper()
2261
 
        stderr = tests.StringIOWrapper()
2262
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2263
 
                                            stdout=stdout, stderr=stderr)
2264
 
        t = self.old_transport
2265
 
        req = RedirectedRequest('GET', t.abspath('a'))
2266
 
        new_prefix = 'http://%s:%s' % (self.new_server.host,
2267
 
                                       self.new_server.port)
2268
 
        self.old_server.redirections = [
2269
 
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2270
 
        self.assertEqual('redirected once', t._perform(req).read())
2271
 
        # stdin should be empty
2272
 
        self.assertEqual('', ui.ui_factory.stdin.readline())
2273
 
        # stdout should be empty, stderr will contains the prompts
2274
 
        self.assertEqual('', stdout.getvalue())
2275