diff --git a/package.json b/package.json index 88e6f8c..9264f21 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cosmos-server", - "version": "0.10.0-unstable25", + "version": "0.10.0-unstable26", "description": "", "main": "test-server.js", "bugs": { diff --git a/src/utils/middleware.go b/src/utils/middleware.go index 6e7d5b6..04881f9 100644 --- a/src/utils/middleware.go +++ b/src/utils/middleware.go @@ -301,12 +301,12 @@ func Restrictions(RestrictToConstellation bool, WhitelistInboundIPs []string) fu } } - isInConstellationBlocking := !RestrictToConstellation || isInConstellation - isWhitelistBlocking := !isUsingWhiteList || isInWhitelist + isInConstellationPassing := !RestrictToConstellation || isInConstellation + isWhitelistPassing := !isUsingWhiteList || isInWhitelist // check if the request is coming from the constellation IP range 192.168.201.0/24 - if (isInConstellationBlocking && isWhitelistBlocking) { - Log("Request from " + ip + " is blocked because of restrictions isInConstellationBlocking: " + fmt.Sprintf("%v", isInConstellationBlocking) + " and isWhitelistBlocking: " + fmt.Sprintf("%v", isWhitelistBlocking)) + if (!isInConstellationPassing || !isWhitelistPassing) { + Log("Request from " + ip + " is blocked because of restrictions isInConstellationPassing: " + fmt.Sprintf("%v", isInConstellationPassing) + " and isWhitelistPassing: " + fmt.Sprintf("%v", isWhitelistPassing)) http.Error(w, "Access denied", http.StatusForbidden) return }