~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-05-01 11:25:12 UTC
  • mfrom: (3211.7.10 protocol-v3-doc)
  • Revision ID: pqm@pqm.ubuntu.com-20080501112512-b9lgs4w8r43evtn1
Add the smart protocol v3 specification to network-protocol.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for HTTP implementations.
18
18
 
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
    config,
35
 
    controldir,
36
 
    debug,
37
38
    errors,
38
39
    osutils,
39
 
    remote as _mod_remote,
40
40
    tests,
41
 
    trace,
42
41
    transport,
43
42
    ui,
 
43
    urlutils,
44
44
    )
45
45
from bzrlib.tests import (
46
 
    features,
47
46
    http_server,
48
47
    http_utils,
49
 
    test_server,
50
 
    )
51
 
from bzrlib.tests.scenarios import (
52
 
    load_tests_apply_scenarios,
53
 
    multiply_scenarios,
54
48
    )
55
49
from bzrlib.transport import (
56
50
    http,
62
56
    )
63
57
 
64
58
 
65
 
if features.pycurl.available():
 
59
try:
66
60
    from bzrlib.transport.http._pycurl import PyCurlTransport
67
 
 
68
 
 
69
 
load_tests = load_tests_apply_scenarios
70
 
 
71
 
 
72
 
def vary_by_http_client_implementation():
73
 
    """Test the two libraries we can use, pycurl and urllib."""
74
 
    transport_scenarios = [
75
 
        ('urllib', dict(_transport=_urllib.HttpTransport_urllib,
76
 
                        _server=http_server.HttpServer_urllib,
77
 
                        _url_protocol='http+urllib',)),
78
 
        ]
79
 
    if features.pycurl.available():
80
 
        transport_scenarios.append(
81
 
            ('pycurl', dict(_transport=PyCurlTransport,
82
 
                            _server=http_server.HttpServer_PyCurl,
83
 
                            _url_protocol='http+pycurl',)))
84
 
    return transport_scenarios
85
 
 
86
 
 
87
 
def vary_by_http_protocol_version():
88
 
    """Test on http/1.0 and 1.1"""
89
 
    return [
90
 
        ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
91
 
        ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
92
 
        ]
93
 
 
94
 
 
95
 
def vary_by_http_auth_scheme():
96
 
    scenarios = [
97
 
        ('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
98
 
        ('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
99
 
        ('basicdigest',
100
 
            dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
101
 
        ]
102
 
    # Add some attributes common to all scenarios
103
 
    for scenario_id, scenario_dict in scenarios:
104
 
        scenario_dict.update(_auth_header='Authorization',
105
 
                             _username_prompt_prefix='',
106
 
                             _password_prompt_prefix='')
107
 
    return scenarios
108
 
 
109
 
 
110
 
def vary_by_http_proxy_auth_scheme():
111
 
    scenarios = [
112
 
        ('proxy-basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
113
 
        ('proxy-digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
114
 
        ('proxy-basicdigest',
115
 
            dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
116
 
        ]
117
 
    # Add some attributes common to all scenarios
118
 
    for scenario_id, scenario_dict in scenarios:
119
 
        scenario_dict.update(_auth_header='Proxy-Authorization',
120
 
                             _username_prompt_prefix='Proxy ',
121
 
                             _password_prompt_prefix='Proxy ')
122
 
    return scenarios
123
 
 
124
 
 
125
 
def vary_by_http_activity():
126
 
    activity_scenarios = [
127
 
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
128
 
                            _transport=_urllib.HttpTransport_urllib,)),
129
 
        ]
130
 
    if features.pycurl.available():
131
 
        activity_scenarios.append(
132
 
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
133
 
                                _transport=PyCurlTransport,)),)
134
 
    if features.HTTPSServerFeature.available():
135
 
        # FIXME: Until we have a better way to handle self-signed certificates
136
 
        # (like allowing them in a test specific authentication.conf for
137
 
        # example), we need some specialized pycurl/urllib transport for tests.
138
 
        # -- vila 2012-01-20
139
 
        from bzrlib.tests import (
140
 
            ssl_certs,
141
 
            )
142
 
        class HTTPS_urllib_transport(_urllib.HttpTransport_urllib):
143
 
 
144
 
            def __init__(self, base, _from_transport=None):
145
 
                super(HTTPS_urllib_transport, self).__init__(
146
 
                    base, _from_transport=_from_transport,
147
 
                    ca_certs=ssl_certs.build_path('ca.crt'))
148
 
 
149
 
        activity_scenarios.append(
150
 
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
151
 
                                  _transport=HTTPS_urllib_transport,)),)
152
 
        if features.pycurl.available():
153
 
            class HTTPS_pycurl_transport(PyCurlTransport):
154
 
 
155
 
                def __init__(self, base, _from_transport=None):
156
 
                    super(HTTPS_pycurl_transport, self).__init__(
157
 
                        base, _from_transport)
158
 
                    self.cabundle = str(ssl_certs.build_path('ca.crt'))
159
 
 
160
 
            activity_scenarios.append(
161
 
                ('pycurl,https', dict(_activity_server=ActivityHTTPSServer,
162
 
                                    _transport=HTTPS_pycurl_transport,)),)
163
 
    return activity_scenarios
 
61
    pycurl_present = True
 
62
except errors.DependencyNotPresent:
 
63
    pycurl_present = False
 
64
 
 
65
 
 
66
class TransportAdapter(tests.TestScenarioApplier):
 
67
    """Generate the same test for each transport implementation."""
 
68
 
 
69
    def __init__(self):
 
70
        transport_scenarios = [
 
71
            ('urllib', dict(_transport=_urllib.HttpTransport_urllib,
 
72
                            _server=http_server.HttpServer_urllib,
 
73
                            _qualified_prefix='http+urllib',)),
 
74
            ]
 
75
        if pycurl_present:
 
76
            transport_scenarios.append(
 
77
                ('pycurl', dict(_transport=PyCurlTransport,
 
78
                                _server=http_server.HttpServer_PyCurl,
 
79
                                _qualified_prefix='http+pycurl',)))
 
80
        self.scenarios = transport_scenarios
 
81
 
 
82
 
 
83
class TransportProtocolAdapter(TransportAdapter):
 
84
    """Generate the same test for each protocol implementation.
 
85
 
 
86
    In addition to the transport adaptatation that we inherit from.
 
87
    """
 
88
 
 
89
    def __init__(self):
 
90
        super(TransportProtocolAdapter, self).__init__()
 
91
        protocol_scenarios = [
 
92
            ('HTTP/1.0',  dict(_protocol_version='HTTP/1.0')),
 
93
            ('HTTP/1.1',  dict(_protocol_version='HTTP/1.1')),
 
94
            ]
 
95
        self.scenarios = tests.multiply_scenarios(self.scenarios,
 
96
                                                  protocol_scenarios)
 
97
 
 
98
 
 
99
class TransportProtocolAuthenticationAdapter(TransportProtocolAdapter):
 
100
    """Generate the same test for each authentication scheme implementation.
 
101
 
 
102
    In addition to the protocol adaptatation that we inherit from.
 
103
    """
 
104
 
 
105
    def __init__(self):
 
106
        super(TransportProtocolAuthenticationAdapter, self).__init__()
 
107
        auth_scheme_scenarios = [
 
108
            ('basic', dict(_auth_scheme='basic')),
 
109
            ('digest', dict(_auth_scheme='digest')),
 
110
            ]
 
111
 
 
112
        self.scenarios = tests.multiply_scenarios(self.scenarios,
 
113
                                                  auth_scheme_scenarios)
 
114
 
 
115
def load_tests(standard_tests, module, loader):
 
116
    """Multiply tests for http clients and protocol versions."""
 
117
    # one for each transport
 
118
    t_adapter = TransportAdapter()
 
119
    t_classes= (TestHttpTransportRegistration,
 
120
                TestHttpTransportUrls,
 
121
                )
 
122
    is_testing_for_transports = tests.condition_isinstance(t_classes)
 
123
 
 
124
    # multiplied by one for each protocol version
 
125
    tp_adapter = TransportProtocolAdapter()
 
126
    tp_classes= (SmartHTTPTunnellingTest,
 
127
                 TestDoCatchRedirections,
 
128
                 TestHTTPConnections,
 
129
                 TestHTTPRedirections,
 
130
                 TestHTTPSilentRedirections,
 
131
                 TestLimitedRangeRequestServer,
 
132
                 TestPost,
 
133
                 TestProxyHttpServer,
 
134
                 TestRanges,
 
135
                 TestSpecificRequestHandler,
 
136
                 )
 
137
    is_also_testing_for_protocols = tests.condition_isinstance(tp_classes)
 
138
 
 
139
    # multiplied by one for each authentication scheme
 
140
    tpa_adapter = TransportProtocolAuthenticationAdapter()
 
141
    tpa_classes = (TestAuth,
 
142
                   )
 
143
    is_also_testing_for_authentication = tests.condition_isinstance(
 
144
        tpa_classes)
 
145
 
 
146
    result = loader.suiteClass()
 
147
    for test_class in tests.iter_suite_tests(standard_tests):
 
148
        # Each test class is either standalone or testing for some combination
 
149
        # of transport, protocol version, authentication scheme. Use the right
 
150
        # adpater (or none) depending on the class.
 
151
        if is_testing_for_transports(test_class):
 
152
            result.addTests(t_adapter.adapt(test_class))
 
153
        elif is_also_testing_for_protocols(test_class):
 
154
            result.addTests(tp_adapter.adapt(test_class))
 
155
        elif is_also_testing_for_authentication(test_class):
 
156
            result.addTests(tpa_adapter.adapt(test_class))
 
157
        else:
 
158
            result.addTest(test_class)
 
159
    return result
164
160
 
165
161
 
166
162
class FakeManager(object):
174
170
 
175
171
class RecordingServer(object):
176
172
    """A fake HTTP server.
177
 
 
 
173
    
178
174
    It records the bytes sent to it, and replies with a 200.
179
175
    """
180
176
 
181
 
    def __init__(self, expect_body_tail=None, scheme=''):
 
177
    def __init__(self, expect_body_tail=None):
