~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-04 14:48:21 UTC
  • mto: (4349.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4350.
  • Revision ID: v.ladeuil+lp@free.fr-20090504144821-39dvqkikmd3zqkdg
Handle servers proposing several authentication schemes.

* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.auth_required): Several schemes can be
proposed by the server, try to match each one in turn.
(BasicAuthHandler.auth_match): Delete dead code.

* bzrlib/tests/test_http.py:
(load_tests): Separate proxy and http authentication tests as they
require different server setups.
(TestAuth.create_transport_readonly_server): Simplified by using
parameter provided by load_tests.
(TestAuth.test_changing_nonce): Adapt to new parametrization.
(TestProxyAuth.create_transport_readonly_server): Deleted.

* bzrlib/tests/http_utils.py:
(DigestAndBasicAuthRequestHandler, HTTPBasicAndDigestAuthServer,
ProxyBasicAndDigestAuthServer): Add a test server proposing both
basic and digest auth schemes but accepting only digest as valid.

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')),
 
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
    # proxy auth: each auth scheme on all http versions on all implementations.
 
117
    tppa_tests, remaining_tests = tests.split_suite_by_condition(
 
118
        remaining_tests, tests.condition_isinstance((
 
119
                TestProxyAuth,
 
120
                )))
 
121
    proxy_auth_scheme_scenarios = [
 
122
        ('basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
 
123
        ('digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
 
124
        ('basicdigest',
 
125
         dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
93
126
        ]
94
 
 
95
 
 
96
 
def vary_by_http_auth_scheme():
97
 
    scenarios = [
 
127
    tppa_scenarios = tests.multiply_scenarios(tp_scenarios,
 
128
                                              proxy_auth_scheme_scenarios)
 
129
    tests.multiply_tests(tppa_tests, tppa_scenarios, result)
 
130
 
 
131
    # auth: each auth scheme on all http versions on all implementations.
 
132
    tpa_tests, remaining_tests = tests.split_suite_by_condition(
 
133
        remaining_tests, tests.condition_isinstance((
 
134
                TestAuth,
 
135
                )))
 
136
    auth_scheme_scenarios = [
98
137
        ('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
99
138
        ('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
100
139
        ('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():
 
140
         dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
 
141
        ]
 
142
    tpa_scenarios = tests.multiply_scenarios(tp_scenarios,
 
143
                                             auth_scheme_scenarios)
 
144
    tests.multiply_tests(tpa_tests, tpa_scenarios, result)
 
145
 
 
146
    # activity: activity on all http versions on all implementations
 
147
    tpact_tests, remaining_tests = tests.split_suite_by_condition(
 
148
        remaining_tests, tests.condition_isinstance((
 
149
                TestActivity,
 
150
                )))
127
151
    activity_scenarios = [
128
 
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
129
 
                            _transport=_urllib.HttpTransport_urllib,)),
 
152
        ('http', dict(_activity_server=ActivityHTTPServer)),
130
153
        ]
131
154
    if tests.HTTPSServerFeature.available():
132
155
        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
 
156
            ('https', dict(_activity_server=ActivityHTTPSServer)))
 
157
    tpact_scenarios = tests.multiply_scenarios(tp_scenarios,
 
158
        activity_scenarios)
 
159
    tests.multiply_tests(tpact_tests, tpact_scenarios, result)
 
160
 
 
161
    # No parametrization for the remaining tests
 
162
    result.addTests(remaining_tests)
 
163
 
 
164
    return result
158
165
 
159
166
 
160
167
class FakeManager(object):
172
179
    It records the bytes sent to it, and replies with a 200.
173
180
    """
174
181
 
175
 
    def __init__(self, expect_body_tail=None, scheme=''):
 
182
    def __init__(self, expect_body_tail=None):
176
183
        """Constructor.
177
184
 
178
185
        :type expect_body_tail: str
183
190
        self.host = None
184
191
        self.port = None
185
192
        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):
 
193
 
 
194
    def setUp(self):
192
195
        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
193
196
        self._sock.bind(('127.0.0.1', 0))
194
197
        self.host, self.port = self._sock.getsockname()
195
198
        self._ready = threading.Event()
196
 
        self._thread = test_server.TestThread(
197
 
            sync_event=self._ready, target=self._accept_read_and_reply)
 
199
        self._thread = threading.Thread(target=self._accept_read_and_reply)
 
200
        self._thread.setDaemon(True)
198
201
        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()
 
202
        self._ready.wait(5)
202
203
 
203
204
    def _accept_read_and_reply(self):
204
205
        self._sock.listen(1)
205
206
        self._ready.set()
206
 
        conn, address = self._sock.accept()
207
 
        if self._expect_body_tail is not None:
 
207
        self._sock.settimeout(5)
 
208
        try:
 
209
            conn, address = self._sock.accept()
 
210
            # On win32, the accepted connection will be non-blocking to start
 
211
            # with because we're using settimeout.
 
212
            conn.setblocking(True)
208
213
            while not self.received_bytes.endswith(self._expect_body_tail):
209
214
                self.received_bytes += conn.recv(4096)
210
215
            conn.sendall('HTTP/1.1 200 OK\r\n')
211
 
        try:
 
216
        except socket.timeout:
 
217
            # Make sure the client isn't stuck waiting for us to e.g. accept.
212
218
            self._sock.close()
213
219
        except socket.error:
214
220
            # The client may have already closed the socket.
215
221
            pass
216
222
 
217
 
    def stop_server(self):
 
223
    def tearDown(self):
218
224
        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()
 
225
            self._sock.close()
223
226
        except socket.error:
224
227
            # We might have already closed it.  We don't care.
225
228
            pass
226
229
        self.host = None
227
230
        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
231
 
232
232
 
233
233
class TestAuthHeader(tests.TestCase):
240
240
 
241
241
    def test_empty_header(self):
242
242
        scheme, remainder = self.parse_header('')
243
 
        self.assertEqual('', scheme)
 
243
        self.assertEquals('', scheme)
244
244
        self.assertIs(None, remainder)
245
245
 
246
246
    def test_negotiate_header(self):
247
247
        scheme, remainder = self.parse_header('Negotiate')
248
 
        self.assertEqual('negotiate', scheme)
 
248
        self.assertEquals('negotiate', scheme)
249
249
        self.assertIs(None, remainder)
250
250
 
251
251
    def test_basic_header(self):
252
252
        scheme, remainder = self.parse_header(
253
253
            'Basic realm="Thou should not pass"')
254
 
        self.assertEqual('basic', scheme)
255
 
        self.assertEqual('realm="Thou should not pass"', remainder)
 
254
        self.assertEquals('basic', scheme)
 
255
        self.assertEquals('realm="Thou should not pass"', remainder)
256
256
 
257
257
    def test_basic_extract_realm(self):
258
258
        scheme, remainder = self.parse_header(
260
260
            _urllib2_wrappers.BasicAuthHandler)
261
261
        match, realm = self.auth_handler.extract_realm(remainder)
262
262
        self.assertTrue(match is not None)
263
 
        self.assertEqual('Thou should not pass', realm)
 
263
        self.assertEquals('Thou should not pass', realm)
264
264
 
265
265
    def test_digest_header(self):
266
266
        scheme, remainder = self.parse_header(
267
267
            '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)
 
268
        self.assertEquals('digest', scheme)
 
269
        self.assertEquals('realm="Thou should not pass"', remainder)
304
270
 
305
271
 
306
272
class TestHTTPServer(tests.TestCase):
311
277
 
312
278
            protocol_version = 'HTTP/0.1'
313
279
 
314
 
        self.assertRaises(httplib.UnknownProtocol,
315
 
                          http_server.HttpServer, BogusRequestHandler)
 
280
        server = http_server.HttpServer(BogusRequestHandler)
 
281
        try:
 
282
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
 
283
        except:
 
284
            server.tearDown()
 
285
            self.fail('HTTP Server creation did not raise UnknownProtocol')
316
286
 
317
287
    def test_force_invalid_protocol(self):
318
 
        self.assertRaises(httplib.UnknownProtocol,
319
 
                          http_server.HttpServer, protocol_version='HTTP/0.1')
 
288
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
 
289
        try:
 
290
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
 
291
        except:
 
292
            server.tearDown()
 
293
            self.fail('HTTP Server creation did not raise UnknownProtocol')
320
294
 
321
295
    def test_server_start_and_stop(self):
322
296
        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)
 
297
        server.setUp()
 
298
        self.assertTrue(server._http_running)
 
299
        server.tearDown()
 
300
        self.assertFalse(server._http_running)
328
301
 
329
302
    def test_create_http_server_one_zero(self):
330
303
        class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
332
305
            protocol_version = 'HTTP/1.0'
333
306
 
334
307
        server = http_server.HttpServer(RequestHandlerOneZero)
335
 
        self.start_server(server)
336
 
        self.assertIsInstance(server.server, http_server.TestingHTTPServer)
 
308
        server.setUp()
 
309
        self.addCleanup(server.tearDown)
 
310
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
337
311
 
338
312
    def test_create_http_server_one_one(self):
339
313
        class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
341
315
            protocol_version = 'HTTP/1.1'
342
316
 
343
317
        server = http_server.HttpServer(RequestHandlerOneOne)
344
 
        self.start_server(server)
345
 
        self.assertIsInstance(server.server,
 
318
        server.setUp()
 
319
        self.addCleanup(server.tearDown)
 
320
        self.assertIsInstance(server._httpd,
346
321
                              http_server.TestingThreadingHTTPServer)
347
322
 
348
323
    def test_create_http_server_force_one_one(self):
352
327
 
353
328
        server = http_server.HttpServer(RequestHandlerOneZero,
354
329
                                        protocol_version='HTTP/1.1')
355
 
        self.start_server(server)
356
 
        self.assertIsInstance(server.server,
 
330
        server.setUp()
 
331
        self.addCleanup(server.tearDown)
 
332
        self.assertIsInstance(server._httpd,
357
333
                              http_server.TestingThreadingHTTPServer)
358
334
 
359
335
    def test_create_http_server_force_one_zero(self):
363
339
 
364
340
        server = http_server.HttpServer(RequestHandlerOneOne,
365
341
                                        protocol_version='HTTP/1.0')
366
 
        self.start_server(server)
367
 
        self.assertIsInstance(server.server,
 
342
        server.setUp()
 
343
        self.addCleanup(server.tearDown)
 
344
        self.assertIsInstance(server._httpd,
368
345
                              http_server.TestingHTTPServer)
369
346
 
370
347
 
372
349
    """Test case to inherit from if pycurl is present"""
373
350
 
374
351
    def _get_pycurl_maybe(self):
375
 
        self.requireFeature(features.pycurl)
376
 
        return PyCurlTransport
 
352
        try:
 
353
            from bzrlib.transport.http._pycurl import PyCurlTransport
 
354
            return PyCurlTransport
 
355
        except errors.DependencyNotPresent:
 
356
            raise tests.TestSkipped('pycurl not present')
377
357
 
378
358
    _transport = property(_get_pycurl_maybe)
379
359
 
386
366
    def test_url_parsing(self):
387
367
        f = FakeManager()
388
368
        url = http.extract_auth('http://example.com', f)
389
 
        self.assertEqual('http://example.com', url)
390
 
        self.assertEqual(0, len(f.credentials))
 
369
        self.assertEquals('http://example.com', url)
 
370
        self.assertEquals(0, len(f.credentials))
391
371
        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])
 
372
            'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
 
373
        self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
 
374
        self.assertEquals(1, len(f.credentials))
 
375
        self.assertEquals([None, 'www.bazaar-vcs.org', 'user', 'pass'],
 
376
                          f.credentials[0])
397
377
 
398
378
 
399
379
class TestHttpTransportUrls(tests.TestCase):
400
380
    """Test the http urls."""
401
381
 
402
 
    scenarios = vary_by_http_client_implementation()
403
 
 
404
382
    def test_abs_url(self):
405
383
        """Construction of absolute http URLs"""
406
 
        t = self._transport('http://example.com/bzr/bzr.dev/')
 
384
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
407
385
        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')
 
386
        eq(t.abspath('.'), 'http://bazaar-vcs.org/bzr/bzr.dev')
 
387
        eq(t.abspath('foo/bar'), 'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
 
388
        eq(t.abspath('.bzr'), 'http://bazaar-vcs.org/bzr/bzr.dev/.bzr')
411
389
        eq(t.abspath('.bzr/1//2/./3'),
412
 
           'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
 
390
           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
413
391
 
414
392
    def test_invalid_http_urls(self):
415
393
        """Trap invalid construction of urls"""
416
 
        self._transport('http://example.com/bzr/bzr.dev/')
 
394
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
417
395
        self.assertRaises(errors.InvalidURL,
418
396
                          self._transport,
419
 
                          'http://http://example.com/bzr/bzr.dev/')
 
397
                          'http://http://bazaar-vcs.org/bzr/bzr.dev/')
420
398
 
421
399
    def test_http_root_urls(self):
422
400
        """Construction of URLs from server root"""
423
 
        t = self._transport('http://example.com/')
 
401
        t = self._transport('http://bzr.ozlabs.org/')
424
402
        eq = self.assertEqualDiff
425
403
        eq(t.abspath('.bzr/tree-version'),
426
 
           'http://example.com/.bzr/tree-version')
 
404
           'http://bzr.ozlabs.org/.bzr/tree-version')
427
405
 
428
406
    def test_http_impl_urls(self):
429
407
        """There are servers which ask for particular clients to connect"""
430
408
        server = self._server()
431
 
        server.start_server()
432
409
        try:
 
410
            server.setUp()
433
411
            url = server.get_url()
434
 
            self.assertTrue(url.startswith('%s://' % self._url_protocol))
 
412
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
435
413
        finally:
436
 
            server.stop_server()
 
414
            server.tearDown()
437
415
 
438
416
 
439
417
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
448
426
        https by supplying a fake version_info that do not
449
427
        support it.
450
428
        """
451
 
        self.requireFeature(features.pycurl)
452
 
        # Import the module locally now that we now it's available.
453
 
        pycurl = features.pycurl.module
 
429
        try:
 
430
            import pycurl
 
431
        except ImportError:
 
432
            raise tests.TestSkipped('pycurl not present')
454
433
 
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')
 
434
        version_info_orig = pycurl.version_info
 
435
        try:
 
436
            # Now that we have pycurl imported, we can fake its version_info
 
437
            # This was taken from a windows pycurl without SSL
 
438
            # (thanks to bialix)
 
439
            pycurl.version_info = lambda : (2,
 
440
                                            '7.13.2',
 
441
                                            462082,
 
442
                                            'i386-pc-win32',
 
443
                                            2576,
 
444
                                            None,
 
445
                                            0,
 
446
                                            None,
 
447
                                            ('ftp', 'gopher', 'telnet',
 
448
                                             'dict', 'ldap', 'http', 'file'),
 
449
                                            None,
 
450
                                            0,
 
451
                                            None)
 
452
            self.assertRaises(errors.DependencyNotPresent, self._transport,
 
453
                              'https://launchpad.net')
 
454
        finally:
 
455
            # Restore the right function
 
456
            pycurl.version_info = version_info_orig
473
457
 
474
458
 
475
459
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
476
460
    """Test the http connections."""
477
461
 
478
 
    scenarios = multiply_scenarios(
479
 
        vary_by_http_client_implementation(),
480
 
        vary_by_http_protocol_version(),
481
 
        )
482
 
 
483
462
    def setUp(self):
484
463
        http_utils.TestCaseWithWebserver.setUp(self)
485
464
        self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
487
466
 
488
467
    def test_http_has(self):
489
468
        server = self.get_readonly_server()
490
 
        t = self.get_readonly_transport()
 
469
        t = self._transport(server.get_url())
491
470
        self.assertEqual(t.has('foo/bar'), True)
492
471
        self.assertEqual(len(server.logs), 1)
493
472
        self.assertContainsRe(server.logs[0],
495
474
 
496
475
    def test_http_has_not_found(self):
497
476
        server = self.get_readonly_server()
498
 
        t = self.get_readonly_transport()
 
477
        t = self._transport(server.get_url())
499
478
        self.assertEqual(t.has('not-found'), False)
500
479
        self.assertContainsRe(server.logs[1],
501
480
            r'"HEAD /not-found HTTP/1.." 404 - "-" "bzr/')
502
481
 
503
482
    def test_http_get(self):
504
483
        server = self.get_readonly_server()
505
 
        t = self.get_readonly_transport()
 
484
        t = self._transport(server.get_url())
506
485
        fp = t.get('foo/bar')
507
486
        self.assertEqualDiff(
508
487
            fp.read(),
530
509
class TestHttpTransportRegistration(tests.TestCase):
531
510
    """Test registrations of various http implementations"""
532
511
 
533
 
    scenarios = vary_by_http_client_implementation()
534
 
 
535
512
    def test_http_registered(self):
536
 
        t = transport.get_transport('%s://foo.com/' % self._url_protocol)
 
513
        t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
537
514
        self.assertIsInstance(t, transport.Transport)
538
515
        self.assertIsInstance(t, self._transport)
539
516
 
540
517
 
541
518
class TestPost(tests.TestCase):
542
519
 
543
 
    scenarios = multiply_scenarios(
544
 
        vary_by_http_client_implementation(),
545
 
        vary_by_http_protocol_version(),
546
 
        )
547
 
 
548
520
    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)
 
521
        server = RecordingServer(expect_body_tail='end-of-body')
 
522
        server.setUp()
 
523
        self.addCleanup(server.tearDown)
 
524
        scheme = self._qualified_prefix
 
525
        url = '%s://%s:%s/' % (scheme, server.host, server.port)
 
526
        http_transport = self._transport(url)
555
527
        code, response = http_transport._post('abc def end-of-body')
556
528
        self.assertTrue(
557
529
            server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
558
530
        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
531
        # The transport should not be assuming that the server can accept
562
532
        # chunked encoding the first time it connects, because HTTP/1.1, so we
563
533
        # check for the literal string.
599
569
    Daughter classes are expected to override _req_handler_class
600
570
    """
601
571
 
602
 
    scenarios = multiply_scenarios(
603
 
        vary_by_http_client_implementation(),
604
 
        vary_by_http_protocol_version(),
605
 
        )
606
 
 
607
572
    # Provide a useful default
608
573
    _req_handler_class = http_server.TestingHTTPRequestHandler
609
574
 
610
575
    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
 
576
        return http_server.HttpServer(self._req_handler_class,
 
577
                                      protocol_version=self._protocol_version)
615
578
 
616
579
    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)
 
580
        return pycurl_present and self._transport == PyCurlTransport
620
581
 
621
582
 
622
583
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
623
584
    """Whatever request comes in, close the connection"""
624
585
 
625
 
    def _handle_one_request(self):
 
586
    def handle_one_request(self):
626
587
        """Handle a single HTTP request, by abruptly closing the connection"""
627
588
        self.close_connection = 1
628
589
 
633
594
    _req_handler_class = WallRequestHandler
634
595
 
635
596
    def test_http_has(self):
636
 
        t = self.get_readonly_transport()
 
597
        server = self.get_readonly_server()
 
598
        t = self._transport(server.get_url())
637
599
        # Unfortunately httplib (see HTTPResponse._read_status
638
600
        # for details) make no distinction between a closed
639
601
        # socket and badly formatted status line, so we can't
640
602
        # 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),
 
603
        # InvalidHttpResponse too.
 
604
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
645
605
                          t.has, 'foo/bar')
646
606
 
647
607
    def test_http_get(self):
648
 
        t = self.get_readonly_transport()
649
 
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
650
 
                           errors.InvalidHttpResponse),
 
608
        server = self.get_readonly_server()
 
609
        t = self._transport(server.get_url())
 
610
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
651
611
                          t.get, 'foo/bar')
