Skip to content

Use reverse to get admin url + added some options for error case #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use reverse to get admin url + added some options for error case #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions admin_ip_whitelist/middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
from django.conf import settings
from django.core.cache import cache
from django.core.exceptions import MiddlewareNotUsed
from django.http import HttpResponseForbidden
from django.http import HttpResponse
from django.core.urlresolvers import reverse

from models import DjangoAdminAccessIPWhitelist, ADMIN_ACCESS_WHITELIST_PREFIX

Expand All @@ -22,6 +23,8 @@ def __init__(self):
self.ENABLED = getattr(settings, 'ADMIN_ACCESS_WHITELIST_ENABLED', False)
self.USE_HTTP_X_FORWARDED_FOR = getattr(settings, 'ADMIN_ACCESS_WHITELIST_USE_HTTP_X_FORWARDED_FOR', False)
self.ADMIN_ACCESS_WHITELIST_MESSAGE = getattr(settings, 'ADMIN_ACCESS_WHITELIST_MESSAGE', 'You are banned.')
self.FAILURE_RESPONSE_CODE = getattr(settings, 'ADMIN_ACCESS_FAILURE_RESPONSE_CODE', 403)
self.ADMIN_BASE_URL = reverse('admin:index')

if not self.ENABLED:
raise MiddlewareNotUsed("django-admin-ip-whitelist is not enabled via settings.py")
Expand All @@ -43,7 +46,7 @@ def _get_ip(self, request):
return ip

def process_request(self, request):
if not request.path.startswith('/admin'):
if not request.path.startswith(self.ADMIN_BASE_URL):
return None

ip = self._get_ip(request)
Expand All @@ -55,15 +58,14 @@ def process_request(self, request):
if self.is_whitelisted(ip):
return None
else:
return self.http_response_forbidden(self.ADMIN_ACCESS_WHITELIST_MESSAGE + '\n<!-- {} -->'.format(ip), content_type="text/html")
return self.http_response(self.ADMIN_ACCESS_WHITELIST_MESSAGE, content_type="text/html")

@staticmethod
def http_response_forbidden(message, content_type):
def http_response(self, message, content_type):
if django.VERSION[:2] > (1, 3):
kwargs = {'content_type': content_type}
else:
kwargs = {'mimetype': content_type}
return HttpResponseForbidden(message, **kwargs)
return HttpResponse(message, status=self.FAILURE_RESPONSE_CODE, **kwargs)

def is_whitelisted(self, ip):
# If a whitelist key exists, return True to allow the request through
Expand Down