Skip to content

Commit

Permalink
fix(integrations): support complex regex coming from DjangoCMS (#1773)
Browse files Browse the repository at this point in the history
Fixes GH-1527
  • Loading branch information
mgaligniana authored Jun 7, 2023
1 parent 59bf4d4 commit 8a6c19c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion sentry_sdk/integrations/django/transactions.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def get_regex(resolver_or_pattern):

class RavenResolver(object):
_optional_group_matcher = re.compile(r"\(\?\:([^\)]+)\)")
_named_group_matcher = re.compile(r"\(\?P<(\w+)>[^\)]+\)+")
_named_group_matcher = re.compile(r"\(\?P<(\w+)>.*\)")
_non_named_group_matcher = re.compile(r"\([^\)]+\)")
# [foo|bar|baz]
_either_option_matcher = re.compile(r"\[([^\]]+)\|([^\]]+)\]")
Expand Down
13 changes: 13 additions & 0 deletions tests/integrations/django/test_transactions.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
url(r"^api/(?P<version>(v1|v2))/author/$", lambda x: ""),
url(r"^report/", lambda x: ""),
url(r"^example/", include(included_url_conf)),
url(
r"^(?P<slug>[$\\-_.+!*(),\\w//]+)/$", lambda x: ""
), # example of complex regex from django-cms
)


Expand Down Expand Up @@ -53,6 +56,16 @@ def test_legacy_resolver_included_match():
assert result == "/example/foo/bar/{param}"


def test_complex_regex_from_django_cms():
"""
Reference: https://github.com/getsentry/sentry-python/issues/1527
"""

resolver = RavenResolver()
result = resolver.resolve("/,/", example_url_conf)
assert result == "/{slug}/"


@pytest.mark.skipif(django.VERSION < (2, 0), reason="Requires Django > 2.0")
def test_legacy_resolver_newstyle_django20_urlconf():
from django.urls import path
Expand Down

0 comments on commit 8a6c19c

Please sign in to comment.