Use correct content lenght on error pages

9af8b521 · Jacob Vosmaer · b1e3c5ae · 9af8b521 · 9af8b521
Commit 9af8b521 authored Jun 09, 2017 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 31 additions and 0 deletions

internal/staticpages/error_pages.go internal/staticpages/error_pages.go +2 -0

main_test.go main_test.go +29 -0

No files found.
--- a/internal/staticpages/error_pages.go
+++ b/internal/staticpages/error_pages.go
@@ -46,6 +46,8 @@ func (s *errorPageResponseWriter) WriteHeader(status int) {

 			helper.SetNoCacheHeaders(s.rw.Header())
 			s.rw.Header().Set("Content-Type", "text/html; charset=utf-8")
+			s.rw.Header().Set("Content-Length", fmt.Sprintf("%d", len(data)))
+			s.rw.Header().Del("Transfer-Encoding")
 			s.rw.WriteHeader(s.status)
 			s.rw.Write(data)
 			return

--- a/main_test.go
+++ b/main_test.go
@@ -293,6 +293,35 @@ func TestDeniedPublicUploadsFile(t *testing.T) {
 	}
 }

+func TestStaticErrorPage(t *testing.T) {
+	errorPageBody := `<html>
+<body>
+This is a static error page for code 499
+</body>
+</html>
+`
+	require.NoError(t, setupStaticFile("499.html", errorPageBody))
+	ts := testhelper.TestServerWithHandler(nil, func(w http.ResponseWriter, _ *http.Request) {
+		upstreamError := "499"
+		// This is the point of the test: the size of the upstream response body
+		// should be overridden.
+		require.NotEqual(t, len(upstreamError), len(errorPageBody))
+		w.WriteHeader(499)
+		_, err := w.Write([]byte(upstreamError))
+		require.NoError(t, err)
+	})
+	defer ts.Close()
+
+	ws := startWorkhorseServer(ts.URL)
+	defer ws.Close()
+
+	resourcePath := "/error-499"
+	resp, body := httpGet(t, ws.URL+resourcePath)
+
+	assert.Equal(t, 499, resp.StatusCode, "GET %q: status code", resourcePath)
+	assert.Equal(t, string(errorPageBody), body, "GET %q: response body", resourcePath)
+}
+
 var sendDataHeader = "Gitlab-Workhorse-Send-Data"

 func sendDataResponder(command string, literalJSON string) *httptest.Server {