
Change the API of oslo.service to accept conf object and remove usage of global CONF object throughout the library. List of functions/classes that accept conf as a parameter: 1. eventlet_backdoor.py * initialize_if_enabled 2. periodic_task.py * PeriodicTasks 3. service.py * launch * ServiceLauncher * ProcessLauncher 4. sslutils.py * is_enabled * wrap Fixed the unit tests. APIImpact bp graduate-oslo-service Change-Id: Icbd5f9e386b0eee2f7c60a65c076f53ba5f0f637
69 lines
2.1 KiB
Python
69 lines
2.1 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 copy
|
|
import os
|
|
import ssl
|
|
|
|
from oslo_service._i18n import _
|
|
from oslo_service import _options
|
|
|
|
|
|
config_section = 'ssl'
|
|
|
|
|
|
def list_opts():
|
|
"""Entry point for oslo-config-generator."""
|
|
return [(config_section, copy.deepcopy(_options.ssl_opts))]
|
|
|
|
|
|
def is_enabled(conf):
|
|
conf.register_opts(_options.ssl_opts, config_section)
|
|
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(conf, sock):
|
|
conf.register_opts(_options.ssl_opts, config_section)
|
|
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)
|