Hopiu/django-analytical
1
0
Fork 0
mirror of https://github.com/jazzband/django-analytical.git synced 2026-03-16 22:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #74 from orcasgit/empty-override

Browse source 
override internal ips with empty list
This commit is contained in:
Joost Cassee 2015-12-18 11:59:39 +01:00
commit 25236d524a
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
analytical/tests/test_utils.py
View file

@ -72,6 +72,14 @@ class InternalIpTestCase(TestCase):
context = Context()
self.assertFalse(is_internal_ip(context))
@override_settings(INTERNAL_IPS=['1.1.1.1'])
@override_settings(ANALYTICAL_INTERNAL_IPS=[])
def test_render_analytical_internal_ips_override_when_empty(self):
req = HttpRequest()
req.META['REMOTE_ADDR'] = '1.1.1.1'
context = Context({'request': req})
self.assertFalse(is_internal_ip(context))
@override_settings(ANALYTICAL_INTERNAL_IPS=['1.1.1.1'])
def test_render_internal_ip(self):
req = HttpRequest()

14
analytical/utils.py
View file

@ -123,15 +123,15 @@ def is_internal_ip(context, prefix=None):
if not remote_ip:
return False
internal_ips = ''
internal_ips = None
if prefix is not None:
internal_ips = getattr(settings, '%s_INTERNAL_IPS' % prefix, '')
if not internal_ips:
internal_ips = getattr(settings, 'ANALYTICAL_INTERNAL_IPS', '')
if not internal_ips:
internal_ips = getattr(settings, 'INTERNAL_IPS', '')
internal_ips = getattr(settings, '%s_INTERNAL_IPS' % prefix, None)
if internal_ips is None:
internal_ips = getattr(settings, 'ANALYTICAL_INTERNAL_IPS', None)
if internal_ips is None:
internal_ips = getattr(settings, 'INTERNAL_IPS', None)
return remote_ip in internal_ips
return remote_ip in (internal_ips or [])
except (KeyError, AttributeError):
return False