firewall: add wildcard dns record support

circle/firewall/fields.py

@@ -28,6 +28,7 @@ import re
 
 
 alfanum_re = re.compile(r'^[A-Za-z0-9_-]+$')
 alfanum_re = re.compile(r'^[A-Za-z0-9_-]+$')
 domain_re = re.compile(r'^([A-Za-z0-9_-]\.?)+$')
 domain_re = re.compile(r'^([A-Za-z0-9_-]\.?)+$')
+domain_wildcard_re = re.compile(r'^(\*\.)?([A-Za-z0-9_-]\.?)+$')
 ipv4_re = re.compile('^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$')
 ipv4_re = re.compile('^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$')
 reverse_domain_re = re.compile(r'^(%\([abcd]\)d|[a-z0-9.-])+$')
 reverse_domain_re = re.compile(r'^(%\([abcd]\)d|[a-z0-9.-])+$')
 ipv6_template_re = re.compile(r'^(%\([abcd]\)[dxX]|[A-Za-z0-9:-])+$')
 ipv6_template_re = re.compile(r'^(%\([abcd]\)[dxX]|[A-Za-z0-9:-])+$')
@@ -216,12 +217,23 @@ def is_valid_domain(value):
     return domain_re.match(value) is not None
     return domain_re.match(value) is not None
 
 
 
 
+def is_valid_domain_wildcard(value):
+    """Check whether the parameter is a valid domain name."""
+    return domain_wildcard_re.match(value) is not None
+
+
 def val_domain(value):
 def val_domain(value):
     """Validate whether the parameter is a valid domin name."""
     """Validate whether the parameter is a valid domin name."""
     if not is_valid_domain(value):
     if not is_valid_domain(value):
         raise ValidationError(_(u'%s - invalid domain name') % value)
         raise ValidationError(_(u'%s - invalid domain name') % value)
 
 
 
 
+def val_domain_wildcard(value):
+    """Validate whether the parameter is a valid domin name."""
+    if not is_valid_domain_wildcard(value):
+        raise ValidationError(_(u'%s - invalid domain name') % value)
+
+
 def is_valid_reverse_domain(value):
 def is_valid_reverse_domain(value):
     """Check whether the parameter is a valid reverse domain name."""
     """Check whether the parameter is a valid reverse domain name."""
     return reverse_domain_re.match(value) is not None
     return reverse_domain_re.match(value) is not None

circle/firewall/models.py

@@ -27,6 +27,7 @@ from django.forms import ValidationError
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _
 from firewall.fields import (MACAddressField, val_alfanum, val_reverse_domain,
 from firewall.fields import (MACAddressField, val_alfanum, val_reverse_domain,
                              val_ipv6_template, val_domain, val_ipv4,
                              val_ipv6_template, val_domain, val_ipv4,
+                             val_domain_wildcard,
                              val_ipv6, val_mx, convert_ipv4_to_ipv6,
                              val_ipv6, val_mx, convert_ipv4_to_ipv6,
                              IPNetworkField, IPAddressField)
                              IPNetworkField, IPAddressField)
 from django.core.validators import MinValueValidator, MaxValueValidator
 from django.core.validators import MinValueValidator, MaxValueValidator
@@ -821,7 +822,7 @@ class Domain(models.Model):
 class Record(models.Model):
 class Record(models.Model):
     CHOICES_type = (('A', 'A'), ('CNAME', 'CNAME'), ('AAAA', 'AAAA'),
     CHOICES_type = (('A', 'A'), ('CNAME', 'CNAME'), ('AAAA', 'AAAA'),
                     ('MX', 'MX'), ('NS', 'NS'), ('PTR', 'PTR'), ('TXT', 'TXT'))
                     ('MX', 'MX'), ('NS', 'NS'), ('PTR', 'PTR'), ('TXT', 'TXT'))
-    name = models.CharField(max_length=40, validators=[val_domain],
+    name = models.CharField(max_length=40, validators=[val_domain_wildcard],
                             blank=True, null=True, verbose_name=_('name'))
                             blank=True, null=True, verbose_name=_('name'))
     domain = models.ForeignKey('Domain', verbose_name=_('domain'))
     domain = models.ForeignKey('Domain', verbose_name=_('domain'))
     host = models.ForeignKey('Host', blank=True, null=True,
     host = models.ForeignKey('Host', blank=True, null=True,