182
178
        """Constructor.
183
179
 
184
180
        :type expect_body_tail: str
189
185
        self.host = None
190
186
        self.port = None
191
187
        self.received_bytes = ''
192
 
        self.scheme = scheme
193
 
 
194
 
    def get_url(self):
195
 
        return '%s://%s:%s/' % (self.scheme, self.host, self.port)
196
 
 
197
 
    def start_server(self):
 
188
 
 
189
    def setUp(self):
198
190
        self._sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
199
191
        self._sock.bind(('127.0.0.1', 0))
200
192
        self.host, self.port = self._sock.getsockname()
201
193
        self._ready = threading.Event()
202
 
        self._thread = test_server.TestThread(
203
 
            sync_event=self._ready, target=self._accept_read_and_reply)
 
194
        self._thread = threading.Thread(target=self._accept_read_and_reply)
 
195
        self._thread.setDaemon(True)
204
196
        self._thread.start()
205
 
        if 'threads' in tests.selftest_debug_flags:
206
 
            sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
207
 
        self._ready.wait()
 
197
        self._ready.wait(5)
208
198
 
209
199
    def _accept_read_and_reply(self):
210
200
        self._sock.listen(1)
211
201
        self._ready.set()
212
 
        conn, address = self._sock.accept()
213
 
        if self._expect_body_tail is not None:
 
202
        self._sock.settimeout(5)
 
203
        try:
 
204
            conn, address = self._sock.accept()
 
205
            # On win32, the accepted connection will be non-blocking to start
 
206
            # with because we're using settimeout.
 
207
            conn.setblocking(True)
214
208
            while not self.received_bytes.endswith(self._expect_body_tail):
215
209
                self.received_bytes += conn.recv(4096)
216
210
            conn.sendall('HTTP/1.1 200 OK\r\n')
217
 
        try:
 
211
        except socket.timeout:
 
212
            # Make sure the client isn't stuck waiting for us to e.g. accept.
218
213
            self._sock.close()
219
214
        except socket.error:
220
215
            # The client may have already closed the socket.
221
216
            pass
222
217
 
223
 
    def stop_server(self):
 
218
    def tearDown(self):
224
219
        try:
225
 
            # Issue a fake connection to wake up the server and allow it to
226
 
            # finish quickly
227
 
            fake_conn = osutils.connect_socket((self.host, self.port))
228
 
            fake_conn.close()
 
220
            self._sock.close()
229
221
        except socket.error:
230
222
            # We might have already closed it.  We don't care.
231
223
            pass
232
224
        self.host = None
233
225
        self.port = None
234
 
        self._thread.join()
235
 
        if 'threads' in tests.selftest_debug_flags:
236
 
            sys.stderr.write('Thread  joined: %s\n' % (self._thread.ident,))
237
 
 
238
 
 
239
 
class TestAuthHeader(tests.TestCase):
240
 
 
241
 
    def parse_header(self, header, auth_handler_class=None):
242
 
        if auth_handler_class is None:
243
 
            auth_handler_class = _urllib2_wrappers.AbstractAuthHandler
244
 
        self.auth_handler =  auth_handler_class()
245
 
        return self.auth_handler._parse_auth_header(header)
246
 
 
247
 
    def test_empty_header(self):
248
 
        scheme, remainder = self.parse_header('')
249
 
        self.assertEqual('', scheme)
250
 
        self.assertIs(None, remainder)
251
 
 
252
 
    def test_negotiate_header(self):
253
 
        scheme, remainder = self.parse_header('Negotiate')
254
 
        self.assertEqual('negotiate', scheme)
255
 
        self.assertIs(None, remainder)
256
 
 
257
 
    def test_basic_header(self):
258
 
        scheme, remainder = self.parse_header(
259
 
            'Basic realm="Thou should not pass"')
260
 
        self.assertEqual('basic', scheme)
261
 
        self.assertEqual('realm="Thou should not pass"', remainder)
262
 
 
263
 
    def test_basic_extract_realm(self):
264
 
        scheme, remainder = self.parse_header(
265
 
            'Basic realm="Thou should not pass"',
266
 
            _urllib2_wrappers.BasicAuthHandler)
267
 
        match, realm = self.auth_handler.extract_realm(remainder)
268
 
        self.assertTrue(match is not None)
269
 
        self.assertEqual('Thou should not pass', realm)
270
 
 
271
 
    def test_digest_header(self):
272
 
        scheme, remainder = self.parse_header(
273
 
            'Digest realm="Thou should not pass"')
274
 
        self.assertEqual('digest', scheme)
275
 
        self.assertEqual('realm="Thou should not pass"', remainder)
276
 
 
277
 
 
278
 
class TestHTTPRangeParsing(tests.TestCase):
279
 
 
280
 
    def setUp(self):
281
 
        super(TestHTTPRangeParsing, self).setUp()
282
 
        # We focus on range  parsing here and ignore everything else
283
 
        class RequestHandler(http_server.TestingHTTPRequestHandler):
284
 
            def setup(self): pass
285
 
            def handle(self): pass
286
 
            def finish(self): pass
287
 
 
288
 
        self.req_handler = RequestHandler(None, None, None)
289
 
 
290
 
    def assertRanges(self, ranges, header, file_size):
291
 
        self.assertEquals(ranges,
292
 
                          self.req_handler._parse_ranges(header, file_size))
293
 
 
294
 
    def test_simple_range(self):
295
 
        self.assertRanges([(0,2)], 'bytes=0-2', 12)
296
 
 
297
 
    def test_tail(self):
298
 
        self.assertRanges([(8, 11)], 'bytes=-4', 12)
299
 
 
300
 
    def test_tail_bigger_than_file(self):
301
 
        self.assertRanges([(0, 11)], 'bytes=-99', 12)
302
 
 
303
 
    def test_range_without_end(self):
304
 
        self.assertRanges([(4, 11)], 'bytes=4-', 12)
305
 
 
306
 
    def test_invalid_ranges(self):
307
 
        self.assertRanges(None, 'bytes=12-22', 12)
308
 
        self.assertRanges(None, 'bytes=1-3,12-22', 12)
309
 
        self.assertRanges(None, 'bytes=-', 12)
310
226
 
311
227
 
312
228
class TestHTTPServer(tests.TestCase):
317
233
 
318
234
            protocol_version = 'HTTP/0.1'
319
235
 
320
 
        self.assertRaises(httplib.UnknownProtocol,
321
 
                          http_server.HttpServer, BogusRequestHandler)
 
236
        server = http_server.HttpServer(BogusRequestHandler)
 
237
        try:
 
238
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
 
239
        except:
 
240
            server.tearDown()
 
241
            self.fail('HTTP Server creation did not raise UnknownProtocol')
322
242
 
323
243
    def test_force_invalid_protocol(self):
324
 
        self.assertRaises(httplib.UnknownProtocol,
325
 
                          http_server.HttpServer, protocol_version='HTTP/0.1')
 
244
        server = http_server.HttpServer(protocol_version='HTTP/0.1')
 
245
        try:
 
246
            self.assertRaises(httplib.UnknownProtocol,server.setUp)
 
247
        except:
 
248
            server.tearDown()
 
249
            self.fail('HTTP Server creation did not raise UnknownProtocol')
326
250
 
327
251
    def test_server_start_and_stop(self):
328
252
        server = http_server.HttpServer()
329
 
        self.addCleanup(server.stop_server)
330
 
        server.start_server()
331
 
        self.assertTrue(server.server is not None)
332
 
        self.assertTrue(server.server.serving is not None)
333
 
        self.assertTrue(server.server.serving)
 
253
        server.setUp()
 
254
        self.assertTrue(server._http_running)
 
255
        server.tearDown()
 
256
        self.assertFalse(server._http_running)
334
257
 
335
258
    def test_create_http_server_one_zero(self):
336
259
        class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):
338
261
            protocol_version = 'HTTP/1.0'
339
262
 
340
263
        server = http_server.HttpServer(RequestHandlerOneZero)
341
 
        self.start_server(server)
342
 
        self.assertIsInstance(server.server, http_server.TestingHTTPServer)
 
264
        server.setUp()
 
265
        self.addCleanup(server.tearDown)
 
266
        self.assertIsInstance(server._httpd, http_server.TestingHTTPServer)
343
267
 
344
268
    def test_create_http_server_one_one(self):
345
269
        class RequestHandlerOneOne(http_server.TestingHTTPRequestHandler):
347
271
            protocol_version = 'HTTP/1.1'
348
272
 
349
273
        server = http_server.HttpServer(RequestHandlerOneOne)
350
 
        self.start_server(server)
351
 
        self.assertIsInstance(server.server,
 
274
        server.setUp()
 
275
        self.addCleanup(server.tearDown)
 
276
        self.assertIsInstance(server._httpd,
352
277
                              http_server.TestingThreadingHTTPServer)
353
278
 
354
279
    def test_create_http_server_force_one_one(self):
358
283
 
359
284
        server = http_server.HttpServer(RequestHandlerOneZero,
360
285
                                        protocol_version='HTTP/1.1')
361
 
        self.start_server(server)
362
 
        self.assertIsInstance(server.server,
 
286
        server.setUp()
 
287
        self.addCleanup(server.tearDown)
 
288
        self.assertIsInstance(server._httpd,
363
289
                              http_server.TestingThreadingHTTPServer)
364
290
 
365
291
    def test_create_http_server_force_one_zero(self):
369
295
 
370
296
        server = http_server.HttpServer(RequestHandlerOneOne,
371
297
                                        protocol_version='HTTP/1.0')
372
 
        self.start_server(server)
373
 
        self.assertIsInstance(server.server,
 
298
        server.setUp()
 
299
        self.addCleanup(server.tearDown)
 
300
        self.assertIsInstance(server._httpd,
374
301
                              http_server.TestingHTTPServer)
375
302
 
376
303
 
378
305
    """Test case to inherit from if pycurl is present"""
379
306
 
380
307
    def _get_pycurl_maybe(self):
381
 
        self.requireFeature(features.pycurl)
382
 
        return PyCurlTransport
 
308
        try:
 
309
            from bzrlib.transport.http._pycurl import PyCurlTransport
 
310
            return PyCurlTransport
 
311
        except errors.DependencyNotPresent:
 
312
            raise tests.TestSkipped('pycurl not present')
383
313
 
384
314
    _transport = property(_get_pycurl_maybe)
385
315
 
386
316
 
 
317
class TestHttpUrls(tests.TestCase):
 
318
 
 
319
    # TODO: This should be moved to authorization tests once they
 
320
    # are written.
 
321
 
 
322
    def test_url_parsing(self):
 
323
        f = FakeManager()
 
324
        url = http.extract_auth('http://example.com', f)
 
325
        self.assertEquals('http://example.com', url)
 
326
        self.assertEquals(0, len(f.credentials))
 
327
        url = http.extract_auth(
 
328
            'http://user:pass@www.bazaar-vcs.org/bzr/bzr.dev', f)
 
329
        self.assertEquals('http://www.bazaar-vcs.org/bzr/bzr.dev', url)
 
330
        self.assertEquals(1, len(f.credentials))
 
331
        self.assertEquals([None, 'www.bazaar-vcs.org', 'user', 'pass'],
 
332
                          f.credentials[0])
 
333
 
 
334
 
387
335
class TestHttpTransportUrls(tests.TestCase):
388
336
    """Test the http urls."""
389
337
 
390
 
    scenarios = vary_by_http_client_implementation()
391
 
 
392
338
    def test_abs_url(self):
393
339
        """Construction of absolute http URLs"""
394
 
        t = self._transport('http://example.com/bzr/bzr.dev/')
 
340
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
395
341
        eq = self.assertEqualDiff
396
 
        eq(t.abspath('.'), 'http://example.com/bzr/bzr.dev')
397
 
        eq(t.abspath('foo/bar'), 'http://example.com/bzr/bzr.dev/foo/bar')
398
 
        eq(t.abspath('.bzr'), 'http://example.com/bzr/bzr.dev/.bzr')
 
342
        eq(t.abspath('.'), 'http://bazaar-vcs.org/bzr/bzr.dev')
 
343
        eq(t.abspath('foo/bar'), 'http://bazaar-vcs.org/bzr/bzr.dev/foo/bar')
 
344
        eq(t.abspath('.bzr'), 'http://bazaar-vcs.org/bzr/bzr.dev/.bzr')
399
345
        eq(t.abspath('.bzr/1//2/./3'),
400
 
           'http://example.com/bzr/bzr.dev/.bzr/1/2/3')
 
346
           'http://bazaar-vcs.org/bzr/bzr.dev/.bzr/1/2/3')
401
347
 
402
348
    def test_invalid_http_urls(self):
403
349
        """Trap invalid construction of urls"""
404
 
        self._transport('http://example.com/bzr/bzr.dev/')
 
350
        t = self._transport('http://bazaar-vcs.org/bzr/bzr.dev/')
405
351
        self.assertRaises(errors.InvalidURL,
406
352
                          self._transport,
407
 
                          'http://http://example.com/bzr/bzr.dev/')
 
353
                          'http://http://bazaar-vcs.org/bzr/bzr.dev/')
408
354
 
409
355
    def test_http_root_urls(self):
410
356
        """Construction of URLs from server root"""
411
 
        t = self._transport('http://example.com/')
 
357
        t = self._transport('http://bzr.ozlabs.org/')
412
358
        eq = self.assertEqualDiff
413
359
        eq(t.abspath('.bzr/tree-version'),
414
 
           'http://example.com/.bzr/tree-version')
 
360
           'http://bzr.ozlabs.org/.bzr/tree-version')
415
361
 
416
362
    def test_http_impl_urls(self):
417
363
        """There are servers which ask for particular clients to connect"""
418
364
        server = self._server()
419
 
        server.start_server()
420
365
        try:
 
366
            server.setUp()
421
367
            url = server.get_url()
422
 
            self.assertTrue(url.startswith('%s://' % self._url_protocol))
 
368
            self.assertTrue(url.startswith('%s://' % self._qualified_prefix))
423
369
        finally:
424
 
            server.stop_server()
 
370
            server.tearDown()
425
371
 
426
372
 
427
373
class TestHttps_pycurl(TestWithTransport_pycurl, tests.TestCase):
436
382
        https by supplying a fake version_info that do not
437
383
        support it.
438
384
        """
439
 
        self.requireFeature(features.pycurl)
440
 
        # Import the module locally now that we now it's available.
441
 
        pycurl = features.pycurl.module
 
385
        try:
 
386
            import pycurl
 
387
        except ImportError:
 
388
            raise tests.TestSkipped('pycurl not present')
442
389
 
443
 
        self.overrideAttr(pycurl, 'version_info',
444
 
                          # Fake the pycurl version_info This was taken from
445
 
                          # a windows pycurl without SSL (thanks to bialix)
446
 
                          lambda : (2,
447
 
                                    '7.13.2',
448
 
                                    462082,
449
 
                                    'i386-pc-win32',
450
 
                                    2576,
451
 
                                    None,
452
 
                                    0,
453
 
                                    None,
454
 
                                    ('ftp', 'gopher', 'telnet',
455
 
                                     'dict', 'ldap', 'http', 'file'),
456
 
                                    None,
457
 
                                    0,
458
 
                                    None))
459
 
        self.assertRaises(errors.DependencyNotPresent, self._transport,
460
 
                          'https://launchpad.net')
 
390
        version_info_orig = pycurl.version_info
 
391
        try:
 
392
            # Now that we have pycurl imported, we can fake its version_info
 
393
            # This was taken from a windows pycurl without SSL
 
394
            # (thanks to bialix)
 
395
            pycurl.version_info = lambda : (2,
 
396
                                            '7.13.2',
 
397
                                            462082,
 
398
                                            'i386-pc-win32',
 
399
                                            2576,
 
400
                                            None,
 
401
                                            0,
 
402
                                            None,
 
403
                                            ('ftp', 'gopher', 'telnet',
 
404
                                             'dict', 'ldap', 'http', 'file'),
 
405
                                            None,
 
406
                                            0,
 
407
                                            None)
 
408
            self.assertRaises(errors.DependencyNotPresent, self._transport,
 
409
                              'https://launchpad.net')
 
410
        finally:
 
411
            # Restore the right function
 
412
            pycurl.version_info = version_info_orig
461
413
 
462
414
 
463
415
class TestHTTPConnections(http_utils.TestCaseWithWebserver):
464
416
    """Test the http connections."""
465
417
 
466
 
    scenarios = multiply_scenarios(
467
 
        vary_by_http_client_implementation(),
468
 
        vary_by_http_protocol_version(),
469
 
        )
470
 
 
471
418
    def setUp(self):
472
 
        super(TestHTTPConnections, self).setUp()
 
419
        http_utils.TestCaseWithWebserver.setUp(self)
473
420
        self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
474
421
                        transport=self.get_transport())
475
422
 
476
423
    def test_http_has(self):
477
424
        server = self.get_readonly_server()
478
 
        t = self.get_readonly_transport()
 
425
        t = self._transport(server.get_url())
479
426
        self.assertEqual(t.has('foo/bar'), True)
480
427
        self.assertEqual(len(server.logs), 1)
