Fix origin handling and fix lines which start with ownernames
Zonefile handling is more robust and more up to the specs. Also added a new zone file which has some nice properties which trigger corner cases.
This commit is contained in:
parent
cb1d41c607
commit
697d67ea96
|
@ -0,0 +1,30 @@
|
||||||
|
$ORIGIN .
|
||||||
|
$TTL 3600 ; 1 hour
|
||||||
|
name IN SOA a6.nstld.com. hostmaster.nic.name. (
|
||||||
|
203362132 ; serial
|
||||||
|
300 ; refresh (5 minutes)
|
||||||
|
300 ; retry (5 minutes)
|
||||||
|
1209600 ; expire (2 weeks)
|
||||||
|
300 ; minimum (5 minutes)
|
||||||
|
)
|
||||||
|
$TTL 10800 ; 3 hours
|
||||||
|
NS g6.nstld.com.
|
||||||
|
NS h6.nstld.com.
|
||||||
|
NS j6.nstld.com.
|
||||||
|
NS k6.nstld.com.
|
||||||
|
NS l6.nstld.com.
|
||||||
|
NS a6.nstld.com.
|
||||||
|
NS c6.nstld.com.
|
||||||
|
NS d6.nstld.com.
|
||||||
|
NS f6.nstld.com.
|
||||||
|
NS m6.nstld.com.
|
||||||
|
$ORIGIN name.
|
||||||
|
0-0onlus NS ns7.ehiweb.it.
|
||||||
|
NS ns8.ehiweb.it.
|
||||||
|
0-g MX 10 mx01.nic
|
||||||
|
MX 10 mx02.nic
|
||||||
|
MX 10 mx03.nic
|
||||||
|
MX 10 mx04.nic
|
||||||
|
$ORIGIN 0-g.name
|
||||||
|
moutamassey NS ns01.yahoodomains.jp.
|
||||||
|
NS ns02.yahoodomains.jp.
|
49
zscan.go
49
zscan.go
|
@ -132,7 +132,8 @@ func parseZone(r io.Reader, origin, f string, t chan Token, include int) {
|
||||||
s.Whitespace = 0
|
s.Whitespace = 0
|
||||||
// Start the lexer
|
// Start the lexer
|
||||||
go zlexer(s, c)
|
go zlexer(s, c)
|
||||||
// 5 possible beginnings of a line, _ is a space
|
// 6 possible beginnings of a line, _ is a space
|
||||||
|
// 0. _ _RRTYPE -> all omitted until the rrtype
|
||||||
// 1. _OWNER _ _RRTYPE -> class/ttl omitted
|
// 1. _OWNER _ _RRTYPE -> class/ttl omitted
|
||||||
// 2. _OWNER _ _STRING _ _RRTYPE -> class omitted
|
// 2. _OWNER _ _STRING _ _RRTYPE -> class omitted
|
||||||
// 3. _OWNER _ _STRING _ _CLASS _ _RRTYPE -> ttl/class
|
// 3. _OWNER _ _STRING _ _CLASS _ _RRTYPE -> ttl/class
|
||||||
|
@ -152,6 +153,7 @@ func parseZone(r io.Reader, origin, f string, t chan Token, include int) {
|
||||||
var h RR_Header
|
var h RR_Header
|
||||||
var ok bool
|
var ok bool
|
||||||
var defttl uint32 = DefaultTtl
|
var defttl uint32 = DefaultTtl
|
||||||
|
var prevName string
|
||||||
for l := range c {
|
for l := range c {
|
||||||
if _DEBUG {
|
if _DEBUG {
|
||||||
fmt.Printf("[%v]\n", l)
|
fmt.Printf("[%v]\n", l)
|
||||||
|
@ -174,6 +176,7 @@ func parseZone(r io.Reader, origin, f string, t chan Token, include int) {
|
||||||
h.Name = l.token
|
h.Name = l.token
|
||||||
if l.token == "@" {
|
if l.token == "@" {
|
||||||
h.Name = origin
|
h.Name = origin
|
||||||
|
prevName = h.Name
|
||||||
st = _EXPECT_OWNER_BL
|
st = _EXPECT_OWNER_BL
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
@ -183,8 +186,9 @@ func parseZone(r io.Reader, origin, f string, t chan Token, include int) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if h.Name[ld-1] != '.' {
|
if h.Name[ld-1] != '.' {
|
||||||
h.Name += origin
|
h.Name = appendOrigin(h.Name, origin)
|
||||||
}
|
}
|
||||||
|
prevName = h.Name
|
||||||
st = _EXPECT_OWNER_BL
|
st = _EXPECT_OWNER_BL
|
||||||
case _DIRTTL:
|
case _DIRTTL:
|
||||||
st = _EXPECT_DIRTTL_BL
|
st = _EXPECT_DIRTTL_BL
|
||||||
|
@ -192,8 +196,23 @@ func parseZone(r io.Reader, origin, f string, t chan Token, include int) {
|
||||||
st = _EXPECT_DIRORIGIN_BL
|
st = _EXPECT_DIRORIGIN_BL
|
||||||
case _DIRINCLUDE:
|
case _DIRINCLUDE:
|
||||||
st = _EXPECT_DIRINCLUDE_BL
|
st = _EXPECT_DIRINCLUDE_BL
|
||||||
|
case _RRTYPE:
|
||||||
|
// Everthing has been omitted
|
||||||
|
h.Name = prevName
|
||||||
|
h.Rrtype, ok = Str_rr[strings.ToUpper(l.token)]
|
||||||
|
if !ok {
|
||||||
|
if h.Rrtype, ok = typeToInt(l.token); !ok {
|
||||||
|
t <- Token{Error: &ParseError{f, "Unknown RR type", l}}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
st = _EXPECT_RDATA
|
||||||
|
case _BLANK:
|
||||||
|
// Discard, can happen when there is nothing on the
|
||||||
|
// line except the RR type
|
||||||
default:
|
default:
|
||||||
t <- Token{Error: &ParseError{f, "Error at the start", l}}
|
println(l.value)
|
||||||
|
t <- Token{Error: &ParseError{f, "Error at beginning", l}}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
case _EXPECT_DIRINCLUDE_BL:
|
case _EXPECT_DIRINCLUDE_BL:
|
||||||
|
@ -235,8 +254,10 @@ func parseZone(r io.Reader, origin, f string, t chan Token, include int) {
|
||||||
}
|
}
|
||||||
if e := slurpRemainder(c, f); e != nil {
|
if e := slurpRemainder(c, f); e != nil {
|
||||||
t <- Token{Error: e}
|
t <- Token{Error: e}
|
||||||
|
return
|
||||||
}
|
}
|
||||||
if ttl, ok := stringToTtl(l, f, t); !ok {
|
if ttl, ok := stringToTtl(l, f, t); !ok {
|
||||||
|
t <- Token{Error: &ParseError{f, "Expecting $TTL value, not this...", l}}
|
||||||
return
|
return
|
||||||
} else {
|
} else {
|
||||||
defttl = ttl
|
defttl = ttl
|
||||||
|
@ -257,9 +278,13 @@ func parseZone(r io.Reader, origin, f string, t chan Token, include int) {
|
||||||
t <- Token{Error: e}
|
t <- Token{Error: e}
|
||||||
}
|
}
|
||||||
if !IsFqdn(l.token) {
|
if !IsFqdn(l.token) {
|
||||||
origin = l.token + "." + origin // Append old origin if the new one isn't a fqdn
|
if origin != "." { // Prevent .. endings
|
||||||
|
origin = l.token + "." + origin
|
||||||
} else {
|
} else {
|
||||||
origin = "." + l.token
|
origin = l.token + origin
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
origin = l.token
|
||||||
}
|
}
|
||||||
st = _EXPECT_OWNER_DIR
|
st = _EXPECT_OWNER_DIR
|
||||||
case _EXPECT_OWNER_BL:
|
case _EXPECT_OWNER_BL:
|
||||||
|
@ -410,7 +435,11 @@ func (l lex) String() string {
|
||||||
case _CLASS:
|
case _CLASS:
|
||||||
return "C:" + l.token + "$"
|
return "C:" + l.token + "$"
|
||||||
case _DIRTTL:
|
case _DIRTTL:
|
||||||
return "T:" + l.token + "$"
|
return "$T:" + l.token + "$"
|
||||||
|
case _DIRORIGIN:
|
||||||
|
return "$O:" + l.token + "$"
|
||||||
|
case _DIRINCLUDE:
|
||||||
|
return "$I:" + l.token + "$"
|
||||||
}
|
}
|
||||||
return "**"
|
return "**"
|
||||||
}
|
}
|
||||||
|
@ -708,3 +737,11 @@ func stringToTtl(l lex, f string, t chan Token) (uint32, bool) {
|
||||||
}
|
}
|
||||||
return s + i, true
|
return s + i, true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func appendOrigin(name, origin string) string {
|
||||||
|
if origin == "." {
|
||||||
|
return name + origin
|
||||||
|
}
|
||||||
|
return name + "." + origin
|
||||||
|
|
||||||
|
}
|
||||||
|
|
31
zscan_rr.go
31
zscan_rr.go
|
@ -1,13 +1,12 @@
|
||||||
package dns
|
package dns
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"net"
|
"net"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TODO: SPF, TKEY, Unknown RRs, RR_URI, DHCID, TLSA
|
// TODO: SPF, TKEY, RR_URI, DHCID, TLSA
|
||||||
|
|
||||||
// Parse the rdata of each rrtype.
|
// Parse the rdata of each rrtype.
|
||||||
// All data from the channel c is either _STRING or _BLANK.
|
// All data from the channel c is either _STRING or _BLANK.
|
||||||
|
@ -85,15 +84,9 @@ Slurp:
|
||||||
|
|
||||||
func slurpRemainder(c chan lex, f string) *ParseError {
|
func slurpRemainder(c chan lex, f string) *ParseError {
|
||||||
l := <-c
|
l := <-c
|
||||||
if _DEBUG {
|
|
||||||
fmt.Printf("%v\n", l)
|
|
||||||
}
|
|
||||||
switch l.value {
|
switch l.value {
|
||||||
case _BLANK:
|
case _BLANK:
|
||||||
l = <-c
|
l = <-c
|
||||||
if _DEBUG {
|
|
||||||
fmt.Printf("%v\n", l)
|
|
||||||
}
|
|
||||||
if l.value != _NEWLINE && l.value != _EOF {
|
if l.value != _NEWLINE && l.value != _EOF {
|
||||||
return &ParseError{f, "garbage after rdata", l}
|
return &ParseError{f, "garbage after rdata", l}
|
||||||
}
|
}
|
||||||
|
@ -143,7 +136,7 @@ func setNS(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad NS Ns", l}
|
return nil, &ParseError{f, "bad NS Ns", l}
|
||||||
}
|
}
|
||||||
if rr.Ns[ld-1] != '.' {
|
if rr.Ns[ld-1] != '.' {
|
||||||
rr.Ns += o
|
rr.Ns = appendOrigin(rr.Ns, o)
|
||||||
}
|
}
|
||||||
return rr, nil
|
return rr, nil
|
||||||
}
|
}
|
||||||
|
@ -159,7 +152,7 @@ func setPTR(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad PTR Ptr", l}
|
return nil, &ParseError{f, "bad PTR Ptr", l}
|
||||||
}
|
}
|
||||||
if rr.Ptr[ld-1] != '.' {
|
if rr.Ptr[ld-1] != '.' {
|
||||||
rr.Ptr += o
|
rr.Ptr = appendOrigin(rr.Ptr, o)
|
||||||
}
|
}
|
||||||
return rr, nil
|
return rr, nil
|
||||||
}
|
}
|
||||||
|
@ -182,7 +175,7 @@ func setMX(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad MX Mx", l}
|
return nil, &ParseError{f, "bad MX Mx", l}
|
||||||
}
|
}
|
||||||
if rr.Mx[ld-1] != '.' {
|
if rr.Mx[ld-1] != '.' {
|
||||||
rr.Mx += o
|
rr.Mx = appendOrigin(rr.Mx, o)
|
||||||
}
|
}
|
||||||
return rr, nil
|
return rr, nil
|
||||||
}
|
}
|
||||||
|
@ -198,7 +191,7 @@ func setCNAME(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad CNAME Cname", l}
|
return nil, &ParseError{f, "bad CNAME Cname", l}
|
||||||
}
|
}
|
||||||
if rr.Cname[ld-1] != '.' {
|
if rr.Cname[ld-1] != '.' {
|
||||||
rr.Cname += o
|
rr.Cname = appendOrigin(rr.Cname, o)
|
||||||
}
|
}
|
||||||
return rr, nil
|
return rr, nil
|
||||||
}
|
}
|
||||||
|
@ -214,7 +207,7 @@ func setDNAME(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad CNAME Target", l}
|
return nil, &ParseError{f, "bad CNAME Target", l}
|
||||||
}
|
}
|
||||||
if rr.Target[ld-1] != '.' {
|
if rr.Target[ld-1] != '.' {
|
||||||
rr.Target += o
|
rr.Target = appendOrigin(rr.Target, o)
|
||||||
}
|
}
|
||||||
return rr, nil
|
return rr, nil
|
||||||
}
|
}
|
||||||
|
@ -231,7 +224,7 @@ func setSOA(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad SOA Ns", l}
|
return nil, &ParseError{f, "bad SOA Ns", l}
|
||||||
}
|
}
|
||||||
if rr.Ns[ld-1] != '.' {
|
if rr.Ns[ld-1] != '.' {
|
||||||
rr.Ns += o
|
rr.Ns = appendOrigin(rr.Ns, o)
|
||||||
}
|
}
|
||||||
|
|
||||||
l = <-c
|
l = <-c
|
||||||
|
@ -241,7 +234,7 @@ func setSOA(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad SOA Mbox", l}
|
return nil, &ParseError{f, "bad SOA Mbox", l}
|
||||||
}
|
}
|
||||||
if rr.Mbox[ld-1] != '.' {
|
if rr.Mbox[ld-1] != '.' {
|
||||||
rr.Mbox += o
|
rr.Mbox = appendOrigin(rr.Mbox, o)
|
||||||
}
|
}
|
||||||
<-c // _BLANK
|
<-c // _BLANK
|
||||||
|
|
||||||
|
@ -304,7 +297,7 @@ func setSRV(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad SRV Target", l}
|
return nil, &ParseError{f, "bad SRV Target", l}
|
||||||
}
|
}
|
||||||
if rr.Target[ld-1] != '.' {
|
if rr.Target[ld-1] != '.' {
|
||||||
rr.Target += o
|
rr.Target = appendOrigin(rr.Target, o)
|
||||||
}
|
}
|
||||||
return rr, nil
|
return rr, nil
|
||||||
}
|
}
|
||||||
|
@ -391,7 +384,7 @@ func setNAPTR(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad NAPTR Replacement", l}
|
return nil, &ParseError{f, "bad NAPTR Replacement", l}
|
||||||
}
|
}
|
||||||
if rr.Replacement[ld-1] != '.' {
|
if rr.Replacement[ld-1] != '.' {
|
||||||
rr.Replacement += o
|
rr.Replacement = appendOrigin(rr.Replacement, o)
|
||||||
}
|
}
|
||||||
return rr, nil
|
return rr, nil
|
||||||
}
|
}
|
||||||
|
@ -498,7 +491,7 @@ func setRRSIG(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad RRSIG SignerName", l}
|
return nil, &ParseError{f, "bad RRSIG SignerName", l}
|
||||||
}
|
}
|
||||||
if rr.SignerName[ld-1] != '.' {
|
if rr.SignerName[ld-1] != '.' {
|
||||||
rr.SignerName += o
|
rr.SignerName = appendOrigin(rr.SignerName, o)
|
||||||
}
|
}
|
||||||
// Get the remaining data until we see a NEWLINE
|
// Get the remaining data until we see a NEWLINE
|
||||||
l = <-c
|
l = <-c
|
||||||
|
@ -529,7 +522,7 @@ func setNSEC(h RR_Header, c chan lex, o, f string) (RR, *ParseError) {
|
||||||
return nil, &ParseError{f, "bad NSEC NextDomain", l}
|
return nil, &ParseError{f, "bad NSEC NextDomain", l}
|
||||||
}
|
}
|
||||||
if rr.NextDomain[ld-1] != '.' {
|
if rr.NextDomain[ld-1] != '.' {
|
||||||
rr.NextDomain += o
|
rr.NextDomain = appendOrigin(rr.NextDomain, o)
|
||||||
}
|
}
|
||||||
|
|
||||||
rr.TypeBitMap = make([]uint16, 0)
|
rr.TypeBitMap = make([]uint16, 0)
|
||||||
|
|
Loading…
Reference in New Issue