community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more docs and add LIST

This commit is contained in:
Miek Gieben 2012-08-07 17:42:36 +02:00
parent 37ff3f9f84
commit 70b98c505e
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ex/fksd/config.mkd → ex/fksd/cmds/config.mkd
View File

@ -29,4 +29,23 @@ Add from axfr:
ZONE. TXT "DROP origin" ZONE. TXT "DROP origin"
## List zones
ZONE. TXT "list"
Zones are listed in the additional section of the reply packet
ZONE. TXT "zonename1"
ZONE. TXT "zonename2"
# USER # USER
## Add user
USER. TXT "ADD miekg tsig
USER. TXT "DROP miekg"
USER. TXT "ADDRIGHT miekg list" // list/write/drop
USER. TXT "DROPRIGHT miekg list"

25
ex/fksd/config.go
View File

@ -21,6 +21,11 @@ func formerr(w dns.ResponseWriter, req *dns.Msg) {
w.Write(m.SetRcode(req, dns.RcodeFormatError)) w.Write(m.SetRcode(req, dns.RcodeFormatError))
} }
func noerr(w dns.ResponseWriter, req *dns.Msg) {
m := new(dns.Msg)
w.Write(m.SetReply(req))
}
func config(w dns.ResponseWriter, req *dns.Msg, c *Config) { func config(w dns.ResponseWriter, req *dns.Msg, c *Config) {
// Set question to fks. IN TXT otherwise error // Set question to fks. IN TXT otherwise error
// tsig signed, key = user // tsig signed, key = user
@ -40,13 +45,14 @@ func config(w dns.ResponseWriter, req *dns.Msg, c *Config) {
t, ok := rr.(*dns.RR_TXT) t, ok := rr.(*dns.RR_TXT)
if !ok { if !ok {
// Not the TXT record -> error formerr(w, req)
return return
} }
switch strings.ToUpper(t.Header().Name) { switch strings.ToUpper(t.Header().Name) {
case "ZONE.": case "ZONE.":
if e := configZONE(t, c); e != nil { if e := configZONE(w, req, t, c); e != nil {
formerr(w, req) formerr(w, req)
return
} }
default: default:
return return
@ -56,7 +62,7 @@ func config(w dns.ResponseWriter, req *dns.Msg, c *Config) {
} }
// Deal with the zone options // Deal with the zone options
func configZONE(t *dns.RR_TXT, c *Config) error { func configZONE(w dns.ResponseWriter, req *dns.Msg, t *dns.RR_TXT, c *Config) error {
sx := strings.Split(t.Txt[0], " ") sx := strings.Split(t.Txt[0], " ")
if len(sx) == 0 { if len(sx) == 0 {
return nil return nil
@ -72,6 +78,7 @@ func configZONE(t *dns.RR_TXT, c *Config) error {
return e return e
} }
logPrintf("config: added: READ %s %s\n", dns.Fqdn(sx[1]), sx[2]) logPrintf("config: added: READ %s %s\n", dns.Fqdn(sx[1]), sx[2])
noerr(w, req)
case "READXFR": case "READXFR":
if len(sx) != 3 { if len(sx) != 3 {
return nil return nil
@ -82,6 +89,7 @@ func configZONE(t *dns.RR_TXT, c *Config) error {
return e return e
} }
logPrintf("config: added: READXFR %s %s\n", dns.Fqdn(sx[1]), sx[2]) logPrintf("config: added: READXFR %s %s\n", dns.Fqdn(sx[1]), sx[2])
noerr(w, req)
case "DROP": case "DROP":
if len(sx) != 2 { if len(sx) != 2 {
return nil return nil
@ -92,6 +100,17 @@ func configZONE(t *dns.RR_TXT, c *Config) error {
return e return e
} }
logPrintf("config: dropped: DROP %s\n", dns.Fqdn(sx[1])) logPrintf("config: dropped: DROP %s\n", dns.Fqdn(sx[1]))
noerr(w, req)
case "LIST":
logPrintf("config: LIST\n")
m := new(dns.Msg)
m.SetReply(req)
// Add the zones to the additional section
for zone, _ := range c.Zones {
a, _ := dns.NewRR("ZONE. TXT \"" + zone + "\"")
m.Extra = append(m.Extra, a)
}
w.Write(m)
} }
return nil return nil
} }