Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: panic was causing compress middleware to force download (#824)

Guilherme Oenningcfe2865db7ae
diff --git a/app/middlewares/compress.go b/app/middlewares/compress.go
index 00f1efa09..f32dee0cf 100644
--- a/app/middlewares/compress.go
+++ b/app/middlewares/compress.go
@@ -24,9 +24,6 @@ func Compress() web.MiddlewareFunc {
res := c.Response
if strings.Contains(c.Request.GetHeader("Accept-Encoding"), "gzip") {
- gw, _ := gzip.NewWriterLevel(res, gzip.DefaultCompression)
- defer gw.Close()
-
res.Header().Set("Content-Encoding", "gzip")
res.Header().Del("Accept-Encoding")
res.Header().Add("Vary", "Accept-Encoding")
@@ -41,12 +38,17 @@ func Compress() web.MiddlewareFunc {
f = nil
}
+ gw, _ := gzip.NewWriterLevel(res, gzip.DefaultCompression)
c.Response = &gzipResponseWriter{
Writer: gw,
ResponseWriter: res,
Hijacker: h,
Flusher: f,
}
+
+ err := next(c)
+ gw.Close()
+ return err
}
return next(c)
}
@@ -84,3 +86,10 @@ func (w *gzipResponseWriter) Flush() {
w.Flusher.Flush()
}
}
+
+func (w *gzipResponseWriter) Close() error {
+ if c, ok := w.Writer.(io.Closer); ok {
+ return c.Close()
+ }
+ return nil
+}
diff --git a/app/middlewares/compress_test.go b/app/middlewares/compress_test.go
index 50a9349cf..b56196d7e 100644
--- a/app/middlewares/compress_test.go
+++ b/app/middlewares/compress_test.go
@@ -35,5 +35,26 @@ func TestCompress(t *testing.T) {
Expect(bytes).Equals([]byte(data))
Expect(status).Equals(http.StatusOK)
Expect(response.Header().Get("Vary")).Equals("Accept-Encoding")
+ Expect(response.Header().Get("Content-Type")).Equals("text/plain; charset=utf-8")
+ Expect(response.Header().Get("Content-Encoding")).Equals("gzip")
+}
+
+func TestCompress_AfterPanic(t *testing.T) {
+ RegisterT(t)
+
+ server := mock.NewServer()
+ server.Use(middlewares.CatchPanic())
+ server.Use(middlewares.Compress())
+ handler := func(c *web.Context) error {
+ panic("Boom!")
+ }
+
+ status, response := server.
+ AddHeader("Accept-Encoding", "gzip").
+ Execute(handler)
+
+ Expect(status).Equals(http.StatusInternalServerError)
+ Expect(response.Header().Get("Vary")).Equals("Accept-Encoding")
+ Expect(response.Header().Get("Content-Type")).Equals("text/html; charset=utf-8")
Expect(response.Header().Get("Content-Encoding")).Equals("gzip")
}
diff --git a/app/middlewares/panic.go b/app/middlewares/panic.go
index 1b7be5044..94678cb8e 100644
--- a/app/middlewares/panic.go
+++ b/app/middlewares/panic.go
@@ -1,6 +1,7 @@
package middlewares
import (
+ "io"
"time"
"github.com/getfider/fider/app/models/dto"
@@ -21,6 +22,10 @@ func CatchPanic() web.MiddlewareFunc {
"URL": c.Request.URL.String(),
"ElapsedMs": time.Since(c.Request.StartTime).Nanoseconds() / int64(time.Millisecond),
})
+
+ if f, ok := c.Response.(io.Closer); ok {
+ f.Close()
+ }
}
}()