481
428
        self.assertContainsRe(server.logs[0],
483
430
 
484
431
    def test_http_has_not_found(self):
485
432
        server = self.get_readonly_server()
486
 
        t = self.get_readonly_transport()
 
433
        t = self._transport(server.get_url())
487
434
        self.assertEqual(t.has('not-found'), False)
488
435
        self.assertContainsRe(server.logs[1],
489
436
            r'"HEAD /not-found HTTP/1.." 404 - "-" "bzr/')
490
437
 
491
438
    def test_http_get(self):
492
439
        server = self.get_readonly_server()
493
 
        t = self.get_readonly_transport()
 
440
        t = self._transport(server.get_url())
494
441
        fp = t.get('foo/bar')
495
442
        self.assertEqualDiff(
496
443
            fp.read(),
500
447
            '"GET /foo/bar HTTP/1.1" 200 - "-" "bzr/%s'
501
448
            % bzrlib.__version__) > -1)
502
449
 
 
450
    def test_get_smart_medium(self):
 
451
        # For HTTP, get_smart_medium should return the transport object.
 
452
        server = self.get_readonly_server()
 
453
        http_transport = self._transport(server.get_url())
 
454
        medium = http_transport.get_smart_medium()
 
455
        self.assertIs(medium, http_transport)
 
456
 
503
457
    def test_has_on_bogus_host(self):
504
458
        # Get a free address and don't 'accept' on it, so that we
505
459
        # can be sure there is no http handler there, but set a
518
472
class TestHttpTransportRegistration(tests.TestCase):
519
473
    """Test registrations of various http implementations"""
520
474
 
521
 
    scenarios = vary_by_http_client_implementation()
522
 
 
523
475
    def test_http_registered(self):
524
 
        t = transport.get_transport_from_url(
525
 
            '%s://foo.com/' % self._url_protocol)
 
476
        t = transport.get_transport('%s://foo.com/' % self._qualified_prefix)
526
477
        self.assertIsInstance(t, transport.Transport)
527
478
        self.assertIsInstance(t, self._transport)
528
479
 
529
480
 
530
481
class TestPost(tests.TestCase):
531
482
 
532
 
    scenarios = multiply_scenarios(
533
 
        vary_by_http_client_implementation(),
534
 
        vary_by_http_protocol_version(),
535
 
        )
536
 
 
537
483
    def test_post_body_is_received(self):
538
 
        server = RecordingServer(expect_body_tail='end-of-body',
539
 
                                 scheme=self._url_protocol)
540
 
        self.start_server(server)
541
 
        url = server.get_url()
542
 
        # FIXME: needs a cleanup -- vila 20100611
543
 
        http_transport = transport.get_transport_from_url(url)
 
484
        server = RecordingServer(expect_body_tail='end-of-body')
 
485
        server.setUp()
 
486
        self.addCleanup(server.tearDown)
 
487
        scheme = self._qualified_prefix
 
488
        url = '%s://%s:%s/' % (scheme, server.host, server.port)
 
489
        http_transport = self._transport(url)
544
490
        code, response = http_transport._post('abc def end-of-body')
