openstack/keystone
Code Issues Proposed changes

Merge "Use min to avoid checking < 1 max fernet keys"

Browse Source
This commit is contained in:
Jenkins 2016-07-01 23:37:00 +00:00 committed by Gerrit Code Review
commit 597bea897e
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
keystone/conf/fernet_tokens.py
View File

@ -25,6 +25,7 @@ Directory containing Fernet token keys.
max_active_keys = cfg.IntOpt( max_active_keys = cfg.IntOpt(
'max_active_keys', 'max_active_keys',
default=3, default=3,
min=1,
help=utils.fmt(""" help=utils.fmt("""
This controls how many keys are held in rotation by keystone-manage This controls how many keys are held in rotation by keystone-manage
fernet_rotate before they are discarded. The default value of 3 means that fernet_rotate before they are discarded. The default value of 3 means that

6
keystone/token/providers/fernet/utils.py
View File

@ -209,12 +209,6 @@ def rotate_keys(keystone_user_id=None, keystone_group_id=None):
_create_new_key(keystone_user_id, keystone_group_id) _create_new_key(keystone_user_id, keystone_group_id)
max_active_keys = CONF.fernet_tokens.max_active_keys max_active_keys = CONF.fernet_tokens.max_active_keys
# check for bad configuration
if max_active_keys < 1:
LOG.warning(_LW(
'[fernet_tokens] max_active_keys must be at least 1 to maintain a '
'primary key.'))
max_active_keys = 1
# purge excess keys # purge excess keys