d97832e8e8
Convert the /auth paths to flask native dispatching. A minor change to additional_urls was implemented to ensure all urls are added at once instead of individually (causing an over- write issue within flask as a single resource may only have a single set of URL mappings). Alternate URLs now support adding alternate JSON Home rel links. This is to support the case of OS-FEDERATION auth routes moving to /auth. The old JSON Home entries must exist but reference the new paths. This port includes the following test changes (needed due to the way flask handles requests and the way requests are passed through the auth system): * Implemented keystone.common.render_token (module) containing render_token_response_from_model and use it instead of keystone.common.controller.render_token_response_from_model. Minor differences occur in render_token_response_from_model in the keystone.common.render_token module, this is simply for referencing data from flask instead of the request object. * Test cases have been modified to no longer rely on the auth controller(s) directly * Test cases now use "make_request" as a context manager since authenticate/authenticate_for_token directly reference the flask contexts and must have an explicit context pushed. * Test cases no longer pass request objects into methods such as authenticate/authenticate_for_token or similar methods on the auth plugins * Test cases for federation reference the token model now where possible instead of the rendered token response. Rendered token responses are generated where needed. * Auth Plugin Configuration is done in test core as well. This is because Auth controller does not exist. NOTE: This is a massive change, but must of these changes were now easily uncoupled because of how far reaching auth is. Change-Id: I636928102875760726cc3493775a2be48e774fd7 Partial-Bug: #1776504
33 lines
1.6 KiB
Python
33 lines
1.6 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.
|
|
|
|
# NOTE(morgan): Import relevant stuff so importing individual under-pinnings
|
|
# isn't needed, keystone.server.flask exposes all the interesting bits
|
|
# needed to develop restful APIs for keystone.
|
|
|
|
from keystone.server.flask.common import APIBase # noqa
|
|
from keystone.server.flask.common import base_url # noqa
|
|
from keystone.server.flask.common import construct_json_home_data # noqa
|
|
from keystone.server.flask.common import construct_resource_map # noqa
|
|
from keystone.server.flask.common import full_url # noqa
|
|
from keystone.server.flask.common import JsonHomeData # noqa
|
|
from keystone.server.flask.common import ResourceBase # noqa
|
|
from keystone.server.flask.common import ResourceMap # noqa
|
|
from keystone.server.flask.common import unenforced_api # noqa
|
|
|
|
|
|
# NOTE(morgan): This allows for from keystone.flask import * and have all the
|
|
# cool stuff needed to develop new APIs within a module/subsystem
|
|
__all__ = ('APIBase', 'JsonHomeData', 'ResourceBase', 'ResourceMap',
|
|
'base_url', 'construct_json_home_data',
|
|
'construct_resource_map', 'full_url', 'unenforced_api')
|