openstack
/
keystone
Code Issues Proposed changes

Merge "Remove uuid token size check from doctor"

This commit is contained in:
Zuul 2018-07-13 04:38:51 +00:00 committed by Gerrit Code Review
parent 0d5b5f6467 f8e05346f5
commit e9856f8bc7
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
keystone/cmd/doctor/tokens.py
View File

@ -25,9 +25,6 @@ def symptom_unreasonable_max_token_size():
providers, then you should set `keystone.conf [DEFAULT] max_token_size`
accordingly:
- For UUID, set `keystone.conf [DEFAULT] max_token_size = 32`, because UUID
tokens are always exactly 32 characters.
- For Fernet, set `keystone.conf [DEFAULT] max_token_size = 255`, because
Fernet tokens should never exceed this length in most deployments.
However, if you are also using `keystone.conf [identity] driver = ldap`,
@ -35,6 +32,4 @@ def symptom_unreasonable_max_token_size():
depending on the IDs returned from LDAP, resulting in longer Fernet
tokens (adjust your `max_token_size` accordingly).
"""
return (
'uuid' in CONF.token.provider and CONF.max_token_size != 32
or 'fernet' in CONF.token.provider and CONF.max_token_size > 255)
return ('fernet' in CONF.token.provider and CONF.max_token_size > 255)

5
keystone/tests/unit/test_cli.py
View File

@ -1238,11 +1238,6 @@ class SecurityComplianceDoctorTests(unit.TestCase):
class TokensDoctorTests(unit.TestCase):
def test_unreasonable_max_token_size_raised(self):
# Symptom Detected: the max_token_size for uuid is not 32
self.config_fixture.config(group='token', provider='uuid')
self.config_fixture.config(max_token_size=33)
self.assertTrue(tokens.symptom_unreasonable_max_token_size())
# Symptom Detected: the max_token_size for fernet is greater than 255
self.config_fixture.config(group='token', provider='fernet')
self.config_fixture.config(max_token_size=256)