From 112d1aaa99b7f1fb7e45a75e74e2b9e5042659cb Mon Sep 17 00:00:00 2001 From: Yann Stepienik Date: Sat, 7 Oct 2023 22:55:18 +0100 Subject: [PATCH] [release] v0.10.1-unstable3 --- src/utils/middleware.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/utils/middleware.go b/src/utils/middleware.go index adbe484..2588b13 100644 --- a/src/utils/middleware.go +++ b/src/utils/middleware.go @@ -290,7 +290,7 @@ func Restrictions(RestrictToConstellation bool, WhitelistInboundIPs []string) fu isInConstellation := strings.HasPrefix(ip, "192.168.201.") || strings.HasPrefix(ip, "192.168.202.") for _, ipRange := range WhitelistInboundIPs { - utils.Debug("Checking if " + ip + " is in " + ipRange) + Debug("Checking if " + ip + " is in " + ipRange) if strings.Contains(ipRange, "/") { if ok, _ := IPInRange(ip, ipRange); ok { isInWhitelist = true @@ -302,24 +302,30 @@ func Restrictions(RestrictToConstellation bool, WhitelistInboundIPs []string) fu } } - utils.Debug("Is using whitelist: " + fmt.Sprintf("%v", isUsingWhiteList)) - utils.Debug("Is in whitelist: " + fmt.Sprintf("%v", isInWhitelist)) - utils.Debug("Is using constellation: " + fmt.Sprintf("%v", RestrictToConstellation)) - utils.Debug("Is in constellation: " + fmt.Sprintf("%v", isInConstellation)) + Debug("Is using whitelist: " + fmt.Sprintf("%v", isUsingWhiteList)) + Debug("Is in whitelist: " + fmt.Sprintf("%v", isInWhitelist)) + Debug("Is using constellation: " + fmt.Sprintf("%v", RestrictToConstellation)) + Debug("Is in constellation: " + fmt.Sprintf("%v", isInConstellation)) - if(RestrictToConstellation) { - if(!isInConstellation) { - if(!isUsingWhiteList) { + if(RestrictToConstellation) { // true + Debug("RestrictToConstellation") + if(!isInConstellation) { // true + Debug("isInConstellation") + if(!isUsingWhiteList) { // false + Debug("isUsingWhiteList") Error("Request from " + ip + " is blocked because of restrictions", nil) http.Error(w, "Access denied", http.StatusForbidden) return - } else if (!isInWhitelist) { + } else if (!isInWhitelist) { // false + Debug("isInWhitelist") Error("Request from " + ip + " is blocked because of restrictions", nil) http.Error(w, "Access denied", http.StatusForbidden) return } } } else if(isUsingWhiteList && !isInWhitelist) { + Debug("isUsingWhiteList && !isInWhitelist") + Debug("isInWhitelist") Error("Request from " + ip + " is blocked because of restrictions", nil) http.Error(w, "Access denied", http.StatusForbidden) return