fix load-balancer example and add server_name to cache keys when requ…

…ired
step-security-bot · May 7, 2023 · 39ace81 · 39ace81
1 parent 66921b0
commit 39ace81
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/examples/load-balancer/docker-compose.yml b/examples/load-balancer/docker-compose.yml
@@ -18,7 +18,7 @@ services:
       - REVERSE_PROXY_URL=/
       - REVERSE_PROXY_HOST=http://app
       - |
-        CUSTOM_CONF_HTTP_upstream.conf=
+        CUSTOM_CONF_HTTP_upstream=
         upstream app {
           server app1:80;
           server app2:80;

diff --git a/src/common/core/blacklist/blacklist.lua b/src/common/core/blacklist/blacklist.lua
@@ -162,15 +162,15 @@ function blacklist:kind_to_ele(kind)
 end
 
 function blacklist:is_in_cache(ele)
-	local ok, data = self.cachestore:get("plugin_blacklist_" .. ele)
+	local ok, data = self.cachestore:get("plugin_blacklist_" .. ngx.ctx.bw.server_name .. ele)
 	if not ok then
 		return false, data
 	end 
 	return true, data
 end
 
 function blacklist:add_to_cache(ele, value)
-	local ok, err = self.cachestore:set("plugin_blacklist_" .. ele, value, 86400)
+	local ok, err = self.cachestore:set("plugin_blacklist_" .. ngx.ctx.bw.server_name .. ele, value, 86400)
 	if not ok then
 		return false, err
 	end 

diff --git a/src/common/core/country/country.lua b/src/common/core/country/country.lua
@@ -92,15 +92,15 @@ function country:preread()
 end
 
 function country:is_in_cache(ip)
-	local ok, data = self.cachestore:get("plugin_country_cache_" .. ip)
+	local ok, data = self.cachestore:get("plugin_country_cache_" .. ngx.ctx.bw.server_name .. ip)
 	if not ok then
 		return false, data
 	end 
 	return true, data
 end
 
 function country:add_to_cache(ip, country, result)
-	local ok, err = self.cachestore:set("plugin_country_cache_" .. ip, cjson.encode({country = country, result = result}), 86400)
+	local ok, err = self.cachestore:set("plugin_country_cache_" .. ngx.ctx.bw.server_name .. ip, cjson.encode({country = country, result = result}), 86400)
 	if not ok then
 		return false, err
 	end 

diff --git a/src/common/core/greylist/greylist.lua b/src/common/core/greylist/greylist.lua
@@ -231,15 +231,15 @@ function greylist:is_greylisted_ua()
 end
 
 function greylist:is_in_cache(ele)
-	local ok, data = self.cachestore:get("plugin_greylist_" .. ele)
+	local ok, data = self.cachestore:get("plugin_greylist_" .. ngx.ctx.bw.server_name .. ele)
 	if not ok then
 		return false, data
 	end 
 	return true, data
 end
 
 function greylist:add_to_cache(ele, value)
-	local ok, err = self.cachestore:set("plugin_greylist_" .. ele, value, 86400)
+	local ok, err = self.cachestore:set("plugin_greylist_" .. ngx.ctx.bw.server_name .. ele, value, 86400)
 	if not ok then
 		return false, err
 	end 

diff --git a/src/common/core/whitelist/whitelist.lua b/src/common/core/whitelist/whitelist.lua
@@ -189,15 +189,15 @@ function whitelist:check_cache()
 end
 
 function whitelist:is_in_cache(ele)
-	local ok, data = self.cachestore:get("plugin_whitelist_" .. ele)
+	local ok, data = self.cachestore:get("plugin_whitelist_" .. ngx.ctx.bw.server_name .. ele)
 	if not ok then
 		return false, data
 	end 
 	return true, data
 end
 
 function whitelist:add_to_cache(ele, value)
-	local ok, err = self.cachestore:set("plugin_whitelist_" .. ele, value, 86400)
+	local ok, err = self.cachestore:set("plugin_whitelist_" .. ngx.ctx.bw.server_name .. ele, value, 86400)
 	if not ok then
 		return false, err
 	end