From 9948228e5b3b46bafaa366d2ce220590e0f3ff05 Mon Sep 17 00:00:00 2001
From: Kazumasa Kohtaka <kkotaka@zlab.co.jp>
Date: Fri, 1 Dec 2017 14:23:45 +0900
Subject: [PATCH] Set a proper status code before sending an error status page
---
server/handlers.go | 2 +-
server/templates.go | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/handlers.go b/server/handlers.go
index d9700f30..926b4000 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -996,7 +996,7 @@ func (s *Server) writeAccessToken(w http.ResponseWriter, idToken, accessToken, r
}
func (s *Server) renderError(w http.ResponseWriter, status int, description string) {
- if err := s.templates.err(w, http.StatusText(status), description); err != nil {
+ if err := s.templates.err(w, status, description); err != nil {
s.logger.Errorf("Server template error: %v", err)
}
}
diff --git a/server/templates.go b/server/templates.go
index 5cadefa3..87567e40 100644
--- a/server/templates.go
+++ b/server/templates.go
@@ -226,12 +226,16 @@ func (t *templates) oob(w http.ResponseWriter, code string) error {
return renderTemplate(w, t.oobTmpl, data)
}
-func (t *templates) err(w http.ResponseWriter, errType string, errMsg string) error {
+func (t *templates) err(w http.ResponseWriter, errCode int, errMsg string) error {
+ w.WriteHeader(errCode)
data := struct {
ErrType string
ErrMsg string
- }{errType, errMsg}
- return renderTemplate(w, t.errorTmpl, data)
+ }{http.StatusText(errCode), errMsg}
+ if err := t.errorTmpl.Execute(w, data); err != nil {
+ return fmt.Errorf("Error rendering template %s: %s", t.errorTmpl.Name(), err)
+ }
+ return nil
}
// small io.Writer utility to determine if executing the template wrote to the underlying response writer.
--
GitLab