github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-12 18:00:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

httpcaddyfile: Improve error on matcher declared outside site block (#3431)

Browse Source
This commit is contained in:
Francis Lavoie 2020-05-20 12:37:48 -04:00 committed by GitHub
parent fae064262d
commit cc8fb488d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
caddyconfig/httpcaddyfile/httptype.go
View File

@ -54,6 +54,9 @@ func (st ServerType) Setup(inputServerBlocks []caddyfile.ServerBlock,
originalServerBlocks := make([]serverBlock, 0, len(inputServerBlocks)) originalServerBlocks := make([]serverBlock, 0, len(inputServerBlocks))
for i, sblock := range inputServerBlocks { for i, sblock := range inputServerBlocks {
for j, k := range sblock.Keys { for j, k := range sblock.Keys {
if j == 0 && strings.HasPrefix(k, "@") {
return nil, warnings, fmt.Errorf("cannot define a matcher outside of a site block: '%s'", k)
}
if _, ok := sbKeys[k]; ok { if _, ok := sbKeys[k]; ok {
return nil, warnings, fmt.Errorf("duplicate site address not allowed: '%s' in %v (site block %d, key %d)", k, sblock.Keys, i, j) return nil, warnings, fmt.Errorf("duplicate site address not allowed: '%s' in %v (site block %d, key %d)", k, sblock.Keys, i, j)
} }

9
caddyconfig/httpcaddyfile/httptype_test.go
View File

@ -57,6 +57,15 @@ func TestMatcherSyntax(t *testing.T) {
expectWarn: false, expectWarn: false,
expectError: false, expectError: false,
}, },
{
input: `@matcher {
path /matcher-not-allowed/outside-of-site-block/*
}
http://localhost
`,
expectWarn: false,
expectError: true,
},
} { } {
adapter := caddyfile.Adapter{ adapter := caddyfile.Adapter{