diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-02-01 07:45:35 +0100 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-02-01 07:47:40 +0100 |
| commit | 3244cb3b31f8f8c39d9dfa82bc01fb2d6db59257 (patch) | |
| tree | 8bf7e67eb83d734ccf8247f217e6d474ef640917 /hugolib | |
| parent | d9282cf98a346fcf98f363d9c353e4920ca85fc7 (diff) | |
Ignore unknown config files in config dir
Swap files etc.
Fixes #5646
Diffstat (limited to 'hugolib')
| -rw-r--r-- | hugolib/config.go | 4 | ||||
| -rw-r--r-- | hugolib/configdir_test.go | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/hugolib/config.go b/hugolib/config.go index 5b56333df..6a1de32be 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -283,6 +283,10 @@ func (l configLoader) loadConfigFromConfigDir(v *viper.Viper) ([]string, error) return nil } + if !config.IsValidConfigFilename(path) { + return nil + } + name := helpers.Filename(filepath.Base(path)) item, err := metadecoders.Default.UnmarshalFileToMap(sourceFs, path) diff --git a/hugolib/configdir_test.go b/hugolib/configdir_test.go index 80fcda61f..c1afbb14e 100644 --- a/hugolib/configdir_test.go +++ b/hugolib/configdir_test.go @@ -97,7 +97,9 @@ p3 = "p3params_no_production" fb = fb.WithWorkingDir("config/development") // This is set in all the config.toml variants above, but this will win. - fb.Add("config.toml", `paginatePath = "pag_development"`) + fb.Add("config.TOML", `paginatePath = "pag_development"`) + // Issue #5646 + fb.Add("config.toml.swp", `p3 = "paginatePath = "nono"`) fb.Add("params.no.toml", `p3 = "p3params_no_development"`) fb.Add("params.toml", `p3 = "p3params_development"`) |