652
612
 
653
613
 
668
628
    _req_handler_class = BadStatusRequestHandler
669
629
 
670
630
    def test_http_has(self):
671
 
        t = self.get_readonly_transport()
 
631
        server = self.get_readonly_server()
 
632
        t = self._transport(server.get_url())
672
633
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
673
634
 
674
635
    def test_http_get(self):
675
 
        t = self.get_readonly_transport()
 
636
        server = self.get_readonly_server()
 
637
        t = self._transport(server.get_url())
676
638
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
677
639
 
678
640
 
683
645
        """Fakes handling a single HTTP request, returns a bad status"""
684
646
        ignored = http_server.TestingHTTPRequestHandler.parse_request(self)
685
647
        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
648
        return False
691
649
 
692
650
 
698
656
 
699
657
    _req_handler_class = InvalidStatusRequestHandler
700
658
 
 
659
    def test_http_has(self):
 
660
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
 
661
            raise tests.KnownFailure(
 
662
                'pycurl hangs if the server send back garbage')
 
663
        super(TestInvalidStatusServer, self).test_http_has()
 
664
 
 
665
    def test_http_get(self):
 
666
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
 
667
            raise tests.KnownFailure(
 
668
                'pycurl hangs if the server send back garbage')
 
669
        super(TestInvalidStatusServer, self).test_http_get()
 
