##// END OF EJS Templates
sslutil: force SSLv3 on Python 2.6 and later (issue3905)...
Augie Fackler -
r19490:074bd023 stable
parent child Browse files
Show More
@@ -1,157 +1,158 b''
1 # sslutil.py - SSL handling for mercurial
1 # sslutil.py - SSL handling for mercurial
2 #
2 #
3 # Copyright 2005, 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
3 # Copyright 2005, 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
4 # Copyright 2006, 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
4 # Copyright 2006, 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
5 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
5 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
6 #
6 #
7 # This software may be used and distributed according to the terms of the
7 # This software may be used and distributed according to the terms of the
8 # GNU General Public License version 2 or any later version.
8 # GNU General Public License version 2 or any later version.
9 import os
9 import os
10
10
11 from mercurial import util
11 from mercurial import util
12 from mercurial.i18n import _
12 from mercurial.i18n import _
13 try:
13 try:
14 # avoid using deprecated/broken FakeSocket in python 2.6
14 # avoid using deprecated/broken FakeSocket in python 2.6
15 import ssl
15 import ssl
16 CERT_REQUIRED = ssl.CERT_REQUIRED
16 CERT_REQUIRED = ssl.CERT_REQUIRED
17 def ssl_wrap_socket(sock, keyfile, certfile,
17 def ssl_wrap_socket(sock, keyfile, certfile,
18 cert_reqs=ssl.CERT_NONE, ca_certs=None):
18 cert_reqs=ssl.CERT_NONE, ca_certs=None):
19 sslsocket = ssl.wrap_socket(sock, keyfile, certfile,
19 sslsocket = ssl.wrap_socket(sock, keyfile, certfile,
20 cert_reqs=cert_reqs, ca_certs=ca_certs)
20 cert_reqs=cert_reqs, ca_certs=ca_certs,
21 ssl_version=ssl.PROTOCOL_SSLv3)
21 # check if wrap_socket failed silently because socket had been closed
22 # check if wrap_socket failed silently because socket had been closed
22 # - see http://bugs.python.org/issue13721
23 # - see http://bugs.python.org/issue13721
23 if not sslsocket.cipher():
24 if not sslsocket.cipher():
24 raise util.Abort(_('ssl connection failed'))
25 raise util.Abort(_('ssl connection failed'))
25 return sslsocket
26 return sslsocket
26 except ImportError:
27 except ImportError:
27 CERT_REQUIRED = 2
28 CERT_REQUIRED = 2
28
29
29 import socket, httplib
30 import socket, httplib
30
31
31 def ssl_wrap_socket(sock, key_file, cert_file,
32 def ssl_wrap_socket(sock, key_file, cert_file,
32 cert_reqs=CERT_REQUIRED, ca_certs=None):
33 cert_reqs=CERT_REQUIRED, ca_certs=None):
33 if not util.safehasattr(socket, 'ssl'):
34 if not util.safehasattr(socket, 'ssl'):
34 raise util.Abort(_('Python SSL support not found'))
35 raise util.Abort(_('Python SSL support not found'))
35 if ca_certs:
36 if ca_certs:
36 raise util.Abort(_(
37 raise util.Abort(_(
37 'certificate checking requires Python 2.6'))
38 'certificate checking requires Python 2.6'))
38
39
39 ssl = socket.ssl(sock, key_file, cert_file)
40 ssl = socket.ssl(sock, key_file, cert_file)
40 return httplib.FakeSocket(sock, ssl)
41 return httplib.FakeSocket(sock, ssl)
41
42
42 def _verifycert(cert, hostname):
43 def _verifycert(cert, hostname):
43 '''Verify that cert (in socket.getpeercert() format) matches hostname.
44 '''Verify that cert (in socket.getpeercert() format) matches hostname.
44 CRLs is not handled.
45 CRLs is not handled.
45
46
46 Returns error message if any problems are found and None on success.
47 Returns error message if any problems are found and None on success.
47 '''
48 '''
48 if not cert:
49 if not cert:
49 return _('no certificate received')
50 return _('no certificate received')
50 dnsname = hostname.lower()
51 dnsname = hostname.lower()
51 def matchdnsname(certname):
52 def matchdnsname(certname):
52 return (certname == dnsname or
53 return (certname == dnsname or
53 '.' in dnsname and certname == '*.' + dnsname.split('.', 1)[1])
54 '.' in dnsname and certname == '*.' + dnsname.split('.', 1)[1])
54
55
55 san = cert.get('subjectAltName', [])
56 san = cert.get('subjectAltName', [])
56 if san:
57 if san:
57 certnames = [value.lower() for key, value in san if key == 'DNS']
58 certnames = [value.lower() for key, value in san if key == 'DNS']
58 for name in certnames:
59 for name in certnames:
59 if matchdnsname(name):
60 if matchdnsname(name):
60 return None
61 return None
61 if certnames:
62 if certnames:
62 return _('certificate is for %s') % ', '.join(certnames)
63 return _('certificate is for %s') % ', '.join(certnames)
63
64
64 # subject is only checked when subjectAltName is empty
65 # subject is only checked when subjectAltName is empty
65 for s in cert.get('subject', []):
66 for s in cert.get('subject', []):
66 key, value = s[0]
67 key, value = s[0]
67 if key == 'commonName':
68 if key == 'commonName':
68 try:
69 try:
69 # 'subject' entries are unicode
70 # 'subject' entries are unicode
70 certname = value.lower().encode('ascii')
71 certname = value.lower().encode('ascii')
71 except UnicodeEncodeError:
72 except UnicodeEncodeError:
72 return _('IDN in certificate not supported')
73 return _('IDN in certificate not supported')
73 if matchdnsname(certname):
74 if matchdnsname(certname):
74 return None
75 return None
75 return _('certificate is for %s') % certname
76 return _('certificate is for %s') % certname
76 return _('no commonName or subjectAltName found in certificate')
77 return _('no commonName or subjectAltName found in certificate')
77
78
78
79
79 # CERT_REQUIRED means fetch the cert from the server all the time AND
80 # CERT_REQUIRED means fetch the cert from the server all the time AND
80 # validate it against the CA store provided in web.cacerts.
81 # validate it against the CA store provided in web.cacerts.
81 #
82 #
82 # We COMPLETELY ignore CERT_REQUIRED on Python <= 2.5, as it's totally
83 # We COMPLETELY ignore CERT_REQUIRED on Python <= 2.5, as it's totally
83 # busted on those versions.
84 # busted on those versions.
84
85
85 def sslkwargs(ui, host):
86 def sslkwargs(ui, host):
86 cacerts = ui.config('web', 'cacerts')
87 cacerts = ui.config('web', 'cacerts')
87 hostfingerprint = ui.config('hostfingerprints', host)
88 hostfingerprint = ui.config('hostfingerprints', host)
88 if cacerts and not hostfingerprint:
89 if cacerts and not hostfingerprint:
89 cacerts = util.expandpath(cacerts)
90 cacerts = util.expandpath(cacerts)
90 if not os.path.exists(cacerts):
91 if not os.path.exists(cacerts):
91 raise util.Abort(_('could not find web.cacerts: %s') % cacerts)
92 raise util.Abort(_('could not find web.cacerts: %s') % cacerts)
92 return {'ca_certs': cacerts,
93 return {'ca_certs': cacerts,
93 'cert_reqs': CERT_REQUIRED,
94 'cert_reqs': CERT_REQUIRED,
94 }
95 }
95 return {}
96 return {}
96
97
97 class validator(object):
98 class validator(object):
98 def __init__(self, ui, host):
99 def __init__(self, ui, host):
99 self.ui = ui
100 self.ui = ui
100 self.host = host
101 self.host = host
101
102
102 def __call__(self, sock, strict=False):
103 def __call__(self, sock, strict=False):
103 host = self.host
104 host = self.host
104 cacerts = self.ui.config('web', 'cacerts')
105 cacerts = self.ui.config('web', 'cacerts')
105 hostfingerprint = self.ui.config('hostfingerprints', host)
106 hostfingerprint = self.ui.config('hostfingerprints', host)
106 if not getattr(sock, 'getpeercert', False): # python 2.5 ?
107 if not getattr(sock, 'getpeercert', False): # python 2.5 ?
107 if hostfingerprint:
108 if hostfingerprint:
108 raise util.Abort(_("host fingerprint for %s can't be "
109 raise util.Abort(_("host fingerprint for %s can't be "
109 "verified (Python too old)") % host)
110 "verified (Python too old)") % host)
110 if strict:
111 if strict:
111 raise util.Abort(_("certificate for %s can't be verified "
112 raise util.Abort(_("certificate for %s can't be verified "
112 "(Python too old)") % host)
113 "(Python too old)") % host)
113 if self.ui.configbool('ui', 'reportoldssl', True):
114 if self.ui.configbool('ui', 'reportoldssl', True):
114 self.ui.warn(_("warning: certificate for %s can't be verified "
115 self.ui.warn(_("warning: certificate for %s can't be verified "
115 "(Python too old)\n") % host)
116 "(Python too old)\n") % host)
116 return
117 return
117
118
118 if not sock.cipher(): # work around http://bugs.python.org/issue13721
119 if not sock.cipher(): # work around http://bugs.python.org/issue13721
119 raise util.Abort(_('%s ssl connection error') % host)
120 raise util.Abort(_('%s ssl connection error') % host)
120 try:
121 try:
121 peercert = sock.getpeercert(True)
122 peercert = sock.getpeercert(True)
122 peercert2 = sock.getpeercert()
123 peercert2 = sock.getpeercert()
123 except AttributeError:
124 except AttributeError:
124 raise util.Abort(_('%s ssl connection error') % host)
125 raise util.Abort(_('%s ssl connection error') % host)
125
126
126 if not peercert:
127 if not peercert:
127 raise util.Abort(_('%s certificate error: '
128 raise util.Abort(_('%s certificate error: '
128 'no certificate received') % host)
129 'no certificate received') % host)
129 peerfingerprint = util.sha1(peercert).hexdigest()
130 peerfingerprint = util.sha1(peercert).hexdigest()
130 nicefingerprint = ":".join([peerfingerprint[x:x + 2]
131 nicefingerprint = ":".join([peerfingerprint[x:x + 2]
131 for x in xrange(0, len(peerfingerprint), 2)])
132 for x in xrange(0, len(peerfingerprint), 2)])
132 if hostfingerprint:
133 if hostfingerprint:
133 if peerfingerprint.lower() != \
134 if peerfingerprint.lower() != \
134 hostfingerprint.replace(':', '').lower():
135 hostfingerprint.replace(':', '').lower():
135 raise util.Abort(_('certificate for %s has unexpected '
136 raise util.Abort(_('certificate for %s has unexpected '
136 'fingerprint %s') % (host, nicefingerprint),
137 'fingerprint %s') % (host, nicefingerprint),
137 hint=_('check hostfingerprint configuration'))
138 hint=_('check hostfingerprint configuration'))
138 self.ui.debug('%s certificate matched fingerprint %s\n' %
139 self.ui.debug('%s certificate matched fingerprint %s\n' %
139 (host, nicefingerprint))
140 (host, nicefingerprint))
140 elif cacerts:
141 elif cacerts:
141 msg = _verifycert(peercert2, host)
142 msg = _verifycert(peercert2, host)
142 if msg:
143 if msg:
143 raise util.Abort(_('%s certificate error: %s') % (host, msg),
144 raise util.Abort(_('%s certificate error: %s') % (host, msg),
144 hint=_('configure hostfingerprint %s or use '
145 hint=_('configure hostfingerprint %s or use '
145 '--insecure to connect insecurely') %
146 '--insecure to connect insecurely') %
146 nicefingerprint)
147 nicefingerprint)
147 self.ui.debug('%s certificate successfully verified\n' % host)
148 self.ui.debug('%s certificate successfully verified\n' % host)
148 elif strict:
149 elif strict:
149 raise util.Abort(_('%s certificate with fingerprint %s not '
150 raise util.Abort(_('%s certificate with fingerprint %s not '
150 'verified') % (host, nicefingerprint),
151 'verified') % (host, nicefingerprint),
151 hint=_('check hostfingerprints or web.cacerts '
152 hint=_('check hostfingerprints or web.cacerts '
152 'config setting'))
153 'config setting'))
153 else:
154 else:
154 self.ui.warn(_('warning: %s certificate with fingerprint %s not '
155 self.ui.warn(_('warning: %s certificate with fingerprint %s not '
155 'verified (check hostfingerprints or web.cacerts '
156 'verified (check hostfingerprints or web.cacerts '
156 'config setting)\n') %
157 'config setting)\n') %
157 (host, nicefingerprint))
158 (host, nicefingerprint))
General Comments 0
You need to be logged in to leave comments. Login now