tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 15:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor subnet cidr validator & add new test

Browse Source 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
This commit is contained in:
Drew Romanyk 2017-11-13 21:53:14 -06:00
parent 6c8184d0d0
commit badd4d764a
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compose/config/validation.py
View File

@ -45,13 +45,11 @@ VALID_NAME_CHARS = '[a-zA-Z0-9\._\-]'
VALID_EXPOSE_FORMAT = r'^\d+(\-\d+)?(\/[a-zA-Z]+)?$' VALID_EXPOSE_FORMAT = r'^\d+(\-\d+)?(\/[a-zA-Z]+)?$'
VALID_IPV4_SEG = r'(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])' VALID_IPV4_SEG = r'(\d{1,2}|1\d{2}|2[0-4]\d|25[0-5])'
VALID_REGEX_IPV4_CIDR = r'^(\d|[1-2]\d|3[0-2])$'
VALID_IPV4_ADDR = "({IPV4_SEG}\.){{3}}{IPV4_SEG}".format(IPV4_SEG=VALID_IPV4_SEG) VALID_IPV4_ADDR = "({IPV4_SEG}\.){{3}}{IPV4_SEG}".format(IPV4_SEG=VALID_IPV4_SEG)
VALID_REGEX_IPV4_ADDR = "^{IPV4_ADDR}$".format(IPV4_ADDR=VALID_IPV4_ADDR) VALID_REGEX_IPV4_CIDR = "^{IPV4_ADDR}/(\d|[1-2]\d|3[0-2])$".format(IPV4_ADDR=VALID_IPV4_ADDR)
VALID_IPV6_SEG = r'[0-9a-fA-F]{1,4}' VALID_IPV6_SEG = r'[0-9a-fA-F]{1,4}'
VALID_REGEX_IPV6_CIDR = r'^(\d|[1-9]\d|1[0-1]\d|12[0-8])$' VALID_REGEX_IPV6_CIDR = "".join("""
VALID_REGEX_IPV6_ADDR = "".join("""
^ ^
( (
(({IPV6_SEG}:){{7}}{IPV6_SEG})| (({IPV6_SEG}:){{7}}{IPV6_SEG})|
@ -67,6 +65,7 @@ VALID_REGEX_IPV6_ADDR = "".join("""
(::(ffff(:0{{1,4}}){{0,1}}:){{0,1}}{IPV4_ADDR})| (::(ffff(:0{{1,4}}){{0,1}}:){{0,1}}{IPV4_ADDR})|
(({IPV6_SEG}:){{1,4}}:{IPV4_ADDR}) (({IPV6_SEG}:){{1,4}}:{IPV4_ADDR})
) )
/(\d|[1-9]\d|1[0-1]\d|12[0-8])
$ $
""".format(IPV6_SEG=VALID_IPV6_SEG, IPV4_ADDR=VALID_IPV4_ADDR).split()) """.format(IPV6_SEG=VALID_IPV6_SEG, IPV4_ADDR=VALID_IPV4_ADDR).split())
@ -93,19 +92,9 @@ def format_expose(instance):
@FormatChecker.cls_checks("subnet_ip_address", raises=ValidationError) @FormatChecker.cls_checks("subnet_ip_address", raises=ValidationError)
def format_subnet_ip_address(instance): def format_subnet_ip_address(instance):
if isinstance(instance, six.string_types): if isinstance(instance, six.string_types):
if '/' not in instance: if not re.match(VALID_REGEX_IPV4_CIDR, instance) and \
raise ValidationError("should be of the format 'IP_ADDRESS/CIDR'") not re.match(VALID_REGEX_IPV6_CIDR, instance):
raise ValidationError("should use the CIDR format")
ip_address, cidr = instance.split('/')
if re.match(VALID_REGEX_IPV4_ADDR, ip_address):
if not re.match(VALID_REGEX_IPV4_CIDR, cidr):
raise ValidationError("should be of the format 'IP_ADDRESS/CIDR'")
elif re.match(VALID_REGEX_IPV6_ADDR, ip_address):
if not re.match(VALID_REGEX_IPV6_CIDR, cidr):
raise ValidationError("should be of the format 'IP_ADDRESS/CIDR'")
else:
raise ValidationError("should be of the format 'IP_ADDRESS/CIDR'")
return True return True

3
tests/unit/config/config_test.py
View File

@ -2866,6 +2866,7 @@ class SubnetTest(unittest.TestCase):
"fe80:0000:0000:0000:0204:61ff:fe9d:f156/01", "fe80:0000:0000:0000:0204:61ff:fe9d:f156/01",
"fe80:0000:0000:0000:0204:61ff:fe9d:f156", "fe80:0000:0000:0000:0204:61ff:fe9d:f156",
"ge80:0000:0000:0000:0204:61ff:fe9d:f156/128", "ge80:0000:0000:0000:0204:61ff:fe9d:f156/128",
"192.168.0.1/31/31",
] ]
VALID_SUBNET_MAPPINGS = [ VALID_SUBNET_MAPPINGS = [
@ -2902,7 +2903,7 @@ class SubnetTest(unittest.TestCase):
with pytest.raises(ConfigurationError) as exc: with pytest.raises(ConfigurationError) as exc:
self.check_config(invalid_subnet) self.check_config(invalid_subnet)
assert "should be of the format 'IP_ADDRESS/CIDR'" in exc.value.msg assert "should use the CIDR format" in exc.value.msg
def test_config_valid_subnet_format_validation(self): def test_config_valid_subnet_format_validation(self):
for valid_subnet in self.VALID_SUBNET_MAPPINGS: for valid_subnet in self.VALID_SUBNET_MAPPINGS: