cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
mwiegand 2021-11-07 13:30:47 +01:00
parent 8eb116378a
commit 0a0c7cb859
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bundles/bind/metadata.py
View file

@ -1,6 +1,7 @@
from ipaddress import ip_interface from ipaddress import ip_interface
from json import dumps from json import dumps
h = repo.libs.hashable.hashable h = repo.libs.hashable.hashable
repo.libs.bind.repo = repo
defaults = { defaults = {
'apt': { 'apt': {
@ -103,7 +104,7 @@ def collect_records(metadata):
for type, values in records.items(): for type, values in records.items():
for value in values: for value in values:
if repo.libs.bind.record_matches_view(value, type, name, zone, view_name, metadata, repo): if repo.libs.bind.record_matches_view(value, type, name, zone, view_name, metadata):
views\ views\
.setdefault(view_name, {})\ .setdefault(view_name, {})\
.setdefault('zones', {})\ .setdefault('zones', {})\

23
libs/bind.py
View file

@ -1,6 +1,13 @@
from ipaddress import ip_address from ipaddress import ip_address
def record_matches_view(value, type, name, zone, view, metadata, repo): def _values_from_all_nodes(type, name, zone):
return {
value
for node in repo.nodes
for value in node.metadata.get(f'dns/{name}.{zone}/{type}', [])
}
def record_matches_view(value, type, name, zone, view, metadata):
if type not in ['A', 'AAAA']: if type not in ['A', 'AAAA']:
return True return True
@ -9,12 +16,7 @@ def record_matches_view(value, type, name, zone, view, metadata, repo):
return True return True
elif not list(filter( elif not list(filter(
lambda other_value: ip_address(other_value).is_private, lambda other_value: ip_address(other_value).is_private,
{ _values_from_all_nodes(type, name, zone),
other_value
for other_node in repo.nodes
if other_node.metadata.get(f'dns/{name}.{zone}/{type}', [])
for other_value in other_node.metadata.get(f'dns/{name}.{zone}/{type}')
}
)): )):
return True return True
else: else:
@ -22,11 +24,6 @@ def record_matches_view(value, type, name, zone, view, metadata, repo):
return True return True
elif not list(filter( elif not list(filter(
lambda other_value: ip_address(other_value).is_global, lambda other_value: ip_address(other_value).is_global,
{ _values_from_all_nodes(type, name, zone),
other_value
for other_node in repo.nodes
if other_node.metadata.get(f'dns/{name}.{zone}/{type}', [])
for other_value in other_node.metadata.get(f'dns/{name}.{zone}/{type}')
}
)): )):
return True return True