From 903649b5c8c4ec34230b716d053a2b31af051985 Mon Sep 17 00:00:00 2001
From: darkweak <darkweak@protonmail.com>
Date: Wed, 6 Apr 2022 11:34:27 +0200
Subject: [PATCH] release(v1.6.5) (#201)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* release(v1.6.5)

* Verify non empty body in træfik response
---
 README.md                                                   | 2 +-
 plugins/caddy/go.mod                                        | 4 ++--
 plugins/chi/go.mod                                          | 4 ++--
 plugins/echo/go.mod                                         | 4 ++--
 plugins/gin/go.mod                                          | 4 ++--
 plugins/skipper/go.mod                                      | 4 ++--
 plugins/traefik/base.go                                     | 6 +++++-
 plugins/traefik/go.mod                                      | 4 ++--
 .../traefik/vendor/github.com/darkweak/souin/rfc/bridge.go  | 3 +++
 plugins/traefik/vendor/modules.txt                          | 2 +-
 plugins/tyk/go.mod                                          | 4 ++--
 plugins/webgo/go.mod                                        | 4 ++--
 12 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index f9a8b0a2c..813e8d8c7 100644
--- a/README.md
+++ b/README.md
@@ -556,7 +556,7 @@ experimental:
   plugins:
     souin:
       moduleName: github.com/darkweak/souin
-      version: v1.6.3
+      version: v1.6.5
 ```
 After that you can declare either the whole configuration at once in the middleware block or by service. See the examples below.
 ```yaml
diff --git a/plugins/caddy/go.mod b/plugins/caddy/go.mod
index d67628083..fb992890e 100644
--- a/plugins/caddy/go.mod
+++ b/plugins/caddy/go.mod
@@ -4,8 +4,8 @@ go 1.16
 
 require (
 	github.com/caddyserver/caddy/v2 v2.4.6
-	github.com/darkweak/souin v1.6.3
+	github.com/darkweak/souin v1.6.5
 	go.uber.org/zap v1.19.1
 )
 
-replace github.com/darkweak/souin v1.6.3 => ../..
+replace github.com/darkweak/souin v1.6.5 => ../..
diff --git a/plugins/chi/go.mod b/plugins/chi/go.mod
index c05531ec0..792d06d6b 100644
--- a/plugins/chi/go.mod
+++ b/plugins/chi/go.mod
@@ -3,9 +3,9 @@ module github.com/darkweak/souin/plugins/chi
 go 1.16
 
 require (
-	github.com/darkweak/souin v1.6.3
+	github.com/darkweak/souin v1.6.5
 	github.com/go-chi/chi/v5 v5.0.7
 	go.uber.org/zap v1.19.1
 )
 
-replace github.com/darkweak/souin v1.6.3 => ../..
+replace github.com/darkweak/souin v1.6.5 => ../..
diff --git a/plugins/echo/go.mod b/plugins/echo/go.mod
index 932be46f7..d162e978c 100644
--- a/plugins/echo/go.mod
+++ b/plugins/echo/go.mod
@@ -3,9 +3,9 @@ module github.com/darkweak/souin/plugins/echo
 go 1.16
 
 require (
-	github.com/darkweak/souin v1.6.3
+	github.com/darkweak/souin v1.6.5
 	github.com/labstack/echo/v4 v4.6.1
 	go.uber.org/zap v1.19.1
 )
 
-replace github.com/darkweak/souin v1.6.3 => ../..
+replace github.com/darkweak/souin v1.6.5 => ../..
diff --git a/plugins/gin/go.mod b/plugins/gin/go.mod
index 40ad1e04a..78f327008 100644
--- a/plugins/gin/go.mod
+++ b/plugins/gin/go.mod
@@ -3,7 +3,7 @@ module github.com/darkweak/souin/plugins/gin
 go 1.16
 
 require (
-	github.com/darkweak/souin v1.6.3
+	github.com/darkweak/souin v1.6.5
 	github.com/gin-gonic/gin v1.7.7
 	github.com/go-playground/validator/v10 v10.10.0 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
@@ -14,4 +14,4 @@ require (
 	google.golang.org/protobuf v1.27.1 // indirect
 )
 
-replace github.com/darkweak/souin v1.6.3 => ../..
+replace github.com/darkweak/souin v1.6.5 => ../..
diff --git a/plugins/skipper/go.mod b/plugins/skipper/go.mod
index 3bc872707..bfa6ed190 100644
--- a/plugins/skipper/go.mod
+++ b/plugins/skipper/go.mod
@@ -3,9 +3,9 @@ module github.com/darkweak/souin/plugins/skipper
 go 1.16
 
 require (
-	github.com/darkweak/souin v1.6.3
+	github.com/darkweak/souin v1.6.5
 	github.com/zalando/skipper v0.13.174
 	go.uber.org/zap v1.19.1
 )
 
-replace github.com/darkweak/souin v1.6.3 => ../..
+replace github.com/darkweak/souin v1.6.5 => ../..
diff --git a/plugins/traefik/base.go b/plugins/traefik/base.go
index 0d010f0d8..5cc592520 100644
--- a/plugins/traefik/base.go
+++ b/plugins/traefik/base.go
@@ -66,7 +66,11 @@ func (r *CustomWriter) Send() (int, error) {
 		}
 	}
 	r.Rw.WriteHeader(r.Response.StatusCode)
-	b, _ := ioutil.ReadAll(r.Response.Body)
+	var b []byte
+
+	if r.Response.Body != nil {
+		b, _ = ioutil.ReadAll(r.Response.Body)
+	}
 	return r.Rw.Write(b)
 }
 
