Merge ~suligap/canonical-identity-provider:new-style-middleware into canonical-identity-provider:master

[Przemysław Suliga]

Switch to Django 1.10 style middleware

https://docs.djangoproject.com/en/1.11/topics/http/middleware/#upgrading-middleware

In most cases this is adding the MiddlewareMixin to our custom
middleware classes. Plus a version bump for django-honeypot that brings
the new style middleware compatibility.

Other middleware used (django and other 3rd party middleware) was already
compatible.

Requires
https://code.launchpad.net/~suligap/canonical-identity-provider/dependencies-django-honeypot-0.7.0/+merge/384546

[Hasan Ammar (hasanammar)]

LGTM!

review: Approve

diff --git a/django_project/settings_base.py b/django_project/settings_base.py
index 512b4d6..d131316 100644
--- a/django_project/settings_base.py
+++ b/django_project/settings_base.py
@@ -384,7 +384,7 @@ MAX_PASSWORD_RESET_TOKENS = 5
 MEDIA_ROOT = ''
 MEDIA_URL = ''
 MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage'
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     ('raven.contrib.django.raven_compat.middleware'
      '.SentryResponseErrorIdMiddleware'),
diff --git a/django_project/settings_test.py b/django_project/settings_test.py
index b27eed7..2c57225 100644
--- a/django_project/settings_test.py
+++ b/django_project/settings_test.py
@@ -5,5 +5,5 @@ from settings_devel import *   # noqa
 # https://github.com/sunlightlabs/django-honeypot/issues/12
 # until django-honeypot provides a way of using the middleware in tests,
 # we'll remove the middleware
-MIDDLEWARE_CLASSES.remove(  # noqa
+MIDDLEWARE.remove(  # noqa
     'identityprovider.middleware.honeypot.HoneypotMiddleware')
diff --git a/requirements.txt b/requirements.txt
index 8c192ec..60cc1e6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ convoy==0.4.1
 cryptography==1.3.2
 django==1.11.27
 django-adminaudit==0.5
-django-honeypot==0.6.0
+django-honeypot==0.7.0
 django-jsonfield==1.0.1
 django-modeldict-yplan==1.5.2
 django-openid-auth==0.14
diff --git a/src/api/v20/utils.py b/src/api/v20/utils.py
index a90f767..1b31bf8 100644
--- a/src/api/v20/utils.py
+++ b/src/api/v20/utils.py
@@ -6,6 +6,7 @@ from operator import attrgetter
 
 from django.http import HttpResponse
 from django.urls import reverse
+from django.utils.deprecation import MiddlewareMixin
 from django.utils.translation import ugettext_lazy as _
 
 from identityprovider.models.account import Account
@@ -15,7 +16,7 @@ from identityprovider.models.const import (
 )
 
 
-class EnsureJSONResponseOnAPIErrorMiddleware(object):
+class EnsureJSONResponseOnAPIErrorMiddleware(MiddlewareMixin):
 
     def process_exception(self, request, exception):
         response = None
diff --git a/src/identityprovider/middleware/http.py b/src/identityprovider/middleware/http.py
index 60df00b..0f7fcb8 100644
--- a/src/identityprovider/middleware/http.py
+++ b/src/identityprovider/middleware/http.py
@@ -3,9 +3,10 @@
 
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_ipv46_address
+from django.utils.deprecation import MiddlewareMixin
 
 
-class SetRemoteAddrFromForwardedFor(object):
+class SetRemoteAddrFromForwardedFor(MiddlewareMixin):
     """Set REMOTE_ADDR based on HTTP_X_FORWARDED_FOR, if the latter is present.
 
     This is useful if you're sitting behind a reverse proxy that causes each
diff --git a/src/identityprovider/middleware/oopsplease.py b/src/identityprovider/middleware/oopsplease.py
index f1eb56e..e8c7a1a 100644
--- a/src/identityprovider/middleware/oopsplease.py
+++ b/src/identityprovider/middleware/oopsplease.py
@@ -2,13 +2,15 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 import sys
 
+from django.utils.deprecation import MiddlewareMixin
+
 from identityprovider.oops_config import (
     ManuallyGeneratedOops,
     global_error_reporter,
 )
 
 
-class OopsPleaseMiddleware(object):
+class OopsPleaseMiddleware(MiddlewareMixin):
 
     QUERY_STRING_KEY = 'oopsplease'
 
diff --git a/src/identityprovider/middleware/readonly.py b/src/identityprovider/middleware/readonly.py
index 34edf99..d17712c 100644
--- a/src/identityprovider/middleware/readonly.py
+++ b/src/identityprovider/middleware/readonly.py
@@ -1,7 +1,9 @@
+from django.utils.deprecation import MiddlewareMixin
+
 from identityprovider.readonly import ReadOnlyManager
 
 
-class ReadOnlyMiddleware(object):
-    """Check for the existance of readonly flag on each requst"""
+class ReadOnlyMiddleware(MiddlewareMixin):
+    """Check for the existance of readonly flag on each request"""
     def process_request(self, request):
         ReadOnlyManager().check_readonly()
diff --git a/src/identityprovider/middleware/useraccount.py b/src/identityprovider/middleware/useraccount.py
index 61480b0..03c63a2 100644
--- a/src/identityprovider/middleware/useraccount.py
+++ b/src/identityprovider/middleware/useraccount.py
@@ -4,13 +4,14 @@
 from django.conf import settings
 from django.contrib.auth import logout
 from django.contrib.auth.models import User
+from django.utils.deprecation import MiddlewareMixin
 from django.utils.translation import LANGUAGE_SESSION_KEY
 
 from identityprovider.const import SESSION_TOKEN_KEY
 from identityprovider.models import Account
 
 
-class UserAccountConversionMiddleware(object):
+class UserAccountConversionMiddleware(MiddlewareMixin):
     """Try to convert request.user to the corresponding Account objects.
 
     If it's a User object, and the request is outside of the admin, and vice
diff --git a/src/identityprovider/tests/test_middleware.py b/src/identityprovider/tests/test_middleware.py
index 3d3775f..6a5a6fa 100644
--- a/src/identityprovider/tests/test_middleware.py
+++ b/src/identityprovider/tests/test_middleware.py
@@ -470,7 +470,7 @@ urlpatterns = original_patterns + [
 ]
 
 
-@modify_settings(MIDDLEWARE_CLASSES={
+@modify_settings(MIDDLEWARE={
     'append': 'identityprovider.middleware.honeypot.HoneypotMiddleware'
 })
 @override_settings(ROOT_URLCONF='identityprovider.tests.test_middleware')
@@ -519,7 +519,7 @@ class HoneypotEnabledTestCase(TestCase):
         self.assertContains(response, "<!DOCTYPE html>")
 
 
-@modify_settings(MIDDLEWARE_CLASSES={
+@modify_settings(MIDDLEWARE={
     'append': 'identityprovider.middleware.honeypot.HoneypotMiddleware'
 })
 class HoneypotWhitelistedTestCase(SSOBaseTestCase):