github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-25 17:56:34 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

log: only allow new roller related options in a block

Browse Source 
fix issue #1529

Signed-off-by: Tw <tw19881113@gmail.com>
This commit is contained in:
Tw 2017-04-17 16:51:37 +08:00
parent 8d1da68b47
commit 702dec0647
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
caddyhttp/log/setup.go
View File

@ -41,12 +41,13 @@ func logParse(c *caddy.Controller) ([]*Rule, error) {
}
where := c.Val()
if httpserver.IsLogRollerSubdirective(what) {
var err error
err = httpserver.ParseRoller(logRoller, what, where)
if err != nil {
return nil, err
}
// only support roller related options inside a block
if !httpserver.IsLogRollerSubdirective(what) {
return nil, c.ArgErr()
}
if err := httpserver.ParseRoller(logRoller, what, where); err != nil {
return nil, err
}
}

2
caddyhttp/log/setup_test.go
View File

@ -205,6 +205,8 @@ func TestLogParse(t *testing.T) {
Format: "{when}",
}},
}}},
{`log access.log { rotate_size }`, true, nil},
{`log access.log { invalid_option 1 }`, true, nil},
}
for i, test := range tests {
c := caddy.NewTestController("http", test.inputLogRules)