Merge branch '522-domain-name-should-contain' into 'master'

firewall: add '/' to domain related regexps

Closes #522

See merge request !402

circle/firewall/fields.py

@@ -27,10 +27,10 @@ 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_wildcard_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./-])+$')
 
 
 
 
 class mac_custom(mac_unix):
 class mac_custom(mac_unix):