feat(core): upstream select it's own storage (#582)

darkweak · web-flow · commit 764943511968 · 2024-12-22T16:55:33.000+01:00
* feat(core): upstream select it's own storage

* fix(ci): vendor and use sync.Mutex instead of reference
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
@@ -358,26 +358,51 @@ func (s *SouinBaseHandler) Store(
 						hn := strings.Split(hname, ":")
 						vhs.Set(hn[0], rq.Header.Get(hn[0]))
 					}
-					for _, storer := range s.Storers {
-						wg.Add(1)
-						go func(currentStorer types.Storer, currentRes http.Response) {
-							defer wg.Done()
-							if currentStorer.SetMultiLevel(
-								cachedKey,
-								variedKey,
-								response,
-								vhs,
-								currentRes.Header.Get("Etag"), ma,
-								variedKey,
-							) == nil {
-								s.Configuration.GetLogger().Debugf("Stored the key %s in the %s provider", variedKey, currentStorer.Name())
-								currentRes.Request = rq
-							} else {
-								mu.Lock()
-								fails = append(fails, fmt.Sprintf("; detail=%s-INSERTION-ERROR", currentStorer.Name()))
-								mu.Unlock()
+					if upstreamStorerTarget := res.Header.Get("X-Souin-Storer"); upstreamStorerTarget != "" {
+						res.Header.Del("X-Souin-Storer")
+
+						var overridedStorer types.Storer
+						for _, storer := range s.Storers {
+							if strings.Contains(strings.ToLower(storer.Name()), strings.ToLower(upstreamStorerTarget)) {
+								overridedStorer = storer
 							}
-						}(storer, res)
+						}
+
+						if overridedStorer.SetMultiLevel(
+							cachedKey,
+							variedKey,
+							response,
+							vhs,
+							res.Header.Get("Etag"), ma,
+							variedKey,
+						) == nil {
+							s.Configuration.GetLogger().Debugf("Stored the key %s in the %s provider", variedKey, overridedStorer.Name())
+							res.Request = rq
+						} else {
+							fails = append(fails, fmt.Sprintf("; detail=%s-INSERTION-ERROR", overridedStorer.Name()))
+						}
+					} else {
+						for _, storer := range s.Storers {
+							wg.Add(1)
+							go func(currentStorer types.Storer, currentRes http.Response) {
+								defer wg.Done()
+								if currentStorer.SetMultiLevel(
+									cachedKey,
+									variedKey,
+									response,
+									vhs,
+									currentRes.Header.Get("Etag"), ma,
+									variedKey,
+								) == nil {
+									s.Configuration.GetLogger().Debugf("Stored the key %s in the %s provider", variedKey, currentStorer.Name())
+									currentRes.Request = rq
+								} else {
+									mu.Lock()
+									fails = append(fails, fmt.Sprintf("; detail=%s-INSERTION-ERROR", currentStorer.Name()))
+									mu.Unlock()
+								}
+							}(storer, res)
+						}
 					}
 
 					wg.Wait()
diff --git a/pkg/middleware/writer.go b/pkg/middleware/writer.go
@@ -24,7 +24,7 @@ func NewCustomWriter(rq *http.Request, rw http.ResponseWriter, b *bytes.Buffer)
 		Req:        rq,
 		Rw:         rw,
 		Headers:    http.Header{},
-		mutex:      &sync.Mutex{},
+		mutex:      sync.Mutex{},
 	}
 }
 
@@ -35,7 +35,7 @@ type CustomWriter struct {
 	Req         *http.Request
 	Headers     http.Header
 	headersSent bool
-	mutex       *sync.Mutex
+	mutex       sync.Mutex
 	statusCode  int
 }
 
diff --git a/pkg/surrogate/providers/common.go b/pkg/surrogate/providers/common.go
@@ -104,7 +104,7 @@ type baseStorage struct {
 	dynamic    bool
 	keepStale  bool
 	logger     core.Logger
-	mu         *sync.Mutex
+	mu         sync.Mutex
 	duration   time.Duration
 }
 
@@ -159,7 +159,6 @@ func (s *baseStorage) init(config configurationtypes.AbstractConfigurationInterf
 	s.dynamic = config.GetDefaultCache().GetCDN().Dynamic
 	s.logger = config.GetLogger()
 	s.keysRegexp = keysRegexp
-	s.mu = &sync.Mutex{}
 	s.duration = storageToInfiniteTTLMap[s.Storage.Name()]
 }
 
diff --git a/pkg/surrogate/providers/common_test.go b/pkg/surrogate/providers/common_test.go
@@ -30,7 +30,7 @@ func mockCommonProvider() *baseStorage {
 			Keys:       make(map[string]configurationtypes.SurrogateKeys),
 			keysRegexp: make(map[string]keysRegexpInner),
 			dynamic:    true,
-			mu:         &sync.Mutex{},
+			mu:         sync.Mutex{},
 			logger:     zap.NewNop().Sugar(),
 		},
 	}
diff --git a/plugins/traefik/override/middleware/writer.go b/plugins/traefik/override/middleware/writer.go
@@ -23,7 +23,7 @@ func NewCustomWriter(rq *http.Request, rw http.ResponseWriter, b *bytes.Buffer)
 		Req:        rq,
 		Rw:         rw,
 		Headers:    http.Header{},
-		mutex:      &sync.Mutex{},
+		mutex:      sync.Mutex{},
 	}
 }
 
@@ -34,7 +34,7 @@ type CustomWriter struct {
 	Req         *http.Request
 	Headers     http.Header
 	headersSent bool
-	mutex       *sync.Mutex
+	mutex       sync.Mutex
 	statusCode  int
 }
 
