diff options
| author | Herman S <hermansc@users.noreply.github.com> | 2019-03-05 22:22:09 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-03-14 20:36:11 -0400 |
| commit | d8704a4d4f6a3bc96cf26ffd1f14bf4b5c71c74d (patch) | |
| tree | 064dbbc6d14cc7ff132e4b7f4aa65bcc1b2bcfa3 /django | |
| parent | b150d9946013758a2a13eee751ac828d8582d944 (diff) | |
[2.2.x] Fixed #30237 -- Made Authentication/SessionMiddleware and ModelBackend admin checks allow subclasses.
Backport of f976ab1b117574db78d884c94e549a6b8e4c9f9b from master.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/checks.py | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py index 3f8abdd476..aaf6ed2cf0 100644 --- a/django/contrib/admin/checks.py +++ b/django/contrib/admin/checks.py @@ -18,6 +18,7 @@ from django.template import engines from django.template.backends.django import DjangoTemplates from django.utils.deprecation import RemovedInDjango30Warning from django.utils.inspect import get_func_args +from django.utils.module_loading import import_string def _issubclass(cls, classinfo): @@ -31,6 +32,23 @@ def _issubclass(cls, classinfo): return False +def _contains_subclass(class_path, candidate_paths): + """ + Return whether or not a dotted class path (or a subclass of that class) is + found in a list of candidate paths. + """ + cls = import_string(class_path) + for path in candidate_paths: + try: + candidate_cls = import_string(path) + except ImportError: + # ImportErrors are raised elsewhere. + continue + if _issubclass(candidate_cls, cls): + return True + return False + + def check_admin_app(app_configs, **kwargs): from django.contrib.admin.sites import all_sites errors = [] @@ -75,8 +93,7 @@ def check_dependencies(**kwargs): else: if ('django.contrib.auth.context_processors.auth' not in django_templates_instance.context_processors and - 'django.contrib.auth.backends.ModelBackend' - in settings.AUTHENTICATION_BACKENDS): + _contains_subclass('django.contrib.auth.backends.ModelBackend', settings.AUTHENTICATION_BACKENDS)): errors.append(checks.Error( "'django.contrib.auth.context_processors.auth' must be " "enabled in DjangoTemplates (TEMPLATES) if using the default " @@ -91,15 +108,14 @@ def check_dependencies(**kwargs): "the admin application.", id='admin.E404', )) - if ('django.contrib.auth.middleware.AuthenticationMiddleware' - not in settings.MIDDLEWARE): + + if not _contains_subclass('django.contrib.auth.middleware.AuthenticationMiddleware', settings.MIDDLEWARE): errors.append(checks.Error( "'django.contrib.auth.middleware.AuthenticationMiddleware' must " "be in MIDDLEWARE in order to use the admin application.", id='admin.E408', )) - if ('django.contrib.messages.middleware.MessageMiddleware' - not in settings.MIDDLEWARE): + if not _contains_subclass('django.contrib.messages.middleware.MessageMiddleware', settings.MIDDLEWARE): errors.append(checks.Error( "'django.contrib.messages.middleware.MessageMiddleware' must " "be in MIDDLEWARE in order to use the admin application.", |
