Skip to content

Commit

Permalink
create: Validate the target path in hugo new
Browse files Browse the repository at this point in the history
  • Loading branch information
bep committed Oct 25, 2021
1 parent 64e1613 commit 75c9b89
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
4 changes: 4 additions & 0 deletions create/content.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

if !files.IsContentFile(b.targetPath) {
return errors.Errorf("target path %q is not a kown content format", b.targetPath)
}

return b.buildFile()

}
Expand Down
17 changes: 14 additions & 3 deletions create/content_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ func TestNewContent(t *testing.T) {
name string
kind 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 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"`}},
{"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
Expand Down Expand Up @@ -80,14 +81,24 @@ func TestNewContent(t *testing.T) {
h, err := hugolib.NewHugoSites(deps.DepsCfg{Cfg: cfg, Fs: fs})
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)
if !strings.HasPrefix(fname, "content") {
fname = filepath.Join("content", fname)
}
content := readFileFromFs(c, fs.Source, fname)
for _, v := range cas.expected {

for _, v := range cas.expected.([]string) {
found := strings.Contains(content, v)
if !found {
c.Fatalf("[%d] %q missing from output:\n%q", i, v, content)
Expand Down

0 comments on commit 75c9b89

Please sign in to comment.