coop-cloud-chaos-patchs
/
go-ssb-room
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

saving notice without content, title should not work

This commit is contained in:
cblgh 2021-03-15 15:29:23 +01:00
parent 362e40e473
commit 83920aa646
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/handlers/admin/notices.go
View File

@ -143,6 +143,11 @@ func (h noticeHandler) save(rw http.ResponseWriter, req *http.Request) {
}
n.Title = req.FormValue("title")
if n.Title == "" {
err = weberrors.ErrBadRequest{Where: "title", Details: fmt.Errorf("title can't be empty")}
h.r.Error(rw, req, http.StatusInternalServerError, err)
return
}
// TODO: validate languages properly
n.Language = req.FormValue("language")
@ -153,6 +158,11 @@ func (h noticeHandler) save(rw http.ResponseWriter, req *http.Request) {
}
n.Content = req.FormValue("content")
if n.Content == "" {
err = weberrors.ErrBadRequest{Where: "content", Details: fmt.Errorf("content can't be empty")}
h.r.Error(rw, req, http.StatusInternalServerError, err)
return
}
// https://github.com/russross/blackfriday/issues/575
n.Content = strings.Replace(n.Content, "\r\n", "\n", -1)

20
web/handlers/admin/notices_test.go
View File

@ -21,10 +21,10 @@ func TestNoticeSaveRefusesIncomplete(t *testing.T) {
urlTo := web.NewURLTo(ts.Router)
// notice values we are selectively omitting in the tests below
// ID: 1,
// Title: "News",
// Content: "Breaking News: This Room Has News",
// Language: "en-GB",
id := []string{"1"}
title := []string{"SSB Breaking News: This Test Is Great"}
content := []string{"Absolutely Thrilling Content"}
language := []string{"pt"}
/* save without id */
u := urlTo(router.AdminNoticeSave)
@ -32,8 +32,18 @@ func TestNoticeSaveRefusesIncomplete(t *testing.T) {
resp := ts.Client.PostForm(u.String(), emptyParams)
a.Equal(http.StatusInternalServerError, resp.Code, "saving without id should not work")
/* save without title */
formValues := url.Values{"id": id, "content": content, "language": language}
resp = ts.Client.PostForm(u.String(), formValues)
a.Equal(http.StatusInternalServerError, resp.Code, "saving without title should not work")
/* save without content */
formValues = url.Values{"id": id, "title": title, "language": language}
resp = ts.Client.PostForm(u.String(), formValues)
a.Equal(http.StatusInternalServerError, resp.Code, "saving without content should not work")
/* save without language */
formValues := url.Values{"id": []string{"1"}, "title": []string{"Fake Title"}, "content": []string{"Thrilling Content"}}
formValues = url.Values{"id": id, "title": title, "content": content}
resp = ts.Client.PostForm(u.String(), formValues)
a.Equal(http.StatusInternalServerError, resp.Code, "saving without language should not work")
}