echocat#6 Fixed bug that empty body responses are not handled correctly

blaubaer · blaubaer · commit bb4f44f969ec · 2017-01-31T10:33:13.000+01:00
diff --git a/filter.go b/filter.go
@@ -39,7 +39,11 @@ func (instance filterHandler) ServeHTTP(writer http.ResponseWriter, request *htt
 			return result, err
 		}
 	}
-	if !wrapper.wasSomethingRecorded() || !wrapper.isBodyAllowed() {
+	if !wrapper.isBodyAllowed() {
+		return result, logError
+	}
+	if !wrapper.wasSomethingRecorded() {
+		wrapper.writeHeadersToDelegate()
 		return result, logError
 	}
 	body := wrapper.recorded()
diff --git a/integration_test.go b/integration_test.go
@@ -96,6 +96,44 @@ func (s *integrationTest) Test_fastcgiWithGzip(c *C) {
 	c.Assert(string(content), Contains, "<title>Hello replaced world!</title>")
 }
 
+func (s *integrationTest) Test_fastcgiWithRedirect(c *C) {
+	s.fcgiServer = test.NewTestingFcgiServer(22792)
+
+	client := http.Client{
+		CheckRedirect: func(req *http.Request, via []*http.Request) error {
+			return http.ErrUseLastResponse
+		},
+	}
+	req, err := http.NewRequest("GET", "http://localhost:22782/redirect.cgi", nil)
+
+	c.Assert(err, IsNil)
+	resp, err := client.Do(req)
+	c.Assert(err, IsNil)
+
+	defer resp.Body.Close()
+	content, err := ioutil.ReadAll(resp.Body)
+	c.Assert(err, IsNil)
+	c.Assert(resp.StatusCode, Equals, 301)
+	c.Assert(resp.Status, Equals, "301 Moved Permanently")
+	c.Assert(string(content), IsEmpty)
+
+	resp2, err := http.Get("http://caddyserver.com")
+	c.Assert(err, IsNil)
+	defer resp2.Body.Close()
+	content, err = ioutil.ReadAll(resp2.Body)
+	c.Assert(err, IsNil)
+	c.Assert(resp.StatusCode, Equals, 301)
+	c.Assert(string(content), Contains, "<title>Caddy - ")
+
+	resp3, err := http.Get("http://localhost:22782/redirect.cgi")
+	c.Assert(err, IsNil)
+	defer resp3.Body.Close()
+	content, err = ioutil.ReadAll(resp3.Body)
+	c.Assert(err, IsNil)
+	c.Assert(resp.StatusCode, Equals, 301)
+	c.Assert(string(content), Contains, "<title>Replaced another!</title>")
+}
+
 func (s *integrationTest) Test_markdown(c *C) {
 	resp, err := http.Get("http://localhost:22783/index.md")
 	c.Assert(err, IsNil)
diff --git a/resources/test/integrationTest.Test_fastcgiWithRedirect.conf b/resources/test/integrationTest.Test_fastcgiWithRedirect.conf
@@ -0,0 +1,15 @@
+:22782 {
+  tls off
+  errors stdout
+  filter rule {
+    content_type "text/html.*"
+    search_pattern "I'am another!"
+    replacement "Replaced another!"
+  }
+  fastcgi / 127.0.0.1:22792 {
+    ext .cgi
+    split .cgi
+    index index.cgi
+    root resources/test/integrationTest.Test_fastcgi
+  }
+}
diff --git a/utils/test/testingFcgiServer.go b/utils/test/testingFcgiServer.go
@@ -22,6 +22,8 @@ func NewTestingFcgiServer(port int) *TestingFcgiServer {
 
 	result.mux = http.NewServeMux()
 	result.mux.HandleFunc("/index.cgi", result.handleIndexRequest)
+	result.mux.HandleFunc("/redirect.cgi", result.handleRedirectRequest)
+	result.mux.HandleFunc("/another.cgi", result.handleAnotherRequest)
 
 	result.listener, err = net.Listen("tcp", fmt.Sprintf(":%d", port))
 	if err != nil {
@@ -51,6 +53,18 @@ func (instance *TestingFcgiServer) handleIndexRequest(resp http.ResponseWriter,
 		"</html>"))
 }
 
+func (instance *TestingFcgiServer) handleRedirectRequest(resp http.ResponseWriter, req *http.Request) {
+	resp.Header().Set("Location", "/another.cgi")
+	resp.WriteHeader(301)
+}
+
+func (instance *TestingFcgiServer) handleAnotherRequest(resp http.ResponseWriter, req *http.Request) {
+	resp.Write([]byte("<html>" +
+		"<head><title>I'am another!</title></head>" +
+		"<body><p>I'am another!</p></body>" +
+		"</html>"))
+}
+
 // Close closes the testing server graceful.
 func (instance *TestingFcgiServer) Close() {
 	defer func() {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,11 @@ func (instance filterHandler) ServeHTTP(writer http.ResponseWriter, request *htt`
`39`	`39`	`return result, err`
`40`	`40`	`}`
`41`	`41`	`}`
`42`		`- if !wrapper.wasSomethingRecorded() \|\| !wrapper.isBodyAllowed() {`
	`42`	`+ if !wrapper.isBodyAllowed() {`
	`43`	`+ return result, logError`
	`44`	`+ }`
	`45`	`+ if !wrapper.wasSomethingRecorded() {`
	`46`	`+ wrapper.writeHeadersToDelegate()`
`43`	`47`	`return result, logError`
`44`	`48`	`}`
`45`	`49`	`body := wrapper.recorded()`