← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Andrew Bennetts
  • Date: 2011-05-18 15:45:07 UTC
  • mto: This revision was merged to the branch mainline in revision 5895.
  • Revision ID: andrew.bennetts@canonical.com-20110518154507-t3qudgcb7fj3omjc
Use pydoctor in api-docs make target.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
34
34
    bzrdir,
35
35
    cethread,
36
36
    config,
37
 
    debug,
38
37
    errors,
39
38
    osutils,
40
39
    remote as _mod_remote,
41
40
    tests,
42
 
    trace,
43
41
    transport,
44
42
    ui,
45
43
    )
93
91
        ]
94
92
 
95
93
 
 
94
def vary_by_http_proxy_auth_scheme():
 
95
    return [
 
96
        ('basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
 
97
        ('digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
 
98
        ('basicdigest',
 
99
            dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
 
100
        ]
 
101
 
 
102
 
96
103
def vary_by_http_auth_scheme():
97
 
    scenarios = [
 
104
    return [
98
105
        ('basic', dict(_auth_server=http_utils.HTTPBasicAuthServer)),
99
106
        ('digest', dict(_auth_server=http_utils.HTTPDigestAuthServer)),
100
107
        ('basicdigest',
101
108
            dict(_auth_server=http_utils.HTTPBasicAndDigestAuthServer)),
102
109
        ]
103
 
    # Add some attributes common to all scenarios
104
 
    for scenario_id, scenario_dict in scenarios:
105
 
        scenario_dict.update(_auth_header='Authorization',
106
 
                             _username_prompt_prefix='',
107
 
                             _password_prompt_prefix='')
108
 
    return scenarios
109
 
 
110
 
 
111
 
def vary_by_http_proxy_auth_scheme():
112
 
    scenarios = [
113
 
        ('proxy-basic', dict(_auth_server=http_utils.ProxyBasicAuthServer)),
114
 
        ('proxy-digest', dict(_auth_server=http_utils.ProxyDigestAuthServer)),
115
 
        ('proxy-basicdigest',
116
 
            dict(_auth_server=http_utils.ProxyBasicAndDigestAuthServer)),
117
 
        ]
118
 
    # Add some attributes common to all scenarios
119
 
    for scenario_id, scenario_dict in scenarios:
120
 
        scenario_dict.update(_auth_header='Proxy-Authorization',
121
 
                             _username_prompt_prefix='Proxy ',
122
 
                             _password_prompt_prefix='Proxy ')
123
 
    return scenarios
124
110
 
125
111
 
126
112
def vary_by_http_activity():
1503
1489
                          self.get_a, self.old_transport, redirected)
1504
1490
 
1505
1491
 
1506
 
def _setup_authentication_config(**kwargs):
1507
 
    conf = config.AuthenticationConfig()
1508
 
    conf._get_config().update({'httptest': kwargs})
1509
 
    conf._save()
1510
 
 
1511
 
 
1512
 
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
1513
 
    """Unit tests for glue by which urllib2 asks us for authentication"""
1514
 
 
1515
 
    def test_get_user_password_without_port(self):
1516
 
        """We cope if urllib2 doesn't tell us the port.
1517
 
 
1518
 
        See https://bugs.launchpad.net/bzr/+bug/654684
1519
 
        """
1520
 
        user = 'joe'
1521
 
        password = 'foo'
1522
 
        _setup_authentication_config(scheme='http', host='localhost',
1523
 
                                     user=user, password=password)
1524
 
        handler = _urllib2_wrappers.HTTPAuthHandler()
1525
 
        got_pass = handler.get_user_password(dict(
1526
 
            user='joe',
1527
 
            protocol='http',
1528
 
            host='localhost',
1529
 
            path='/',
1530
 
            realm='Realm',
1531
 
            ))
1532
 
        self.assertEquals((user, password), got_pass)
1533
 
 
1534
 
 
1535
1492
class TestAuth(http_utils.TestCaseWithWebserver):
1536
1493
    """Test authentication scheme"""
1537
1494
 
1541
1498
        vary_by_http_auth_scheme(),
1542
1499
        )
1543
1500
 
 
1501
    _auth_header = 'Authorization'
 
1502
    _password_prompt_prefix = ''
 
1503
    _username_prompt_prefix = ''
 
1504
    # Set by load_tests
 
1505
    _auth_server = None
 
1506
 
1544
1507
    def setUp(self):
1545
1508
        super(TestAuth, self).setUp()
1546
1509
        self.server = self.get_readonly_server()
1687
1650
        ui.ui_factory = tests.TestUIFactory(stdin=stdin_content,
1688
1651
                                            stderr=tests.StringIOWrapper())
1689
1652
        # Create a minimal config file with the right password
1690
 
        _setup_authentication_config(scheme='http', port=self.server.port,
1691
 
                                     user=user, password=password)
 
1653
        _setup_authentication_config(
 
1654
            scheme='http', 
 
1655
            port=self.server.port,
 
1656
            user=user,
 
1657
            password=password)
1692
1658
        # Issue a request to the server to connect
1693
1659
        self.assertEqual('contents of a\n',t.get('a').read())
1694
1660
        # stdin should have  been left untouched
1724
1690
        user = 'joe'
1725
1691
        password = 'foo'
1726
1692
        self.server.add_user(user, password)
1727
 
        _setup_authentication_config(scheme='http', port=self.server.port,
1728
 
                                     user=user, password=password)
 
1693
        _setup_authentication_config(
 
1694
            scheme='http', 
 
1695
            port=self.server.port,
 
1696
            user=user,
 
1697
            password=password)
1729
1698
        t = self.get_user_transport(None, None)
1730
1699
        # Issue a request to the server to connect
1731
1700
        self.assertEqual('contents of a\n', t.get('a').read())
1732
1701
        # Only one 'Authentication Required' error should occur
1733
1702
        self.assertEqual(1, self.server.auth_required_errors)
1734
1703
 
1735
 
    def test_no_credential_leaks_in_log(self):
1736
 
        self.overrideAttr(debug, 'debug_flags', set(['http']))
 
1704
 
 
1705
def _setup_authentication_config(**kwargs):
 
1706
    conf = config.AuthenticationConfig()
 
1707
    conf._get_config().update({'httptest': kwargs})
 
1708
    conf._save()
 
1709
 
 
1710
 
 
1711
 
 
1712
class TestUrllib2AuthHandler(tests.TestCaseWithTransport):
 
1713
    """Unit tests for glue by which urllib2 asks us for authentication"""
 
1714
 
 
1715
    def test_get_user_password_without_port(self):
 
1716
        """We cope if urllib2 doesn't tell us the port.
 
1717
 
 
1718
        See https://bugs.launchpad.net/bzr/+bug/654684
 
1719
        """
1737
1720
        user = 'joe'
1738
 
        password = 'very-sensitive-password'
1739
 
        self.server.add_user(user, password)
1740
 
        t = self.get_user_transport(user, password)
1741
 
        # Capture the debug calls to mutter
1742
 
        self.mutters = []
1743
 
        def mutter(*args):
1744
 
            lines = args[0] % args[1:]
1745
 
            # Some calls output multiple lines, just split them now since we
1746
 
            # care about a single one later.
1747
 
            self.mutters.extend(lines.splitlines())
1748
 
        self.overrideAttr(trace, 'mutter', mutter)
1749
 
        # Issue a request to the server to connect
1750
 
        self.assertEqual(True, t.has('a'))
1751
 
        # Only one 'Authentication Required' error should occur
1752
 
        self.assertEqual(1, self.server.auth_required_errors)
1753
 
        # Since the authentification succeeded, there should be a corresponding
1754
 
        # debug line
1755
 
        sent_auth_headers = [line for line in self.mutters
1756
 
                             if line.startswith('> %s' % (self._auth_header,))]
1757
 
        self.assertLength(1, sent_auth_headers)
1758
 
        self.assertStartsWith(sent_auth_headers[0],
1759
 
                              '> %s: <masked>' % (self._auth_header,))
 
1721
        password = 'foo'
 
1722
        _setup_authentication_config(
 
1723
            scheme='http', 
 
1724
            host='localhost',
 
1725
            user=user,
 
1726
            password=password)
 
1727
        handler = _urllib2_wrappers.HTTPAuthHandler()
 
1728
        got_pass = handler.get_user_password(dict(
 
1729
            user='joe',
 
1730
            protocol='http',
 
1731
            host='localhost',
 
1732
            path='/',
 
1733
            realm='Realm',
 
1734
            ))
 
1735
        self.assertEquals((user, password), got_pass)
1760
1736
 
1761
1737
 
1762
1738
class TestProxyAuth(TestAuth):
1763
 
    """Test proxy authentication schemes.
1764
 
 
1765
 
    This inherits from TestAuth to tweak the setUp and filter some failing
1766
 
    tests.
1767
 
    """
 
1739
    """Test proxy authentication schemes."""
1768
1740
 
1769
1741
    scenarios = multiply_scenarios(
1770
1742
        vary_by_http_client_implementation(),
1772
1744
        vary_by_http_proxy_auth_scheme(),
1773
1745
        )
1774
1746
 
 
1747
    _auth_header = 'Proxy-authorization'
 
1748
    _password_prompt_prefix = 'Proxy '
 
1749
    _username_prompt_prefix = 'Proxy '
 
1750
 
1775
1751
    def setUp(self):
1776
1752
        super(TestProxyAuth, self).setUp()
1777
1753
        # Override the contents to avoid false positives
2037
2013
        tests.TestCase.setUp(self)
2038
2014
        self.server = self._activity_server(self._protocol_version)
2039
2015
        self.server.start_server()
2040
 
        _activities = {} # Don't close over self and create a cycle
 
2016
        self.activities = {}
2041
2017
        def report_activity(t, bytes, direction):
2042
 
            count = _activities.get(direction, 0)
 
2018
            count = self.activities.get(direction, 0)
2043
2019
            count += bytes
2044
 
            _activities[direction] = count
2045
 
        self.activities = _activities
 
2020
            self.activities[direction] = count
2046
2021
 
2047
2022
        # We override at class level because constructors may propagate the
2048
2023
        # bound method and render instance overriding ineffective (an
2273
2248
        # stdout should be empty, stderr will contains the prompts
2274
2249
        self.assertEqual('', stdout.getvalue())
2275
2250
 
 
2251