545
491
        self.assertTrue(
546
492
            server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
547
493
        self.assertTrue('content-length: 19\r' in server.received_bytes.lower())
548
 
        self.assertTrue('content-type: application/octet-stream\r'
549
 
                        in server.received_bytes.lower())
550
494
        # The transport should not be assuming that the server can accept
551
495
        # chunked encoding the first time it connects, because HTTP/1.1, so we
552
496
        # check for the literal string.
588
532
    Daughter classes are expected to override _req_handler_class
589
533
    """
590
534
 
591
 
    scenarios = multiply_scenarios(
592
 
        vary_by_http_client_implementation(),
593
 
        vary_by_http_protocol_version(),
594
 
        )
595
 
 
596
535
    # Provide a useful default
597
536
    _req_handler_class = http_server.TestingHTTPRequestHandler
598
537
 
599
538
    def create_transport_readonly_server(self):
600
 
        server = http_server.HttpServer(self._req_handler_class,
601
 
                                        protocol_version=self._protocol_version)
602
 
        server._url_protocol = self._url_protocol
603
 
        return server
 
539
        return http_server.HttpServer(self._req_handler_class,
 
540
                                      protocol_version=self._protocol_version)
604
541
 
605
542
    def _testing_pycurl(self):
606
 
        # TODO: This is duplicated for lots of the classes in this file
607
 
        return (features.pycurl.available()
608
 
                and self._transport == PyCurlTransport)
 
543
        return pycurl_present and self._transport == PyCurlTransport
609
544
 
610
545
 
611
546
class WallRequestHandler(http_server.TestingHTTPRequestHandler):
612
547
    """Whatever request comes in, close the connection"""
613
548
 
614
 
    def _handle_one_request(self):
 
549
    def handle_one_request(self):
615
550
        """Handle a single HTTP request, by abruptly closing the connection"""
616
551
        self.close_connection = 1
617
552
 
622
557
    _req_handler_class = WallRequestHandler
623
558
 
624
559
    def test_http_has(self):
625
 
        t = self.get_readonly_transport()
 
560
        server = self.get_readonly_server()
 
561
        t = self._transport(server.get_url())
626
562
        # Unfortunately httplib (see HTTPResponse._read_status
627
563
        # for details) make no distinction between a closed
628
564
        # socket and badly formatted status line, so we can't
629
565
        # just test for ConnectionError, we have to test
630
 
        # InvalidHttpResponse too. And pycurl may raise ConnectionReset
631
 
        # instead of ConnectionError too.
632
 
        self.assertRaises(( errors.ConnectionError, errors.ConnectionReset,
633
 
                            errors.InvalidHttpResponse),
 
566
        # InvalidHttpResponse too.
 
567
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
634
568
                          t.has, 'foo/bar')
635
569
 
636
570
    def test_http_get(self):
637
 
        t = self.get_readonly_transport()
638
 
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
639
 
                           errors.InvalidHttpResponse),
 
571
        server = self.get_readonly_server()
 
572
        t = self._transport(server.get_url())
 
573
        self.assertRaises((errors.ConnectionError, errors.InvalidHttpResponse),
640
574
                          t.get, 'foo/bar')
641
575
 
642
576
 
657
591
    _req_handler_class = BadStatusRequestHandler
658
592
 
659
593
    def test_http_has(self):
660
 
        t = self.get_readonly_transport()
 
594
        server = self.get_readonly_server()
 
595
        t = self._transport(server.get_url())
661
596
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
662
597
 
663
598
    def test_http_get(self):
664
 
        t = self.get_readonly_transport()
 
599
        server = self.get_readonly_server()
 
600
        t = self._transport(server.get_url())
665
601
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
666
602
 
667
603
 
672
608
        """Fakes handling a single HTTP request, returns a bad status"""
673
609
        ignored = http_server.TestingHTTPRequestHandler.parse_request(self)
674
610
        self.wfile.write("Invalid status line\r\n")
675
 
        # If we don't close the connection pycurl will hang. Since this is a
676
 
        # stress test we don't *have* to respect the protocol, but we don't
677
 
        # have to sabotage it too much either.
678
 
        self.close_connection = True
679
611
        return False
680
612
 
681
613
 
687
619
 
688
620
    _req_handler_class = InvalidStatusRequestHandler
689
621
 
 
622
    def test_http_has(self):
 
623
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
 
624
            raise tests.KnownFailure(
 
625
                'pycurl hangs if the server send back garbage')
 
626
        super(TestInvalidStatusServer, self).test_http_has()
 
627
 
 
628
    def test_http_get(self):
 
629
        if self._testing_pycurl() and self._protocol_version == 'HTTP/1.1':
 
630
            raise tests.KnownFailure(
 
631
                'pycurl hangs if the server send back garbage')
 
632
        super(TestInvalidStatusServer, self).test_http_get()
 
633
 
690
634
 
691
635
class BadProtocolRequestHandler(http_server.TestingHTTPRequestHandler):
692
636
    """Whatever request comes in, returns a bad protocol version"""
708
652
    _req_handler_class = BadProtocolRequestHandler
709
653
 
710
654
    def setUp(self):
711
 
        if self._testing_pycurl():
 
655
        if pycurl_present and self._transport == PyCurlTransport:
712
656
            raise tests.TestNotApplicable(
713
657
                "pycurl doesn't check the protocol version")
714
658
        super(TestBadProtocolServer, self).setUp()
715
659
 
716
660
    def test_http_has(self):
717
 
        t = self.get_readonly_transport()
 
661
        server = self.get_readonly_server()
 
662
        t = self._transport(server.get_url())
718
663
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
719
664
 
720
665
    def test_http_get(self):
721
 
        t = self.get_readonly_transport()
 
666
        server = self.get_readonly_server()
 
667
        t = self._transport(server.get_url())
722
668
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
723
669
 
724
670
 
738
684
    _req_handler_class = ForbiddenRequestHandler
739
685
 
740
686
    def test_http_has(self):
741
 
        t = self.get_readonly_transport()
 
687
        server = self.get_readonly_server()
 
688
        t = self._transport(server.get_url())
742
689
        self.assertRaises(errors.TransportError, t.has, 'foo/bar')
743
690
 
744
691
    def test_http_get(self):
745
 
        t = self.get_readonly_transport()
 
692
        server = self.get_readonly_server()
 
693
        t = self._transport(server.get_url())
746
694
        self.assertRaises(errors.TransportError, t.get, 'foo/bar')
747
695
 
748
696
 
754
702
        self.assertEqual(None, server.host)
755
703
        self.assertEqual(None, server.port)
756
704
 
757
 
    def test_setUp_and_stop(self):
 
705
    def test_setUp_and_tearDown(self):
758
706
        server = RecordingServer(expect_body_tail=None)
759
 
        server.start_server()
 
707
        server.setUp()
760
708
        try:
761
709
            self.assertNotEqual(None, server.host)
762
710
            self.assertNotEqual(None, server.port)
763
711
        finally:
764
 
            server.stop_server()
 
712
            server.tearDown()
765
713
        self.assertEqual(None, server.host)
766
714
        self.assertEqual(None, server.port)
767
715
 
768
716
    def test_send_receive_bytes(self):
769
 
        server = RecordingServer(expect_body_tail='c', scheme='http')
770
 
        self.start_server(server)
 
717
        server = RecordingServer(expect_body_tail='c')
 
718
        server.setUp()
 
719
        self.addCleanup(server.tearDown)
771
720
        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
772
721
        sock.connect((server.host, server.port))
773
722
        sock.sendall('abc')
787
736
        self.build_tree_contents([('a', '0123456789')],)
788
737
 
789
738
    def test_readv(self):
790
 
        t = self.get_readonly_transport()
 
739
        server = self.get_readonly_server()
 
740
        t = self._transport(server.get_url())
791
741
        l = list(t.readv('a', ((0, 1), (1, 1), (3, 2), (9, 1))))
792
742
        self.assertEqual(l[0], (0, '0'))
793
743
        self.assertEqual(l[1], (1, '1'))
795
745
        self.assertEqual(l[3], (9, '9'))
796
746
 
797
747
    def test_readv_out_of_order(self):
798
 
        t = self.get_readonly_transport()
 
748
        server = self.get_readonly_server()
 
749
        t = self._transport(server.get_url())
799
750
        l = list(t.readv('a', ((1, 1), (9, 1), (0, 1), (3, 2))))
800
751
        self.assertEqual(l[0], (1, '1'))
801
752
        self.assertEqual(l[1], (9, '9'))
803
754
        self.assertEqual(l[3], (3, '34'))
804
755
 
805
756
    def test_readv_invalid_ranges(self):
806
 
        t = self.get_readonly_transport()
 
757
        server = self.get_readonly_server()
 
758
        t = self._transport(server.get_url())
807
759
 
808
760
        # This is intentionally reading off the end of the file
809
761
        # since we are sure that it cannot get there
817
769
 
818
770
    def test_readv_multiple_get_requests(self):
819
771
        server = self.get_readonly_server()
820
 
        t = self.get_readonly_transport()
 
772
        t = self._transport(server.get_url())
821
773
        # force transport to issue multiple requests
822
774
        t._max_readv_combine = 1
823
775
        t._max_get_ranges = 1
831
783
 
832
784
    def test_readv_get_max_size(self):
833
785
        server = self.get_readonly_server()
834
 
        t = self.get_readonly_transport()
 
786
        t = self._transport(server.get_url())
835
787
        # force transport to issue multiple requests by limiting the number of
836
788
        # bytes by request. Note that this apply to coalesced offsets only, a
837
789
        # single range will keep its size even if bigger than the limit.
846
798
 
847
799
    def test_complete_readv_leave_pipe_clean(self):
848
800
        server = self.get_readonly_server()
849
 
        t = self.get_readonly_transport()
 
801
        t = self._transport(server.get_url())
850
802
        # force transport to issue multiple requests
851
803
        t._get_max_size = 2
852
 
        list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
 
804
        l = list(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
853
805
        # The server should have issued 3 requests
854
806
        self.assertEqual(3, server.GET_request_nb)
855
807
        self.assertEqual('0123456789', t.get_bytes('a'))
857
809
 
858
810
    def test_incomplete_readv_leave_pipe_clean(self):
859
811
        server = self.get_readonly_server()
860
 
        t = self.get_readonly_transport()
 
812
        t = self._transport(server.get_url())
861
813
        # force transport to issue multiple requests
862
814
        t._get_max_size = 2
863
815
        # Don't collapse readv results into a list so that we leave unread
864
816
        # bytes on the socket
865
817
        ireadv = iter(t.readv('a', ((0, 1), (1, 1), (2, 4), (6, 4))))
866
818
        self.assertEqual((0, '0'), ireadv.next())
867
 
        # The server should have issued one request so far
 
819
        # The server should have issued one request so far 
868
820
        self.assertEqual(1, server.GET_request_nb)
869
821
        self.assertEqual('0123456789', t.get_bytes('a'))
870
822
        # get_bytes issued an additional request, the readv pending ones are
932
884
    def get_multiple_ranges(self, file, file_size, ranges):
933
885
        self.send_response(206)
934
886
        self.send_header('Accept-Ranges', 'bytes')
935
 
        # XXX: this is strange; the 'random' name below seems undefined and
936
 
        # yet the tests pass -- mbp 2010-10-11 bug 658773
937
887
        boundary = "%d" % random.randint(0,0x7FFFFFFF)
938
888
        self.send_header("Content-Type",
939
889
                         "multipart/byteranges; boundary=%s" % boundary)
1001
951
                return
1002
952
            self.send_range_content(file, start, end - start + 1)
1003
953
            cur += 1
1004
 
        # Final boundary
 
954
        # No final boundary
1005
955
        self.wfile.write(boundary_line)
1006
956
 
1007
957
 
1015
965
 
1016
966
    def test_readv_with_short_reads(self):
1017
967
        server = self.get_readonly_server()
1018
 
        t = self.get_readonly_transport()
 
968
        t = self._transport(server.get_url())
1019
969
        # Force separate ranges for each offset
1020
970
        t._bytes_to_read_before_seek = 0
1021
971
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1036
986
        # that mode
1037
987
        self.assertEqual('single', t._range_hint)
1038
988
 
1039
 
 
1040
 
class TruncatedBeforeBoundaryRequestHandler(
1041
 
    http_server.TestingHTTPRequestHandler):
1042
 
    """Truncation before a boundary, like in bug 198646"""
1043
 
 
1044
 
    _truncated_ranges = 1
1045
 
 
1046
 
    def get_multiple_ranges(self, file, file_size, ranges):
1047
 
        self.send_response(206)
1048
 
        self.send_header('Accept-Ranges', 'bytes')
1049
 
        boundary = 'tagada'
1050
 
        self.send_header('Content-Type',
1051
 
                         'multipart/byteranges; boundary=%s' % boundary)
1052
 
        boundary_line = '--%s\r\n' % boundary
1053
 
        # Calculate the Content-Length
1054
 
        content_length = 0
1055
 
        for (start, end) in ranges:
1056
 
            content_length += len(boundary_line)
1057
 
            content_length += self._header_line_length(
1058
 
                'Content-type', 'application/octet-stream')
1059
 
            content_length += self._header_line_length(
1060
 
                'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))
1061
 
            content_length += len('\r\n') # end headers
1062
 
            content_length += end - start # + 1
1063
 
        content_length += len(boundary_line)
1064
 
        self.send_header('Content-length', content_length)
1065
 
        self.end_headers()
1066
 
 
1067
 
        # Send the multipart body
1068
 
        cur = 0
1069
 
        for (start, end) in ranges:
1070
 
            if cur + self._truncated_ranges >= len(ranges):
1071
 
                # Abruptly ends the response and close the connection
1072
 
                self.close_connection = 1
1073
 
                return
1074
 
            self.wfile.write(boundary_line)
1075
 
            self.send_header('Content-type', 'application/octet-stream')
1076
 
            self.send_header('Content-Range', 'bytes %d-%d/%d'
1077
 
                             % (start, end, file_size))
1078
 
            self.end_headers()
1079
 
            self.send_range_content(file, start, end - start + 1)
1080
 
            cur += 1
1081
 
        # Final boundary
1082
 
        self.wfile.write(boundary_line)
1083
 
 
1084
 
 
1085
 
class TestTruncatedBeforeBoundary(TestSpecificRequestHandler):
1086
 
    """Tests the case of bug 198646, disconnecting before a boundary."""
1087
 
 
1088
 
    _req_handler_class = TruncatedBeforeBoundaryRequestHandler
1089
 
 
1090
 
    def setUp(self):
1091
 
        super(TestTruncatedBeforeBoundary, self).setUp()
1092
 
        self.build_tree_contents([('a', '0123456789')],)
1093
 
 
1094
 
    def test_readv_with_short_reads(self):
1095
 
        server = self.get_readonly_server()
1096
 
        t = self.get_readonly_transport()
1097
 
        # Force separate ranges for each offset
1098
 
        t._bytes_to_read_before_seek = 0
1099
 
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
1100
 
        self.assertEqual((0, '0'), ireadv.next())
1101
 
        self.assertEqual((2, '2'), ireadv.next())
1102
 
        self.assertEqual((4, '45'), ireadv.next())
1103
 
        self.assertEqual((9, '9'), ireadv.next())
1104
 
 
1105
 
 
1106
989
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1107
990
    """Errors out when range specifiers exceed the limit"""
1108
991
 
1132
1015
class TestLimitedRangeRequestServer(http_utils.TestCaseWithWebserver):
1133
1016
    """Tests readv requests against a server erroring out on too much ranges."""
1134
1017
 
1135
 
    scenarios = multiply_scenarios(
1136
 
        vary_by_http_client_implementation(),
1137
 
        vary_by_http_protocol_version(),
1138
 
        )
1139
 
 
1140
1018
    # Requests with more range specifiers will error out
1141
1019
    range_limit = 3
1142
1020
 
1144
1022
        return LimitedRangeHTTPServer(range_limit=self.range_limit,
1145
1023
                                      protocol_version=self._protocol_version)
1146
1024
 
 
1025
    def get_transport(self):
 
1026
        return self._transport(self.get_readonly_server().get_url())
 
1027
 
1147
1028
    def setUp(self):
1148
 
        super(TestLimitedRangeRequestServer, self).setUp()
 
1029
        http_utils.TestCaseWithWebserver.setUp(self)
1149
1030
        # We need to manipulate ranges that correspond to real chunks in the
1150
1031
        # response, so we build a content appropriately.
1151
1032
        filler = ''.join(['abcdefghij' for x in range(102)])
1153
1034
        self.build_tree_contents([('a', content)],)
1154
1035
 
1155
1036
    def test_few_ranges(self):
1156
 
        t = self.get_readonly_transport()
 
1037
        t = self.get_transport()
1157
1038
        l = list(t.readv('a', ((0, 4), (1024, 4), )))
1158
1039
        self.assertEqual(l[0], (0, '0000'))
1159
1040
        self.assertEqual(l[1], (1024, '0001'))
1160
1041
        self.assertEqual(1, self.get_readonly_server().GET_request_nb)
1161
1042
 
1162
1043
    def test_more_ranges(self):
1163
 
        t = self.get_readonly_transport()
 
1044
        t = self.get_transport()
1164
1045
        l = list(t.readv('a', ((0, 4), (1024, 4), (4096, 4), (8192, 4))))
1165
1046
        self.assertEqual(l[0], (0, '0000'))
1166
1047
        self.assertEqual(l[1], (1024, '0001'))
1177
1058
    Only the urllib implementation is tested here.
1178
1059
    """
1179
1060
 
 
1061
    def setUp(self):
 
1062
        tests.TestCase.setUp(self)
 
1063
        self._old_env = {}
 
1064
 
 
1065
    def tearDown(self):
 
1066
        self._restore_env()
 
1067
        tests.TestCase.tearDown(self)
 
1068
 
 
1069
    def _install_env(self, env):
 
1070
        for name, value in env.iteritems():
 
1071
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1072
 
 
1073
    def _restore_env(self):
 
1074
        for name, value in self._old_env.iteritems():
 
1075
            osutils.set_or_unset_env(name, value)
 
1076
 
1180
1077
    def _proxied_request(self):
1181
1078
        handler = _urllib2_wrappers.ProxyHandler()
1182
 
        request = _urllib2_wrappers.Request('GET', 'http://baz/buzzle')
 
1079
        request = _urllib2_wrappers.Request('GET','http://baz/buzzle')
1183
1080
        handler.set_proxy(request, 'http')
1184
1081
        return request
1185
1082
 
1186
 
    def assertEvaluateProxyBypass(self, expected, host, no_proxy):
1187
 
        handler = _urllib2_wrappers.ProxyHandler()
1188
 
        self.assertEquals(expected,
1189
 
                          handler.evaluate_proxy_bypass(host, no_proxy))
1190
 
 
1191
1083
    def test_empty_user(self):
1192
 
        self.overrideEnv('http_proxy', 'http://bar.com')
1193
 
        request = self._proxied_request()
1194
 
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
1195
 
 
1196
 
    def test_user_with_at(self):
1197
 
        self.overrideEnv('http_proxy',
1198
 
                         'http://username@domain:password@proxy_host:1234')
 
1084
        self._install_env({'http_proxy': 'http://bar.com'})
1199
1085
        request = self._proxied_request()
1200
1086
        self.assertFalse(request.headers.has_key('Proxy-authorization'))
1201
1087
 
1202
1088
    def test_invalid_proxy(self):
1203
1089
        """A proxy env variable without scheme"""
1204
 
        self.overrideEnv('http_proxy', 'host:1234')
 
1090
        self._install_env({'http_proxy': 'host:1234'})
1205
1091
        self.assertRaises(errors.InvalidURL, self._proxied_request)
1206
1092
 
1207
 
    def test_evaluate_proxy_bypass_true(self):
1208
 
        """The host is not proxied"""
1209
 
        self.assertEvaluateProxyBypass(True, 'example.com', 'example.com')
1210
 
        self.assertEvaluateProxyBypass(True, 'bzr.example.com', '*example.com')
1211
 
 
1212
 
    def test_evaluate_proxy_bypass_false(self):
1213
 
        """The host is proxied"""
1214
 
        self.assertEvaluateProxyBypass(False, 'bzr.example.com', None)
1215
 
 
1216
 
    def test_evaluate_proxy_bypass_unknown(self):
1217
 
        """The host is not explicitly proxied"""
1218
 
        self.assertEvaluateProxyBypass(None, 'example.com', 'not.example.com')
1219
 
        self.assertEvaluateProxyBypass(None, 'bzr.example.com', 'example.com')
1220
 
 
1221
 
    def test_evaluate_proxy_bypass_empty_entries(self):
1222
 
        """Ignore empty entries"""
1223
 
        self.assertEvaluateProxyBypass(None, 'example.com', '')
1224
 
        self.assertEvaluateProxyBypass(None, 'example.com', ',')
1225
 
        self.assertEvaluateProxyBypass(None, 'example.com', 'foo,,bar')
1226
 
 
1227
1093
 
1228
1094
class TestProxyHttpServer(http_utils.TestCaseWithTwoWebservers):
1229
1095
    """Tests proxy server.
1234
1100
    to the file names).
1235
1101
    """
1236
1102
 
1237
 
    scenarios = multiply_scenarios(
1238
 
        vary_by_http_client_implementation(),
1239
 
        vary_by_http_protocol_version(),
1240
 
        )
1241
 
 
1242
1103
    # FIXME: We don't have an https server available, so we don't
1243
 
    # test https connections. --vila toolongago
 
1104
    # test https connections.
1244
1105
 
1245
1106
    def setUp(self):
1246
1107
        super(TestProxyHttpServer, self).setUp()
1247
 
        self.transport_secondary_server = http_utils.ProxyServer
1248
1108
        self.build_tree_contents([('foo', 'contents of foo\n'),
1249
1109
                                  ('foo-proxied', 'proxied contents of foo\n')])
1250
1110
        # Let's setup some attributes for tests
1251
 
        server = self.get_readonly_server()
1252
 
        self.server_host_port = '%s:%d' % (server.host, server.port)
 
1111
        self.server = self.get_readonly_server()
 
1112
        self.proxy_address = '%s:%d' % (self.server.host, self.server.port)
1253
1113
        if self._testing_pycurl():
1254
1114
            # Oh my ! pycurl does not check for the port as part of
1255
1115
            # no_proxy :-( So we just test the host part
1256
 
            self.no_proxy_host = server.host
 
1116
            self.no_proxy_host = 'localhost'
1257
1117
        else:
1258
 
            self.no_proxy_host = self.server_host_port
 
1118
            self.no_proxy_host = self.proxy_address
1259
1119
        # The secondary server is the proxy
1260
 
        self.proxy_url = self.get_secondary_url()
 
1120
        self.proxy = self.get_secondary_server()
 
1121
        self.proxy_url = self.proxy.get_url()
 
1122
        self._old_env = {}
1261
1123
 
1262
1124
    def _testing_pycurl(self):
1263
 
        # TODO: This is duplicated for lots of the classes in this file
1264
 
        return (features.pycurl.available()
1265
 
                and self._transport == PyCurlTransport)
1266
 
 
1267
 
    def assertProxied(self):
1268
 
        t = self.get_readonly_transport()
1269
 
        self.assertEqual('proxied contents of foo\n', t.get('foo').read())
1270
 
 
1271
 
    def assertNotProxied(self):
1272
 
        t = self.get_readonly_transport()
1273
 
        self.assertEqual('contents of foo\n', t.get('foo').read())
 
1125
        return pycurl_present and self._transport == PyCurlTransport
 
1126
 
 
1127
    def create_transport_secondary_server(self):
 
1128
        """Creates an http server that will serve files with
 
1129
        '-proxied' appended to their names.
 
1130
        """
 
1131
        return http_utils.ProxyServer(protocol_version=self._protocol_version)
 
1132
 
 
1133
    def _install_env(self, env):
 
1134
        for name, value in env.iteritems():
 
1135
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1136
 
 
1137
    def _restore_env(self):
 
1138
        for name, value in self._old_env.iteritems():
 
1139
            osutils.set_or_unset_env(name, value)
 
1140
 
 
1141
    def proxied_in_env(self, env):
 
1142
        self._install_env(env)
 
1143
        url = self.server.get_url()
 
1144
        t = self._transport(url)
 
1145
        try:
 
1146
            self.assertEqual(t.get('foo').read(), 'proxied contents of foo\n')
 
1147
        finally:
 
1148
            self._restore_env()
 
1149
 
 
1150
    def not_proxied_in_env(self, env):
 
1151
        self._install_env(env)
 
1152
        url = self.server.get_url()
 
1153
        t = self._transport(url)
 
1154
        try:
 
1155
            self.assertEqual(t.get('foo').read(), 'contents of foo\n')
 
1156
        finally:
 
1157
            self._restore_env()
1274
1158
 
1275
1159
    def test_http_proxy(self):
1276
 
        self.overrideEnv('http_proxy', self.proxy_url)
1277
 
        self.assertProxied()
 
1160
        self.proxied_in_env({'http_proxy': self.proxy_url})
1278
1161
 
1279
1162
    def test_HTTP_PROXY(self):
1280
1163
        if self._testing_pycurl():
1283
1166
            # about. Should we ?)
1284
1167
            raise tests.TestNotApplicable(
1285
1168
                'pycurl does not check HTTP_PROXY for security reasons')
1286
 
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
1287
 
        self.assertProxied()
 
1169
        self.proxied_in_env({'HTTP_PROXY': self.proxy_url})
1288
1170
 
1289
1171
    def test_all_proxy(self):
1290
 
        self.overrideEnv('all_proxy', self.proxy_url)
1291
 
        self.assertProxied()
 
1172
        self.proxied_in_env({'all_proxy': self.proxy_url})
1292
1173
 
1293
1174
    def test_ALL_PROXY(self):
1294
 
        self.overrideEnv('ALL_PROXY', self.proxy_url)
1295
 
        self.assertProxied()
 
1175
        self.proxied_in_env({'ALL_PROXY': self.proxy_url})
1296
1176
 
1297
1177
    def test_http_proxy_with_no_proxy(self):
1298
 
        self.overrideEnv('no_proxy', self.no_proxy_host)
1299
 
        self.overrideEnv('http_proxy', self.proxy_url)
1300
 
        self.assertNotProxied()
 
1178
        self.not_proxied_in_env({'http_proxy': self.proxy_url,
 
1179
                                 'no_proxy': self.no_proxy_host})
1301
1180
 
1302
1181
    def test_HTTP_PROXY_with_NO_PROXY(self):
1303
1182
        if self._testing_pycurl():
1304
1183
            raise tests.TestNotApplicable(
1305
1184
                'pycurl does not check HTTP_PROXY for security reasons')
1306
 
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
1307
 
        self.overrideEnv('HTTP_PROXY', self.proxy_url)
1308
 
        self.assertNotProxied()
 
1185
        self.not_proxied_in_env({'HTTP_PROXY': self.proxy_url,
 
1186
                                 'NO_PROXY': self.no_proxy_host})
1309
1187
 
1310
1188
    def test_all_proxy_with_no_proxy(self):
1311
 
        self.overrideEnv('no_proxy', self.no_proxy_host)
1312
 
        self.overrideEnv('all_proxy', self.proxy_url)
1313
 
        self.assertNotProxied()
 
1189
        self.not_proxied_in_env({'all_proxy': self.proxy_url,
 
1190
                                 'no_proxy': self.no_proxy_host})
1314
1191
 
1315
1192
    def test_ALL_PROXY_with_NO_PROXY(self):
1316
 
        self.overrideEnv('NO_PROXY', self.no_proxy_host)
1317
 
        self.overrideEnv('ALL_PROXY', self.proxy_url)
1318
 
        self.assertNotProxied()
 
1193
        self.not_proxied_in_env({'ALL_PROXY': self.proxy_url,
 
1194
                                 'NO_PROXY': self.no_proxy_host})
1319
1195
 
1320
1196
    def test_http_proxy_without_scheme(self):
1321
 
        self.overrideEnv('http_proxy', self.server_host_port)
1322
1197
        if self._testing_pycurl():
1323
1198
            # pycurl *ignores* invalid proxy env variables. If that ever change
1324
1199
            # in the future, this test will fail indicating that pycurl do not
1325
1200
            # ignore anymore such variables.
1326
 
            self.assertNotProxied()
 
1201
            self.not_proxied_in_env({'http_proxy': self.proxy_address})
1327
1202
        else:
1328
 
            self.assertRaises(errors.InvalidURL, self.assertProxied)
 
1203
            self.assertRaises(errors.InvalidURL,
 
1204
                              self.proxied_in_env,
 
1205
                              {'http_proxy': self.proxy_address})
1329
1206
 
1330
1207
 
1331
1208
class TestRanges(http_utils.TestCaseWithWebserver):
1332
1209
    """Test the Range header in GET methods."""
1333
1210
 
1334
 
    scenarios = multiply_scenarios(
1335
 
        vary_by_http_client_implementation(),
1336
 
        vary_by_http_protocol_version(),
1337
 
        )
1338
 
 
1339
1211
    def setUp(self):
1340
 
        super(TestRanges, self).setUp()
 
1212
        http_utils.TestCaseWithWebserver.setUp(self)
1341
1213
        self.build_tree_contents([('a', '0123456789')],)
 
1214
        server = self.get_readonly_server()
 
1215
        self.transport = self._transport(server.get_url())
1342
1216
 
1343
1217
    def create_transport_readonly_server(self):
1344
1218
        return http_server.HttpServer(protocol_version=self._protocol_version)
1345
1219
 
1346
1220
    def _file_contents(self, relpath, ranges):
1347
 
        t = self.get_readonly_transport()
1348
1221
        offsets = [ (start, end - start + 1) for start, end in ranges]
1349
 
        coalesce = t._coalesce_offsets
 
1222
        coalesce = self.transport._coalesce_offsets
1350
1223
        coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
1351
 
        code, data = t._get(relpath, coalesced)
 
1224
        code, data = self.transport._get(relpath, coalesced)
1352
1225
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1353
1226
        for start, end in ranges:
1354
1227
            data.seek(start)
1355
1228
            yield data.read(end - start + 1)
1356
1229
 
1357
1230
    def _file_tail(self, relpath, tail_amount):
1358
 
        t = self.get_readonly_transport()
1359
 
        code, data = t._get(relpath, [], tail_amount)
 
1231
        code, data = self.transport._get(relpath, [], tail_amount)
1360
1232
        self.assertTrue(code in (200, 206),'_get returns: %d' % code)
1361
1233
        data.seek(-tail_amount, 2)
1362
1234
        return data.read(tail_amount)
1381
1253
class TestHTTPRedirections(http_utils.TestCaseWithRedirectedWebserver):
1382
1254
    """Test redirection between http servers."""
1383
1255
 
1384
 
    scenarios = multiply_scenarios(
1385
 
        vary_by_http_client_implementation(),
1386
 
        vary_by_http_protocol_version(),
1387
 
        )
 
1256
    def create_transport_secondary_server(self):
 
1257
        """Create the secondary server redirecting to the primary server"""
 
1258
        new = self.get_readonly_server()
 
1259
 
 
1260
        redirecting = http_utils.HTTPServerRedirecting(
 
1261
            protocol_version=self._protocol_version)
 
1262
        redirecting.redirect_to(new.host, new.port)
 
1263
        return redirecting
1388
1264
 
1389
1265
    def setUp(self):
1390
1266
        super(TestHTTPRedirections, self).setUp()
1393
1269
                                  '# Bazaar revision bundle v0.9\n#\n')