diff --git a/plugins/traefik/override/surrogate/providers/common.go b/plugins/traefik/override/surrogate/providers/common.go
@@ -79,7 +79,7 @@ type baseStorage struct {
 	keysRegexp map[string]keysRegexpInner
 	dynamic    bool
 	keepStale  bool
-	mu         *sync.Mutex
+	mu         sync.Mutex
 	duration   time.Duration
 }
 
@@ -116,7 +116,7 @@ func (s *baseStorage) init(config configurationtypes.AbstractConfigurationInterf
 
 	s.dynamic = config.GetDefaultCache().GetCDN().Dynamic
 	s.keysRegexp = keysRegexp
-	s.mu = &sync.Mutex{}
+	s.mu = sync.Mutex{}
 	s.duration = storageToInfiniteTTLMap[s.Storage.Name()]
 }
 
diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/pkg/middleware/writer.go b/plugins/traefik/vendor/github.com/darkweak/souin/pkg/middleware/writer.go
diff --git a/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/common.go b/plugins/traefik/vendor/github.com/darkweak/souin/pkg/surrogate/providers/common.go
diff --git a/plugins/tyk/override/cache/surrogate/providers/common.go b/plugins/tyk/override/cache/surrogate/providers/common.go
@@ -72,7 +72,7 @@ type baseStorage struct {
 	dynamic    bool
 	keepStale  bool
 	logger     *zap.Logger
-	mu         *sync.Mutex
+	mu         sync.Mutex
 }
 
 func (s *baseStorage) init(config configurationtypes.AbstractConfigurationInterface) {
@@ -103,7 +103,7 @@ func (s *baseStorage) init(config configurationtypes.AbstractConfigurationInterf
 	s.dynamic = config.GetDefaultCache().GetCDN().Dynamic
 	s.logger = config.GetLogger()
 	s.keysRegexp = keysRegexp
-	s.mu = &sync.Mutex{}
+	s.mu = sync.Mutex{}
 }
 
 func (s *baseStorage) storeTag(tag string, cacheKey string, re *regexp.Regexp) {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func NewCustomWriter(rq http.Request, rw http.ResponseWriter, b bytes.Buffer)`
`24`	`24`	`Req: rq,`
`25`	`25`	`Rw: rw,`
`26`	`26`	`Headers: http.Header{},`
`27`		`- mutex: &sync.Mutex{},`
	`27`	`+ mutex: sync.Mutex{},`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`@@ -35,7 +35,7 @@ type CustomWriter struct {`
`35`	`35`	`Req *http.Request`
`36`	`36`	`Headers http.Header`
`37`	`37`	`headersSent bool`
`38`		`- mutex *sync.Mutex`
	`38`	`+ mutex sync.Mutex`
`39`	`39`	`statusCode int`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ type baseStorage struct {`
`104`	`104`	`dynamic bool`
`105`	`105`	`keepStale bool`
`106`	`106`	`logger core.Logger`
`107`		`- mu *sync.Mutex`
	`107`	`+ mu sync.Mutex`
`108`	`108`	`duration time.Duration`
`109`	`109`	`}`
`110`	`110`
`@@ -159,7 +159,6 @@ func (s *baseStorage) init(config configurationtypes.AbstractConfigurationInterf`
`159`	`159`	`s.dynamic = config.GetDefaultCache().GetCDN().Dynamic`
`160`	`160`	`s.logger = config.GetLogger()`
`161`	`161`	`s.keysRegexp = keysRegexp`
`162`		`- s.mu = &sync.Mutex{}`
`163`	`162`	`s.duration = storageToInfiniteTTLMap[s.Storage.Name()]`
`164`	`163`	`}`
`165`	`164`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func mockCommonProvider() *baseStorage {`
`30`	`30`	`Keys: make(map[string]configurationtypes.SurrogateKeys),`
`31`	`31`	`keysRegexp: make(map[string]keysRegexpInner),`
`32`	`32`	`dynamic: true,`
`33`		`- mu: &sync.Mutex{},`
	`33`	`+ mu: sync.Mutex{},`
`34`	`34`	`logger: zap.NewNop().Sugar(),`
`35`	`35`	`},`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func NewCustomWriter(rq http.Request, rw http.ResponseWriter, b bytes.Buffer)`
`23`	`23`	`Req: rq,`
`24`	`24`	`Rw: rw,`
`25`	`25`	`Headers: http.Header{},`
`26`		`- mutex: &sync.Mutex{},`
	`26`	`+ mutex: sync.Mutex{},`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`@@ -34,7 +34,7 @@ type CustomWriter struct {`
`34`	`34`	`Req *http.Request`
`35`	`35`	`Headers http.Header`
`36`	`36`	`headersSent bool`
`37`		`- mutex *sync.Mutex`
	`37`	`+ mutex sync.Mutex`
`38`	`38`	`statusCode int`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ type baseStorage struct {`
`79`	`79`	`keysRegexp map[string]keysRegexpInner`
`80`	`80`	`dynamic bool`
`81`	`81`	`keepStale bool`
`82`		`- mu *sync.Mutex`
	`82`	`+ mu sync.Mutex`
`83`	`83`	`duration time.Duration`
`84`	`84`	`}`
`85`	`85`
`@@ -116,7 +116,7 @@ func (s *baseStorage) init(config configurationtypes.AbstractConfigurationInterf`
`116`	`116`
`117`	`117`	`s.dynamic = config.GetDefaultCache().GetCDN().Dynamic`
`118`	`118`	`s.keysRegexp = keysRegexp`
`119`		`- s.mu = &sync.Mutex{}`
	`119`	`+ s.mu = sync.Mutex{}`
`120`	`120`	`s.duration = storageToInfiniteTTLMap[s.Storage.Name()]`
`121`	`121`	`}`
`122`	`122`