mirror of
https://github.com/github/octodns.git
synced 2024-05-11 05:55:00 +00:00
Merge branch 'main' into name-filtering
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
* Now that it's used as it needed to be YamlProvider overrides
|
||||
Provider.supports and just always says Yes so that any dynamically registered
|
||||
types will be supported.
|
||||
* Add TtlRestrictionFilter processor for adding ttl restriction/checking
|
||||
* NameAllowlistFilter & NameRejectlistFilter implementations to support
|
||||
filtering on record names to include/exclude records from management.
|
||||
|
||||
|
||||
@@ -10,6 +10,10 @@ from __future__ import (
|
||||
)
|
||||
|
||||
|
||||
class ProcessorException(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class BaseProcessor(object):
|
||||
def __init__(self, name):
|
||||
self.name = name
|
||||
|
||||
83
octodns/processor/restrict.py
Normal file
83
octodns/processor/restrict.py
Normal file
@@ -0,0 +1,83 @@
|
||||
#
|
||||
#
|
||||
#
|
||||
|
||||
from __future__ import (
|
||||
absolute_import,
|
||||
division,
|
||||
print_function,
|
||||
unicode_literals,
|
||||
)
|
||||
|
||||
from .base import BaseProcessor, ProcessorException
|
||||
|
||||
|
||||
class RestrictionException(ProcessorException):
|
||||
pass
|
||||
|
||||
|
||||
class TtlRestrictionFilter(BaseProcessor):
|
||||
'''
|
||||
Ensure that configured TTLs are between a configured minimum and maximum or
|
||||
in an allowed set of values.
|
||||
|
||||
The default minimum is 1 (the behavior of 0 is undefined spec-wise) and the
|
||||
default maximum is 604800 (seven days.) allowed_ttls is only used when
|
||||
explicitly configured and min and max are ignored in that case.
|
||||
|
||||
Example usage:
|
||||
|
||||
processors:
|
||||
min-max-ttl:
|
||||
class: octodns.processor.restrict.TtlRestrictionFilter
|
||||
min_ttl: 60
|
||||
max_ttl: 3600
|
||||
# allowed_ttls: [300, 900, 3600]
|
||||
|
||||
zones:
|
||||
exxampled.com.:
|
||||
sources:
|
||||
- config
|
||||
processors:
|
||||
- min-max-ttl
|
||||
targets:
|
||||
- azure
|
||||
|
||||
The restriction can be skipped for specific records by setting the lenient
|
||||
flag, e.g.
|
||||
|
||||
a:
|
||||
octodns:
|
||||
lenient: true
|
||||
ttl: 0
|
||||
value: 1.2.3.4
|
||||
|
||||
The higher level lenient flags are not checked as it would make more sense
|
||||
to just avoid enabling the processor in those cases.
|
||||
'''
|
||||
|
||||
SEVEN_DAYS = 60 * 60 * 24 * 7
|
||||
|
||||
def __init__(self, name, min_ttl=1, max_ttl=SEVEN_DAYS, allowed_ttls=None):
|
||||
super().__init__(name)
|
||||
self.min_ttl = min_ttl
|
||||
self.max_ttl = max_ttl
|
||||
self.allowed_ttls = set(allowed_ttls) if allowed_ttls else None
|
||||
|
||||
def process_source_zone(self, zone, *args, **kwargs):
|
||||
for record in zone.records:
|
||||
if record._octodns.get('lenient'):
|
||||
continue
|
||||
if self.allowed_ttls and record.ttl not in self.allowed_ttls:
|
||||
raise RestrictionException(
|
||||
f'{record.fqdn} ttl={record.ttl} not an allowed value, allowed_ttls={self.allowed_ttls}'
|
||||
)
|
||||
elif record.ttl < self.min_ttl:
|
||||
raise RestrictionException(
|
||||
f'{record.fqdn} ttl={record.ttl} too low, min_ttl={self.min_ttl}'
|
||||
)
|
||||
elif record.ttl > self.max_ttl:
|
||||
raise RestrictionException(
|
||||
f'{record.fqdn} ttl={record.ttl} too high, max_ttl={self.max_ttl}'
|
||||
)
|
||||
return zone
|
||||
113
tests/test_octodns_processor_restrict.py
Normal file
113
tests/test_octodns_processor_restrict.py
Normal file
@@ -0,0 +1,113 @@
|
||||
from unittest import TestCase
|
||||
|
||||
from octodns.processor.restrict import (
|
||||
RestrictionException,
|
||||
TtlRestrictionFilter,
|
||||
)
|
||||
from octodns.record import Record
|
||||
from octodns.zone import Zone
|
||||
|
||||
|
||||
class TestTtlRestrictionFilter(TestCase):
|
||||
def test_restrict_ttl(self):
|
||||
# configured values
|
||||
restrictor = TtlRestrictionFilter('test', min_ttl=32, max_ttl=1024)
|
||||
|
||||
zone = Zone('unit.tests.', [])
|
||||
good = Record.new(
|
||||
zone, 'good', {'type': 'A', 'ttl': 42, 'value': '1.2.3.4'}
|
||||
)
|
||||
zone.add_record(good)
|
||||
|
||||
restricted = restrictor.process_source_zone(zone)
|
||||
self.assertEqual(zone.records, restricted.records)
|
||||
|
||||
# too low
|
||||
low = Record.new(
|
||||
zone, 'low', {'type': 'A', 'ttl': 16, 'value': '1.2.3.4'}
|
||||
)
|
||||
copy = zone.copy()
|
||||
copy.add_record(low)
|
||||
with self.assertRaises(RestrictionException) as ctx:
|
||||
restrictor.process_source_zone(copy)
|
||||
self.assertEqual(
|
||||
'low.unit.tests. ttl=16 too low, min_ttl=32', str(ctx.exception)
|
||||
)
|
||||
|
||||
# with lenient set, we can go lower
|
||||
lenient = Record.new(
|
||||
zone,
|
||||
'low',
|
||||
{
|
||||
'octodns': {'lenient': True},
|
||||
'type': 'A',
|
||||
'ttl': 16,
|
||||
'value': '1.2.3.4',
|
||||
},
|
||||
)
|
||||
copy = zone.copy()
|
||||
copy.add_record(lenient)
|
||||
restricted = restrictor.process_source_zone(copy)
|
||||
self.assertEqual(copy.records, restricted.records)
|
||||
|
||||
# too high
|
||||
high = Record.new(
|
||||
zone, 'high', {'type': 'A', 'ttl': 2048, 'value': '1.2.3.4'}
|
||||
)
|
||||
copy = zone.copy()
|
||||
copy.add_record(high)
|
||||
with self.assertRaises(RestrictionException) as ctx:
|
||||
restrictor.process_source_zone(copy)
|
||||
self.assertEqual(
|
||||
'high.unit.tests. ttl=2048 too high, max_ttl=1024',
|
||||
str(ctx.exception),
|
||||
)
|
||||
|
||||
# too low defaults
|
||||
restrictor = TtlRestrictionFilter('test')
|
||||
low = Record.new(
|
||||
zone, 'low', {'type': 'A', 'ttl': 0, 'value': '1.2.3.4'}
|
||||
)
|
||||
copy = zone.copy()
|
||||
copy.add_record(low)
|
||||
with self.assertRaises(RestrictionException) as ctx:
|
||||
restrictor.process_source_zone(copy)
|
||||
self.assertEqual(
|
||||
'low.unit.tests. ttl=0 too low, min_ttl=1', str(ctx.exception)
|
||||
)
|
||||
|
||||
# too high defaults
|
||||
high = Record.new(
|
||||
zone, 'high', {'type': 'A', 'ttl': 999999, 'value': '1.2.3.4'}
|
||||
)
|
||||
copy = zone.copy()
|
||||
copy.add_record(high)
|
||||
with self.assertRaises(RestrictionException) as ctx:
|
||||
restrictor.process_source_zone(copy)
|
||||
self.assertEqual(
|
||||
'high.unit.tests. ttl=999999 too high, max_ttl=604800',
|
||||
str(ctx.exception),
|
||||
)
|
||||
|
||||
# allowed_ttls
|
||||
restrictor = TtlRestrictionFilter('test', allowed_ttls=[42, 300])
|
||||
|
||||
# add 300 (42 is already there)
|
||||
another = Record.new(
|
||||
zone, 'another', {'type': 'A', 'ttl': 300, 'value': '4.5.6.7'}
|
||||
)
|
||||
zone.add_record(another)
|
||||
|
||||
# 42 and 300 are allowed through
|
||||
restricted = restrictor.process_source_zone(zone)
|
||||
self.assertEqual(zone.records, restricted.records)
|
||||
|
||||
# 16 is not
|
||||
copy = zone.copy()
|
||||
copy.add_record(low)
|
||||
with self.assertRaises(RestrictionException) as ctx:
|
||||
restrictor.process_source_zone(copy)
|
||||
self.assertEqual(
|
||||
'low.unit.tests. ttl=0 not an allowed value, allowed_ttls={42, 300}',
|
||||
str(ctx.exception),
|
||||
)
|
||||
Reference in New Issue
Block a user