diff --git a/keystone/cmd/doctor/tokens.py b/keystone/cmd/doctor/tokens.py index 185e92eb67..8bd03c2b81 100644 --- a/keystone/cmd/doctor/tokens.py +++ b/keystone/cmd/doctor/tokens.py @@ -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) diff --git a/keystone/tests/unit/test_cli.py b/keystone/tests/unit/test_cli.py index 68683dc963..64586459d7 100644 --- a/keystone/tests/unit/test_cli.py +++ b/keystone/tests/unit/test_cli.py @@ -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)