~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

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