Skip to content

fix(allowed-domains): preserve blank origin values #129428

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

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

fix(allowed-domains): preserve blank origin values #129428

Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions src/sentry/api/serializers/rest_framework/origin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ class OriginField(serializers.CharField):

def to_internal_value(self, data):
rv = super().to_internal_value(data)
if not rv:
return
self.validate_origin(rv)
return rv

Expand Down
10 changes: 10 additions & 0 deletions tests/sentry/api/serializers/rest_framework/test_origin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ class DummySerializer(serializers.Serializer):
origin_field = OriginField()


class BlankOriginSerializer(serializers.Serializer):
origin_field = OriginField(allow_blank=True)


class OriginFieldTest(TestCase):
def test_valid_origin(self) -> None:
urls = ["https://www.foo.com", "*", "*.domain.com", "*:80", "localhost:8080"]
Expand All @@ -20,3 +24,9 @@ def test_invalid_origin(self) -> None:
for url in urls:
serializer = DummySerializer(data={"origin_field": url})
assert serializer.is_valid() is False

def test_blank_origin_is_preserved(self) -> None:
serializer = BlankOriginSerializer(data={"origin_field": ""})

assert serializer.is_valid()
assert serializer.validated_data["origin_field"] == ""
Loading