##// END OF EJS Templates
sslutil: make cert fingerprints messages more actionable...
sslutil: make cert fingerprints messages more actionable The previous warning and abort messages were difficult to understand. This patch makes them slightly better. I think there is still room to tweak the messaging. And as we adopt new security defaults, these messages will certainly change again. But at least this takes us a step in the right direction. References to "section" have been removed because if no fingerprint is defined, "section" can never be "hostfingerprints." So just print "hostsecurity" every time.

File last commit:

r29292:bc5f5549 default
r29292:bc5f5549 default
Show More
sslutil.py
411 lines | 15.1 KiB | text/x-python | PythonLexer
Augie Fackler
sslutil: extracted ssl methods from httpsconnection in url.py...
r14204 # sslutil.py - SSL handling for mercurial
#
# Copyright 2005, 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
# Copyright 2006, 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Gregory Szorc
sslutil: use absolute_import
r25977
from __future__ import absolute_import
Augie Fackler
sslutil: extracted ssl methods from httpsconnection in url.py...
r14204
Gregory Szorc
sslutil: use absolute_import
r25977 import os
import ssl
import sys
from .i18n import _
Gregory Szorc
sslutil: use preferred formatting for import syntax
r28577 from . import (
error,
util,
)
Yuya Nishihara
ssl: load CA certificates from system's store by default on Python 2.7.9...
r24291
Gregory Szorc
sslutil: better document state of security/ssl module...
r28647 # Python 2.7.9+ overhauled the built-in SSL/TLS features of Python. It added
# support for TLS 1.1, TLS 1.2, SNI, system CA stores, etc. These features are
# all exposed via the "ssl" module.
#
# Depending on the version of Python being used, SSL/TLS support is either
# modern/secure or legacy/insecure. Many operations in this module have
# separate code paths depending on support in Python.
Gregory Szorc
sslutil: expose attribute indicating whether SNI is supported...
r26622 hassni = getattr(ssl, 'HAS_SNI', False)
Gregory Szorc
sslutil: store OP_NO_SSL* constants in module scope...
r28648 try:
OP_NO_SSLv2 = ssl.OP_NO_SSLv2
OP_NO_SSLv3 = ssl.OP_NO_SSLv3
except AttributeError:
OP_NO_SSLv2 = 0x1000000
OP_NO_SSLv3 = 0x2000000
Gregory Szorc
sslutil: implement SSLContext class...
r28649 try:
# ssl.SSLContext was added in 2.7.9 and presence indicates modern
# SSL/TLS features are available.
SSLContext = ssl.SSLContext
modernssl = True
Gregory Szorc
sslutil: move _canloaddefaultcerts logic...
r28650 _canloaddefaultcerts = util.safehasattr(SSLContext, 'load_default_certs')
Gregory Szorc
sslutil: implement SSLContext class...
r28649 except AttributeError:
modernssl = False
Gregory Szorc
sslutil: move _canloaddefaultcerts logic...
r28650 _canloaddefaultcerts = False
Gregory Szorc
sslutil: implement SSLContext class...
r28649
# We implement SSLContext using the interface from the standard library.
class SSLContext(object):
# ssl.wrap_socket gained the "ciphers" named argument in 2.7.
_supportsciphers = sys.version_info >= (2, 7)
def __init__(self, protocol):
# From the public interface of SSLContext
self.protocol = protocol
self.check_hostname = False
self.options = 0
self.verify_mode = ssl.CERT_NONE
# Used by our implementation.
self._certfile = None
self._keyfile = None
self._certpassword = None
self._cacerts = None
self._ciphers = None
def load_cert_chain(self, certfile, keyfile=None, password=None):
self._certfile = certfile
self._keyfile = keyfile
self._certpassword = password
def load_default_certs(self, purpose=None):
pass
def load_verify_locations(self, cafile=None, capath=None, cadata=None):
if capath:
raise error.Abort('capath not supported')
if cadata:
raise error.Abort('cadata not supported')
self._cacerts = cafile
def set_ciphers(self, ciphers):
if not self._supportsciphers:
raise error.Abort('setting ciphers not supported')
self._ciphers = ciphers
def wrap_socket(self, socket, server_hostname=None, server_side=False):
# server_hostname is unique to SSLContext.wrap_socket and is used
# for SNI in that context. So there's nothing for us to do with it
# in this legacy code since we don't support SNI.
args = {
'keyfile': self._keyfile,
'certfile': self._certfile,
'server_side': server_side,
'cert_reqs': self.verify_mode,
'ssl_version': self.protocol,
'ca_certs': self._cacerts,
}
if self._supportsciphers:
args['ciphers'] = self._ciphers
return ssl.wrap_socket(socket, **args)
Gregory Szorc
sslutil: introduce a function for determining host-specific settings...
r29258 def _hostsettings(ui, hostname):
"""Obtain security settings for a hostname.
Returns a dict of settings relevant to that hostname.
"""
s = {
Gregory Szorc
sslutil: add devel.disableloaddefaultcerts to disable CA loading...
r29288 # Whether we should attempt to load default/available CA certs
# if an explicit ``cafile`` is not defined.
'allowloaddefaultcerts': True,
Gregory Szorc
sslutil: introduce a function for determining host-specific settings...
r29258 # List of 2-tuple of (hash algorithm, hash).
'certfingerprints': [],
Gregory Szorc
sslutil: move CA file processing into _hostsettings()...
r29260 # Path to file containing concatenated CA certs. Used by
# SSLContext.load_verify_locations().
'cafile': None,
Gregory Szorc
sslutil: store flag for whether cert verification is disabled...
r29287 # Whether certificate verification should be disabled.
'disablecertverification': False,
Gregory Szorc
sslutil: reference appropriate config section in messaging...
r29268 # Whether the legacy [hostfingerprints] section has data for this host.
'legacyfingerprint': False,
Gregory Szorc
sslutil: move SSLContext.verify_mode value into _hostsettings...
r29259 # ssl.CERT_* constant used by SSLContext.verify_mode.
'verifymode': None,
Gregory Szorc
sslutil: introduce a function for determining host-specific settings...
r29258 }
Gregory Szorc
sslutil: allow fingerprints to be specified in [hostsecurity]...
r29267 # Look for fingerprints in [hostsecurity] section. Value is a list
# of <alg>:<fingerprint> strings.
fingerprints = ui.configlist('hostsecurity', '%s:fingerprints' % hostname,
[])
for fingerprint in fingerprints:
if not (fingerprint.startswith(('sha1:', 'sha256:', 'sha512:'))):
raise error.Abort(_('invalid fingerprint for %s: %s') % (
hostname, fingerprint),
hint=_('must begin with "sha1:", "sha256:", '
'or "sha512:"'))
alg, fingerprint = fingerprint.split(':', 1)
fingerprint = fingerprint.replace(':', '').lower()
s['certfingerprints'].append((alg, fingerprint))
Gregory Szorc
sslutil: introduce a function for determining host-specific settings...
r29258 # Fingerprints from [hostfingerprints] are always SHA-1.
for fingerprint in ui.configlist('hostfingerprints', hostname, []):
fingerprint = fingerprint.replace(':', '').lower()
s['certfingerprints'].append(('sha1', fingerprint))
Gregory Szorc
sslutil: reference appropriate config section in messaging...
r29268 s['legacyfingerprint'] = True
Gregory Szorc
sslutil: introduce a function for determining host-specific settings...
r29258
Gregory Szorc
sslutil: move SSLContext.verify_mode value into _hostsettings...
r29259 # If a host cert fingerprint is defined, it is the only thing that
# matters. No need to validate CA certs.
if s['certfingerprints']:
s['verifymode'] = ssl.CERT_NONE
# If --insecure is used, don't take CAs into consideration.
elif ui.insecureconnections:
Gregory Szorc
sslutil: store flag for whether cert verification is disabled...
r29287 s['disablecertverification'] = True
Gregory Szorc
sslutil: move SSLContext.verify_mode value into _hostsettings...
r29259 s['verifymode'] = ssl.CERT_NONE
Gregory Szorc
sslutil: add devel.disableloaddefaultcerts to disable CA loading...
r29288 if ui.configbool('devel', 'disableloaddefaultcerts'):
s['allowloaddefaultcerts'] = False
Gregory Szorc
sslutil: move CA file processing into _hostsettings()...
r29260 # Try to hook up CA certificate validation unless something above
# makes it not necessary.
if s['verifymode'] is None:
# Find global certificates file in config.
cafile = ui.config('web', 'cacerts')
if cafile:
cafile = util.expandpath(cafile)
if not os.path.exists(cafile):
raise error.Abort(_('could not find web.cacerts: %s') % cafile)
else:
# No global CA certs. See if we can load defaults.
cafile = _defaultcacerts()
if cafile:
ui.debug('using %s to enable OS X system CA\n' % cafile)
s['cafile'] = cafile
# Require certificate validation if CA certs are being loaded and
# verification hasn't been disabled above.
Gregory Szorc
sslutil: add devel.disableloaddefaultcerts to disable CA loading...
r29288 if cafile or (_canloaddefaultcerts and s['allowloaddefaultcerts']):
Gregory Szorc
sslutil: move CA file processing into _hostsettings()...
r29260 s['verifymode'] = ssl.CERT_REQUIRED
else:
# At this point we don't have a fingerprint, aren't being
# explicitly insecure, and can't load CA certs. Connecting
# at this point is insecure. But we do it for BC reasons.
# TODO abort here to make secure by default.
s['verifymode'] = ssl.CERT_NONE
assert s['verifymode'] is not None
Gregory Szorc
sslutil: move SSLContext.verify_mode value into _hostsettings...
r29259
Gregory Szorc
sslutil: introduce a function for determining host-specific settings...
r29258 return s
Gregory Szorc
sslutil: move sslkwargs logic into internal function (API)...
r29249 def wrapsocket(sock, keyfile, certfile, ui, serverhostname=None):
Gregory Szorc
sslutil: add docstring to wrapsocket()...
r28653 """Add SSL/TLS to a socket.
This is a glorified wrapper for ``ssl.wrap_socket()``. It makes sane
choices based on what security options are available.
In addition to the arguments supported by ``ssl.wrap_socket``, we allow
the following additional arguments:
* serverhostname - The expected hostname of the remote server. If the
server (and client) support SNI, this tells the server which certificate
to use.
"""
Gregory Szorc
sslutil: require serverhostname argument (API)...
r29224 if not serverhostname:
raise error.Abort('serverhostname argument is required')
Gregory Szorc
sslutil: move SSLContext.verify_mode value into _hostsettings...
r29259 settings = _hostsettings(ui, serverhostname)
Gregory Szorc
sslutil: move sslkwargs logic into internal function (API)...
r29249
Gregory Szorc
sslutil: remove indentation in wrapsocket declaration...
r28652 # Despite its name, PROTOCOL_SSLv23 selects the highest protocol
# that both ends support, including TLS protocols. On legacy stacks,
# the highest it likely goes in TLS 1.0. On modern stacks, it can
# support TLS 1.2.
#
# The PROTOCOL_TLSv* constants select a specific TLS version
# only (as opposed to multiple versions). So the method for
# supporting multiple TLS versions is to use PROTOCOL_SSLv23 and
# disable protocols via SSLContext.options and OP_NO_* constants.
# However, SSLContext.options doesn't work unless we have the
# full/real SSLContext available to us.
#
# SSLv2 and SSLv3 are broken. We ban them outright.
if modernssl:
protocol = ssl.PROTOCOL_SSLv23
else:
protocol = ssl.PROTOCOL_TLSv1
Gregory Szorc
sslutil: always use SSLContext...
r28651
Gregory Szorc
sslutil: remove indentation in wrapsocket declaration...
r28652 # TODO use ssl.create_default_context() on modernssl.
sslcontext = SSLContext(protocol)
Gregory Szorc
sslutil: always use SSLContext...
r28651
Gregory Szorc
sslutil: remove indentation in wrapsocket declaration...
r28652 # This is a no-op on old Python.
sslcontext.options |= OP_NO_SSLv2 | OP_NO_SSLv3
Gregory Szorc
sslutil: always use SSLContext...
r28651
Gregory Szorc
sslutil: move and document verify_mode assignment...
r28848 # This still works on our fake SSLContext.
Gregory Szorc
sslutil: move CA file processing into _hostsettings()...
r29260 sslcontext.verify_mode = settings['verifymode']
Gregory Szorc
sslutil: move and document verify_mode assignment...
r28848
Gregory Szorc
sslutil: remove indentation in wrapsocket declaration...
r28652 if certfile is not None:
def password():
f = keyfile or certfile
return ui.getpass(_('passphrase for %s: ') % f, '')
sslcontext.load_cert_chain(certfile, keyfile, password)
Gregory Szorc
sslutil: move and document verify_mode assignment...
r28848
Gregory Szorc
sslutil: move CA file processing into _hostsettings()...
r29260 if settings['cafile'] is not None:
sslcontext.load_verify_locations(cafile=settings['cafile'])
Gregory Szorc
sslutil: use CA loaded state to drive validation logic...
r29113 caloaded = True
Gregory Szorc
sslutil: add devel.disableloaddefaultcerts to disable CA loading...
r29288 elif settings['allowloaddefaultcerts']:
Gregory Szorc
sslutil: remove indentation in wrapsocket declaration...
r28652 # This is a no-op on old Python.
sslcontext.load_default_certs()
Gregory Szorc
sslutil: add devel.disableloaddefaultcerts to disable CA loading...
r29288 caloaded = True
else:
caloaded = False
Alex Orange
https: support tls sni (server name indication) for https urls (issue3090)...
r23834
Gregory Szorc
sslutil: remove indentation in wrapsocket declaration...
r28652 sslsocket = sslcontext.wrap_socket(sock, server_hostname=serverhostname)
# check if wrap_socket failed silently because socket had been
# closed
# - see http://bugs.python.org/issue13721
if not sslsocket.cipher():
raise error.Abort(_('ssl connection failed'))
Gregory Szorc
sslutil: use CA loaded state to drive validation logic...
r29113
Gregory Szorc
sslutil: use a dict for hanging hg state off the wrapped socket...
r29225 sslsocket._hgstate = {
'caloaded': caloaded,
Gregory Szorc
sslutil: store and use hostname and ui in socket instance...
r29226 'hostname': serverhostname,
Gregory Szorc
sslutil: move SSLContext.verify_mode value into _hostsettings...
r29259 'settings': settings,
Gregory Szorc
sslutil: store and use hostname and ui in socket instance...
r29226 'ui': ui,
Gregory Szorc
sslutil: use a dict for hanging hg state off the wrapped socket...
r29225 }
Gregory Szorc
sslutil: use CA loaded state to drive validation logic...
r29113
Gregory Szorc
sslutil: remove indentation in wrapsocket declaration...
r28652 return sslsocket
Augie Fackler
sslutil: extracted ssl methods from httpsconnection in url.py...
r14204
def _verifycert(cert, hostname):
'''Verify that cert (in socket.getpeercert() format) matches hostname.
CRLs is not handled.
Returns error message if any problems are found and None on success.
'''
if not cert:
return _('no certificate received')
dnsname = hostname.lower()
def matchdnsname(certname):
return (certname == dnsname or
'.' in dnsname and certname == '*.' + dnsname.split('.', 1)[1])
san = cert.get('subjectAltName', [])
if san:
certnames = [value.lower() for key, value in san if key == 'DNS']
for name in certnames:
if matchdnsname(name):
return None
Nicolas Bareil
sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798)...
r14666 if certnames:
return _('certificate is for %s') % ', '.join(certnames)
Augie Fackler
sslutil: extracted ssl methods from httpsconnection in url.py...
r14204
# subject is only checked when subjectAltName is empty
for s in cert.get('subject', []):
key, value = s[0]
if key == 'commonName':
try:
# 'subject' entries are unicode
certname = value.lower().encode('ascii')
except UnicodeEncodeError:
return _('IDN in certificate not supported')
if matchdnsname(certname):
return None
return _('certificate is for %s') % certname
return _('no commonName or subjectAltName found in certificate')
# CERT_REQUIRED means fetch the cert from the server all the time AND
# validate it against the CA store provided in web.cacerts.
Mads Kiilerich
ssl: only use the dummy cert hack if using an Apple Python (issue4410)...
r23042 def _plainapplepython():
"""return true if this seems to be a pure Apple Python that
* is unfrozen and presumably has the whole mercurial module in the file
system
* presumably is an Apple Python that uses Apple OpenSSL which has patches
for using system certificate store CAs in addition to the provided
cacerts file
"""
Yuya Nishihara
ssl: resolve symlink before checking for Apple python executable (issue4588)...
r24614 if sys.platform != 'darwin' or util.mainfrozen() or not sys.executable:
Mads Kiilerich
ssl: only use the dummy cert hack if using an Apple Python (issue4410)...
r23042 return False
Yuya Nishihara
ssl: resolve symlink before checking for Apple python executable (issue4588)...
r24614 exe = os.path.realpath(sys.executable).lower()
Mads Kiilerich
ssl: only use the dummy cert hack if using an Apple Python (issue4410)...
r23042 return (exe.startswith('/usr/bin/python') or
exe.startswith('/system/library/frameworks/python.framework/'))
Yuya Nishihara
ssl: extract function that returns dummycert path on Apple python...
r24288 def _defaultcacerts():
Gregory Szorc
sslutil: move code examining _canloaddefaultcerts out of _defaultcacerts...
r29107 """return path to default CA certificates or None."""
Yuya Nishihara
ssl: extract function that returns dummycert path on Apple python...
r24288 if _plainapplepython():
dummycert = os.path.join(os.path.dirname(__file__), 'dummycert.pem')
if os.path.exists(dummycert):
return dummycert
Gregory Szorc
sslutil: move code examining _canloaddefaultcerts out of _defaultcacerts...
r29107
return None
Yuya Nishihara
ssl: extract function that returns dummycert path on Apple python...
r24288
Gregory Szorc
sslutil: remove "strict" argument from validatesocket()...
r29286 def validatesocket(sock):
Gregory Szorc
sslutil: convert socket validation from a class to a function (API)...
r29227 """Validate a socket meets security requiremnets.
Augie Fackler
sslutil: extracted ssl methods from httpsconnection in url.py...
r14204
Gregory Szorc
sslutil: convert socket validation from a class to a function (API)...
r29227 The passed socket must have been created with ``wrapsocket()``.
"""
host = sock._hgstate['hostname']
ui = sock._hgstate['ui']
Gregory Szorc
sslutil: introduce a function for determining host-specific settings...
r29258 settings = sock._hgstate['settings']
Matt Mackall
sslutil: try harder to avoid getpeercert problems...
r18879
Gregory Szorc
sslutil: convert socket validation from a class to a function (API)...
r29227 try:
peercert = sock.getpeercert(True)
peercert2 = sock.getpeercert()
except AttributeError:
raise error.Abort(_('%s ssl connection error') % host)
Matt Mackall
sslutil: try harder to avoid getpeercert problems...
r18879
Gregory Szorc
sslutil: convert socket validation from a class to a function (API)...
r29227 if not peercert:
raise error.Abort(_('%s certificate error: '
'no certificate received') % host)
Gregory Szorc
sslutil: document and slightly refactor validation logic...
r28850
Gregory Szorc
sslutil: move and change warning when cert verification is disabled...
r29289 if settings['disablecertverification']:
# We don't print the certificate fingerprint because it shouldn't
# be necessary: if the user requested certificate verification be
# disabled, they presumably already saw a message about the inability
# to verify the certificate and this message would have printed the
# fingerprint. So printing the fingerprint here adds little to no
# value.
ui.warn(_('warning: connection security to %s is disabled per current '
'settings; communication is susceptible to eavesdropping '
'and tampering\n') % host)
return
Gregory Szorc
sslutil: convert socket validation from a class to a function (API)...
r29227 # If a certificate fingerprint is pinned, use it and only it to
# validate the remote cert.
Gregory Szorc
sslutil: calculate host fingerprints from additional algorithms...
r29262 peerfingerprints = {
'sha1': util.sha1(peercert).hexdigest(),
'sha256': util.sha256(peercert).hexdigest(),
'sha512': util.sha512(peercert).hexdigest(),
}
Gregory Szorc
sslutil: print SHA-256 fingerprint by default...
r29290
def fmtfingerprint(s):
return ':'.join([s[x:x + 2] for x in range(0, len(s), 2)])
legacyfingerprint = fmtfingerprint(peerfingerprints['sha1'])
nicefingerprint = 'sha256:%s' % fmtfingerprint(peerfingerprints['sha256'])
Gregory Szorc
sslutil: calculate host fingerprints from additional algorithms...
r29262
Gregory Szorc
sslutil: reference appropriate config section in messaging...
r29268 if settings['legacyfingerprint']:
section = 'hostfingerprint'
else:
section = 'hostsecurity'
Gregory Szorc
sslutil: introduce a function for determining host-specific settings...
r29258 if settings['certfingerprints']:
for hash, fingerprint in settings['certfingerprints']:
Gregory Szorc
sslutil: calculate host fingerprints from additional algorithms...
r29262 if peerfingerprints[hash].lower() == fingerprint:
Gregory Szorc
sslutil: refactor code for fingerprint matching...
r29291 ui.debug('%s certificate matched fingerprint %s:%s\n' %
(host, hash, fmtfingerprint(fingerprint)))
return
raise error.Abort(_('certificate for %s has unexpected '
'fingerprint %s') % (host, legacyfingerprint),
hint=_('check %s configuration') % section)
Gregory Szorc
sslutil: document and slightly refactor validation logic...
r28850
Gregory Szorc
sslutil: convert socket validation from a class to a function (API)...
r29227 if not sock._hgstate['caloaded']:
Gregory Szorc
sslutil: make cert fingerprints messages more actionable...
r29292 ui.warn(_('warning: certificate for %s not verified '
'(set hostsecurity.%s:certfingerprints=%s or web.cacerts '
'config settings)\n') % (host, host, nicefingerprint))
Gregory Szorc
sslutil: convert socket validation from a class to a function (API)...
r29227 return
Gregory Szorc
sslutil: use CA loaded state to drive validation logic...
r29113
Gregory Szorc
sslutil: convert socket validation from a class to a function (API)...
r29227 msg = _verifycert(peercert2, host)
if msg:
raise error.Abort(_('%s certificate error: %s') % (host, msg),
Gregory Szorc
sslutil: make cert fingerprints messages more actionable...
r29292 hint=_('set hostsecurity.%s:certfingerprints=%s '
'config setting or use --insecure to connect '
'insecurely') %
(host, nicefingerprint))