Mirror/pve-network
1
0
Fork 1
mirror of git://git.proxmox.com/git/pve-network.git synced 2025-04-30 11:27:11 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

dns: powerdns: correctly handle different records types (A / AAAA)

Browse source 
This fixes an issue with dual stacking, when using a zone with both a
IPv4 and IPv6 subnet and the same DNS suffix, pve-network will try to
set both DNS records (type A and AAAA) in the same powerdns rrset,
causing an API error, and effectively causing no forward DNS records
being created.

This change edits the `get_zone_rrset` function so that it takes the
DNS record type into account.

Signed-off-by: Matthieu Pignolet <m@mpgn.dev>
Tested-by: Stefan Hanreich <s.hanreich@proxmox.com>
 [TL: wrap commit message]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
matthieu 2025-02-27 13:02:27 +04:00 committed by Thomas Lamprecht
parent a77f0c21ca
commit 2fd0ad83d3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/PVE/Network/SDN/Dns/PowerdnsPlugin.pm
View file

@ -66,7 +66,7 @@ sub add_a_record {
my $fqdn = $hostname.".".$zone."."; my $fqdn = $hostname.".".$zone.".";
my $zonecontent = get_zone_content($plugin_config, $zone); my $zonecontent = get_zone_content($plugin_config, $zone);
my $existing_rrset = get_zone_rrset($zonecontent, $fqdn); my $existing_rrset = get_zone_rrset($zonecontent, $fqdn, $type);
my $final_records = []; my $final_records = [];
for my $record (@{$existing_rrset->{records}}) { for my $record (@{$existing_rrset->{records}}) {
@ -136,7 +136,7 @@ sub del_a_record {
my $type = Net::IP::ip_is_ipv6($ip) ? "AAAA" : "A"; my $type = Net::IP::ip_is_ipv6($ip) ? "AAAA" : "A";
my $zonecontent = get_zone_content($plugin_config, $zone); my $zonecontent = get_zone_content($plugin_config, $zone);
my $existing_rrset = get_zone_rrset($zonecontent, $fqdn); my $existing_rrset = get_zone_rrset($zonecontent, $fqdn, $type);
my $final_records = [ grep { $_->{content} ne $ip } $existing_rrset->{records}->@* ]; my $final_records = [ grep { $_->{content} ne $ip } $existing_rrset->{records}->@* ];
my $final_records_size = scalar($final_records->@*); my $final_records_size = scalar($final_records->@*);
@ -262,10 +262,10 @@ sub get_zone_content {
} }
sub get_zone_rrset { sub get_zone_rrset {
my ($zonecontent, $name) = @_; my ($zonecontent, $name, $type) = @_;
for my $rrset (@{$zonecontent->{rrsets}}) { for my $rrset (@{$zonecontent->{rrsets}}) {
return $rrset if $rrset->{name} eq $name; return $rrset if $rrset->{name} eq $name and ($rrset->{type} eq $type);
} }
return; # not found return; # not found
} }