1394
1270
                                  ],)
1395
1271
 
 
1272
        self.old_transport = self._transport(self.old_server.get_url())
 
1273
 
1396
1274
    def test_redirected(self):
1397
 
        self.assertRaises(errors.RedirectRequested,
1398
 
                          self.get_old_transport().get, 'a')
1399
 
        self.assertEqual('0123456789', self.get_new_transport().get('a').read())
 
1275
        self.assertRaises(errors.RedirectRequested, self.old_transport.get, 'a')
 
1276
        t = self._transport(self.new_server.get_url())
 
1277
        self.assertEqual('0123456789', t.get('a').read())
 
1278
 
 
1279
    def test_read_redirected_bundle_from_url(self):
 
1280
        from bzrlib.bundle import read_bundle_from_url
 
1281
        url = self.old_transport.abspath('bundle')
 
1282
        bundle = read_bundle_from_url(url)
 
1283
        # If read_bundle_from_url was successful we get an empty bundle
 
1284
        self.assertEqual([], bundle.revisions)
1400
1285
 
1401
1286
 
1402
1287
class RedirectedRequest(_urllib2_wrappers.Request):
1411
1296
        # Since the tests using this class will replace
1412
1297
        # _urllib2_wrappers.Request, we can't just call the base class __init__
1413
1298
        # or we'll loop.
1414
 
        RedirectedRequest.init_orig(self, method, url, *args, **kwargs)
 
1299
        RedirectedRequest.init_orig(self, method, url, args, kwargs)
1415
1300
        self.follow_redirections = True
1416
1301
 
1417
1302
 
1418
 
def install_redirected_request(test):
1419
 
    test.overrideAttr(_urllib2_wrappers, 'Request', RedirectedRequest)
1420
 
 
1421
 
 
1422
 
def cleanup_http_redirection_connections(test):
1423
 
    # Some sockets are opened but never seen by _urllib, so we trap them at
1424
 
    # the _urllib2_wrappers level to be able to clean them up.
1425
 
    def socket_disconnect(sock):
1426
 
        try:
1427
 
            sock.shutdown(socket.SHUT_RDWR)
1428
 
            sock.close()
1429
 
        except socket.error:
1430
 
            pass
1431
 
    def connect(connection):
1432
 
        test.http_connect_orig(connection)
1433
 
        test.addCleanup(socket_disconnect, connection.sock)
1434
 
    test.http_connect_orig = test.overrideAttr(
1435
 
        _urllib2_wrappers.HTTPConnection, 'connect', connect)
1436
 
    def connect(connection):
1437
 
        test.https_connect_orig(connection)
1438
 
        test.addCleanup(socket_disconnect, connection.sock)
1439
 
    test.https_connect_orig = test.overrideAttr(
1440
 
        _urllib2_wrappers.HTTPSConnection, 'connect', connect)
1441
 
 
1442
 
 
1443
1303
class TestHTTPSilentRedirections(http_utils.TestCaseWithRedirectedWebserver):
1444
1304
    """Test redirections.
1445
1305
 
1454
1314
    -- vila 20070212
1455
1315
    """
1456
1316
 
1457
 
    scenarios = multiply_scenarios(
1458
 
        vary_by_http_client_implementation(),
1459
 
        vary_by_http_protocol_version(),
1460
 
        )
1461
 
 
1462
1317
    def setUp(self):
1463
 
        if (features.pycurl.available()
1464
 
            and self._transport == PyCurlTransport):
 
1318
        if pycurl_present and self._transport == PyCurlTransport:
1465
1319
            raise tests.TestNotApplicable(
1466
 
                "pycurl doesn't redirect silently anymore")
 
1320
                "pycurl doesn't redirect silently annymore")
1467
1321
        super(TestHTTPSilentRedirections, self).setUp()
1468
 
        install_redirected_request(self)
1469
 
        cleanup_http_redirection_connections(self)
 
1322
        self.setup_redirected_request()
 
1323
        self.addCleanup(self.cleanup_redirected_request)
1470
1324
        self.build_tree_contents([('a','a'),
1471
1325
                                  ('1/',),
1472
1326
                                  ('1/a', 'redirected once'),
1480
1334
                                  ('5/a', 'redirected 5 times'),
1481
1335
                                  ],)
1482
1336
 
 
1337
        self.old_transport = self._transport(self.old_server.get_url())
 
1338
 
 
1339
    def setup_redirected_request(self):
 
1340
        self.original_class = _urllib2_wrappers.Request
 
1341
        _urllib2_wrappers.Request = RedirectedRequest
 
1342
 
 
1343
    def cleanup_redirected_request(self):
 
1344
        _urllib2_wrappers.Request = self.original_class
 
1345
 
 
1346
    def create_transport_secondary_server(self):
 
1347
        """Create the secondary server, redirections are defined in the tests"""
 
1348
        return http_utils.HTTPServerRedirecting(
 
1349
            protocol_version=self._protocol_version)
 
1350
 
1483
1351
    def test_one_redirection(self):
1484
 
        t = self.get_old_transport()
1485
 
        req = RedirectedRequest('GET', t._remote_path('a'))
 
1352
        t = self.old_transport
 
1353
 
 
1354
        req = RedirectedRequest('GET', t.abspath('a'))
 
1355
        req.follow_redirections = True
1486
1356
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1487
1357
                                       self.new_server.port)
1488
1358
        self.old_server.redirections = \
1489
1359
            [('(.*)', r'%s/1\1' % (new_prefix), 301),]
1490
 
        self.assertEqual('redirected once', t._perform(req).read())
 
1360
        self.assertEquals('redirected once',t._perform(req).read())
1491
1361
 
1492
1362
    def test_five_redirections(self):
1493
 
        t = self.get_old_transport()
1494
 
        req = RedirectedRequest('GET', t._remote_path('a'))
 
1363
        t = self.old_transport
 
1364
 
 
1365
        req = RedirectedRequest('GET', t.abspath('a'))
 
1366
        req.follow_redirections = True
1495
1367
        old_prefix = 'http://%s:%s' % (self.old_server.host,
1496
1368
                                       self.old_server.port)
