4dbb55cbb0
The common RPC code has been updated to include the following:
8575d87af49ea276341908f83c8c51db13afca44
8b2b0b743e84ceed7841cf470afed6a5da8e1d07
23f602940c64ba408d77ceb8f5ba0f67ee4a18ef
6d0a6c3083218cdac52758a8b6aac6b03402c658
7cac1ac1bd9df36d4e5183afac3b643df10b1d4d
8159efddabb09dd9b7c99963ff7c9de0a6c62b62
Updated to include the following in modules in openstack-common.conf:
py3kcompat, sslutils, and versionutils.
The update also includes imports from the RPC code
Change-Id: I84c5b8e2b17da0018dd69ecb354d123a609afe98
99 lines
2.8 KiB
Python
99 lines
2.8 KiB
Python
# Copyright 2013 IBM Corp.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import os
|
|
import ssl
|
|
|
|
from oslo.config import cfg
|
|
|
|
from neutron.openstack.common.gettextutils import _
|
|
|
|
|
|
ssl_opts = [
|
|
cfg.StrOpt('ca_file',
|
|
default=None,
|
|
help="CA certificate file to use to verify "
|
|
"connecting clients"),
|
|
cfg.StrOpt('cert_file',
|
|
default=None,
|
|
help="Certificate file to use when starting "
|
|
"the server securely"),
|
|
cfg.StrOpt('key_file',
|
|
default=None,
|
|
help="Private key file to use when starting "
|
|
"the server securely"),
|
|
]
|
|
|
|
|
|
CONF = cfg.CONF
|
|
CONF.register_opts(ssl_opts, "ssl")
|
|
|
|
|
|
def is_enabled():
|
|
cert_file = CONF.ssl.cert_file
|
|
key_file = CONF.ssl.key_file
|
|
ca_file = CONF.ssl.ca_file
|
|
use_ssl = cert_file or key_file
|
|
|
|
if cert_file and not os.path.exists(cert_file):
|
|
raise RuntimeError(_("Unable to find cert_file : %s") % cert_file)
|
|
|
|
if ca_file and not os.path.exists(ca_file):
|
|
raise RuntimeError(_("Unable to find ca_file : %s") % ca_file)
|
|
|
|
if key_file and not os.path.exists(key_file):
|
|
raise RuntimeError(_("Unable to find key_file : %s") % key_file)
|
|
|
|
if use_ssl and (not cert_file or not key_file):
|
|
raise RuntimeError(_("When running server in SSL mode, you must "
|
|
"specify both a cert_file and key_file "
|
|
"option value in your configuration file"))
|
|
|
|
return use_ssl
|
|
|
|
|
|
def wrap(sock):
|
|
ssl_kwargs = {
|
|
'server_side': True,
|
|
'certfile': CONF.ssl.cert_file,
|
|
'keyfile': CONF.ssl.key_file,
|
|
'cert_reqs': ssl.CERT_NONE,
|
|
}
|
|
|
|
if CONF.ssl.ca_file:
|
|
ssl_kwargs['ca_certs'] = CONF.ssl.ca_file
|
|
ssl_kwargs['cert_reqs'] = ssl.CERT_REQUIRED
|
|
|
|
return ssl.wrap_socket(sock, **ssl_kwargs)
|
|
|
|
|
|
_SSL_PROTOCOLS = {
|
|
"tlsv1": ssl.PROTOCOL_TLSv1,
|
|
"sslv23": ssl.PROTOCOL_SSLv23,
|
|
"sslv3": ssl.PROTOCOL_SSLv3
|
|
}
|
|
|
|
try:
|
|
_SSL_PROTOCOLS["sslv2"] = ssl.PROTOCOL_SSLv2
|
|
except AttributeError:
|
|
pass
|
|
|
|
|
|
def validate_ssl_version(version):
|
|
key = version.lower()
|
|
try:
|
|
return _SSL_PROTOCOLS[key]
|
|
except KeyError:
|
|
raise RuntimeError(_("Invalid SSL version : %s") % version)
|