670
 
701
671
 
702
672
class BadProtocolRequestHandler(http_server.TestingHTTPRequestHandler):
703
673
    """Whatever request comes in, returns a bad protocol version"""
719
689
    _req_handler_class = BadProtocolRequestHandler
720
690
 
721
691
    def setUp(self):
722
 
        if self._testing_pycurl():
 
692
        if pycurl_present and self._transport == PyCurlTransport:
723
693
            raise tests.TestNotApplicable(
724
694
                "pycurl doesn't check the protocol version")
725
695
        super(TestBadProtocolServer, self).setUp()
726
696
 
727
697
    def test_http_has(self):
728
 
        t = self.get_readonly_transport()
 
698
        server = self.get_readonly_server()
 
699
        t = self._transport(server.get_url())
729
700
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
730
701
 
731
702
    def test_http_get(self):
732
 
        t = self.get_readonly_transport()
 
703
        server = self.get_readonly_server()
 
704
        t = self._transport(server.get_url())
733
705
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
734
706
 
735
707
 
749
721
    _req_handler_class = ForbiddenRequestHandler
750
722
 
751
723
    def test_http_has(self):
752
 
        t = self.get_readonly_transport()
 
724
        server = self.get_readonly_server()
 
725
        t = self._transport(server.get_url())
753
726
        self.assertRaises(errors.TransportError, t.has, 'foo/bar')
754
727
 
755
728
    def test_http_get(self):
756
 
        t = self.get_readonly_transport()
 
729
        server = self.get_readonly_server()
 
730
        t = self._transport(server.get_url())
757
731
        self.assertRaises(errors.TransportError, t.get, 'foo/bar')
758
732
 
759
733
 
765
739
        self.assertEqual(None, server.host)
766
740
        self.assertEqual(None, server.port)
767
741
 
768
 
    def test_setUp_and_stop(self):
 
742
    def test_setUp_and_tearDown(self):
769
743
        server = RecordingServer(expect_body_tail=None)
770
 
        server.start_server()
 
744
        server.setUp()
771
745
        try:
772
746
            self.assertNotEqual(None, server.host)
773
747
            self.assertNotEqual(None, server.port)
774
748
        finally:
775
 
            server.stop_server()
 
749
            server.tearDown()
776
750
        self.assertEqual(None, server.host)
