firewall: add wildcard domain support

firewall/fields.py

@@ -9,6 +9,7 @@ import re
 mac_re = re.compile(r'^([0-9a-fA-F]{2}([:-]?|$)){6}$')
 mac_re = re.compile(r'^([0-9a-fA-F]{2}([:-]?|$)){6}$')
 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_-]\.?)+$')
+wildcard_domain_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.-])+$')
 
 
@@ -50,6 +51,11 @@ def val_domain(value):
     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_wildcard_domain(value):
+    """Validate whether the parameter is a valid domin name."""
+    if not wildcard_domain_re.match(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

firewall/models.py

@@ -293,7 +293,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_wildcard_domain],
             blank=True, null=True)
             blank=True, null=True)
     domain = models.ForeignKey('Domain')
     domain = models.ForeignKey('Domain')
     host = models.ForeignKey('Host', blank=True, null=True)
     host = models.ForeignKey('Host', blank=True, null=True)