github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix validation of Page Kind in cascade target map

Browse source 
Fixes #8888
This commit is contained in:
Joe Mooring 2022-01-29 18:34:27 -08:00 committed by Bjørn Erik Pedersen
parent a7d182cea1
commit d1109f590a
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/content/en/content-management/front-matter.md
View file

@ -184,7 +184,7 @@ path
: A [Glob](https://github.com/gobwas/glob) pattern matching the content path below /content. Expects Unix-styled slashes. Note that this is the virtual path, so it starts at the mount root. The matching support double-asterisks so you can match for patterns like `/blog/*/**` to match anything from the third level and down. : A [Glob](https://github.com/gobwas/glob) pattern matching the content path below /content. Expects Unix-styled slashes. Note that this is the virtual path, so it starts at the mount root. The matching support double-asterisks so you can match for patterns like `/blog/*/**` to match anything from the third level and down.
kind kind
: The Page's Kind, e.g. "section". : A Glob pattern matching the Page's Kind(s), e.g. "{home,section}".
lang lang
: A Glob pattern matching the Page's language, e.g. "{en,sv}". : A Glob pattern matching the Page's language, e.g. "{en,sv}".

15
resources/page/page_matcher.go
View file

@ -17,11 +17,10 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/pkg/errors"
"github.com/gohugoio/hugo/common/maps" "github.com/gohugoio/hugo/common/maps"
"github.com/gohugoio/hugo/hugofs/glob" "github.com/gohugoio/hugo/hugofs/glob"
"github.com/mitchellh/mapstructure" "github.com/mitchellh/mapstructure"
"github.com/pkg/errors"
) )
// A PageMatcher can be used to match a Page with Glob patterns. // A PageMatcher can be used to match a Page with Glob patterns.
@ -114,8 +113,16 @@ func DecodePageMatcher(m interface{}, v *PageMatcher) error {
v.Kind = strings.ToLower(v.Kind) v.Kind = strings.ToLower(v.Kind)
if v.Kind != "" { if v.Kind != "" {
if _, found := kindMap[v.Kind]; !found { g, _ := glob.GetGlob(v.Kind)
return errors.Errorf("%q is not a valid Page Kind", v.Kind) found := false
for _, k := range kindMap {
if g.Match(k) {
found = true
break
}
}
if !found {
return errors.Errorf("%q did not match a valid Page Kind", v.Kind)
} }
} }

7
resources/page/page_matcher_test.go
View file

@ -54,7 +54,12 @@ func TestPageMatcher(t *testing.T) {
c.Run("Decode", func(c *qt.C) { c.Run("Decode", func(c *qt.C) {
var v PageMatcher var v PageMatcher
c.Assert(DecodePageMatcher(map[string]interface{}{"kind": "foo"}, &v), qt.Not((qt.IsNil))) c.Assert(DecodePageMatcher(map[string]interface{}{"kind": "foo"}, &v), qt.Not(qt.IsNil))
c.Assert(DecodePageMatcher(map[string]interface{}{"kind": "{foo,bar}"}, &v), qt.Not(qt.IsNil))
c.Assert(DecodePageMatcher(map[string]interface{}{"kind": "taxonomy"}, &v), qt.IsNil)
c.Assert(DecodePageMatcher(map[string]interface{}{"kind": "{taxonomy,foo}"}, &v), qt.IsNil)
c.Assert(DecodePageMatcher(map[string]interface{}{"kind": "{taxonomy,term}"}, &v), qt.IsNil)
c.Assert(DecodePageMatcher(map[string]interface{}{"kind": "*"}, &v), qt.IsNil)
c.Assert(DecodePageMatcher(map[string]interface{}{"kind": "home", "path": filepath.FromSlash("/a/b/**")}, &v), qt.IsNil) c.Assert(DecodePageMatcher(map[string]interface{}{"kind": "home", "path": filepath.FromSlash("/a/b/**")}, &v), qt.IsNil)
c.Assert(v, qt.Equals, PageMatcher{Kind: "home", Path: "/a/b/**"}) c.Assert(v, qt.Equals, PageMatcher{Kind: "home", Path: "/a/b/**"})
}) })