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>
73 lines
2.1 KiB
Go
73 lines
2.1 KiB
Go
package dnsserver
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"fmt"
|
|
"net/http"
|
|
|
|
"github.com/coredns/caddy"
|
|
"github.com/coredns/coredns/plugin"
|
|
)
|
|
|
|
// Config configuration for a single server.
|
|
type Config struct {
|
|
// The zone of the site.
|
|
Zone string
|
|
|
|
// one or several hostnames to bind the server to.
|
|
// defaults to a single empty string that denote the wildcard address
|
|
ListenHosts []string
|
|
|
|
// The port to listen on.
|
|
Port string
|
|
|
|
// Root points to a base directory we find user defined "things".
|
|
// First consumer is the file plugin to looks for zone files in this place.
|
|
Root string
|
|
|
|
// Debug controls the panic/recover mechanism that is enabled by default.
|
|
Debug bool
|
|
|
|
// The transport we implement, normally just "dns" over TCP/UDP, but could be
|
|
// DNS-over-TLS or DNS-over-gRPC.
|
|
Transport string
|
|
|
|
// If this function is not nil it will be used to inspect and validate
|
|
// HTTP requests. Although this isn't referenced in-tree, external plugins
|
|
// may depend on it.
|
|
HTTPRequestValidateFunc func(*http.Request) bool
|
|
|
|
// TLSConfig when listening for encrypted connections (gRPC, DNS-over-TLS).
|
|
TLSConfig *tls.Config
|
|
|
|
// Plugin stack.
|
|
Plugin []plugin.Plugin
|
|
|
|
// Compiled plugin stack.
|
|
pluginChain plugin.Handler
|
|
|
|
// Plugin interested in announcing that they exist, so other plugin can call methods
|
|
// on them should register themselves here. The name should be the name as return by the
|
|
// Handler's Name method.
|
|
registry map[string]plugin.Handler
|
|
}
|
|
|
|
// keyForConfig builds a key for identifying the configs during setup time
|
|
func keyForConfig(blocIndex int, blocKeyIndex int) string {
|
|
return fmt.Sprintf("%d:%d", blocIndex, blocKeyIndex)
|
|
}
|
|
|
|
// GetConfig gets the Config that corresponds to c.
|
|
// If none exist nil is returned.
|
|
func GetConfig(c *caddy.Controller) *Config {
|
|
ctx := c.Context().(*dnsContext)
|
|
key := keyForConfig(c.ServerBlockIndex, c.ServerBlockKeyIndex)
|
|
if cfg, ok := ctx.keysToConfigs[key]; ok {
|
|
return cfg
|
|
}
|
|
// we should only get here during tests because directive
|
|
// actions typically skip the server blocks where we make
|
|
// the configs.
|
|
ctx.saveConfig(key, &Config{ListenHosts: []string{""}})
|
|
return GetConfig(c)
|
|
}
|