diff --git a/plugins/traefik/go.mod b/plugins/traefik/go.mod
index 7716203d5..a584d40bc 100644
--- a/plugins/traefik/go.mod
+++ b/plugins/traefik/go.mod
@@ -3,10 +3,10 @@ module github.com/darkweak/souin/plugins/traefik
 go 1.16
 
 require (
-	github.com/darkweak/souin v1.6.3
+	github.com/darkweak/souin v1.6.5
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pquerna/cachecontrol v0.1.0
 	go.uber.org/zap v1.19.1
 )
 
-replace github.com/darkweak/souin v1.6.3 => ../..
+replace github.com/darkweak/souin v1.6.5 => ../..
diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/rfc/bridge.go b/plugins/traefik/vendor/github.com/darkweak/souin/rfc/bridge.go
index 581b1803a..f54c13374 100644
--- a/plugins/traefik/vendor/github.com/darkweak/souin/rfc/bridge.go
+++ b/plugins/traefik/vendor/github.com/darkweak/souin/rfc/bridge.go
@@ -116,6 +116,9 @@ func commonVaryMatchesVerification(cachedResp *http.Response, req *http.Request)
 // UpdateCacheEventually will handle Request and update the previous one in the cache provider
 func (t *VaryTransport) UpdateCacheEventually(req *http.Request) (*http.Response, error) {
 	if req.Response.Header.Get("Cache-Control") == "" && t.ConfigurationURL.DefaultCacheControl != "" {
+		if req.Response.Header == nil {
+			req.Response.Header = http.Header{}
+		}
 		req.Response.Header.Set("Cache-Control", t.ConfigurationURL.DefaultCacheControl)
 	}
 
diff --git a/plugins/traefik/vendor/modules.txt b/plugins/traefik/vendor/modules.txt
index 814a32a31..9bd431184 100644
--- a/plugins/traefik/vendor/modules.txt
+++ b/plugins/traefik/vendor/modules.txt
@@ -39,7 +39,7 @@ github.com/buraksezer/olric/stats
 github.com/cespare/xxhash
 # github.com/cespare/xxhash/v2 v2.1.2
 github.com/cespare/xxhash/v2
-# github.com/darkweak/souin v1.6.3 => ../..
+# github.com/darkweak/souin v1.6.5 => ../..
 ## explicit
 github.com/darkweak/souin/api
 github.com/darkweak/souin/api/auth
diff --git a/plugins/tyk/go.mod b/plugins/tyk/go.mod
index 1cf50942d..b1b616549 100644
--- a/plugins/tyk/go.mod
+++ b/plugins/tyk/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/TykTechnologies/gojsonschema v0.0.0-20170222154038-dcb3e4bb7990 // indirect
 	github.com/TykTechnologies/tyk v2.9.5+incompatible
 	github.com/clbanning/mxj v1.8.4 // indirect
-	github.com/darkweak/souin v1.6.3
+	github.com/darkweak/souin v1.6.5
 	github.com/franela/goblin v0.0.0-20211003143422-0a4f594942bf // indirect
 	github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 // indirect
 	github.com/hashicorp/terraform v1.0.1 // indirect
@@ -22,6 +22,6 @@ require (
 )
 
 replace (
-	github.com/darkweak/souin v1.6.3 => ../..
+	github.com/darkweak/souin v1.6.5 => ../..
 	github.com/hashicorp/terraform v1.0.1 => github.com/hashicorp/terraform v0.14.11
 )
diff --git a/plugins/webgo/go.mod b/plugins/webgo/go.mod
index 9013fd096..8a25f41e2 100644
--- a/plugins/webgo/go.mod
+++ b/plugins/webgo/go.mod
@@ -4,8 +4,8 @@ go 1.16
 
 require (
 	github.com/bnkamalesh/webgo/v6 v6.6.1
-	github.com/darkweak/souin v1.6.3
+	github.com/darkweak/souin v1.6.5
 	go.uber.org/zap v1.19.1
 )
 
-replace github.com/darkweak/souin v1.6.3 => ../..
+replace github.com/darkweak/souin v1.6.5 => ../..