Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion pydantic_extra_types/domain.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
class DomainStr(str):
"""A string subclass with custom validation for domain string format."""

_domain_re_pattern = r'(?=^.{1,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)'
_domain_re_pattern = (
r'(?=^.{1,253}$)' r'(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+' r'([a-zA-Z]{2,63}|xn--[a-zA-Z0-9]{2,59})$)'
)

@classmethod
def validate(cls, __input_value: Any, _: Any) -> str:
Expand Down
20 changes: 20 additions & 0 deletions tests/test_domain.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,23 @@ def test_very_long_domains(domain: str):
def test_invalid_domain_types(domain: Any):
with pytest.raises(ValidationError, match='Value must be a string'):
MyModel(domain=domain)


def test_domainstr_with_punycode():
class Model(BaseModel):
domain: DomainStr

valid = 'xn--7-7sbirhro.xn--80ahmohdapg.xn--80asehdb'
model = Model(domain=valid)
assert model.domain == valid


def test_domainstr_invalid():
class Model(BaseModel):
domain: DomainStr

try:
Model(domain='invalid_domain')
assert False, 'Expected ValidationError'
except ValidationError:
pass