diff options
| author | Zuul <zuul@review.opendev.org> | 2022-02-17 18:15:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-02-17 18:15:40 +0000 |
| commit | a3fc9e7c3845387644f0661a6c6c0fd316b6c9ee (patch) | |
| tree | c7f44c69ec73205f7404709dbaddafcec437ce7a | |
| parent | 86afaa7b1dbde21010c9c61ec0188a9356e14753 (diff) | |
| parent | d023b103e550f8237cb3cea72b99bbcf70791413 (diff) | |
| download | keystone-a3fc9e7c3845387644f0661a6c6c0fd316b6c9ee.tar.gz | |
Merge "Properly instantiate FernetUtils"
| -rw-r--r-- | keystone/common/fernet_utils.py | 4 | ||||
| -rw-r--r-- | keystone/credential/providers/fernet/core.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/keystone/common/fernet_utils.py b/keystone/common/fernet_utils.py index 9188dfbfc..928c2488d 100644 --- a/keystone/common/fernet_utils.py +++ b/keystone/common/fernet_utils.py @@ -36,8 +36,8 @@ NULL_KEY = base64.urlsafe_b64encode(b'\x00' * 32) class FernetUtils(object): - def __init__(self, key_repository=None, max_active_keys=None, - config_group=None): + def __init__(self, key_repository, max_active_keys, + config_group): self.key_repository = key_repository self.max_active_keys = max_active_keys self.config_group = config_group diff --git a/keystone/credential/providers/fernet/core.py b/keystone/credential/providers/fernet/core.py index 00e197a37..99de106fb 100644 --- a/keystone/credential/providers/fernet/core.py +++ b/keystone/credential/providers/fernet/core.py @@ -96,7 +96,7 @@ class Provider(core.Provider): :returns: a decrypted credential """ key_utils = fernet_utils.FernetUtils( - CONF.credential.key_repository, MAX_ACTIVE_KEYS) + CONF.credential.key_repository, MAX_ACTIVE_KEYS, 'credential') keys = key_utils.load_keys(use_null_key=True) fernet_keys = [fernet.Fernet(key) for key in keys] crypto = fernet.MultiFernet(fernet_keys) |