diff --git a/README.md b/README.md index 332aa43..5a227a4 100644 --- a/README.md +++ b/README.md @@ -274,8 +274,6 @@ locked out. * ``DEFENDER_REDIS_URL``: String: the redis url for defender. Default: ``redis://localhost:6379/0`` (Example with password: ``redis://:mypassword@localhost:6379/0``) -* ``DEFENDER_PROTECTED_LOGINS``: Tuple: Used by ``ViewDecoratorMiddleware`` to decide -which login urls need protecting. Default: ``('/accounts/login/',)`` * ``DEFENDER_USE_CELERY``: Boolean: If you want to use Celery to store the login attempt to the database, set to True. If False, it is saved inline. Default: ``False`` diff --git a/defender/config.py b/defender/config.py index 6e7a5a3..e9a5979 100644 --- a/defender/config.py +++ b/defender/config.py @@ -48,7 +48,4 @@ USERNAME_FORM_FIELD = get_setting('DEFENDER_USERNAME_FORM_FIELD', 'username') LOCKOUT_URL = get_setting('DEFENDER_LOCKOUT_URL') -PROTECTED_LOGINS = get_setting('DEFENDER_PROTECTED_LOGINS', - ('/accounts/login/',)) - USE_CELERY = get_setting('DEFENDER_USE_CELERY', False) diff --git a/defender/middleware.py b/defender/middleware.py index f2a89f9..7d40116 100644 --- a/defender/middleware.py +++ b/defender/middleware.py @@ -1,7 +1,6 @@ from django.contrib.auth import views as auth_views from .decorators import watch_login -from .config import PROTECTED_LOGINS class FailedLoginMiddleware(object): @@ -10,20 +9,3 @@ class FailedLoginMiddleware(object): # watch the auth login auth_views.login = watch_login(auth_views.login) - - -class ViewDecoratorMiddleware(object): - """ - When the django_axes middleware is installed, by default it watches the - django.auth.views.login. - This middleware allows adding protection to other views without the need - to change any urls or dectorate them manually. - Add this middleware to your MIDDLEWARE settings after - `defender.middleware.FailedLoginMiddleware` and before the django - flatpages middleware. - """ - - def process_view(self, request, view_func, view_args, view_kwargs): - if request.path in PROTECTED_LOGINS: - return watch_login(view_func)(request, *view_args, **view_kwargs) - return None diff --git a/defender/test_settings.py b/defender/test_settings.py index 848048c..2ecba37 100644 --- a/defender/test_settings.py +++ b/defender/test_settings.py @@ -15,7 +15,6 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'defender.middleware.FailedLoginMiddleware', - 'defender.middleware.ViewDecoratorMiddleware', ) ROOT_URLCONF = 'defender.test_urls' diff --git a/defender/tests.py b/defender/tests.py index 18fe1d8..888db3d 100644 --- a/defender/tests.py +++ b/defender/tests.py @@ -501,7 +501,6 @@ class AccessAttemptTest(DefenderTestCase): from .admin import AccessAttemptAdmin AccessAttemptAdmin - @patch('defender.config.PROTECTED_LOGINS', (ADMIN_LOGIN_URL, )) def test_decorator_middleware(self): # because watch_login is called twice in this test (once by the # middleware and once by the decorator) we have half as many attempts diff --git a/defender/travis_settings.py b/defender/travis_settings.py index fba68e5..8987ea1 100644 --- a/defender/travis_settings.py +++ b/defender/travis_settings.py @@ -15,7 +15,6 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'defender.middleware.FailedLoginMiddleware', - 'defender.middleware.ViewDecoratorMiddleware', ) ROOT_URLCONF = 'defender.test_urls'