1497
1369
        new_prefix = 'http://%s:%s' % (self.new_server.host,
1503
1375
            ('/4(.*)', r'%s/5\1' % (new_prefix), 301),
1504
1376
            ('(/[^/]+)', r'%s/1\1' % (old_prefix), 301),
1505
1377
            ]
1506
 
        self.assertEqual('redirected 5 times', t._perform(req).read())
 
1378
        self.assertEquals('redirected 5 times',t._perform(req).read())
1507
1379
 
1508
1380
 
1509
1381
class TestDoCatchRedirections(http_utils.TestCaseWithRedirectedWebserver):
1510
1382
    """Test transport.do_catching_redirections."""
1511
1383
 
1512
 
    scenarios = multiply_scenarios(
1513
 
        vary_by_http_client_implementation(),
1514
 
        vary_by_http_protocol_version(),
1515
 
        )
1516
 
 
1517
1384
    def setUp(self):
1518
1385
        super(TestDoCatchRedirections, self).setUp()
1519
1386
        self.build_tree_contents([('a', '0123456789'),],)
1520
 
        cleanup_http_redirection_connections(self)
1521
 
 
1522
 
        self.old_transport = self.get_old_transport()
1523
 
 
1524
 
    def get_a(self, t):
1525
 
        return t.get('a')
 
1387
 
 
1388
        self.old_transport = self._transport(self.old_server.get_url())
 
1389
 
 
1390
    def get_a(self, transport):
 
1391
        return transport.get('a')
1526
1392
 
1527
1393
    def test_no_redirection(self):
1528
 
        t = self.get_new_transport()
 
1394
        t = self._transport(self.new_server.get_url())
1529
1395
 
1530
1396
        # We use None for redirected so that we fail if redirected
1531
 
        self.assertEqual('0123456789',
1532
 
                         transport.do_catching_redirections(
 
1397
        self.assertEquals('0123456789',
 
1398
                          transport.do_catching_redirections(
1533
1399
                self.get_a, t, None).read())
1534
1400
 
1535
1401
    def test_one_redirection(self):
1536
1402
        self.redirections = 0
1537
1403
 
1538
 
        def redirected(t, exception, redirection_notice):
 
1404
        def redirected(transport, exception, redirection_notice):
1539
1405
            self.redirections += 1
1540
 
            redirected_t = t._redirected_to(exception.source, exception.target)
1541
 
            return redirected_t
 
1406
            dir, file = urlutils.split(exception.target)
 
1407
            return self._transport(dir)
1542
1408
 
1543
 
        self.assertEqual('0123456789',
1544
 
                         transport.do_catching_redirections(
 
1409
        self.assertEquals('0123456789',
 
1410
                          transport.do_catching_redirections(
1545
1411
                self.get_a, self.old_transport, redirected).read())
1546
 
        self.assertEqual(1, self.redirections)
 
1412
        self.assertEquals(1, self.redirections)
1547
1413
 
1548
1414
    def test_redirection_loop(self):
1549
1415
 
1558
1424
                          self.get_a, self.old_transport, redirected)
1559
1425
 
1560
1426
 
1561
 
def _setup_authentication_config(**kwargs):
1562
 
    conf = config.AuthenticationConfig()
1563
 
    conf._get_config().update({'httptest': kwargs})
1564
 
    conf._save()
1565
 
 
1566
 
 
1567
 
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
1568
 
    """Unit tests for glue by which urllib2 asks us for authentication"""
1569
 
 
1570
 
    def test_get_user_password_without_port(self):
1571
 
        """We cope if urllib2 doesn't tell us the port.
1572
 
 
1573
 
        See https://bugs.launchpad.net/bzr/+bug/654684
1574
 
        """
1575
 
        user = 'joe'
1576
 
        password = 'foo'
1577
 
        _setup_authentication_config(scheme='http', host='localhost',
1578
 
                                     user=user, password=password)
1579
 
        handler = _urllib2_wrappers.HTTPAuthHandler()
1580
 
        got_pass = handler.get_user_password(dict(
1581
 
            user='joe',
1582
 
            protocol='http',
1583
 
            host='localhost',
1584
 
            path='/',
1585
 
            realm='Realm',
1586
 
            ))
1587
 
        self.assertEquals((user, password), got_pass)
1588
 
 
1589
 
 
1590
1427
class TestAuth(http_utils.TestCaseWithWebserver):
1591
1428
    """Test authentication scheme"""
1592
1429
 
1593
 
    scenarios = multiply_scenarios(
1594
 
        vary_by_http_client_implementation(),
1595
 
        vary_by_http_protocol_version(),
1596
 
        vary_by_http_auth_scheme(),
1597
 
        )
 
1430
    _auth_header = 'Authorization'
 
1431
    _password_prompt_prefix = ''
1598
1432
 
1599
1433
    def setUp(self):
1600
1434
        super(TestAuth, self).setUp()
1603
1437
                                  ('b', 'contents of b\n'),])
1604
1438
 
1605
1439
    def create_transport_readonly_server(self):
1606
 
        server = self._auth_server(protocol_version=self._protocol_version)
1607
 
        server._url_protocol = self._url_protocol
 
1440
        if self._auth_scheme == 'basic':
 
1441
            server = http_utils.HTTPBasicAuthServer(
 
1442
                protocol_version=self._protocol_version)
 
1443
        else:
 
1444
            if self._auth_scheme != 'digest':
 
1445
                raise AssertionError('Unknown auth scheme: %r'
 
1446
                                     % self._auth_scheme)
 
1447
            server = http_utils.HTTPDigestAuthServer(
 
1448
                protocol_version=self._protocol_version)
1608
1449
        return server
1609
1450
 
1610
1451
    def _testing_pycurl(self):
1611
 
        # TODO: This is duplicated for lots of the classes in this file
1612
 
        return (features.pycurl.available()
1613
 
                and self._transport == PyCurlTransport)
 
1452
        return pycurl_present and self._transport == PyCurlTransport
1614
1453
 
1615
 
    def get_user_url(self, user, password):
 
1454
    def get_user_url(self, user=None, password=None):
1616
1455
        """Build an url embedding user and password"""
1617
1456
        url = '%s://' % self.server._url_protocol
1618
1457
        if user is not None:
1623
1462
        url += '%s:%s/' % (self.server.host, self.server.port)
1624
1463
        return url
1625
1464
 
1626
 
    def get_user_transport(self, user, password):
1627
 
        t = transport.get_transport_from_url(
1628
 
            self.get_user_url(user, password))
1629
 
        return t
 
1465
    def get_user_transport(self, user=None, password=None):
 
1466
        return self._transport(self.get_user_url(user, password))
1630
1467
 
1631
1468
    def test_no_user(self):
1632
1469
        self.server.add_user('joe', 'foo')
1633
 
        t = self.get_user_transport(None, None)
 
1470
        t = self.get_user_transport()
1634
1471
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'a')
1635
1472
        # Only one 'Authentication Required' error should occur
1636
1473
        self.assertEqual(1, self.server.auth_required_errors)
1666
1503
        # initial 'who are you' and 'this is not you, who are you')
1667
1504
        self.assertEqual(2, self.server.auth_required_errors)
1668
1505
 
1669
 
    def test_prompt_for_username(self):
1670
 
        if self._testing_pycurl():
1671
 
            raise tests.TestNotApplicable(
1672
 
                'pycurl cannot prompt, it handles auth by embedding'
1673
 
                ' user:pass in urls only')
1674
 
 
1675
 
        self.server.add_user('joe', 'foo')
1676
 
        t = self.get_user_transport(None, None)
1677
 
        stdout = tests.StringIOWrapper()
1678
 
        stderr = tests.StringIOWrapper()
1679
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
1680
 
                                            stdout=stdout, stderr=stderr)
1681
 
        self.assertEqual('contents of a\n',t.get('a').read())
1682
 
        # stdin should be empty
1683
 
        self.assertEqual('', ui.ui_factory.stdin.readline())
1684
 
        stderr.seek(0)
1685
 
        expected_prompt = self._expected_username_prompt(t._unqualified_scheme)
1686
 
        self.assertEqual(expected_prompt, stderr.read(len(expected_prompt)))
1687
 
        self.assertEqual('', stdout.getvalue())
1688
 
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1689
 
                                    stderr.readline())
1690
 
 
1691
1506
    def test_prompt_for_password(self):
1692
1507
        if self._testing_pycurl():
1693
1508
            raise tests.TestNotApplicable(
1697
1512
        self.server.add_user('joe', 'foo')
1698
1513
        t = self.get_user_transport('joe', None)
1699
1514
        stdout = tests.StringIOWrapper()
1700
 
        stderr = tests.StringIOWrapper()
1701
 
        ui.ui_factory = tests.TestUIFactory(stdin='foo\n',
1702
 
                                            stdout=stdout, stderr=stderr)
1703
 
        self.assertEqual('contents of a\n', t.get('a').read())
 
1515
        ui.ui_factory = tests.TestUIFactory(stdin='foo\n', stdout=stdout)
 
1516
        self.assertEqual('contents of a\n',t.get('a').read())
1704
1517
        # stdin should be empty
1705
1518
        self.assertEqual('', ui.ui_factory.stdin.readline())
1706
1519
        self._check_password_prompt(t._unqualified_scheme, 'joe',
1707
 
                                    stderr.getvalue())
1708
 
        self.assertEqual('', stdout.getvalue())
 
1520
                                    stdout.getvalue())
1709
1521
        # And we shouldn't prompt again for a different request
1710
1522
        # against the same transport.
1711
1523
        self.assertEqual('contents of b\n',t.get('b').read())
1721
1533
                              % (scheme.upper(),
1722
1534
                                 user, self.server.host, self.server.port,
1723
1535
                                 self.server.auth_realm)))
1724
 
        self.assertEqual(expected_prompt, actual_prompt)
1725
 
 
1726
 
    def _expected_username_prompt(self, scheme):
1727
 
        return (self._username_prompt_prefix
1728
 
                + "%s %s:%d, Realm: '%s' username: " % (scheme.upper(),
1729
 
                                 self.server.host, self.server.port,
1730
 
                                 self.server.auth_realm))
 
1536
        self.assertEquals(expected_prompt, actual_prompt)
1731
1537
 
1732
1538
    def test_no_prompt_for_password_when_using_auth_config(self):
1733
1539
        if self._testing_pycurl():
1741
1547
        self.server.add_user(user, password)
1742
1548
        t = self.get_user_transport(user, None)
1743
1549
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1744
 
                                            stderr=tests.StringIOWrapper())
 
1550
                                            stdout=tests.StringIOWrapper())
1745
1551
        # Create a minimal config file with the right password
1746
 
        _setup_authentication_config(scheme='http', port=self.server.port,
1747
 
                                     user=user, password=password)
 
1552
        conf = config.AuthenticationConfig()
 
1553
        conf._get_config().update(
 
1554
            {'httptest': {'scheme': 'http', 'port': self.server.port,
 
1555
                          'user': user, 'password': password}})
 
1556
        conf._save()
1748
1557
        # Issue a request to the server to connect
1749
1558
        self.assertEqual('contents of a\n',t.get('a').read())
1750
1559
        # stdin should have  been left untouched
1753
1562
        self.assertEqual(1, self.server.auth_required_errors)
1754
1563
 
1755
1564
    def test_changing_nonce(self):
1756
 
        if self._auth_server not in (http_utils.HTTPDigestAuthServer,
1757
 
                                     http_utils.ProxyDigestAuthServer):
1758
 
            raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
 
1565
        if self._auth_scheme != 'digest':
 
1566
            raise tests.TestNotApplicable('HTTP auth digest only test')
1759
1567
        if self._testing_pycurl():
