openstack/deb-heat
Code Issues Proposed changes

Merge "auth_encryption_key is being checked to be 16, 24, or 32"

Browse Source
This commit is contained in:
Jenkins 2015-04-10 03:32:00 +00:00 committed by Gerrit Code Review
commit 947aaf97da
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/common/config.py
View File

@ -321,6 +321,10 @@ def startup_sanity_check():
'"stack_user_domain_name" without '
'"stack_domain_admin" and '
'"stack_domain_admin_password"'))
auth_key_len = len(cfg.CONF.auth_encryption_key)
if auth_key_len not in [16, 24, 32]:
raise exception.Error(_('heat.conf misconfigured, auth_encryption_key '
'length must be 16, 24 or 32'))
def list_opts():

7
heat/common/crypt.py
View File

@ -16,13 +16,16 @@ import base64
from Crypto.Cipher import AES
from oslo_config import cfg
from heat.common.i18n import _
from heat.openstack.common.crypto import utils
auth_opts = [
cfg.StrOpt('auth_encryption_key',
default='notgood but just long enough i think',
help="Encryption key used for authentication info in database.")
default='notgood but just long enough i t',
help=_('Encryption key used for authentication '
'info in database. Length of this key '
'must be 16, 24 or 32'))
]
cfg.CONF.register_opts(auth_opts)

16
heat/tests/test_heatclient.py
View File

@ -1583,3 +1583,19 @@ class KeystoneClientTestDomainName(KeystoneClientTest):
def test_create_stack_domain_user(self):
p = super(KeystoneClientTestDomainName, self)
p.test_create_stack_domain_user()
class HeatClientTest(KeystoneClientTest):
"""Test cases for heat.common.config"""
def setUp(self):
super(HeatClientTest, self).setUp()
def test_init_auth_encryption_key_length(self):
"""Test for length of the auth_encryption_length in config file"""
cfg.CONF.set_override('auth_encryption_key', 'abcdefghijklma')
err = self.assertRaises(exception.Error,
config.startup_sanity_check)
exp_msg = ('heat.conf misconfigured, auth_encryption_key '
'length must be 16, 24 or 32')
self.assertIn(exp_msg, six.text_type(err))