777
751
        self.assertEqual(None, server.port)
778
752
 
779
753
    def test_send_receive_bytes(self):
780
 
        server = RecordingServer(expect_body_tail='c', scheme='http')
781
 
        self.start_server(server)
 
754
        server = RecordingServer(expect_body_tail='c')
 
755
        server.setUp()
 
756
        self.addCleanup(server.tearDown)
782
757
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
783
758
        sock.connect((server.host, server.port))
784
759
        sock.sendall('abc')
798
773
        self.build_tree_contents([('a', '0123456789')],)
799
774
 
800
775
    def test_readv(self):
801
 
        t = self.get_readonly_transport()
 
776
        server = self.get_readonly_server()
 
777
        t = self._transport(server.get_url())
802
778
        l = list(t.readv('a', ((0, 1), (1, 1), (3, 2), (9, 1))))
803
779
        self.assertEqual(l[0], (0, '0'))
804
780
        self.assertEqual(l[1], (1, '1'))
806
782
        self.assertEqual(l[3], (9, '9'))
807
783
 
808
784
    def test_readv_out_of_order(self):
809
 
        t = self.get_readonly_transport()
 
785
        server = self.get_readonly_server()
 
786
        t = self._transport(server.get_url())
810
787
        l = list(t.readv('a', ((1, 1), (9, 1), (0, 1), (3, 2))))
811
788
        self.assertEqual(l[0], (1, '1'))
812
789
        self.assertEqual(l[1], (9, '9'))
814
791
        self.assertEqual(l[3], (3, '34'))
815
792
 
816
793
    def test_readv_invalid_ranges(self):
817
 
        t = self.get_readonly_transport()
 
794
        server = self.get_readonly_server()
 
795
        t = self._transport(server.get_url())
818
796
 
819
797
        # This is intentionally reading off the end of the file
820
798
        # since we are sure that it cannot get there
828
806
 
829
807
    def test_readv_multiple_get_requests(self):
830
808
        server = self.get_readonly_server()
831
 
        t = self.get_readonly_transport()
 
809
        t = self._transport(server.get_url())
832
810
        # force transport to issue multiple requests
833
811
        t._max_readv_combine = 1
834
812
        t._max_get_ranges = 1
842
820
 
843
821
    def test_readv_get_max_size(self):
844
822
        server = self.get_readonly_server()
845
 
        t = self.get_readonly_transport()
 
823
        t = self._transport(server.get_url())
846
824
        # force transport to issue multiple requests by limiting the number of
847
825
        # bytes by request. Note that this apply to coalesced offsets only, a
848
826
        # single range will keep its size even if bigger than the limit.
857
835
 
858
836
    def test_complete_readv_leave_pipe_clean(self):
859
837
        server = self.get_readonly_server()
860
 
        t = self.get_readonly_transport()
 
838
        t = self._transport(server.get_url())
861
839
        # force transport to issue multiple requests
862
840
        t._get_max_size = 2
863
 
        list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
 
841
        l = list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
864
842
        # The server should have issued 3 requests
865
843
        self.assertEqual(3, server.GET_request_nb)
866
844
        self.assertEqual('0123456789', t.get_bytes('a'))
868
846
 
869
847
    def test_incomplete_readv_leave_pipe_clean(self):
870
848
        server = self.get_readonly_server()
871
 
        t = self.get_readonly_transport()
 
849
        t = self._transport(server.get_url())
872
850
        # force transport to issue multiple requests
873
851
        t._get_max_size = 2
874
852
        # Don't collapse readv results into a list so that we leave unread
943
921
    def get_multiple_ranges(self, file, file_size, ranges):
944
922
        self.send_response(206)
945
923
        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
924
        boundary = "%d" % random.randint(0,0x7FFFFFFF)
949
925
        self.send_header("Content-Type",
950
926
                         "multipart/byteranges; boundary=%s" % boundary)
1012
988
                return
1013
989
            self.send_range_content(file, start, end - start + 1)
1014
990
            cur += 1
1015
 
        # Final boundary
 
991
        # No final boundary
1016
992
        self.wfile.write(boundary_line)
1017
993
 
1018
994
 
1026
1002
 
1027
1003
    def test_readv_with_short_reads(self):
1028
1004
        server = self.get_readonly_server()
1029
 
        t = self.get_readonly_transport()
 
1005
        t = self._transport(server.get_url())
1030
1006
        # Force separate ranges for each offset
1031
1007
        t._bytes_to_read_before_seek = 0
1032
1008
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1047
1023
        # that mode
1048
1024
        self.assertEqual('single', t._range_hint)
1049
1025
 
1050
 
 
1051
1026
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1052
1027
    """Errors out when range specifiers exceed the limit"""
1053
1028
 
1077
1052
class TestLimitedRangeRequestServer(http_utils.TestCaseWithWebserver):
1078
1053
    """Tests readv requests against a server erroring out on too much ranges."""
1079
1054
 
1080
 
    scenarios = multiply_scenarios(
1081
 
        vary_by_http_client_implementation(),
1082
 
        vary_by_http_protocol_version(),
1083
 
        )
1084
 
 
1085
1055
    # Requests with more range specifiers will error out
1086
1056
    range_limit = 3
1087
1057
 
1089
1059
        return LimitedRangeHTTPServer(range_limit=self.range_limit,
1090
1060
                                      protocol_version=self._protocol_version)
1091
1061
 
 
1062
    def get_transport(self):
 
1063
        return self._transport(self.get_readonly_server().get_url())
 
1064
 
1092
1065
    def setUp(self):
1093
1066
        http_utils.TestCaseWithWebserver.setUp(self)
1094
1067
        # We need to manipulate ranges that correspond to real chunks in the
1098
1071
        self.build_tree_contents([('a', content)],)
1099
1072
 
1100
1073
    def test_few_ranges(self):
1101
 
        t = self.get_readonly_transport()
 
1074
        t = self.get_transport()
1102
1075
        l = list(t.readv('a', ((0, 4), (1024, 4), )))
1103
1076
        self.assertEqual(l[0], (0, '0000'))
1104
1077
        self.assertEqual(l[1], (1024, '0001'))
1105
1078
        self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1106
1079
 
1107
1080
    def test_more_ranges(self):
1108
 
        t = self.get_readonly_transport()
 
1081
        t = self.get_transport()
1109
1082
        l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1110
1083
        self.assertEqual(l[0], (0, '0000'))
1111
1084
        self.assertEqual(l[1], (1024, '0001'))
1122
1095
    Only the urllib implementation is tested here.
1123
1096
    """
1124
1097
 
 
1098
    def setUp(self):
 
1099
        tests.TestCase.setUp(self)
 
1100
        self._old_env = {}
 
1101
 
 
1102
    def tearDown(self):
 
1103
        self._restore_env()
 
1104
        tests.TestCase.tearDown(self)
 
1105
 
 
1106
    def _install_env(self, env):
 
1107
        for name, value in env.iteritems():
 
1108
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1109
 
 
1110
    def _restore_env(self):
 
1111
        for name, value in self._old_env.iteritems():
 
1112
            osutils.set_or_unset_env(name, value)
 
1113
 
1125
1114
    def _proxied_request(self):
1126
1115
        handler = _urllib2_wrappers.ProxyHandler()
1127
 
        request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
 
1116
        request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
1128
1117
        handler.set_proxy(request, 'http')
1129
1118
        return request
1130
1119
 
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
1120
    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')
 
1121
        self._install_env({'http_proxy': 'http://bar.com'})
1144
1122
        request = self._proxied_request()
1145
1123
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
1146
1124
 
1147
1125
    def test_invalid_proxy(self):
1148
1126
        """A proxy env variable without scheme"""
1149
 
        self.overrideEnv('http_proxy', 'host:1234')
 
1127
        self._install_env({'http_proxy': 'host:1234'})
1150
1128
        self.assertRaises(errors.InvalidURL, self._proxied_request)
1151
1129
 
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
1130
 
1173
1131
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1174
1132
    """Tests proxy server.