1760
 
            self.knownFailure(
 
1568
            raise tests.KnownFailure(
1761
1569
                'pycurl does not handle a nonce change')
1762
1570
        self.server.add_user('joe', 'foo')
1763
1571
        t = self.get_user_transport('joe', 'foo')
1773
1581
        # initial 'who are you' and a second 'who are you' with the new nonce)
1774
1582
        self.assertEqual(2, self.server.auth_required_errors)
1775
1583
 
1776
 
    def test_user_from_auth_conf(self):
1777
 
        if self._testing_pycurl():
1778
 
            raise tests.TestNotApplicable(
1779
 
                'pycurl does not support authentication.conf')
1780
 
        user = 'joe'
1781
 
        password = 'foo'
1782
 
        self.server.add_user(user, password)
1783
 
        _setup_authentication_config(scheme='http', port=self.server.port,
1784
 
                                     user=user, password=password)
1785
 
        t = self.get_user_transport(None, None)
1786
 
        # Issue a request to the server to connect
1787
 
        self.assertEqual('contents of a\n', t.get('a').read())
1788
 
        # Only one 'Authentication Required' error should occur
1789
 
        self.assertEqual(1, self.server.auth_required_errors)
1790
 
 
1791
 
    def test_no_credential_leaks_in_log(self):
1792
 
        self.overrideAttr(debug, 'debug_flags', set(['http']))
1793
 
        user = 'joe'
1794
 
        password = 'very-sensitive-password'
1795
 
        self.server.add_user(user, password)
1796
 
        t = self.get_user_transport(user, password)
1797
 
        # Capture the debug calls to mutter
1798
 
        self.mutters = []
1799
 
        def mutter(*args):
1800
 
            lines = args[0] % args[1:]
1801
 
            # Some calls output multiple lines, just split them now since we
1802
 
            # care about a single one later.
1803
 
            self.mutters.extend(lines.splitlines())
1804
 
        self.overrideAttr(trace, 'mutter', mutter)
1805
 
        # Issue a request to the server to connect
1806
 
        self.assertEqual(True, t.has('a'))
1807
 
        # Only one 'Authentication Required' error should occur
1808
 
        self.assertEqual(1, self.server.auth_required_errors)
1809
 
        # Since the authentification succeeded, there should be a corresponding
1810
 
        # debug line
1811
 
        sent_auth_headers = [line for line in self.mutters
1812
 
                             if line.startswith('> %s' % (self._auth_header,))]
1813
 
        self.assertLength(1, sent_auth_headers)
1814
 
        self.assertStartsWith(sent_auth_headers[0],
1815
 
                              '> %s: <masked>' % (self._auth_header,))
1816
1584
 
1817
1585
 
1818
1586
class TestProxyAuth(TestAuth):
1819
 
    """Test proxy authentication schemes.
1820
 
 
1821
 
    This inherits from TestAuth to tweak the setUp and filter some failing
1822
 
    tests.
1823
 
    """
1824
 
 
1825
 
    scenarios = multiply_scenarios(
1826
 
        vary_by_http_client_implementation(),
1827
 
        vary_by_http_protocol_version(),
1828
 
        vary_by_http_proxy_auth_scheme(),
1829
 
        )
 
1587
    """Test proxy authentication schemes."""
 
1588
 
 
1589
    _auth_header = 'Proxy-authorization'
 
1590
    _password_prompt_prefix='Proxy '
1830
1591
 
1831
1592
    def setUp(self):
1832
1593
        super(TestProxyAuth, self).setUp()
 
1594
        self._old_env = {}
 
1595
        self.addCleanup(self._restore_env)
1833
1596
        # Override the contents to avoid false positives
1834
1597
        self.build_tree_contents([('a', 'not proxied contents of a\n'),
1835
1598
                                  ('b', 'not proxied contents of b\n'),
1837
1600
                                  ('b-proxied', 'contents of b\n'),
1838
1601
                                  ])
1839
1602
 
1840
 
    def get_user_transport(self, user, password):
1841
 
        self.overrideEnv('all_proxy', self.get_user_url(user, password))
1842
 
        return TestAuth.get_user_transport(self, user, password)
 
1603
    def create_transport_readonly_server(self):
 
1604
        if self._auth_scheme == 'basic':
 
1605
            server = http_utils.ProxyBasicAuthServer(
 
1606
                protocol_version=self._protocol_version)
 
1607
        else:
 
1608
            if self._auth_scheme != 'digest':
 
1609
                raise AssertionError('Unknown auth scheme: %r'
 
1610
                                     % self._auth_scheme)
 
1611
            server = http_utils.ProxyDigestAuthServer(
 
1612
                protocol_version=self._protocol_version)
 
1613
        return server
 
1614
 
 
1615
    def get_user_transport(self, user=None, password=None):
 
1616
        self._install_env({'all_proxy': self.get_user_url(user, password)})
 
1617
        return self._transport(self.server.get_url())
 
1618
 
 
1619
    def _install_env(self, env):
 
1620
        for name, value in env.iteritems():
 
1621
            self._old_env[name] = osutils.set_or_unset_env(name, value)
 
1622
 
 
1623
    def _restore_env(self):
 
1624
        for name, value in self._old_env.iteritems():
 
1625
            osutils.set_or_unset_env(name, value)
1843
1626
 
1844
1627
    def test_empty_pass(self):
1845
1628
        if self._testing_pycurl():
1846
1629
            import pycurl
1847
1630
            if pycurl.version_info()[1] < '7.16.0':
1848
 
                self.knownFailure(
 
1631
                raise tests.KnownFailure(
1849
1632
                    'pycurl < 7.16.0 does not handle empty proxy passwords')
1850
1633
        super(TestProxyAuth, self).test_empty_pass()
1851
1634
 
1864
1647
        self.readfile = StringIO(socket_read_content)
1865
1648
        self.writefile = StringIO()
1866
1649
        self.writefile.close = lambda: None
1867
 
        self.close = lambda: None
1868
1650
 
1869
1651
    def makefile(self, mode='r', bufsize=None):
1870
1652
        if 'r' in mode:
1875
1657
 
1876
1658
class SmartHTTPTunnellingTest(tests.TestCaseWithTransport):
1877
1659
 
1878
 
    scenarios = multiply_scenarios(
1879
 
        vary_by_http_client_implementation(),
1880
 
        vary_by_http_protocol_version(),
1881
 
        )
1882
 
 
1883
1660
    def setUp(self):
1884
1661
        super(SmartHTTPTunnellingTest, self).setUp()
1885
1662
        # We use the VFS layer as part of HTTP tunnelling tests.
1886
 
        self.overrideEnv('BZR_NO_SMART_VFS', None)
 
1663
        self._captureVar('BZR_NO_SMART_VFS', None)
1887
1664
        self.transport_readonly_server = http_utils.HTTPServerWithSmarts
1888
 
        self.http_server = self.get_readonly_server()
1889
1665
 
1890
1666
    def create_transport_readonly_server(self):
1891
 
        server = http_utils.HTTPServerWithSmarts(
 
1667
        return http_utils.HTTPServerWithSmarts(
1892
1668
            protocol_version=self._protocol_version)
1893
 
        server._url_protocol = self._url_protocol
1894
 
        return server
1895
 
 
1896
 
    def test_open_controldir(self):
1897
 
        branch = self.make_branch('relpath')
1898
 
        url = self.http_server.get_url() + 'relpath'
1899
 
        bd = controldir.ControlDir.open(url)
1900
 
        self.addCleanup(bd.transport.disconnect)
1901
 
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1902
1669
 
1903
1670
    def test_bulk_data(self):
1904
1671
        # We should be able to send and receive bulk data in a single message.
1905
1672
        # The 'readv' command in the smart protocol both sends and receives
1906
1673
        # bulk data, so we use that.
1907
1674
        self.build_tree(['data-file'])
1908
 
        http_transport = transport.get_transport_from_url(
1909
 
            self.http_server.get_url())
 
1675
        http_server = self.get_readonly_server()
 
1676
        http_transport = self._transport(http_server.get_url())
1910
1677
        medium = http_transport.get_smart_medium()
1911
1678
        # Since we provide the medium, the url below will be mostly ignored
1912
1679
        # during the test, as long as the path is '/'.
1920
1687
        post_body = 'hello\n'
1921
1688
        expected_reply_body = 'ok\x012\n'
1922
1689
 
1923
 
        http_transport = transport.get_transport_from_url(
1924
 
            self.http_server.get_url())
 
1690
        http_server = self.get_readonly_server()
 
1691
        http_transport = self._transport(http_server.get_url())
1925
1692
        medium = http_transport.get_smart_medium()
1926
1693
        response = medium.send_http_smart_request(post_body)
1927
1694
        reply_body = response.read()
1928
1695
        self.assertEqual(expected_reply_body, reply_body)
1929
1696
 
1930
1697
    def test_smart_http_server_post_request_handler(self):
1931
 
        httpd = self.http_server.server
 
1698
        httpd = self.get_readonly_server()._get_httpd()
1932
1699
 
1933
1700
        socket = SampleSocket(
1934
1701
            'POST /.bzr/smart %s \r\n' % self._protocol_version
1952
1719
        self.assertEndsWith(response, expected_end_of_response)
1953
1720
 
1954
1721
 
1955
 
class ForbiddenRequestHandler(http_server.TestingHTTPRequestHandler):
1956
 
    """No smart server here request handler."""
1957
 
 
1958
 
    def do_POST(self):
1959
 
        self.send_error(403, "Forbidden")
1960
 
 
1961
 
 
1962
 
class SmartClientAgainstNotSmartServer(TestSpecificRequestHandler):
1963
 
    """Test smart client behaviour against an http server without smarts."""
1964
 
 
1965
 
    _req_handler_class = ForbiddenRequestHandler
1966
 
 
1967
 
    def test_probe_smart_server(self):
1968
 
        """Test error handling against server refusing smart requests."""
1969
 
        t = self.get_readonly_transport()
1970
 
        # No need to build a valid smart request here, the server will not even
1971
 
        # try to interpret it.
1972
 
        self.assertRaises(errors.SmartProtocolError,
1973
 
                          t.get_smart_medium().send_http_smart_request,
1974
 
                          'whatever')
1975
 
 
1976
 
 
1977
 
class Test_redirected_to(tests.TestCase):
1978
 
 
1979
 
    scenarios = vary_by_http_client_implementation()
1980
 
 
1981
 
    def test_redirected_to_subdir(self):
1982
 
        t = self._transport('http://www.example.com/foo')
1983
 
        r = t._redirected_to('http://www.example.com/foo',
1984
 
                             'http://www.example.com/foo/subdir')
1985
 
        self.assertIsInstance(r, type(t))
1986
 
        # Both transports share the some connection
1987
 
        self.assertEqual(t._get_connection(), r._get_connection())
1988
 
        self.assertEquals('http://www.example.com/foo/subdir/', r.base)
1989
 
 
1990
 
    def test_redirected_to_self_with_slash(self):
1991
 
        t = self._transport('http://www.example.com/foo')
1992
 
        r = t._redirected_to('http://www.example.com/foo',
1993
 
                             'http://www.example.com/foo/')
1994
 
        self.assertIsInstance(r, type(t))
1995
 
        # Both transports share the some connection (one can argue that we
1996
 
        # should return the exact same transport here, but that seems
1997
 
        # overkill).
1998
 
        self.assertEqual(t._get_connection(), r._get_connection())
1999
 
 
2000
 
    def test_redirected_to_host(self):
2001
 
        t = self._transport('http://www.example.com/foo')
2002
 
        r = t._redirected_to('http://www.example.com/foo',
2003
 
                             'http://foo.example.com/foo/subdir')
2004
 
        self.assertIsInstance(r, type(t))
2005
 
        self.assertEquals('http://foo.example.com/foo/subdir/',
2006
 
            r.external_url())
2007
 
 
2008
 
    def test_redirected_to_same_host_sibling_protocol(self):
2009
 
        t = self._transport('http://www.example.com/foo')
2010
 
        r = t._redirected_to('http://www.example.com/foo',
2011
 
                             'https://www.example.com/foo')
2012
 
        self.assertIsInstance(r, type(t))
2013
 
        self.assertEquals('https://www.example.com/foo/',
2014
 
            r.external_url())
2015
 
 
2016
 
    def test_redirected_to_same_host_different_protocol(self):
2017
 
        t = self._transport('http://www.example.com/foo')
2018
 
        r = t._redirected_to('http://www.example.com/foo',
2019
 
                             'ftp://www.example.com/foo')
2020
 
        self.assertNotEquals(type(r), type(t))
2021
 
        self.assertEquals('ftp://www.example.com/foo/', r.external_url())
2022
 
 
2023
 
    def test_redirected_to_same_host_specific_implementation(self):
2024
 
        t = self._transport('http://www.example.com/foo')
2025
 
        r = t._redirected_to('http://www.example.com/foo',
2026
 
                             'https+urllib://www.example.com/foo')
2027
 
        self.assertEquals('https://www.example.com/foo/', r.external_url())
2028
 
 
2029
 
    def test_redirected_to_different_host_same_user(self):
2030
 
        t = self._transport('http://joe@www.example.com/foo')
2031
 
        r = t._redirected_to('http://www.example.com/foo',
2032
 
                             'https://foo.example.com/foo')
2033
 
        self.assertIsInstance(r, type(t))
2034
 
        self.assertEqual(t._parsed_url.user, r._parsed_url.user)
2035
 
        self.assertEquals('https://joe@foo.example.com/foo/', r.external_url())
2036
 
 
2037
 
 
2038
 
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
2039
 
    """Request handler for a unique and pre-defined request.
2040
 
 
2041
 
    The only thing we care about here is how many bytes travel on the wire. But
2042
 
    since we want to measure it for a real http client, we have to send it
2043
 
    correct responses.
2044
 
 
2045
 
    We expect to receive a *single* request nothing more (and we won't even
2046
 
    check what request it is, we just measure the bytes read until an empty
2047
 
    line.
2048
 
    """
2049
 
 
2050
 
    def _handle_one_request(self):
2051
 
        tcs = self.server.test_case_server
2052
 
        requestline = self.rfile.readline()
2053
 
        headers = self.MessageClass(self.rfile, 0)
2054
 
        # We just read: the request, the headers, an empty line indicating the
2055
 
        # end of the headers.
2056
 
        bytes_read = len(requestline)
2057
 
        for line in headers.headers:
2058
 
            bytes_read += len(line)
2059
 
        bytes_read += len('\r\n')
2060
 
        if requestline.startswith('POST'):
2061
 
            # The body should be a single line (or we don't know where it ends
2062
 
            # and we don't want to issue a blocking read)
2063
 
            body = self.rfile.readline()
2064
 
            bytes_read += len(body)
2065
 
        tcs.bytes_read = bytes_read
2066
 
 
2067
 
        # We set the bytes written *before* issuing the write, the client is
2068
 
        # supposed to consume every produced byte *before* checking that value.
2069
 
 
2070
 
        # Doing the oppposite may lead to test failure: we may be interrupted
2071
 
        # after the write but before updating the value. The client can then
2072
 
        # continue and read the value *before* we can update it. And yes,
2073
 
        # this has been observed -- vila 20090129
2074
 
        tcs.bytes_written = len(tcs.canned_response)
2075
 
        self.wfile.write(tcs.canned_response)
2076
 
 
2077
 
 
2078
 
class ActivityServerMixin(object):
2079
 
 
2080
 
    def __init__(self, protocol_version):
2081
 
        super(ActivityServerMixin, self).__init__(
2082
 
            request_handler=PredefinedRequestHandler,
2083
 
            protocol_version=protocol_version)
2084
 
        # Bytes read and written by the server
2085
 
        self.bytes_read = 0
2086
 
        self.bytes_written = 0
2087
 
        self.canned_response = None
2088
 
 
2089
 
 
2090
 
class ActivityHTTPServer(ActivityServerMixin, http_server.HttpServer):
2091
 
    pass
2092
 
 
2093
 
 
2094
 
if features.HTTPSServerFeature.available():
2095
 
    from bzrlib.tests import https_server
2096
 
    class ActivityHTTPSServer(ActivityServerMixin, https_server.HTTPSServer):
2097
 
        pass
2098
 
 
2099
 
 
2100
 
class TestActivityMixin(object):
2101
 
    """Test socket activity reporting.
2102
 
 
2103
 
    We use a special purpose server to control the bytes sent and received and
2104
 
    be able to predict the activity on the client socket.
2105
 
    """
2106
 
 
2107
 
    def setUp(self):
2108
 
        self.server = self._activity_server(self._protocol_version)
2109
 
        self.server.start_server()
2110
 
        self.addCleanup(self.server.stop_server)
2111
 
        _activities = {} # Don't close over self and create a cycle
2112
 
        def report_activity(t, bytes, direction):
2113
 
            count = _activities.get(direction, 0)
2114
 
            count += bytes
2115
 
            _activities[direction] = count
2116
 
        self.activities = _activities
2117
 
        # We override at class level because constructors may propagate the
2118
 
        # bound method and render instance overriding ineffective (an
2119
 
        # alternative would be to define a specific ui factory instead...)
2120
 
        self.overrideAttr(self._transport, '_report_activity', report_activity)
2121
 
 
2122
 
    def get_transport(self):
2123
 
        t = self._transport(self.server.get_url())
2124
 
        # FIXME: Needs cleanup -- vila 20100611
2125
 
        return t
2126
 
 
2127
 
    def assertActivitiesMatch(self):
2128
 
        self.assertEqual(self.server.bytes_read,
2129
 
                         self.activities.get('write', 0), 'written bytes')
2130
 
        self.assertEqual(self.server.bytes_written,
2131
 
                         self.activities.get('read', 0), 'read bytes')
2132
 
 
2133
 
    def test_get(self):
2134
 
        self.server.canned_response = '''HTTP/1.1 200 OK\r
2135
 
Date: Tue, 11 Jul 2006 04:32:56 GMT\r
2136
 
Server: Apache/2.0.54 (Fedora)\r
2137
 
Last-Modified: Sun, 23 Apr 2006 19:35:20 GMT\r
2138
 
ETag: "56691-23-38e9ae00"\r
2139
 
Accept-Ranges: bytes\r
2140
 
Content-Length: 35\r
2141
 
Connection: close\r
2142
 
Content-Type: text/plain; charset=UTF-8\r
2143
 
\r
2144
 
Bazaar-NG meta directory, format 1
2145
 
'''
2146
 
        t = self.get_transport()
2147
 
        self.assertEqual('Bazaar-NG meta directory, format 1\n',
2148
 
                         t.get('foo/bar').read())
2149
 
        self.assertActivitiesMatch()
2150
 
 
2151
 
    def test_has(self):
2152
 
        self.server.canned_response = '''HTTP/1.1 200 OK\r
2153
 
Server: SimpleHTTP/0.6 Python/2.5.2\r
2154
 
Date: Thu, 29 Jan 2009 20:21:47 GMT\r
2155
 
Content-type: application/octet-stream\r
2156
 
Content-Length: 20\r
2157
 
Last-Modified: Thu, 29 Jan 2009 20:21:47 GMT\r
2158
 
\r
2159
 
'''
2160
 
        t = self.get_transport()
2161
 
        self.assertTrue(t.has('foo/bar'))
2162
 
        self.assertActivitiesMatch()
2163
 
 
2164
 
    def test_readv(self):
2165
 
        self.server.canned_response = '''HTTP/1.1 206 Partial Content\r
2166
 
Date: Tue, 11 Jul 2006 04:49:48 GMT\r
2167
 
Server: Apache/2.0.54 (Fedora)\r
2168
 
Last-Modified: Thu, 06 Jul 2006 20:22:05 GMT\r
2169
 
ETag: "238a3c-16ec2-805c5540"\r
2170
 
Accept-Ranges: bytes\r
2171
 
Content-Length: 1534\r
2172
 
Connection: close\r
2173
 
Content-Type: multipart/byteranges; boundary=418470f848b63279b\r
2174
 
\r
2175
 
\r
2176
 
--418470f848b63279b\r
2177
 
Content-type: text/plain; charset=UTF-8\r
2178
 
Content-range: bytes 0-254/93890\r
2179
 
\r
2180
 
mbp@sourcefrog.net-20050309040815-13242001617e4a06
2181
 
mbp@sourcefrog.net-20050309040929-eee0eb3e6d1e7627
2182
 
mbp@sourcefrog.net-20050309040957-6cad07f466bb0bb8
2183
 
mbp@sourcefrog.net-20050309041501-c840e09071de3b67
2184
 
mbp@sourcefrog.net-20050309044615-c24a3250be83220a
2185
 
\r
2186
 
--418470f848b63279b\r
2187
 
Content-type: text/plain; charset=UTF-8\r
2188
 
Content-range: bytes 1000-2049/93890\r
2189
 
\r
2190
 
40-fd4ec249b6b139ab
2191
 
mbp@sourcefrog.net-20050311063625-07858525021f270b
2192
 
mbp@sourcefrog.net-20050311231934-aa3776aff5200bb9
2193
 
mbp@sourcefrog.net-20050311231953-73aeb3a131c3699a
2194
 
mbp@sourcefrog.net-20050311232353-f5e33da490872c6a
2195
 
mbp@sourcefrog.net-20050312071639-0a8f59a34a024ff0
2196
 
mbp@sourcefrog.net-20050312073432-b2c16a55e0d6e9fb
2197
 
mbp@sourcefrog.net-20050312073831-a47c3335ece1920f
2198
 
mbp@sourcefrog.net-20050312085412-13373aa129ccbad3
2199
 
mbp@sourcefrog.net-20050313052251-2bf004cb96b39933
2200
 
mbp@sourcefrog.net-20050313052856-3edd84094687cb11
2201
 
mbp@sourcefrog.net-20050313053233-e30a4f28aef48f9d
2202
 
mbp@sourcefrog.net-20050313053853-7c64085594ff3072
2203
 
mbp@sourcefrog.net-20050313054757-a86c3f5871069e22
2204
 
mbp@sourcefrog.net-20050313061422-418f1f73b94879b9
2205
 
mbp@sourcefrog.net-20050313120651-497bd231b19df600
2206
 
mbp@sourcefrog.net-20050314024931-eae0170ef25a5d1a
2207
 
mbp@sourcefrog.net-20050314025438-d52099f915fe65fc
2208
 
mbp@sourcefrog.net-20050314025539-637a636692c055cf
2209
 
mbp@sourcefrog.net-20050314025737-55eb441f430ab4ba
2210
 
mbp@sourcefrog.net-20050314025901-d74aa93bb7ee8f62
2211
 
mbp@source\r
2212
 
--418470f848b63279b--\r
2213
 
'''
2214
 
        t = self.get_transport()
2215
 
        # Remember that the request is ignored and that the ranges below
2216
 
        # doesn't have to match the canned response.
2217
 
        l = list(t.readv('/foo/bar', ((0, 255), (1000, 1050))))
2218
 
        self.assertEqual(2, len(l))
2219
 
        self.assertActivitiesMatch()
2220
 
 
2221
 
    def test_post(self):
2222
 
        self.server.canned_response = '''HTTP/1.1 200 OK\r
2223
 
Date: Tue, 11 Jul 2006 04:32:56 GMT\r
2224
 
Server: Apache/2.0.54 (Fedora)\r
2225
 
Last-Modified: Sun, 23 Apr 2006 19:35:20 GMT\r
2226
 
ETag: "56691-23-38e9ae00"\r
2227
 
Accept-Ranges: bytes\r
2228
 
Content-Length: 35\r
2229
 
Connection: close\r
2230
 
Content-Type: text/plain; charset=UTF-8\r
2231
 
\r
2232
 
lalala whatever as long as itsssss
2233
 
'''
2234
 
        t = self.get_transport()
2235
 
        # We must send a single line of body bytes, see
2236
 
        # PredefinedRequestHandler._handle_one_request
2237
 
        code, f = t._post('abc def end-of-body\n')
2238
 
        self.assertEqual('lalala whatever as long as itsssss\n', f.read())
2239
 
        self.assertActivitiesMatch()
2240
 
 
2241
 
 
2242
 
class TestActivity(tests.TestCase, TestActivityMixin):
2243
 
 
2244
 
    scenarios = multiply_scenarios(
2245
 
        vary_by_http_activity(),
2246
 
        vary_by_http_protocol_version(),
2247
 
        )
2248
 
 
2249
 
    def setUp(self):
2250
 
        super(TestActivity, self).setUp()
2251
 
        TestActivityMixin.setUp(self)
2252
 
 
2253
 
 
2254
 
class TestNoReportActivity(tests.TestCase, TestActivityMixin):
2255
 
 
2256
 
    # Unlike TestActivity, we are really testing ReportingFileSocket and
2257
 
    # ReportingSocket, so we don't need all the parametrization. Since
2258
 
    # ReportingFileSocket and ReportingSocket are wrappers, it's easier to
2259
 
    # test them through their use by the transport than directly (that's a
2260
 
    # bit less clean but far more simpler and effective).
2261
 
    _activity_server = ActivityHTTPServer
2262
 
    _protocol_version = 'HTTP/1.1'
2263
 
 
2264
 
    def setUp(self):
2265
 
        super(TestNoReportActivity, self).setUp()
2266
 
        self._transport =_urllib.HttpTransport_urllib
2267
 
        TestActivityMixin.setUp(self)
2268
 
 
2269
 
    def assertActivitiesMatch(self):
2270
 
        # Nothing to check here
2271
 
        pass
2272
 
 
2273
 
 
2274
 
class TestAuthOnRedirected(http_utils.TestCaseWithRedirectedWebserver):
2275
 
    """Test authentication on the redirected http server."""
2276
 
 
2277
 
    scenarios = vary_by_http_protocol_version()
2278
 
 
2279
 
    _auth_header = 'Authorization'
2280
 
    _password_prompt_prefix = ''
2281
 
    _username_prompt_prefix = ''
2282
 
    _auth_server = http_utils.HTTPBasicAuthServer
2283
 
    _transport = _urllib.HttpTransport_urllib
2284
 
 
2285
 
    def setUp(self):
2286
 
        super(TestAuthOnRedirected, self).setUp()
2287
 
        self.build_tree_contents([('a','a'),
2288
 
                                  ('1/',),
2289
 
                                  ('1/a', 'redirected once'),
2290
 
                                  ],)
2291
 
        new_prefix = 'http://%s:%s' % (self.new_server.host,
2292
 
                                       self.new_server.port)
2293
 
        self.old_server.redirections = [
2294
 
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2295
 
        self.old_transport = self.get_old_transport()
2296
 
        self.new_server.add_user('joe', 'foo')
2297
 
        cleanup_http_redirection_connections(self)
2298
 
 
2299
 
    def create_transport_readonly_server(self):
2300
 
        server = self._auth_server(protocol_version=self._protocol_version)
2301
 
        server._url_protocol = self._url_protocol
2302
 
        return server
2303
 
 
2304
 
    def get_a(self, t):
2305
 
        return t.get('a')
2306
 
 
2307
 
    def test_auth_on_redirected_via_do_catching_redirections(self):
2308
 
        self.redirections = 0
2309
 
 
2310
 
        def redirected(t, exception, redirection_notice):
2311
 
            self.redirections += 1
2312
 
            redirected_t = t._redirected_to(exception.source, exception.target)
2313
 
            self.addCleanup(redirected_t.disconnect)
2314
 
            return redirected_t
2315
 
 
2316
 
        stdout = tests.StringIOWrapper()
2317
 
        stderr = tests.StringIOWrapper()
2318
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2319
 
                                            stdout=stdout, stderr=stderr)
2320
 
        self.assertEqual('redirected once',
2321
 
                         transport.do_catching_redirections(
2322
 
                self.get_a, self.old_transport, redirected).read())
2323
 
        self.assertEqual(1, self.redirections)
2324
 
        # stdin should be empty
2325
 
        self.assertEqual('', ui.ui_factory.stdin.readline())
2326
 
        # stdout should be empty, stderr will contains the prompts
2327
 
        self.assertEqual('', stdout.getvalue())
2328
 
 
2329
 
    def test_auth_on_redirected_via_following_redirections(self):
2330
 
        self.new_server.add_user('joe', 'foo')
2331
 
        stdout = tests.StringIOWrapper()
2332
 
        stderr = tests.StringIOWrapper()
2333
 
        ui.ui_factory = tests.TestUIFactory(stdin='joe\nfoo\n',
2334
 
                                            stdout=stdout, stderr=stderr)
2335
 
        t = self.old_transport
2336
 
        req = RedirectedRequest('GET', t.abspath('a'))
2337
 
        new_prefix = 'http://%s:%s' % (self.new_server.host,
2338
 
                                       self.new_server.port)
2339
 
        self.old_server.redirections = [
2340
 
            ('(.*)', r'%s/1\1' % (new_prefix), 301),]
2341
 
        self.assertEqual('redirected once', t._perform(req).read())
2342
 
        # stdin should be empty
2343
 
        self.assertEqual('', ui.ui_factory.stdin.readline())
2344
 
        # stdout should be empty, stderr will contains the prompts
2345
 
        self.assertEqual('', stdout.getvalue())
2346