jorj/martnet-ddns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change shape for bind configuration; use one unified file, add new options when adding zones

Browse Source
This commit is contained in:
Jorj Bauer
2026-01-24 12:15:15 -05:00
parent f2b2ba25f0
commit ff83f9c5de
16 changed files with 167 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
DDNS.pm
View File

@@ -29,7 +29,7 @@ sub _validateTypeOrDie {
my ($t) = @_;
die "Invalid type"
unless ($t =~ /^_(vhosts|pureslave|custom|dnssec)$/);
unless ($t =~ /^_(vhosts|pureslave|custom)$/);
}
sub _fqdn {
@@ -119,45 +119,50 @@ sub _txt_from_line {
return $txt;
}
sub _normalize_master_value {
sub _parse_txt_payload {
my ($raw) = @_;
return undef unless defined $raw;
return (undef, undef) unless defined $raw;
my $v = $raw;
$v =~ s/^\s+|\s+$//g;
return $v if $v eq '';
# JSON objects/arrays are allowed as TXT payloads.
# Legacy format: plain string (single master or ';' separated list)
my $payload;
if ($v =~ /^[\[{]/) {
my $obj;
eval { $obj = decode_json($v); 1 } or return $v; # fall back to raw
eval { $obj = decode_json($v); 1 } or do {
# If JSON decoding fails, treat as legacy string.
$obj = undef;
};
# Supported shapes:
# - {"master": "ip"}
# - {"masters": "ip1;ip2"}
# - {"masters": ["ip1","ip2"]}
if (ref($obj) eq 'HASH') {
if (defined $obj->{masters}) {
if (ref($obj->{masters}) eq 'ARRAY') {
my @m = map { defined($_) ? $_ : () } @{$obj->{masters}};
$v = join(';', @m);
} else {
$v = $obj->{masters};
if (defined $obj) {
$payload = $obj if ref($obj) eq 'HASH';
# Normalize masters string from supported JSON shapes.
if (ref($obj) eq 'HASH') {
if (defined $obj->{masters}) {
if (ref($obj->{masters}) eq 'ARRAY') {
my @m = map { defined($_) ? $_ : () } @{$obj->{masters}};
$v = join(';', @m);
} else {
$v = $obj->{masters};
}
} elsif (defined $obj->{master}) {
$v = $obj->{master};
}
} elsif (defined $obj->{master}) {
$v = $obj->{master};
} elsif (ref($obj) eq 'ARRAY') {
my @m = map { defined($_) ? $_ : () } @$obj;
$v = join(';', @m);
}
} elsif (ref($obj) eq 'ARRAY') {
my @m = map { defined($_) ? $_ : () } @$obj;
$v = join(';', @m);
}
}
# Normalize formatting for BIND masters blocks: no spaces, no trailing ';'
$v = '' unless defined $v;
$v =~ s/\s+//g;
$v =~ s/;+$//;
return $v;
return ($v, $payload);
}
sub _quote_txt_rdata {
@@ -168,6 +173,14 @@ sub _quote_txt_rdata {
return "\"$s\"";
}
{
my ($s) = @_;
$s = '' unless defined $s;
$s =~ s/\\/\\\\/g;
$s =~ s/\"/\\\"/g;
return "\"$s\"";
}
sub _gethosts {
my ($this, $type) = @_;
@@ -186,19 +199,15 @@ sub _gethosts {
if ($type) {
if (/^(\S+)\.$type\.private\.invalid\.\s+\d+\s+IN\s+TXT\s+/) {
my $z = $1;
my $m = _normalize_master_value(_txt_from_line($_));
push (@vh, { zone => $z,
type => $type,
master => $m });
my ($m, $payload) = _parse_txt_payload(_txt_from_line($_));
push (@vh, { zone => $z, type => $type, master => $m, payload => $payload });
}
} else {
# Querying everything
if (/^(\S+)\.(\S+)\.private\.invalid\.\s+\d+\s+IN\s+TXT\s+/) {
my ($z, $t) = ($1, $2);
my $m = _normalize_master_value(_txt_from_line($_));
push (@vh, { zone => $z,
type => $t,
master => $m });
my ($m, $payload) = _parse_txt_payload(_txt_from_line($_));
push (@vh, { zone => $z, type => $t, master => $m, payload => $payload });
}
}
}
@@ -209,7 +218,6 @@ sub _gethosts {
# Find the type of domin that $dom is. If we don't find it, return
# undef. (The domain $dom ends in a dot; the DNS info we find won't;
# hence the concat of the extra "." after the lc.)
# (Skip _dnssec records in this check.)
sub type {
my ($this, $dom) = @_;
@@ -219,7 +227,7 @@ sub type {
foreach my $i (@vh) {
if (lc($i->{zone})."." eq lc($dom)) {
return $i->{type}
unless ($i->{type} eq '_dnssec');
;
}
}
@@ -233,9 +241,7 @@ sub add {
my $fqdn = _fqdn($dom, $type);
if (my $existingtype = $this->type($dom)) {
die "Domain $dom already exists [of type $existingtype]"
unless ($existingtype eq '_dnssec' ||
$type eq '_dnssec');
die "Domain $dom already exists [of type $existingtype]";
}
# TXT RDATA must be quoted for JSON (and is safe for legacy strings too).
@@ -267,21 +273,25 @@ sub cleanup {
system("/usr/local/bin/sync-master-vhosts");
}
sub is_dnssec {
my ($this, $dom) = @_;
_validateOrDie($dom);
$dom =~ s/^(.+)\.$/$1/; # remove trailing dot
my @h = $this->_gethosts('_dnssec');
foreach my $i (@h) {
if (lc($i->{zone}) eq $dom) {
return 1;
}
my @vh = $this->get();
foreach my $i (@vh) {
next unless (lc($i->{zone}) eq lc($dom));
my $p = $i->{payload};
return 1 if (defined $p && ref($p) eq 'HASH' && $p->{dnssec});
return 0;
}
return 0;
}
sub default_master {
{
my ($this, $type) = @_;
# This could return different masters for different types