Merge pull request #5 from madebymode/patch

Minor Patch: better errors/handling

.traefik.yml

@@ -16,13 +16,11 @@ testData:
   CacheKeyIncludeRequestURI: true
   CacheKeyIncludeHeaders: false
   CacheKeyHeaders:
-    - Authorization
     - User-Agent
     - Cache-Control
   CacheKeyMatchAllHeaders: false
   CacheKeyIncludeHost: true
   CacheKeyIncludeRemoteAddress: false
 
-
 iconPath: ./img/icon.png
 bannerPath: ./img/banner.png

modsecurity.go

@@ -209,6 +209,8 @@ func (a *Modsecurity) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	resp, respErr := a.HandleCacheAndForwardRequest(reqCopy)
 
 	if respErr != nil {
+		a.logger.Printf("error handling request: %v", respErr)
+		http.Error(rw, "Internal Server Error", http.StatusInternalServerError)
 		return
 	}
 

modsecurity_handlers.go

@@ -2,6 +2,7 @@ package traefik_modsecurity_plugin
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -16,10 +17,10 @@ func (a *Modsecurity) HandleRequestBodyMaxSize(rw http.ResponseWriter, req *http
 	bodyReader := io.LimitReader(req.Body, a.maxBodySize+1)
 	bodyBuffer := new(bytes.Buffer)
 	n, err := io.Copy(bodyBuffer, bodyReader)
-	req.Body.Close()
+	err = req.Body.Close()
 
 	if err != nil {
-		if err == io.EOF || err == io.ErrUnexpectedEOF {
+		if err == io.EOF || errors.Is(err, io.ErrUnexpectedEOF) {
 			// Request body size is within limit.
 			req.Body = io.NopCloser(bodyBuffer)
 			return nil