1179
1137
    to the file names).
1180
1138
    """
1181
1139
 
1182
 
    scenarios = multiply_scenarios(
1183
 
        vary_by_http_client_implementation(),
1184
 
        vary_by_http_protocol_version(),
1185
 
        )
1186
 
 
1187
1140
    # FIXME: We don't have an https server available, so we don't
1188
 
    # test https connections. --vila toolongago
 
1141
    # test https connections.
1189
1142
 
1190
1143
    def setUp(self):
1191
1144
        super(TestProxyHttpServer, self).setUp()
1192
 
        self.transport_secondary_server = http_utils.ProxyServer
1193
1145
        self.build_tree_contents([('foo', 'contents of foo\n'),
1194
1146
                                  ('foo-proxied', 'proxied contents of foo\n')])
1195
1147
        # Let's setup some attributes for tests
1196
 
        server = self.get_readonly_server()
1197
 
        self.server_host_port = '%s:%d' % (server.host, server.port)
 
1148
        self.server = self.get_readonly_server()
 
1149
        self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
1198
1150
        if self._testing_pycurl():
1199
1151
            # Oh my ! pycurl does not check for the port as part of
1200
1152
            # no_proxy :-( So we just test the host part
1201
 
            self.no_proxy_host = server.host
 
1153
            self.no_proxy_host = 'localhost'
1202
1154
        else:
1203
 
            self.no_proxy_host = self.server_host_port
 
1155
            self.no_proxy_host = self.proxy_address
1204
1156
        # The secondary server is the proxy
1205
 
        self.proxy_url = self.get_secondary_url()
 
1157
        self.proxy = self.get_secondary_server()
 
1158
        self.proxy_url = self.proxy.get_url()
 
1159
        self._old_env = {}
1206
1160
 
1207
1161
    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())
 
1162
        return pycurl_present and self._transport == PyCurlTransport
 
1163
 
 
1164
    def create_transport_secondary_server(self):
 
1165
        """Creates an http server that will serve files with
 
1166
        '-proxied' appended to their names.
 
1167
        """
 
1168
        return http_utils.ProxyServer(protocol_version=self._protocol_version)
 
1169
 
 
1170
    def _install_env(self, env):
 
1171
        for name, value in env.iteritems():
 
1172
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1173
 
 
1174
    def _restore_env(self):
 
1175
        for name, value in self._old_env.iteritems():
 
1176
            osutils.set_or_unset_env(name, value)
 
1177
 
 
1178
    def proxied_in_env(self, env):
 
1179
        self._install_env(env)
 
1180
        url = self.server.get_url()
 
1181
        t = self._transport(url)
 
1182
        try:
 
1183
            self.assertEqual('proxied contents of foo\n', t.get('foo').read())
 
1184
        finally:
 
1185
            self._restore_env()
 
1186
 
 
1187
    def not_proxied_in_env(self, env):
 
1188
        self._install_env(env)
 
1189
        url = self.server.get_url()
 
1190
        t = self._transport(url)
 
1191
        try:
 
1192
            self.assertEqual('contents of foo\n', t.get('foo').read())
 
1193
        finally:
 
1194
            self._restore_env()
1219
1195
 
1220
1196
    def test_http_proxy(self):
1221
 
        self.overrideEnv('http_proxy', self.proxy_url)
1222
 
        self.assertProxied()
 
1197
        self.proxied_in_env({'http_proxy': self.proxy_url})
1223
1198
 
1224
1199
    def test_HTTP_PROXY(self):
1225
1200
        if self._testing_pycurl():
1228
1203
            # about. Should we ?)
1229
1204
            raise tests.TestNotApplicable(
1230
1205
                'pycurl does not check HTTP_PROXY for security reasons')
1231
 
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
1232
 
        self.assertProxied()
 
1206
        self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
1233
1207
 
1234
1208
    def test_all_proxy(self):
1235
 
        self.overrideEnv('all_proxy', self.proxy_url)
1236
 
        self.assertProxied()
 
1209
        self.proxied_in_env({'all_proxy': self.proxy_url})
1237
1210
 
1238
1211
    def test_ALL_PROXY(self):
1239
 
        self.overrideEnv('ALL_PROXY', self.proxy_url)
1240
 
        self.assertProxied()
 
1212
        self.proxied_in_env({'ALL_PROXY': self.proxy_url})
1241
1213
 
1242
1214
    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()
 
1215
        self.not_proxied_in_env({'http_proxy': self.proxy_url,
 
1216
                                 'no_proxy': self.no_proxy_host})
1246
1217
 
1247
1218
    def test_HTTP_PROXY_with_NO_PROXY(self):
1248
1219
        if self._testing_pycurl():
1249
1220
            raise tests.TestNotApplicable(
1250
1221
                '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()
 
1222
        self.not_proxied_in_env({'HTTP_PROXY': self.proxy_url,
 
1223
                                 'NO_PROXY': self.no_proxy_host})
1254
1224
 
1255
1225
    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()
 
1226
        self.not_proxied_in_env({'all_proxy': self.proxy_url,
 
1227
                                 'no_proxy': self.no_proxy_host})
1259
1228
 
1260
1229
    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()
 
1230
        self.not_proxied_in_env({'ALL_PROXY': self.proxy_url,
 
1231
                                 'NO_PROXY': self.no_proxy_host})
1264
1232
 
1265
1233
    def test_http_proxy_without_scheme(self):
1266
 
        self.overrideEnv('http_proxy', self.server_host_port)
1267
1234
        if self._testing_pycurl():
1268
1235
            # pycurl *ignores* invalid proxy env variables. If that ever change
1269
1236
            # in the future, this test will fail indicating that pycurl do not
1270
1237
            # ignore anymore such variables.
1271
 
            self.assertNotProxied()
 
1238
            self.not_proxied_in_env({'http_proxy': self.proxy_address})
1272
1239
        else:
1273
 
            self.assertRaises(errors.InvalidURL, self.assertProxied)
 
1240
            self.assertRaises(errors.InvalidURL,
 
1241
                              self.proxied_in_env,
 
1242
                              {'http_proxy': self.proxy_address})
1274
1243
 
1275
1244
 
1276
1245
class TestRanges(http_utils.TestCaseWithWebserver):
1277
1246
    """Test the Range header in GET methods."""
1278
1247
 
1279
 
    scenarios = multiply_scenarios(
1280
 
        vary_by_http_client_implementation(),
1281
 
        vary_by_http_protocol_version(),
1282
 
        )
1283
 
 
1284
1248
    def setUp(self):
1285
1249
        http_utils.TestCaseWithWebserver.setUp(self)
1286
1250
        self.build_tree_contents([('a', '0123456789')],)
 
1251
        server = self.get_readonly_server()
 
1252
        self.transport = self._transport(server.get_url())
1287
1253
 
1288
1254
    def create_transport_readonly_server(self):
1289
1255
        return http_server.HttpServer(protocol_version=self._protocol_version)
1290
1256
 
1291
1257
    def _file_contents(self, relpath, ranges):
1292
 
        t = self.get_readonly_transport()
1293
1258
        offsets = [ (start, end - start + 1) for start, end in ranges]
1294
 
        coalesce = t._coalesce_offsets
 
1259
        coalesce = self.transport._coalesce_offsets
1295
1260
        coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1296
 
        code, data = t._get(relpath, coalesced)
 
1261
        code, data = self.transport._get(relpath, coalesced)
1297
1262
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1298
1263
        for start, end in ranges:
1299
1264
            data.seek(start)
1300
1265
            yield data.read(end - start + 1)
1301
1266
 
1302
1267
    def _file_tail(self, relpath, tail_amount):
1303
 
        t = self.get_readonly_transport()
1304
 
        code, data = t._get(relpath, [], tail_amount)
 
1268
        code, data = self.transport._get(relpath, [], tail_amount)
1305
1269
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1306
1270
        data.seek(-tail_amount, 2)
1307
1271
        return data.read(tail_amount)
1326
1290
class TestHTTPRedirections(http_utils.TestCaseWithRedirectedWebserver):
1327
1291
    """Test redirection between http servers."""
1328
1292
 
1329
 
    scenarios = multiply_scenarios(
1330
 
        vary_by_http_client_implementation(),
1331
 
        vary_by_http_protocol_version(),
1332
 
        )
 
1293
    def create_transport_secondary_server(self):
 
1294
        """Create the secondary server redirecting to the primary server"""
 
1295
        new = self.get_readonly_server()
 
1296
 
 
1297
        redirecting = http_utils.HTTPServerRedirecting(
 
1298
            protocol_version=self._protocol_version)
 
1299
        redirecting.redirect_to(new.host, new.port)
 
1300
        return redirecting
1333
1301
 
1334
1302
    def setUp(self):
1335
1303
        super(TestHTTPRedirections, self).setUp()
1337
1305
                                  ('bundle',
1338
1306
                                  '# Bazaar revision bundle v0.9\n#\n')
1339
1307
                                  ],)
 
1308
        # The requests to the old server will be redirected to the new server
 
1309
        self.old_transport = self._transport(self.old_server.get_url())
1340
1310
 
1341
1311
    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())
 
1312
        self.assertRaises(errors.RedirectRequested, self.old_transport.get, 'a')
 
1313
        t = self._transport(self.new_server.get_url())
 
1314
        self.assertEqual('0123456789', t.get('a').read())
 
1315
 
 
1316
    def test_read_redirected_bundle_from_url(self):
 
1317
        from bzrlib.bundle import read_bundle_from_url
 
1318
        url = self.old_transport.abspath('bundle')
 
1319
        bundle = self.applyDeprecated(deprecated_in((1, 12, 0)),
 
1320
                read_bundle_from_url, url)
 
1321
        # If read_bundle_from_url was successful we get an empty bundle
 
1322
        self.assertEqual([], bundle.revisions)
1345
1323
 
1346
1324
 
1347
1325
class RedirectedRequest(_urllib2_wrappers.Request):
1360
1338
        self.follow_redirections = True
1361
1339
 
1362
1340
 
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
1341
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1389
1342
    """Test redirections.
