e42614edc5
* core: fix v4 non-octet reverse zones This fixes the reverse zones handling. Add expanstion of the reverse notation to all octet boundary subnets and add those to the config - just as if they were directly typed in the config. This takes inspiration from #4501, but that (even with DCO!!) seems to be just using https://github.com/apparentlymart/go-cidr/ so use that instead - I think a minor function is still needed that one is copied from #4501. Also sort the zones we are listing on startup - caught in this PR because of the expanded zones being not listed next to each other. This also removes the need for FilterFunc from the config, so this is now gone as well, making the whole thing slightly more efficient. Add couple of reverse unit tests and a e2e test that queries for the correct (and incorrect) reverse zones and checks the reply. Closes: #4501 Fixes: #2779 Signed-off-by: Miek Gieben <miek@miek.nl> * Add more test cases Add test from origin bug report: #2779 Signed-off-by: Miek Gieben <miek@miek.nl> * Rebase and fix conflicts Signed-off-by: Miek Gieben <miek@miek.nl>
40 lines
955 B
Go
40 lines
955 B
Go
package dnsserver
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
)
|
|
|
|
// startUpZones creates the text that we show when starting up:
|
|
// grpc://example.com.:1055
|
|
// example.com.:1053 on 127.0.0.1
|
|
func startUpZones(protocol, addr string, zones map[string]*Config) string {
|
|
s := ""
|
|
|
|
keys := make([]string, len(zones))
|
|
i := 0
|
|
for k := range zones {
|
|
keys[i] = k
|
|
i++
|
|
}
|
|
sort.Strings(keys)
|
|
|
|
for _, zone := range keys {
|
|
// split addr into protocol, IP and Port
|
|
_, ip, port, err := SplitProtocolHostPort(addr)
|
|
|
|
if err != nil {
|
|
// this should not happen, but we need to take care of it anyway
|
|
s += fmt.Sprintln(protocol + zone + ":" + addr)
|
|
continue
|
|
}
|
|
if ip == "" {
|
|
s += fmt.Sprintln(protocol + zone + ":" + port)
|
|
continue
|
|
}
|
|
// if the server is listening on a specific address let's make it visible in the log,
|
|
// so one can differentiate between all active listeners
|
|
s += fmt.Sprintln(protocol + zone + ":" + port + " on " + ip)
|
|
}
|
|
return s
|
|
}
|