Noescape (#88)

* disable html escaping for short description

* provide noescape function for templates

* move template functions before template loading

* go fmt

* linter fixes
This commit is contained in:
f0x52 2021-07-13 16:05:03 +02:00 committed by GitHub
parent bdba3ff9a9
commit f05b255511
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 1 deletions

View file

@ -126,6 +126,9 @@ func New(cfg *config.Config, db db.DB, logger *logrus.Logger) (Router, error) {
return nil, err
}
// set template functions
loadTemplateFunctions(engine)
// load templates onto the engine
if err := loadTemplates(cfg, engine); err != nil {
return nil, err

View file

@ -2,6 +2,7 @@ package router
import (
"fmt"
"html/template"
"os"
"path/filepath"
@ -21,3 +22,13 @@ func loadTemplates(cfg *config.Config, engine *gin.Engine) error {
engine.LoadHTMLGlob(tmPath)
return nil
}
func noescape(str string) template.HTML {
return template.HTML(str)
}
func loadTemplateFunctions(engine *gin.Engine) {
engine.SetFuncMap(template.FuncMap{
"noescape": noescape,
})
}

View file

@ -101,5 +101,9 @@ func (m *Module) Route(s router.Router) error {
// 404 handler
s.AttachNoRouteHandler(m.NotFoundHandler)
if err != nil {
return fmt.Errorf("error setting router FuncMap: %s", err)
}
return nil
}

View file

@ -9,7 +9,7 @@
<h3>This is the default landing page, you can edit it from <span class="accent">./web/template/index.tmpl</span></h1>
<p>
{{.instance.ShortDescription}}
{{.instance.ShortDescription |noescape}}
</p>
</section>