1390
1343
 
1399
1352
    -- vila 20070212
1400
1353
    """
1401
1354
 
1402
 
    scenarios = multiply_scenarios(
1403
 
        vary_by_http_client_implementation(),
1404
 
        vary_by_http_protocol_version(),
1405
 
        )
1406
 
 
1407
1355
    def setUp(self):
1408
 
        if (features.pycurl.available()
1409
 
            and self._transport == PyCurlTransport):
 
1356
        if pycurl_present and self._transport == PyCurlTransport:
1410
1357
            raise tests.TestNotApplicable(
1411
 
                "pycurl doesn't redirect silently anymore")
 
1358
                "pycurl doesn't redirect silently annymore")
1412
1359
        super(TestHTTPSilentRedirections, self).setUp()
1413
 
        install_redirected_request(self)
1414
 
        cleanup_http_redirection_connections(self)
 
1360
        self.setup_redirected_request()
 
1361
        self.addCleanup(self.cleanup_redirected_request)
1415
1362
        self.build_tree_contents([('a','a'),
1416
1363
                                  ('1/',),
1417
1364
                                  ('1/a', 'redirected once'),
1425
1372
                                  ('5/a', 'redirected 5 times'),
1426
1373
                                  ],)
1427
1374
 
 
1375
        self.old_transport = self._transport(self.old_server.get_url())
 
1376
 
 
1377
    def setup_redirected_request(self):
 
1378
        self.original_class = _urllib2_wrappers.Request
 
1379
        _urllib2_wrappers.Request = RedirectedRequest
 
1380
 
 
1381
    def cleanup_redirected_request(self):
 
1382
        _urllib2_wrappers.Request = self.original_class
 
1383
 
 
1384
    def create_transport_secondary_server(self):
 
1385
        """Create the secondary server, redirections are defined in the tests"""
 
1386
        return http_utils.HTTPServerRedirecting(
 
1387
            protocol_version=self._protocol_version)
 
1388
 
1428
1389
    def test_one_redirection(self):
1429
 
        t = self.get_old_transport()
1430
 
        req = RedirectedRequest('GET', t._remote_path('a'))
 
1390
        t = self.old_transport
 
1391
 
 
1392
        req = RedirectedRequest('GET', t.abspath('a'))
 
1393
        req.follow_redirections = True
1431
1394
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1432
1395
                                       self.new_server.port)
1433
1396
        self.old_server.redirections = \
1434
1397
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1435
 
        self.assertEqual('redirected once', t._perform(req).read())
 
1398
        self.assertEquals('redirected once',t._perform(req).read())
1436
1399
 
1437
1400
    def test_five_redirections(self):
1438
 
        t = self.get_old_transport()
1439
 
        req = RedirectedRequest('GET', t._remote_path('a'))
 
1401
        t = self.old_transport
 
1402
 
 
1403
        req = RedirectedRequest('GET', t.abspath('a'))
 
1404
        req.follow_redirections = True
1440
1405
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1441
1406
                                       self.old_server.port)
1442
1407
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1448
1413
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1449
1414
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1450
1415
            ]
1451
 
        self.assertEqual('redirected 5 times', t._perform(req).read())
 
1416
        self.assertEquals('redirected 5 times',t._perform(req).read())
1452
1417
 
1453
1418
 
1454
1419
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1455
1420
    """Test transport.do_catching_redirections."""
1456
1421
 
1457
 
    scenarios = multiply_scenarios(
1458
 
        vary_by_http_client_implementation(),
1459
 
        vary_by_http_protocol_version(),
1460
 
        )
1461
 
 
1462
1422
    def setUp(self):
1463
1423
        super(TestDoCatchRedirections, self).setUp()
1464
1424
        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')
 
1425
 
 
1426
        self.old_transport = self._transport(self.old_server.get_url())
 
1427
 
 
1428
    def get_a(self, transport):
 
1429
        return transport.get('a')
1471
1430
 
1472
1431
    def test_no_redirection(self):
1473
 
        t = self.get_new_transport()
 
1432
        t = self._transport(self.new_server.get_url())
1474
1433
 
1475
1434
        # We use None for redirected so that we fail if redirected
1476
 
        self.assertEqual('0123456789',
1477
 
                         transport.do_catching_redirections(
 
1435
        self.assertEquals('0123456789',
 
1436
                          transport.do_catching_redirections(
1478
1437
                self.get_a, t, None).read())
1479
1438
 
1480
1439
    def test_one_redirection(self):
1481
1440
        self.redirections = 0
1482
1441
 
1483
 
        def redirected(t, exception, redirection_notice):
 
1442
        def redirected(transport, exception, redirection_notice):
1484
1443
            self.redirections += 1
1485
 
            redirected_t = t._redirected_to(exception.source, exception.target)
1486
 
            return redirected_t
 
1444
            dir, file = urlutils.split(exception.target)
 
1445
            return self._transport(dir)
1487
1446
 
1488
 
        self.assertEqual('0123456789',
1489
 
                         transport.do_catching_redirections(
 
1447
        self.assertEquals('0123456789',
 
1448
                          transport.do_catching_redirections(
1490
1449
                self.get_a, self.old_transport, redirected).read())
1491
 
        self.assertEqual(1, self.redirections)
 
1450
        self.assertEquals(1, self.redirections)
1492
1451
 
1493
1452
    def test_redirection_loop(self):
1494
1453
 
1503
1462
                          self.get_a, self.old_transport, redirected)
1504
1463
 
1505
1464
 
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
1465
class TestAuth(http_utils.TestCaseWithWebserver):
1536
1466
    """Test authentication scheme"""
1537
1467
 
1538
 
    scenarios = multiply_scenarios(
1539
 
        vary_by_http_client_implementation(),
1540
 
        vary_by_http_protocol_version(),
1541
 
        vary_by_http_auth_scheme(),
1542
 
        )
 
1468
    _auth_header = 'Authorization'
 
1469
    _password_prompt_prefix = ''
 
1470
    _username_prompt_prefix = ''
 
1471
    # Set by load_tests
 
1472
    _auth_server = None
1543
1473
 
1544
1474
    def setUp(self):
1545
1475
        super(TestAuth, self).setUp()
1548
1478
                                  ('b', 'contents of b\n'),])
1549
1479
 
1550
1480
    def create_transport_readonly_server(self):
1551
 
        server = self._auth_server(protocol_version=self._protocol_version)
1552
 
        server._url_protocol = self._url_protocol
1553
 
        return server
 
1481
        return self._auth_server(protocol_version=self._protocol_version)
1554
1482
 
1555
1483
    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)
 
1484
        return pycurl_present and self._transport == PyCurlTransport
1559
1485
 
1560
1486
    def get_user_url(self, user, password):
1561
1487
        """Build an url embedding user and password"""
1569
1495
        return url
1570
1496
 
1571
1497
    def get_user_transport(self, user, password):
1572
 
        t = transport.get_transport(self.get_user_url(user, password))
1573
 
        return t
 
1498
        return self._transport(self.get_user_url(user, password))
1574
1499
 
1575
1500
    def test_no_user(self):
1576
1501
        self.server.add_user('joe', 'foo')
1619
1544
        self.server.add_user('joe', 'foo')
1620
1545
        t = self.get_user_transport(None, None)
1621
1546
        stdout = tests.StringIOWrapper()
1622
 
        stderr = tests.StringIOWrapper()
1623
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
1624
 
                                            stdout=stdout, stderr=stderr)
 
1547
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n', stdout=stdout)
1625
1548
        self.assertEqual('contents of a\n',t.get('a').read())
1626
1549
        # stdin should be empty
1627
1550
        self.assertEqual('', ui.ui_factory.stdin.readline())
1628
 
        stderr.seek(0)
 
1551
        stdout.seek(0)
1629
1552
        expected_prompt = self._expected_username_prompt(t._unqualified_scheme)
1630
 
        self.assertEqual(expected_prompt, stderr.read(len(expected_prompt)))
1631
 
        self.assertEqual('', stdout.getvalue())
 
1553
        self.assertEquals(expected_prompt, stdout.read(len(expected_prompt)))
1632
1554
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1633
 
                                    stderr.readline())
 
1555
                                    stdout.readline())
1634
1556
 
1635
1557
    def test_prompt_for_password(self):
1636
1558
        if self._testing_pycurl():
1641
1563
        self.server.add_user('joe', 'foo')
1642
1564
        t = self.get_user_transport('joe', None)
1643
1565
        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())
 
1566
        ui.ui_factory = tests.TestUIFactory(stdin='foo\n', stdout=stdout)
 
1567
        self.assertEqual('contents of a\n',t.get('a').read())
1648
1568
        # stdin should be empty
1649
1569
        self.assertEqual('', ui.ui_factory.stdin.readline())
1650
1570
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1651
 
                                    stderr.getvalue())
1652
 
        self.assertEqual('', stdout.getvalue())
 
1571
                                    stdout.getvalue())
1653
1572
        # And we shouldn't prompt again for a different request
1654
1573
        # against the same transport.
1655
1574
        self.assertEqual('contents of b\n',t.get('b').read())
1665
1584
                              % (scheme.upper(),
1666
1585
                                 user, self.server.host, self.server.port,
1667
1586
                                 self.server.auth_realm)))
1668
 
        self.assertEqual(expected_prompt, actual_prompt)
 
1587
        self.assertEquals(expected_prompt, actual_prompt)
1669
1588
 
1670
1589
    def _expected_username_prompt(self, scheme):
1671
1590
        return (self._username_prompt_prefix
1685
1604
        self.server.add_user(user, password)
1686
1605
        t = self.get_user_transport(user, None)
1687
1606
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1688
 
                                            stderr=tests.StringIOWrapper())
 
1607
                                            stdout=tests.StringIOWrapper())
1689
1608
        # Create a minimal config file with the right password
1690
 
        _setup_authentication_config(scheme='http', port=self.server.port,
1691
 
                                     user=user, password=password)
 
1609
        conf = config.AuthenticationConfig()
 
1610
        conf._get_config().update(
 
1611
            {'httptest': {'scheme': 'http', 'port': self.server.port,
 
1612
                          'user': user, 'password': password}})
 
1613
        conf._save()
1692
1614
        # Issue a request to the server to connect
1693
1615
        self.assertEqual('contents of a\n',t.get('a').read())
1694
1616
        # stdin should have  been left untouched
1696
1618
        # Only one 'Authentication Required' error should occur
1697
1619
        self.assertEqual(1, self.server.auth_required_errors)
1698
1620
 
 
1621
    def test_user_from_auth_conf(self):
 
1622
        if self._testing_pycurl():
 
1623
            raise tests.TestNotApplicable(
 
1624
                'pycurl does not support authentication.conf')
 
1625
        user = 'joe'
 
1626
        password = 'foo'
 
1627
        self.server.add_user(user, password)
 
1628
        # Create a minimal config file with the right password
 
1629
        conf = config.AuthenticationConfig()
 
1630
        conf._get_config().update(
 
1631
            {'httptest': {'scheme': 'http', 'port': self.server.port,
 
1632
                          'user': user, 'password': password}})
 
1633
        conf._save()
 
1634
        t = self.get_user_transport(None, None)
 
1635
        # Issue a request to the server to connect
 
1636
        self.assertEqual('contents of a\n', t.get('a').read())
 
1637
        # Only one 'Authentication Required' error should occur
 
1638
        self.assertEqual(1, self.server.auth_required_errors)
 
1639
 
1699
1640
    def test_changing_nonce(self):
1700
1641
        if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1701
1642
                                     http_utils.ProxyDigestAuthServer):
1717
1658
        # initial 'who are you' and a second 'who are you' with the new nonce)
1718
1659
        self.assertEqual(2, self.server.auth_required_errors)
1719
1660
 
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
1661
 
1761
1662
 
1762
1663
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
 
        )
 
1664
    """Test proxy authentication schemes."""
 
1665
 
 
1666
    _auth_header = 'Proxy-authorization'
 
1667
    _password_prompt_prefix = 'Proxy '
 
1668
    _username_prompt_prefix = 'Proxy '
1774
1669
 
1775
1670
    def setUp(self):
1776
1671
        super(TestProxyAuth, self).setUp()
 
1672
        self._old_env = {}
 
1673
        self.addCleanup(self._restore_env)
1777
1674
        # Override the contents to avoid false positives
1778
1675
        self.build_tree_contents([('a', 'not proxied contents of a\n'),
1779
1676
                                  ('b', 'not proxied contents of b\n'),
1782
1679
                                  ])
1783
1680
 
1784
1681
    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)
 
1682
        self._install_env({'all_proxy': self.get_user_url(user, password)})
 
1683
        return self._transport(self.server.get_url())
 
1684
 
 
1685
    def _install_env(self, env):
 
1686
        for name, value in env.iteritems():
 
1687
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1688
 
 
1689
    def _restore_env(self):
 
1690
        for name, value in self._old_env.iteritems():
 
1691
            osutils.set_or_unset_env(name, value)
1787
1692
 
1788
1693
    def test_empty_pass(self):
1789
1694
        if self._testing_pycurl():
1808
1713
        self.readfile = StringIO(socket_read_content)
1809
1714
        self.writefile = StringIO()
1810
1715
        self.writefile.close = lambda: None
1811
 
        self.close = lambda: None
1812
1716
 
1813
1717
    def makefile(self, mode='r', bufsize=None):
1814
1718
        if 'r' in mode:
1819
1723
 
1820
1724
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1821
1725
 
1822
 
    scenarios = multiply_scenarios(
1823
 
        vary_by_http_client_implementation(),
1824
 
        vary_by_http_protocol_version(),
1825
 
        )
1826
 
 
1827
1726
    def setUp(self):
1828
1727
        super(SmartHTTPTunnellingTest, self).setUp()
1829
1728
        # We use the VFS layer as part of HTTP tunnelling tests.
1830
 
        self.overrideEnv('BZR_NO_SMART_VFS', None)
 
1729
        self._captureVar('BZR_NO_SMART_VFS', None)
1831
1730
        self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1832
 
        self.http_server = self.get_readonly_server()
1833
1731
 
1834
1732
    def create_transport_readonly_server(self):
1835
 
        server = http_utils.HTTPServerWithSmarts(
 
1733
        return http_utils.HTTPServerWithSmarts(
1836
1734
            protocol_version=self._protocol_version)
1837
 
        server._url_protocol = self._url_protocol
1838
 
        return server
1839
1735
 
1840
1736
    def test_open_bzrdir(self):
1841
1737
        branch = self.make_branch('relpath')
1842
 
        url = self.http_server.get_url() + 'relpath'
 
1738
        http_server = self.get_readonly_server()
 
1739
        url = http_server.get_url() + 'relpath'
1843
1740
        bd = bzrdir.BzrDir.open(url)
1844
 
        self.addCleanup(bd.transport.disconnect)
1845
1741
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1846
1742
 
1847
1743
    def test_bulk_data(self):
1849
1745
        # The 'readv' command in the smart protocol both sends and receives
1850
1746
        # bulk data, so we use that.
1851
1747
        self.build_tree(['data-file'])
1852
 
        http_transport = transport.get_transport(self.http_server.get_url())
 
1748
        http_server = self.get_readonly_server()
 
1749
        http_transport = self._transport(http_server.get_url())
1853
1750
        medium = http_transport.get_smart_medium()
1854
1751
        # Since we provide the medium, the url below will be mostly ignored
1855
1752
        # during the test, as long as the path is '/'.
1863
1760
        post_body = 'hello\n'
1864
1761
        expected_reply_body = 'ok\x012\n'
1865
1762
 
1866
 
        http_transport = transport.get_transport(self.http_server.get_url())
 
1763
        http_server = self.get_readonly_server()
 
1764
        http_transport = self._transport(http_server.get_url())
1867
1765
        medium = http_transport.get_smart_medium()
1868
1766
        response = medium.send_http_smart_request(post_body)
1869
1767
        reply_body = response.read()
1870
1768
        self.assertEqual(expected_reply_body, reply_body)
1871
1769
 
1872
1770
    def test_smart_http_server_post_request_handler(self):
1873
 
        httpd = self.http_server.server
 
1771
        httpd = self.get_readonly_server()._get_httpd()
1874
1772
 
1875
1773
        socket = SampleSocket(
1876
1774
            'POST /.bzr/smart %s \r\n' % self._protocol_version
1908
1806
 
1909
1807
    def test_probe_smart_server(self):
1910
1808
        """Test error handling against server refusing smart requests."""
1911
 
        t = self.get_readonly_transport()
 
1809
        server = self.get_readonly_server()
 
1810
        t = self._transport(server.get_url())
1912
1811
        # No need to build a valid smart request here, the server will not even
1913
1812
        # try to interpret it.
1914
1813
        self.assertRaises(errors.SmartProtocolError,
1915
1814
                          t.get_smart_medium().send_http_smart_request,
1916
1815
                          'whatever')
1917
1816
 
1918
 
 
1919
1817
class Test_redirected_to(tests.TestCase):
1920
1818
 
1921
 
    scenarios = vary_by_http_client_implementation()
1922
 
 
1923
1819
    def test_redirected_to_subdir(self):
1924
1820
        t = self._transport('http://www.example.com/foo')
1925
1821
        r = t._redirected_to('http://www.example.com/foo',
1926
1822
                             'http://www.example.com/foo/subdir')
1927
1823
        self.assertIsInstance(r, type(t))
1928
1824
        # Both transports share the some connection
1929
 
        self.assertEqual(t._get_connection(), r._get_connection())
 
1825
        self.assertEquals(t._get_connection(), r._get_connection())
1930
1826
 
1931
1827
    def test_redirected_to_self_with_slash(self):
1932
1828
        t = self._transport('http://www.example.com/foo')
1936
1832
        # Both transports share the some connection (one can argue that we
1937
1833
        # should return the exact same transport here, but that seems
1938
1834
        # overkill).
1939
 
        self.assertEqual(t._get_connection(), r._get_connection())
 
1835
        self.assertEquals(t._get_connection(), r._get_connection())
1940
1836
 
1941
1837
    def test_redirected_to_host(self):
1942
1838
        t = self._transport('http://www.example.com/foo')
1961
1857
        r = t._redirected_to('http://www.example.com/foo',
1962
1858
                             'https://foo.example.com/foo')
1963
1859
        self.assertIsInstance(r, type(t))
1964
 
        self.assertEqual(t._user, r._user)
 
1860
        self.assertEquals(t._user, r._user)
1965
1861
 
1966
1862
 
1967
1863
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
1976
1872
    line.
1977
1873
    """
