From 95edec54485529f69f9df526ebbc69772b36bc6c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 9 Dec 2019 10:02:56 -0500 Subject: [PATCH] #3722: Tweak ordering of permitted characters to avoid creating a regex range --- netbox/ipam/migrations/0027_ipaddress_add_dns_name.py | 2 +- netbox/ipam/validators.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/ipam/migrations/0027_ipaddress_add_dns_name.py b/netbox/ipam/migrations/0027_ipaddress_add_dns_name.py index 4eaa1498d..c93034f3d 100644 --- a/netbox/ipam/migrations/0027_ipaddress_add_dns_name.py +++ b/netbox/ipam/migrations/0027_ipaddress_add_dns_name.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='ipaddress', name='dns_name', - field=models.CharField(blank=True, max_length=255, validators=[django.core.validators.RegexValidator(code='invalid', message='Only alphanumeric characters, hyphens, periods, and underscores are allowed in DNS names', regex='^[0-9A-Za-z.-_]+$')]), + field=models.CharField(blank=True, max_length=255, validators=[django.core.validators.RegexValidator(code='invalid', message='Only alphanumeric characters, hyphens, periods, and underscores are allowed in DNS names', regex='^[0-9A-Za-z._-]+$')]), ), ] diff --git a/netbox/ipam/validators.py b/netbox/ipam/validators.py index 4659a9177..960675643 100644 --- a/netbox/ipam/validators.py +++ b/netbox/ipam/validators.py @@ -2,7 +2,7 @@ from django.core.validators import RegexValidator DNSValidator = RegexValidator( - regex='^[0-9A-Za-z.-_]+$', + regex='^[0-9A-Za-z._-]+$', message='Only alphanumeric characters, hyphens, periods, and underscores are allowed in DNS names', code='invalid' )