StackExchange/dnscontrol
1
1
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2025-12-16 21:58:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

zone2dnscontrol: handle strings with ";" a bit better.

Browse source
This commit is contained in:
Tom Limoncelli 2017-03-14 18:08:02 -07:00
parent 51cf29a0e4
commit b69cc65baf
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
misc/zone2dnscontrol/README.md
View file

@ -18,6 +18,6 @@ Example:
Caveats: Caveats:
* TTLs are stripped out and/or ignored. * TTLs are stripped out and/or ignored.
* TXT records that include a ";" will not be translated properly. * Comments must start on the beginning of the line.
* `$INCLUDE` may not be handled correctly if you are not in the right directory. * `$INCLUDE` may not be handled correctly if you are not in the right directory.
* `$GENERATE` is not handled at all. * `$GENERATE` is not handled at all.

13
misc/zone2dnscontrol/canonzone
View file

@ -69,9 +69,12 @@ sub doit {
# process whitespace, comments, and continuations: # process whitespace, comments, and continuations:
chomp; chomp;
# the order of the next three lines is very important # the order of the next three lines is very important
s/;.*//; # toss comments s/^;.*//; # toss lines that start with a comment.
next if /^\s*$/; # skip blank lines next if /^\s*$/; # skip blank lines
redo if ( /\(/ && ! /\)/ ) && ($_ .= <>); # handle continuations redo if ( /\(/ && ! /\)/ ) && ($_ .= <>); # handle continuations
# BUG: This doesn't handle comments that start in the middle of the line.
# Doing this would require handling quoted strings that include semicolons,
# which is difficult.
# Handle the meta stuff: # Handle the meta stuff:
if (/^\$ORIGIN\s+/) { # handle the $ORIGIN statements if (/^\$ORIGIN\s+/) { # handle the $ORIGIN statements
@ -111,13 +114,13 @@ sub doit {
# Extract the host, type, and data from the RR: # Extract the host, type, and data from the RR:
if (/(\S+)\s+(\d*)\s+IN\s+(\S+)\s+(.*)/i) { # host ttl IN rrtype data if (/(\S+)\s+(\d*)\s+IN\s+(\S+)\s+(.*)/i) { # host ttl IN rrtype data
($h, $junk, $TYPE, $data) = ($1, $2, $3, $4); ($h, $junk, $TYPE, $data) = ($1, $2, $3, $4);
#print "read: HOST:$h JUNK:$junk TYPE:$TYPE DATA:$data\n"; #print "readA: HOST:$h JUNK:$junk TYPE:$TYPE DATA:$data\n";
} elsif (/(\S+)\s+IN\s+(\S+)\s+(.*)/i) { # host IN rrtype data } elsif (/(\S+)\s+IN\s+(\S+)\s+(.*)/i) { # host IN rrtype data
($h, $TYPE, $data) = ($1, $2, $3); ($h, $TYPE, $data) = ($1, $2, $3);
#print "read: HOST:$h TYPE:$TYPE DATA:$data\n"; #print "readB: HOST:$h TYPE:$TYPE DATA:$data\n";
} elsif (/(\S+)\s+(\S+)\s+(.*)/i) { # host IN rrtype data } elsif (/(\S+)\s+(\S+)\s+(.*)/i) { # host IN rrtype data
($h, $TYPE, $data) = ($1, $2, $3); ($h, $TYPE, $data) = ($1, $2, $3);
#print "read: HOST:$h TYPE:$TYPE DATA:$data\n"; #print "readC: HOST:$h TYPE:$TYPE DATA:$data\n";
} else { } else {
die "ERROR2: I don't understand this line:\n$_\n"; die "ERROR2: I don't understand this line:\n$_\n";
} }
@ -133,7 +136,7 @@ sub doit {
$defname = $host; # record what will be the next line's default hostname $defname = $host; # record what will be the next line's default hostname
# remove the domain we are stripping the zone: # remove the domain if we are stripping the zone:
$host =~ s/\.$stripend$//i unless $nostripend; $host =~ s/\.$stripend$//i unless $nostripend;
# Format and print the RR: # Format and print the RR: