From 7b3e6ba96a7a7bcab0074a74ecc8add607825200 Mon Sep 17 00:00:00 2001 From: derpadoo Date: Thu, 30 Apr 2020 16:15:13 -0500 Subject: [PATCH] Updated models.py to allow hypens in DNS domain targets --- master/django_scantron/__init__.py | 2 +- master/django_scantron/models.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/master/django_scantron/__init__.py b/master/django_scantron/__init__.py index 952f23c..56c876a 100644 --- a/master/django_scantron/__init__.py +++ b/master/django_scantron/__init__.py @@ -1 +1 @@ -__version__ = "1.26" +__version__ = "1.27" diff --git a/master/django_scantron/models.py b/master/django_scantron/models.py index 53e1193..648ba9b 100644 --- a/master/django_scantron/models.py +++ b/master/django_scantron/models.py @@ -2,7 +2,7 @@ from django.conf import settings from django.contrib.auth.models import User # noqa from django.core.exceptions import ValidationError -from django.core.validators import MinValueValidator, RegexValidator +from django.core.validators import RegexValidator from django.db.models.signals import post_save from django.dispatch import receiver @@ -94,8 +94,8 @@ class Site(models.Model): max_length=1_048_576, # 2^20 = 1048576 validators=[ RegexValidator( - regex="^[a-zA-Z0-9/\.\: ]*$", # Characters to support IPv4, IPv6, and FQDNs only. Space delimited. - message="Targets can only contain alphanumeric characters, /, ., :, and spaces", + regex="^[a-zA-Z0-9/\.\:\- ]*$", # Characters to support IPv4, IPv6, and FQDNs only. Space delimited. + message="Targets can only contain alphanumeric characters, /, ., :, -, and spaces", ) ], verbose_name="Targets", @@ -106,8 +106,8 @@ class Site(models.Model): max_length=1_048_576, # 2^20 = 1048576 validators=[ RegexValidator( - regex="^[a-zA-Z0-9/\.\: ]*$", # Characters to support IPv4, IPv6, and FQDNs only. Space delimited. - message="Excluded targets can only contain alphanumeric characters, /, ., :, and spaces", + regex="^[a-zA-Z0-9/\.\:\- ]*$", # Characters to support IPv4, IPv6, and FQDNs only. Space delimited. + message="Excluded targets can only contain alphanumeric characters, /, ., :, -, and spaces", ) ], verbose_name="Excluded targets",