diff --git a/go.mod b/go.mod
index 38f31c0..ebeb291 100644
--- a/go.mod
+++ b/go.mod
@@ -2,9 +2,17 @@ module github.com/oscarmlage/wikingo
go 1.17
-require github.com/labstack/echo/v4 v4.7.1
+require (
+ github.com/labstack/echo/v4 v4.7.1
+ github.com/microcosm-cc/bluemonday v1.0.18
+ github.com/russross/blackfriday/v2 v2.1.0
+ gorm.io/driver/sqlite v1.3.1
+ gorm.io/gorm v1.23.2
+)
require (
+ github.com/aymerick/douceur v0.2.0 // indirect
+ github.com/gorilla/css v1.0.0 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.4 // indirect
github.com/labstack/gommon v0.3.1 // indirect
@@ -17,6 +25,4 @@ require (
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect
golang.org/x/text v0.3.7 // indirect
- gorm.io/driver/sqlite v1.3.1 // indirect
- gorm.io/gorm v1.23.2 // indirect
)
diff --git a/go.sum b/go.sum
index 0782e7e..df90ea0 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,11 @@
+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
+github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas=
@@ -17,8 +21,12 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/microcosm-cc/bluemonday v1.0.18 h1:6HcxvXDAi3ARt3slx6nTesbvorIc3QeTzBNRvWktHBo=
+github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -29,6 +37,7 @@ github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/server/app.go b/server/app.go
index e1245f9..b41148c 100644
--- a/server/app.go
+++ b/server/app.go
@@ -3,6 +3,8 @@ package server
import (
"fmt"
"github.com/labstack/echo/v4"
+ "github.com/microcosm-cc/bluemonday"
+ "github.com/russross/blackfriday/v2"
"log"
"net/http"
)
@@ -18,8 +20,11 @@ func WikiHome(c echo.Context) error {
}
}
fmt.Printf("res: %T\n", page)
+ unsafe := blackfriday.Run([]byte(page.Body))
+ html := bluemonday.UGCPolicy().SanitizeBytes(unsafe)
return c.Render(http.StatusOK, "page.html", map[string]interface{}{
"page": page,
+ "html": string(html[:]),
})
}
@@ -36,8 +41,11 @@ func WikiPage(c echo.Context) error {
}
}
fmt.Printf("res: %T\n", page)
+ unsafe := blackfriday.Run([]byte(page.Body))
+ html := bluemonday.UGCPolicy().SanitizeBytes(unsafe)
return c.Render(http.StatusOK, "page.html", map[string]interface{}{
"page": page,
+ "html": string(html[:]),
})
}
diff --git a/server/server.go b/server/server.go
index 1192ba5..3c74f8d 100644
--- a/server/server.go
+++ b/server/server.go
@@ -47,7 +47,12 @@ func Serve() {
// Instantiate a template registry with an array of template set
// Ref: https://gist.github.com/rand99/808e6e9702c00ce64803d94abff65678
templates := make(map[string]*template.Template)
- templates["page.html"] = template.Must(template.ParseFiles("views/page.html", "views/base.html"))
+
+ templates["page.html"] = template.Must(template.New("page.html").Funcs(template.FuncMap{
+ "safeHTML": func(s string) template.HTML {
+ return template.HTML(s)
+ },
+ }).ParseFiles("views/page.html", "views/base.html"))
templates["list.html"] = template.Must(template.ParseFiles("views/list.html", "views/base.html"))
templates["edit.html"] = template.Must(template.ParseFiles("views/edit.html", "views/base.html"))
templates["about.html"] = template.Must(template.ParseFiles("views/about.html", "views/base.html"))
diff --git a/views/page.html b/views/page.html
index ec3a265..de63795 100644
--- a/views/page.html
+++ b/views/page.html
@@ -4,8 +4,7 @@
{{define "body"}}
{{ .page.Name }}
- {{ .page.Name }}
- {{ .page.Body }}
+ {{ .html | safeHTML }}
Edit
Last modified: {{ .page.UpdatedAt }}