30e29148c5
Currently, Mistral registers the configuration options under keystoneclient middleware auth_token twice: by default when the keystoneclient.middleware.auth_token module is loaded and in mistral.config under a separate keystone group. This change removes the keystone group in mistral.config, modifies API to use the default opts registered under keystone_authtoken, and adds unit tests to ensure the keystone middleware is called when auth is enabled. Change-Id: I18948f7fa8b93b458335eb08176427a75c568873 Implements: blueprint mistral-config-cleanup
52 lines
1.5 KiB
Python
52 lines
1.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
#
|
|
# Copyright 2013 - Mirantis, Inc.
|
|
#
|
|
# 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.
|
|
|
|
"""Access Control API server."""
|
|
|
|
from keystoneclient.middleware import auth_token
|
|
from oslo.config import cfg
|
|
|
|
|
|
_ENFORCER = None
|
|
|
|
|
|
def setup(app):
|
|
if cfg.CONF.pecan.auth_enable:
|
|
return auth_token.AuthProtocol(app, dict(cfg.CONF.keystone_authtoken))
|
|
else:
|
|
return app
|
|
|
|
|
|
def get_limited_to(headers):
|
|
"""Return the user and project the request should be limited to.
|
|
|
|
:param headers: HTTP headers dictionary
|
|
:return: A tuple of (user, project), set to None if there's no limit on
|
|
one of these.
|
|
|
|
"""
|
|
return headers.get('X-User-Id'), headers.get('X-Project-Id')
|
|
|
|
|
|
def get_limited_to_project(headers):
|
|
"""Return the project the request should be limited to.
|
|
|
|
:param headers: HTTP headers dictionary
|
|
:return: A project, or None if there's no limit on it.
|
|
|
|
"""
|
|
return get_limited_to(headers)[1]
|