mirror of
https://github.com/coredns/coredns.git
synced 2026-07-23 08:00:11 -04:00
d1a6ab0eb9
The warning added in #8216 passed the skipped file where the kept file belongs and vice versa, so it logged "using <skipped> instead of <kept>" — the reverse of what Walk actually does. Swap the arguments (and use cleanPath for both) so the message names the file that is being used. Strengthen TestWalkWarnsForDuplicateOrigin to assert the direction; it only checked that both names appeared, so the inversion passed before. Signed-off-by: maximilize <3752128+maximilize@users.noreply.github.com>
124 lines
2.9 KiB
Go
124 lines
2.9 KiB
Go
package auto
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"regexp"
|
|
|
|
"github.com/coredns/coredns/plugin/file"
|
|
|
|
"github.com/miekg/dns"
|
|
)
|
|
|
|
// Walk will recursively walk of the file under l.directory and adds the one that match l.re.
|
|
func (a Auto) Walk() error {
|
|
// TODO(miek): should add something so that we don't stomp on each other.
|
|
|
|
// Resolve symlinks in the directory path so filepath.Walk will traverse it.
|
|
// filepath.Walk uses os.Lstat on the root and won't enter a symlinked directory.
|
|
// This is needed when DIR itself is a symlink (e.g., Kubernetes ConfigMap mounts).
|
|
dir := a.directory
|
|
if resolved, err := filepath.EvalSymlinks(a.directory); err == nil {
|
|
dir = resolved
|
|
}
|
|
|
|
toDelete := make(map[string]bool)
|
|
for _, n := range a.Names() {
|
|
toDelete[n] = true
|
|
}
|
|
seen := make(map[string]string)
|
|
|
|
filepath.Walk(dir, func(path string, info os.FileInfo, e error) error {
|
|
if e != nil {
|
|
log.Warningf("error reading %v: %v", path, e)
|
|
}
|
|
if info == nil || info.IsDir() {
|
|
return nil
|
|
}
|
|
|
|
match, origin := matches(a.re, info.Name(), a.template)
|
|
if !match {
|
|
return nil
|
|
}
|
|
|
|
cleanPath := filepath.Clean(path)
|
|
if previous, ok := seen[origin]; ok && previous != cleanPath {
|
|
log.Warningf("Multiple zone files match origin %q: using %q instead of %q", origin, previous, cleanPath)
|
|
toDelete[origin] = false
|
|
return nil
|
|
}
|
|
seen[origin] = cleanPath
|
|
|
|
if z, ok := a.Z[origin]; ok {
|
|
toDelete[origin] = false
|
|
z.SetFile(cleanPath)
|
|
return nil
|
|
}
|
|
|
|
reader, err := os.Open(cleanPath) //nolint:gosec // G122: path is from filepath.Walk rooted in a.directory; symlinks must be followed for configmap-style mounts
|
|
if err != nil {
|
|
log.Warningf("Opening %s failed: %s", path, err)
|
|
return nil
|
|
}
|
|
defer reader.Close()
|
|
|
|
// Serial for loading a zone is 0, because it is a new zone.
|
|
zo, err := file.Parse(reader, origin, path, 0)
|
|
if err != nil {
|
|
log.Warningf("Parse zone `%s': %v", origin, err)
|
|
return nil
|
|
}
|
|
|
|
zo.ReloadInterval = a.ReloadInterval
|
|
zo.Upstream = a.upstream
|
|
|
|
a.Add(zo, origin, a.transfer)
|
|
|
|
if a.metrics != nil {
|
|
a.metrics.AddZone(origin)
|
|
}
|
|
|
|
log.Infof("Inserting zone `%s' from: %s", origin, path)
|
|
|
|
toDelete[origin] = false
|
|
|
|
return nil
|
|
})
|
|
|
|
for origin, ok := range toDelete {
|
|
if !ok {
|
|
continue
|
|
}
|
|
|
|
if a.metrics != nil {
|
|
a.metrics.RemoveZone(origin)
|
|
}
|
|
|
|
a.Remove(origin)
|
|
|
|
log.Infof("Deleting zone `%s'", origin)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// matches re to filename, if it is a match, the subexpression will be used to expand
|
|
// template to an origin. When match is true that origin is returned. Origin is fully qualified.
|
|
func matches(re *regexp.Regexp, filename, template string) (match bool, origin string) {
|
|
base := filepath.Base(filename)
|
|
|
|
matches := re.FindStringSubmatchIndex(base)
|
|
if matches == nil {
|
|
return false, ""
|
|
}
|
|
|
|
by := re.ExpandString(nil, template, base, matches)
|
|
if by == nil {
|
|
return false, ""
|
|
}
|
|
|
|
origin = dns.Fqdn(string(by))
|
|
|
|
return true, origin
|
|
}
|