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

middleware/file: transfer from does not make sense (#314)

Browse source 
Make it return an error when you use `transfer from` when you're
not a secondary.

Add tests as well.

Fixes #310
This commit is contained in:
Miek Gieben 2016-10-02 19:41:00 +01:00 • committed by GitHub
parent 560f11d148
commit cc486fb900
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
middleware/file/setup.go
View file

@ -83,7 +83,7 @@ func fileParse(c *caddy.Controller) (Zones, error) {
noReload := false
for c.NextBlock() {
t, _, e := TransferParse(c)
t, _, e := TransferParse(c, false)
if e != nil {
return Zones{}, e
}
@ -105,8 +105,9 @@ func fileParse(c *caddy.Controller) (Zones, error) {
}
// TransferParse parses transfer statements: 'transfer to [address...]'.
// Exported so secondary can use this as well.
func TransferParse(c *caddy.Controller) (tos, froms []string, err error) {
// Exported so secondary can use this as well. For the `file` middleware transfer from does
// not make sense; make this an error.
func TransferParse(c *caddy.Controller, secondary bool) (tos, froms []string, err error) {
what := c.Val()
if !c.NextArg() {
return nil, nil, c.ArgErr()
@ -126,6 +127,9 @@ func TransferParse(c *caddy.Controller) (tos, froms []string, err error) {
}
}
if value == "from" {
if !secondary {
return nil, nil, fmt.Errorf("can't use `transfer from` when not being a seconary")
}
froms = c.RemainingArgs()
for i := range froms {
if froms[i] != "*" {

7
middleware/file/setup_test.go
View file

@ -26,6 +26,13 @@ func TestFileParse(t *testing.T) {
shouldErr bool
expectedZones Zones
}{
{
`file ` + zoneFileName1 + ` miek.nl {
transfer from 127.0.0.1
}`,
true,
Zones{},
},
{
`file`,
true,

2
middleware/secondary/setup.go
View file

@ -63,7 +63,7 @@ func secondaryParse(c *caddy.Controller) (file.Zones, error) {
}
for c.NextBlock() {
t, f, e := file.TransferParse(c)
t, f, e := file.TransferParse(c, true)
if e != nil {
return file.Zones{}, e
}