Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(plugin/secondary): make transfer property mandatory #7249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisohaver merged 2 commits into from
Apr 25, 2025
Merged

fix(plugin/secondary): make transfer property mandatory #7249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c59af2
fix(plugin/secondary): make transfer property mandatory
wafuwafu13 Apr 12, 2025
271eba2
fix(plugin/secondary): add line break
wafuwafu13 Apr 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions plugin/secondary/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ func secondaryParse(c *caddy.Controller) (file.Zones, error) {
names = append(names, origins[i])
}

hasTransfer := false
for c.NextBlock() {
var f []string

Expand All @@ -82,6 +83,7 @@ func secondaryParse(c *caddy.Controller) (file.Zones, error) {
if err != nil {
return file.Zones{}, err
}
hasTransfer = true
default:
return file.Zones{}, c.Errf("unknown property '%s'", c.Val())
}
Expand All @@ -93,6 +95,9 @@ func secondaryParse(c *caddy.Controller) (file.Zones, error) {
z[origin].Upstream = upstream.New()
}
}
if !hasTransfer {
return file.Zones{}, c.Err("secondary zones require a transfer from property")
}
}
}
return file.Zones{Z: z, Names: names}, nil
Expand Down
20 changes: 14 additions & 6 deletions plugin/secondary/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ func TestSecondaryParse(t *testing.T) {
transferFrom string
zones []string
}{
{
`secondary`,
false, // TODO(miek): should actually be true, because without transfer lines this does not make sense
"",
nil,
},
{
`secondary {
transfer from 127.0.0.1
Expand All @@ -35,6 +29,20 @@ func TestSecondaryParse(t *testing.T) {
"127.0.0.1:53",
[]string{"example.org."},
},
{
`secondary`,
true,
"",
nil,
},
{
`secondary example.org {
transferr from 127.0.0.1
Copy link
Contributor Author

@wafuwafu13 wafuwafu13 Apr 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intentionally made a typo.

}`,
true,
"",
nil,
},
}

for i, test := range tests {
Expand Down