mirror/gohugoio-hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-05-11 05:54:58 +00:00
Code Issues Releases Activity

create: Validate the target path in hugo new

Browse Source 
Fixes #9072
This commit is contained in:
Bjørn Erik Pedersen
2021-10-25 12:28:12 +02:00
parent 64e1613fb3
commit 75c9b893d9
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
create/content.go
View File

@@ -91,6 +91,10 @@ func NewContent(h *hugolib.HugoSites, kind, targetPath string) error {
return errors.Errorf("failed to resolve %q to a archetype template", targetPath) return errors.Errorf("failed to resolve %q to a archetype template", targetPath)
} }
if !files.IsContentFile(b.targetPath) {
return errors.Errorf("target path %q is not a kown content format", b.targetPath)
}
return b.buildFile() return b.buildFile()
} }

17
create/content_test.go
View File

@@ -40,10 +40,11 @@ func TestNewContent(t *testing.T) {
name string name string
kind string kind string
path string path string
expected []string expected interface{}
}{ }{
{"Post", "post", "post/sample-1.md", []string{`title = "Post Arch title"`, `test = "test1"`, "date = \"2015-01-12T19:20:04-07:00\""}}, {"Post", "post", "post/sample-1.md", []string{`title = "Post Arch title"`, `test = "test1"`, "date = \"2015-01-12T19:20:04-07:00\""}},
{"Post org-mode", "post", "post/org-1.org", []string{`#+title: ORG-1`}}, {"Post org-mode", "post", "post/org-1.org", []string{`#+title: ORG-1`}},
{"Post, unknown content filetype", "post", "post/sample-1.pdoc", false},
{"Empty date", "emptydate", "post/sample-ed.md", []string{`title = "Empty Date Arch title"`, `test = "test1"`}}, {"Empty date", "emptydate", "post/sample-ed.md", []string{`title = "Empty Date Arch title"`, `test = "test1"`}},
{"Archetype file not found", "stump", "stump/sample-2.md", []string{`title: "Sample 2"`}}, // no archetype file {"Archetype file not found", "stump", "stump/sample-2.md", []string{`title: "Sample 2"`}}, // no archetype file
{"No archetype", "", "sample-3.md", []string{`title: "Sample 3"`}}, // no archetype {"No archetype", "", "sample-3.md", []string{`title: "Sample 3"`}}, // no archetype
@@ -80,14 +81,24 @@ func TestNewContent(t *testing.T) {
h, err := hugolib.NewHugoSites(deps.DepsCfg{Cfg: cfg, Fs: fs}) h, err := hugolib.NewHugoSites(deps.DepsCfg{Cfg: cfg, Fs: fs})
c.Assert(err, qt.IsNil) c.Assert(err, qt.IsNil)
c.Assert(create.NewContent(h, cas.kind, cas.path), qt.IsNil) err = create.NewContent(h, cas.kind, cas.path)
if b, ok := cas.expected.(bool); ok && !b {
if !b {
c.Assert(err, qt.Not(qt.IsNil))
}
return
}
c.Assert(err, qt.IsNil)
fname := filepath.FromSlash(cas.path) fname := filepath.FromSlash(cas.path)
if !strings.HasPrefix(fname, "content") { if !strings.HasPrefix(fname, "content") {
fname = filepath.Join("content", fname) fname = filepath.Join("content", fname)
} }
content := readFileFromFs(c, fs.Source, fname) content := readFileFromFs(c, fs.Source, fname)
for _, v := range cas.expected {
for _, v := range cas.expected.([]string) {
found := strings.Contains(content, v) found := strings.Contains(content, v)
if !found { if !found {
c.Fatalf("[%d] %q missing from output:\n%q", i, v, content) c.Fatalf("[%d] %q missing from output:\n%q", i, v, content)