Merge "Fix django.contrib.auth.middleware monkey patching" into stable/rocky

This commit is contained in:
Zuul 2018-11-23 06:59:21 +00:00 committed by Gerrit Code Review
commit 8728ed60ec
8 changed files with 34 additions and 14 deletions

View File

@ -60,6 +60,7 @@ INSTALLED_APPS = (
)
MIDDLEWARE = (
'openstack_auth.middleware.OpenstackAuthMonkeyPatchMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',

View File

@ -0,0 +1,25 @@
# 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.
from openstack_auth import utils
# NOTE: The main role of this middleware is to call this.
utils.patch_middleware_get_user()
class OpenstackAuthMonkeyPatchMiddleware(object):
def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
# Do nothing actually
return self.get_response(request)

View File

@ -28,6 +28,7 @@ INSTALLED_APPS = [
]
MIDDLEWARE = [
'openstack_auth.middleware.OpenstackAuthMonkeyPatchMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',

View File

@ -15,13 +15,9 @@ from django.conf.urls import include
from django.conf.urls import url
from django.views import generic
from openstack_auth import utils
from openstack_auth import views
utils.patch_middleware_get_user()
urlpatterns = [
url(r"", include('openstack_auth.urls')),
url(r"^websso/$", views.websso, name='websso'),

View File

@ -16,8 +16,6 @@ from django.conf.urls import url
from openstack_auth import utils
from openstack_auth import views
utils.patch_middleware_get_user()
urlpatterns = [
url(r"^login/$", views.login, name='login'),

View File

@ -37,8 +37,8 @@ We need the request object to get the user, so we'll slightly modify the
existing django.contrib.auth.get_user method. To do so we update the
auth middleware to point to our overridden method.
Calling the "patch_middleware_get_user" method somewhere like our urls.py
file takes care of hooking it in appropriately.
Calling "patch_middleware_get_user" is done in our custom middleware at
"openstack_auth.middleware" to monkeypatch the code in before it is needed.
"""

View File

@ -110,6 +110,7 @@ OPENSTACK_IMAGE_BACKEND = {
}
MIDDLEWARE = (
'openstack_auth.middleware.OpenstackAuthMonkeyPatchMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',

View File

@ -496,7 +496,6 @@ class APITestCase(TestCase):
LOG.warning("APITestCase has been deprecated in favor of mock usage "
"and will be removed at the beginning of 'Stein' release. "
"Please convert your to use APIMockTestCase instead.")
utils.patch_middleware_get_user()
def fake_keystoneclient(request, admin=False):
"""Returns the stub keystoneclient.
@ -616,11 +615,10 @@ class APITestCase(TestCase):
return self.swiftclient
class APIMockTestCase(TestCase):
def setUp(self):
super(APIMockTestCase, self).setUp()
utils.patch_middleware_get_user()
# NOTE(adriant): APIMockTestCase was only needed for some openstack_auth
# monkeypatching. With the new monkeypatch middleware from openstack_auth this
# is not needed. This class is used by horizon plugins, so we cannot drop it.
APIMockTestCase = TestCase
# Need this to test both Glance API V1 and V2 versions