1978
1874
 
1979
 
    def _handle_one_request(self):
 
1875
    def handle_one_request(self):
1980
1876
        tcs = self.server.test_case_server
1981
1877
        requestline = self.rfile.readline()
1982
1878
        headers = self.MessageClass(self.rfile, 0)
2026
1922
        pass
2027
1923
 
2028
1924
 
2029
 
class TestActivityMixin(object):
 
1925
class TestActivity(tests.TestCase):
2030
1926
    """Test socket activity reporting.
2031
1927
 
2032
1928
    We use a special purpose server to control the bytes sent and received and
2036
1932
    def setUp(self):
2037
1933
        tests.TestCase.setUp(self)
2038
1934
        self.server = self._activity_server(self._protocol_version)
2039
 
        self.server.start_server()
2040
 
        _activities = {} # Don't close over self and create a cycle
 
1935
        self.server.setUp()
 
1936
        self.activities = {}
2041
1937
        def report_activity(t, bytes, direction):
2042
 
            count = _activities.get(direction, 0)
 
1938
            count = self.activities.get(direction, 0)
2043
1939
            count += bytes
2044
 
            _activities[direction] = count
2045
 
        self.activities = _activities
 
1940
            self.activities[direction] = count
2046
1941
 
2047
1942
        # We override at class level because constructors may propagate the
2048
1943
        # bound method and render instance overriding ineffective (an
2049
1944
        # 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)
 
1945
        self.orig_report_activity = self._transport._report_activity
 
1946
        self._transport._report_activity = report_activity
 
1947
 
 
1948
    def tearDown(self):
 
1949
        self._transport._report_activity = self.orig_report_activity
 
1950
        self.server.tearDown()
 
1951
        tests.TestCase.tearDown(self)
2052
1952
 
2053
1953
    def get_transport(self):
2054
 
        t = self._transport(self.server.get_url())
2055
 
        # FIXME: Needs cleanup -- vila 20100611
2056
 
        return t
 
1954
        return self._transport(self.server.get_url())
2057
1955
 
2058
1956
    def assertActivitiesMatch(self):
2059
1957
        self.assertEqual(self.server.bytes_read,
2164
2062
'''
2165
2063
        t = self.get_transport()
2166
2064
        # We must send a single line of body bytes, see
2167
 
        # PredefinedRequestHandler._handle_one_request
 
2065
        # PredefinedRequestHandler.handle_one_request
2168
2066
        code, f = t._post('abc def end-of-body\n')
2169
2067
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2170
2068
        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