diff options
| -rw-r--r-- | raven/contrib/django/views.py | 10 | ||||
| -rwxr-xr-x | setup.py | 2 | ||||
| -rw-r--r-- | tests/contrib/django/tests.py | 11 |
3 files changed, 16 insertions, 7 deletions
diff --git a/raven/contrib/django/views.py b/raven/contrib/django/views.py index c6628ac..4e34c63 100644 --- a/raven/contrib/django/views.py +++ b/raven/contrib/django/views.py @@ -25,9 +25,13 @@ def is_valid_origin(origin): return True origin = origin.lower() - for value in settings.SENTRY_ALLOW_ORIGIN.split(' '): - if value.lower() == origin: - return True + for value in settings.SENTRY_ALLOW_ORIGIN: + if isinstance(value, basestring): + if value.lower() == origin: + return True + else: + if value.match(origin): + return True return False @@ -46,7 +46,7 @@ install_requires = [ setup( name='raven', - version='1.8.3', + version='1.8.4', author='David Cramer', author_email='dcramer@gmail.com', url='http://github.com/dcramer/raven', diff --git a/tests/contrib/django/tests.py b/tests/contrib/django/tests.py index 04ce1ab..44714a1 100644 --- a/tests/contrib/django/tests.py +++ b/tests/contrib/django/tests.py @@ -2,10 +2,11 @@ from __future__ import absolute_import -import django -import mock import datetime +import django import logging +import mock +import re from celery.tests.utils import with_eager_tasks from StringIO import StringIO @@ -518,7 +519,11 @@ class IsValidOriginTestCase(TestCase): self.assertTrue(is_valid_origin('http://example.com')) def test_setting_uri(self): - with Settings(SENTRY_ALLOW_ORIGIN='http://example.com'): + with Settings(SENTRY_ALLOW_ORIGIN=['http://example.com']): + self.assertTrue(is_valid_origin('http://example.com')) + + def test_setting_regexp(self): + with Settings(SENTRY_ALLOW_ORIGIN=[re.compile('https?\://(.*\.)?example\.com')]): self.assertTrue(is_valid_origin('http://example.com')) |