← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/https_server.py

  • Committer: Vincent Ladeuil
  • Date: 2010-01-26 10:17:22 UTC
  • mfrom: (4985.1.5 add-attr-cleanup)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100126101722-y213sv39buw3dgi2
Implement TestCase.overrideAttr to simplify tests setUp/cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/https_server.py
1
 
# Copyright (C) 2007-2011 Canonical Ltd
 
1
# Copyright (C) 2007 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
17
17
"""HTTPS test server, available when ssl python module is available"""
18
18
 
19
19
import ssl
20
 
import sys
21
20
 
22
21
from bzrlib.tests import (
23
22
    http_server,
24
23
    ssl_certs,
25
 
    test_server,
26
24
    )
27
25
 
28
26
 
32
30
        self.key_file = key_file
33
31
        self.cert_file = cert_file
34
32
 
35
 
    def _get_ssl_request (self, sock, addr):
36
 
        """Wrap the socket with SSL"""
37
 
        ssl_sock = ssl.wrap_socket(sock, server_side=True,
38
 
                                   keyfile=self.key_file,
39
 
                                   certfile=self.cert_file,
40
 
                                   do_handshake_on_connect=False)
41
 
        return ssl_sock, addr
42
 
 
43
 
    def verify_request(self, request, client_address):
44
 
        """Verify the request.
45
 
 
46
 
        Return True if we should proceed with this request, False if we should
47
 
        not even touch a single byte in the socket !
 
33
    def get_request (self):
 
34
        """Get the request and client address from the socket.
 
35
 
 
36
        This is called in response to a connection issued to the server, we
 
37
        wrap the socket with SSL.
48
38
        """
49
 
        serving = test_server.TestingTCPServerMixin.verify_request(
50
 
            self, request, client_address)
51
 
        if serving:
52
 
            request.do_handshake()
53
 
        return serving
54
 
 
55
 
    def ignored_exceptions_during_shutdown(self, e):
56
 
        if (sys.version < (2, 7) and isinstance(e, TypeError)
57
 
            and e.args[0] == "'member_descriptor' object is not callable"):
58
 
            # Fixed in python-2.7 (and some Ubuntu 2.6) there is a bug where
59
 
            # the ssl socket fail to raise a socket.error when trying to read
60
 
            # from a closed socket. This is rarely observed in practice but
61
 
            # still make valid selftest runs fail if not caught.
62
 
            return True
63
 
        base = test_server.TestingTCPServerMixin
64
 
        return base.ignored_exceptions_during_shutdown(self, e)
 
39
        sock, addr = self.socket.accept()
 
40
        sslconn = ssl.wrap_socket(sock, server_side=True,
 
41
                                  keyfile=self.key_file,
 
42
                                  certfile=self.cert_file)
 
43
        return sslconn, addr
65
44
 
66
45
 
67
46
class TestingHTTPSServer(TestingHTTPSServerMixin,
73
52
        http_server.TestingHTTPServer.__init__(
74
53
            self, server_address, request_handler_class, test_case_server)
75
54
 
76
 
    def get_request(self):
77
 
        sock, addr = http_server.TestingHTTPServer.get_request(self)
78
 
        return self._get_ssl_request(sock, addr)
79
 
 
80
55
 
81
56
class TestingThreadingHTTPSServer(TestingHTTPSServerMixin,
82
57
                                  http_server.TestingThreadingHTTPServer):
87
62
        http_server.TestingThreadingHTTPServer.__init__(
88
63
            self, server_address, request_handler_class, test_case_server)
89
64
 
90
 
    def get_request(self):
91
 
        sock, addr = http_server.TestingThreadingHTTPServer.get_request(self)
92
 
        return self._get_ssl_request(sock, addr)
93
 
 
94
65
 
95
66
class HTTPSServer(http_server.HttpServer):
96
67
 
102
73
                         }
103
74
 
104
75
    # Provides usable defaults since an https server requires both a
105
 
    # private key and a certificate to work.
 
76
    # private key and certificate to work.
106
77
    def __init__(self, request_handler=http_server.TestingHTTPRequestHandler,
107
78
                 protocol_version=None,
108
79
                 key_file=ssl_certs.build_path('server_without_pass.key'),
113
84
        self.cert_file = cert_file
114
85
        self.temp_files = []
115
86
 
116
 
    def create_server(self):
117
 
        return self.server_class(
118
 
            (self.host, self.port), self.request_handler_class, self,
119
 
            self.key_file, self.cert_file)
 
87
    def create_httpd(self, serv_cls, rhandler_cls):
 
88
        return serv_cls((self.host, self.port), self.request_handler,
 
89
                        self, self.key_file, self.cert_file)
120
90
 
121
91
 
122
92
class HTTPSServer_urllib(HTTPSServer):