TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 4 Projects Releases Packages Wiki Activity Actions

Revert "plugin/tls: respect the path specified by root plugin (#5944)" (#6136)

Browse source 
This reverts commit d0375bc026.
This commit is contained in:
Chris O'Haver 2023-06-01 14:07:58 -04:00 • committed by GitHub
parent d0375bc026
commit d3965b8b60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugin.cfg
View file

@ -19,7 +19,6 @@
# Local plugin example: # Local plugin example:
# log:log # log:log
root:root
metadata:metadata metadata:metadata
geoip:geoip geoip:geoip
cancel:cancel cancel:cancel
@ -28,6 +27,7 @@ timeouts:timeouts
reload:reload reload:reload
nsid:nsid nsid:nsid
bufsize:bufsize bufsize:bufsize
root:root
bind:bind bind:bind
debug:debug debug:debug
trace:trace trace:trace

7
plugin/etcd/setup.go
View file

@ -2,7 +2,6 @@ package etcd
import ( import (
"crypto/tls" "crypto/tls"
"path/filepath"
"github.com/coredns/caddy" "github.com/coredns/caddy"
"github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/core/dnsserver"
@ -30,7 +29,6 @@ func setup(c *caddy.Controller) error {
} }
func etcdParse(c *caddy.Controller) (*Etcd, error) { func etcdParse(c *caddy.Controller) (*Etcd, error) {
config := dnsserver.GetConfig(c)
etc := Etcd{PathPrefix: "skydns"} etc := Etcd{PathPrefix: "skydns"}
var ( var (
tlsConfig *tls.Config tlsConfig *tls.Config
@ -68,11 +66,6 @@ func etcdParse(c *caddy.Controller) (*Etcd, error) {
c.RemainingArgs() c.RemainingArgs()
case "tls": // cert key cacertfile case "tls": // cert key cacertfile
args := c.RemainingArgs() args := c.RemainingArgs()
for i := range args {
if !filepath.IsAbs(args[i]) && config.Root != "" {
args[i] = filepath.Join(config.Root, args[i])
}
}
tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...) tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...)
if err != nil { if err != nil {
return &Etcd{}, err return &Etcd{}, err

8
plugin/forward/setup.go
View file

@ -4,7 +4,6 @@ import (
"crypto/tls" "crypto/tls"
"errors" "errors"
"fmt" "fmt"
"path/filepath"
"strconv" "strconv"
"time" "time"
@ -166,7 +165,6 @@ func parseStanza(c *caddy.Controller) (*Forward, error) {
} }
func parseBlock(c *caddy.Controller, f *Forward) error { func parseBlock(c *caddy.Controller, f *Forward) error {
config := dnsserver.GetConfig(c)
switch c.Val() { switch c.Val() {
case "except": case "except":
ignore := c.RemainingArgs() ignore := c.RemainingArgs()
@ -232,11 +230,7 @@ func parseBlock(c *caddy.Controller, f *Forward) error {
if len(args) > 3 { if len(args) > 3 {
return c.ArgErr() return c.ArgErr()
} }
for i := range args {
if !filepath.IsAbs(args[i]) && config.Root != "" {
args[i] = filepath.Join(config.Root, args[i])
}
}
tlsConfig, err := pkgtls.NewTLSConfigFromArgs(args...) tlsConfig, err := pkgtls.NewTLSConfigFromArgs(args...)
if err != nil { if err != nil {
return err return err

7
plugin/grpc/setup.go
View file

@ -3,7 +3,6 @@ package grpc
import ( import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"path/filepath"
"github.com/coredns/caddy" "github.com/coredns/caddy"
"github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/core/dnsserver"
@ -111,11 +110,7 @@ func parseBlock(c *caddy.Controller, g *GRPC) error {
if len(args) > 3 { if len(args) > 3 {
return c.ArgErr() return c.ArgErr()
} }
for i := range args {
if !filepath.IsAbs(args[i]) && dnsserver.GetConfig(c).Root != "" {
args[i] = filepath.Join(dnsserver.GetConfig(c).Root, args[i])
}
}
tlsConfig, err := pkgtls.NewTLSConfigFromArgs(args...) tlsConfig, err := pkgtls.NewTLSConfigFromArgs(args...)
if err != nil { if err != nil {
return err return err

6
plugin/tls/tls.go
View file

@ -2,7 +2,6 @@ package tls
import ( import (
ctls "crypto/tls" ctls "crypto/tls"
"path/filepath"
"github.com/coredns/caddy" "github.com/coredns/caddy"
"github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/core/dnsserver"
@ -58,11 +57,6 @@ func parseTLS(c *caddy.Controller) error {
return c.Errf("unknown option '%s'", c.Val()) return c.Errf("unknown option '%s'", c.Val())
} }
} }
for i := range args {
if !filepath.IsAbs(args[i]) && config.Root != "" {
args[i] = filepath.Join(config.Root, args[i])
}
}
tls, err := tls.NewTLSConfigFromArgs(args...) tls, err := tls.NewTLSConfigFromArgs(args...)
if err != nil { if err != nil {
return err return err