caddyhttp: Wrap the response writer, chain handlers, directive ordering

caddyserver · Apr 27, 2020 · 1ab3e02 · 1ab3e02
1 parent c6051b6
commit 1ab3e02
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/caddyconfig/httpcaddyfile/directives.go b/caddyconfig/httpcaddyfile/directives.go
@@ -52,6 +52,7 @@ var directiveOrder = []string{
 	"basicauth",
 	"request_header",
 	"encode",
+	"status_code",
 	"templates",
 
 	// special routing directives

diff --git a/modules/caddyhttp/statuscode.go b/modules/caddyhttp/statuscode.go
@@ -58,7 +58,7 @@ func (s *StatusCode) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 	return nil
 }
 
-func (s StatusCode) ServeHTTP(w http.ResponseWriter, r *http.Request, _ Handler) error {
+func (s StatusCode) ServeHTTP(w http.ResponseWriter, r *http.Request, next Handler) error {
 	repl := r.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
 
 	// get the status code
@@ -71,10 +71,14 @@ func (s StatusCode) ServeHTTP(w http.ResponseWriter, r *http.Request, _ Handler)
 		statusCode = intVal
 	}
 
+	// wrap the response writer so we can modify the status
+	// without repercursions (i.e. writing it twice)
+	wrapper := NewResponseRecorder(w, nil, nil)
+
 	// write headers
-	w.WriteHeader(statusCode)
+	wrapper.WriteHeader(statusCode)
 
-	return nil
+	return next.ServeHTTP(wrapper, r)
 }
 
 // Interface guards