diff options
| -rw-r--r-- | handler.go | 9 | ||||
| -rw-r--r-- | main.go | 3 | ||||
| -rw-r--r-- | templates.go | 22 |
3 files changed, 14 insertions, 20 deletions
@@ -42,8 +42,7 @@ func indexGet(w http.ResponseWriter, r *http.Request) { } } - path := filepath.Join(config.Http.Templates, "index.html") - ServeTemplate(w, "index", path, elements) + ServeTemplate(w, "index.html", elements) } func recipeGet(w http.ResponseWriter, r *http.Request) { @@ -101,8 +100,7 @@ func recipeGet(w http.ResponseWriter, r *http.Request) { goldmark.Convert([]byte(elements[0].DescriptionMarkdown), &buf) elements[0].RenderedDescriptionMarkdown = buf.String() - path := filepath.Join(config.Http.Templates, "recipe.html") - ServeTemplate(w, "recipe", path, elements[0]) + ServeTemplate(w, "recipe.html", elements[0]) } func recipePost(w http.ResponseWriter, r *http.Request) { @@ -175,8 +173,7 @@ func recipeEditGet(w http.ResponseWriter, r *http.Request) { return } - path := filepath.Join(config.Http.Templates, "recipe_edit.html") - ServeTemplate(w, "recipe", path, elements[0]) + ServeTemplate(w, "recipe_edit.html", elements[0]) } func recipeEditPost(w http.ResponseWriter, r *http.Request) { @@ -6,14 +6,17 @@ import ( "os" "os/signal" "syscall" + "text/template" ) var config RuntimeConfig var db *sql.DB +var templates *template.Template func main() { log.Printf("Started Ceres recipe server.\n") config = GetRuntimeConfig() + templates = setupTemplates() db = setupDatabase() provideShutdown() runServer() diff --git a/templates.go b/templates.go index d18017f..6b4fe51 100644 --- a/templates.go +++ b/templates.go @@ -1,28 +1,22 @@ package main import ( - "io/ioutil" "log" "net/http" "text/template" // FIXME switch to html/template for security reasons // and make a workaround for rendered Markdown insertion ) -func ServeTemplate(w http.ResponseWriter, name string, path string, data interface{}) { - - templateFile, err := ioutil.ReadFile(path) +func setupTemplates() *template.Template { + t, err := template.ParseGlob(config.Http.Templates + "/*.html") if err != nil { - log.Print(err) - http.Error(w, http.StatusText(404), 404) - return + panic(err) } - tmpl, err := template.New(name).Parse(string(templateFile)) - if err != nil { - log.Print(err) - http.Error(w, http.StatusText(404), 404) - return - } - err = tmpl.Execute(w, data) + return t +} + +func ServeTemplate(w http.ResponseWriter, name string, data interface{}) { + err := templates.ExecuteTemplate(w, name, data) if err != nil { log.Print(err) http.Error(w, http.StatusText(404), 404) |