Renamed exthandler to urlrewritefilter to better illustrate it's purpose
This commit is contained in:
parent
eeeb55e4a2
commit
f9c44f02b8
|
@ -64,12 +64,12 @@ sql_idle_timeout = 30
|
|||
|
||||
[pipeline:admin]
|
||||
pipeline =
|
||||
exthandler
|
||||
urlrewritefilter
|
||||
admin_service
|
||||
|
||||
[pipeline:keystone-legacy-auth]
|
||||
pipeline =
|
||||
exthandler
|
||||
urlrewritefilter
|
||||
legacy_auth
|
||||
public_service
|
||||
|
||||
|
@ -79,8 +79,8 @@ paste.app_factory = keystone.server:app_factory
|
|||
[app:admin_service]
|
||||
paste.app_factory = keystone.server:admin_app_factory
|
||||
|
||||
[filter:exthandler]
|
||||
paste.filter_factory = keystone.middleware.exthandler:filter_factory
|
||||
[filter:urlrewritefilter]
|
||||
paste.filter_factory = keystone.middleware.url:filter_factory
|
||||
|
||||
[filter:legacy_auth]
|
||||
paste.filter_factory = keystone.frontends.legacy_token_auth:filter_factory
|
||||
|
|
|
@ -30,7 +30,8 @@ overwrites the Accept header in the request, if present.
|
|||
CONTENT_TYPES = {'json': 'application/json', 'xml': 'application/xml'}
|
||||
DEFAULT_CONTENT_TYPE = CONTENT_TYPES['json']
|
||||
|
||||
class UrlExtensionFilter(object):
|
||||
class UrlRewriteFilter(object):
|
||||
"""Middleware filter to handle URL rewriting"""
|
||||
|
||||
def __init__(self, app, conf):
|
||||
# app is the next app in WSGI chain - eventually the OpenStack service
|
||||
|
@ -78,5 +79,5 @@ def filter_factory(global_conf, **local_conf):
|
|||
conf.update(local_conf)
|
||||
|
||||
def ext_filter(app):
|
||||
return UrlExtensionFilter(app, conf)
|
||||
return UrlRewriteFilter(app, conf)
|
||||
return ext_filter
|
|
@ -9,7 +9,7 @@ TEST_FILES = [
|
|||
#'test_authn_v2.py', # this is largely failing
|
||||
'test_common.py', # this doesn't actually contain tests
|
||||
'test_endpoints.py',
|
||||
'test_exthandler.py',
|
||||
'test_urlrewritefilter.py',
|
||||
'test_groups.py',
|
||||
'test_keystone.py', # not sure why this is referencing itself
|
||||
'test_roles.py',
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
|
||||
import unittest
|
||||
from keystone.middleware.exthandler import UrlExtensionFilter
|
||||
from keystone.middleware.url import UrlRewriteFilter
|
||||
|
||||
|
||||
class MockWsgiApp(object):
|
||||
|
@ -35,7 +35,7 @@ def _start_response():
|
|||
class UrlExtensionFilterTest(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.filter = UrlExtensionFilter(MockWsgiApp(), {})
|
||||
self.filter = UrlRewriteFilter(MockWsgiApp(), {})
|
||||
|
||||
def test_remove_trailing_slash(self):
|
||||
env = {'PATH_INFO': '/v2.0/'}
|
2
setup.py
2
setup.py
|
@ -57,7 +57,7 @@ setup(
|
|||
entry_points={
|
||||
'paste.app_factory': ['main=identity:app_factory'],
|
||||
'paste.filter_factory': [
|
||||
'extfilter=keystone.middleware.exthandler:filter_factory',
|
||||
'extfilter=keystone.middleware.url:filter_factory',
|
||||
'remoteauth=keystone.middleware.remoteauth:remoteauth_factory',
|
||||
'tokenauth=keystone.auth_protocols.auth_token:filter_factory',
|
||||
'swiftauth=keystone.middleware.swift_auth:filter_factory',
|
||||
|
|
Loading…
Reference in New Issue