9e84371461
This patch improves check_token validation performance by only pulling revocation events based on the token issued_at value, taking advantage of the table index. In this way, only a subset of relevant events will be returned for validation. Benchmarks can be seen at [1], but included here as well: Time per Request for Old Method ------------------------------- 10 revokes at 7.908 100 revokes at 18.224 1,000 revokes at 110.155 10,000 revokes at 1998.220 Time per Request New Method --------------------------- 10 revokes at 17.636ms, 100 revokes at 17.279ms, 1,000 revokes at 17.370, 10,000 revokes w/all revokes issued before token at 17.263 (best case) 10,000 revokes w/all revokes after token creation 44.934ms (worst case) [1] https://gist.github.com/csrichard1/4b7b8527ee5a6565a84956cff33cf29b Change-Id: I9c2f067d870d542ec5909eaf8b24ded07b75f433 Partial-Bug: 1524030
210 lines
8.1 KiB
Python
210 lines
8.1 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""Main entry point into the Revoke service."""
|
|
|
|
from keystone.common import cache
|
|
from keystone.common import dependency
|
|
from keystone.common import extension
|
|
from keystone.common import manager
|
|
import keystone.conf
|
|
from keystone import exception
|
|
from keystone.i18n import _
|
|
from keystone.models import revoke_model
|
|
from keystone import notifications
|
|
|
|
|
|
CONF = keystone.conf.CONF
|
|
|
|
|
|
EXTENSION_DATA = {
|
|
'name': 'OpenStack Revoke API',
|
|
'namespace': 'http://docs.openstack.org/identity/api/ext/'
|
|
'OS-REVOKE/v1.0',
|
|
'alias': 'OS-REVOKE',
|
|
'updated': '2014-02-24T20:51:0-00:00',
|
|
'description': 'OpenStack revoked token reporting mechanism.',
|
|
'links': [
|
|
{
|
|
'rel': 'describedby',
|
|
'type': 'text/html',
|
|
'href': 'http://developer.openstack.org/'
|
|
'api-ref-identity-v3-ext.html',
|
|
}
|
|
]}
|
|
extension.register_admin_extension(EXTENSION_DATA['alias'], EXTENSION_DATA)
|
|
extension.register_public_extension(EXTENSION_DATA['alias'], EXTENSION_DATA)
|
|
|
|
# This builds a discrete cache region dedicated to revoke events. The API can
|
|
# return a filtered list based upon last fetchtime. This is deprecated but
|
|
# must be maintained.
|
|
REVOKE_REGION = cache.create_region(name='revoke')
|
|
MEMOIZE = cache.get_memoization_decorator(
|
|
group='revoke',
|
|
region=REVOKE_REGION)
|
|
|
|
|
|
@dependency.provider('revoke_api')
|
|
class Manager(manager.Manager):
|
|
"""Default pivot point for the Revoke backend.
|
|
|
|
Performs common logic for recording revocations.
|
|
|
|
See :mod:`keystone.common.manager.Manager` for more details on
|
|
how this dynamically calls the backend.
|
|
|
|
"""
|
|
|
|
driver_namespace = 'keystone.revoke'
|
|
|
|
def __init__(self):
|
|
super(Manager, self).__init__(CONF.revoke.driver)
|
|
self._register_listeners()
|
|
self.model = revoke_model
|
|
|
|
@MEMOIZE
|
|
def _list_events(self, last_fetch):
|
|
return self.driver.list_events(last_fetch)
|
|
|
|
def list_events(self, last_fetch=None):
|
|
return self._list_events(last_fetch)
|
|
|
|
def _user_callback(self, service, resource_type, operation,
|
|
payload):
|
|
self.revoke_by_user(payload['resource_info'])
|
|
|
|
def _role_callback(self, service, resource_type, operation,
|
|
payload):
|
|
self.revoke(
|
|
revoke_model.RevokeEvent(role_id=payload['resource_info']))
|
|
|
|
def _project_callback(self, service, resource_type, operation,
|
|
payload):
|
|
self.revoke(
|
|
revoke_model.RevokeEvent(project_id=payload['resource_info']))
|
|
|
|
def _domain_callback(self, service, resource_type, operation,
|
|
payload):
|
|
self.revoke(
|
|
revoke_model.RevokeEvent(domain_id=payload['resource_info']))
|
|
|
|
def _trust_callback(self, service, resource_type, operation,
|
|
payload):
|
|
self.revoke(
|
|
revoke_model.RevokeEvent(trust_id=payload['resource_info']))
|
|
|
|
def _consumer_callback(self, service, resource_type, operation,
|
|
payload):
|
|
self.revoke(
|
|
revoke_model.RevokeEvent(consumer_id=payload['resource_info']))
|
|
|
|
def _access_token_callback(self, service, resource_type, operation,
|
|
payload):
|
|
self.revoke(
|
|
revoke_model.RevokeEvent(access_token_id=payload['resource_info']))
|
|
|
|
def _role_assignment_callback(self, service, resource_type, operation,
|
|
payload):
|
|
info = payload['resource_info']
|
|
self.revoke_by_grant(role_id=info['role_id'], user_id=info['user_id'],
|
|
domain_id=info.get('domain_id'),
|
|
project_id=info.get('project_id'))
|
|
|
|
def _register_listeners(self):
|
|
callbacks = {
|
|
notifications.ACTIONS.deleted: [
|
|
['OS-TRUST:trust', self._trust_callback],
|
|
['OS-OAUTH1:consumer', self._consumer_callback],
|
|
['OS-OAUTH1:access_token', self._access_token_callback],
|
|
['role', self._role_callback],
|
|
['user', self._user_callback],
|
|
['project', self._project_callback],
|
|
['role_assignment', self._role_assignment_callback]
|
|
],
|
|
notifications.ACTIONS.disabled: [
|
|
['user', self._user_callback],
|
|
['project', self._project_callback],
|
|
['domain', self._domain_callback],
|
|
],
|
|
notifications.ACTIONS.internal: [
|
|
[notifications.INVALIDATE_USER_TOKEN_PERSISTENCE,
|
|
self._user_callback],
|
|
]
|
|
}
|
|
|
|
for event, cb_info in callbacks.items():
|
|
for resource_type, callback_fns in cb_info:
|
|
notifications.register_event_callback(event, resource_type,
|
|
callback_fns)
|
|
|
|
def revoke_by_user(self, user_id):
|
|
return self.revoke(revoke_model.RevokeEvent(user_id=user_id))
|
|
|
|
def _assert_not_domain_and_project_scoped(self, domain_id=None,
|
|
project_id=None):
|
|
if domain_id is not None and project_id is not None:
|
|
msg = _('The revoke call must not have both domain_id and '
|
|
'project_id. This is a bug in the Keystone server. The '
|
|
'current request is aborted.')
|
|
raise exception.UnexpectedError(exception=msg)
|
|
|
|
def revoke_by_audit_id(self, audit_id):
|
|
self.revoke(revoke_model.RevokeEvent(audit_id=audit_id))
|
|
|
|
def revoke_by_audit_chain_id(self, audit_chain_id, project_id=None,
|
|
domain_id=None):
|
|
|
|
self._assert_not_domain_and_project_scoped(domain_id=domain_id,
|
|
project_id=project_id)
|
|
|
|
self.revoke(revoke_model.RevokeEvent(audit_chain_id=audit_chain_id,
|
|
domain_id=domain_id,
|
|
project_id=project_id))
|
|
|
|
def revoke_by_grant(self, role_id, user_id=None,
|
|
domain_id=None, project_id=None):
|
|
self.revoke(
|
|
revoke_model.RevokeEvent(user_id=user_id,
|
|
role_id=role_id,
|
|
domain_id=domain_id,
|
|
project_id=project_id))
|
|
|
|
def revoke_by_user_and_project(self, user_id, project_id):
|
|
self.revoke(
|
|
revoke_model.RevokeEvent(project_id=project_id, user_id=user_id))
|
|
|
|
def revoke_by_project_role_assignment(self, project_id, role_id):
|
|
self.revoke(revoke_model.RevokeEvent(project_id=project_id,
|
|
role_id=role_id))
|
|
|
|
def revoke_by_domain_role_assignment(self, domain_id, role_id):
|
|
self.revoke(revoke_model.RevokeEvent(domain_id=domain_id,
|
|
role_id=role_id))
|
|
|
|
def check_token(self, token):
|
|
"""Check the values from a token against the revocation list.
|
|
|
|
:param token: dictionary of values from a token, normalized for
|
|
differences between v2 and v3. The checked values
|
|
are a subset of the attributes of model.TokenEvent
|
|
|
|
:raises keystone.exception.TokenNotFound: If the token is invalid.
|
|
|
|
"""
|
|
if revoke_model.is_revoked(self.driver.list_events(token=token),
|
|
token):
|
|
raise exception.TokenNotFound(_('Failed to validate token'))
|
|
|
|
def revoke(self, event):
|
|
self.driver.revoke(event)
|
|
REVOKE_REGION.invalidate()
|