mirror/github-octodns
1
0
Fork 0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00
Code Issues Releases Activity

Merge pull request #1070 from octodns/mixed-subnets

Browse Source 
Fix validation for dynamic records with IPv4+IPv6 subnets
This commit is contained in:
Viranch Mehta
2023-09-25 14:37:04 -07:00
committed by GitHub
parent 1c0f0b4a48 55a535d0f0
commit 9c72ae1459
2 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
octodns/record/dynamic.py
View File

@@ -3,6 +3,7 @@
#
import re
from collections import defaultdict
from logging import getLogger
from .change import Update
@@ -220,7 +221,7 @@ class _DynamicMixin(object):
reasons = []
pools_seen = set()
subnets_seen = {}
subnets_seen = defaultdict(dict)
geos_seen = {}
if not isinstance(rules, (list, tuple)):
@@ -291,11 +292,16 @@ class _DynamicMixin(object):
# previous loop will log any invalid subnets, here we
# process only valid ones and skip invalid ones
pass
# sort subnets from largest to smallest so that we can
# detect rule that have needlessly targeted a more specific
# subnet along with a larger subnet that already contains it
for subnet in sorted(networks):
for seen, where in subnets_seen.items():
sorted_networks = sorted(
networks, key=lambda n: (n.version, n)
)
for subnet in sorted_networks:
subnets_seen_version = subnets_seen[subnet.version]
for seen, where in subnets_seen_version.items():
if subnet == seen:
reasons.append(
f'rule {rule_num} targets subnet {subnet} which has previously been seen in rule {where}'
@@ -305,7 +311,7 @@ class _DynamicMixin(object):
f'rule {rule_num} targets subnet {subnet} which is more specific than the previously seen {seen} in rule {where}'
)
subnets_seen[subnet] = rule_num
subnets_seen_version[subnet] = rule_num
if not isinstance(geos, (list, tuple)):
reasons.append(f'rule {rule_num} geos must be a list')

43
tests/test_octodns_record_dynamic.py
View File

@@ -1561,3 +1561,46 @@ class TestRecordDynamic(TestCase):
]
),
)
def test_dynamic_subnet_mixed_versions(self):
# mixed IPv4 and IPv6 subnets should not raise a validation error
Record.new(
self.zone,
'good',
{
'dynamic': {
'pools': {
'one': {'values': [{'value': '1.1.1.1'}]},
'two': {'values': [{'value': '2.2.2.2'}]},
},
'rules': [
{'subnets': ['10.1.0.0/16', '1::/66'], 'pool': 'one'},
{'pool': 'two'},
],
},
'ttl': 60,
'type': 'A',
'values': ['2.2.2.2'],
},
)
Record.new(
self.zone,
'good',
{
'dynamic': {
'pools': {
'one': {'values': [{'value': '1.1.1.1'}]},
'two': {'values': [{'value': '2.2.2.2'}]},
},
'rules': [
{'subnets': ['10.1.0.0/16'], 'pool': 'one'},
{'subnets': ['1::/66'], 'pool': 'two'},
{'pool': 'two'},
],
},
'ttl': 60,
'type': 'A',
'values': ['2.2.2.2'],
},
)