diff --git a/package.json b/package.json index dd8f61f..7d7fcdd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cosmos-server", - "version": "0.10.1-unstable3", + "version": "0.10.1", "description": "", "main": "test-server.js", "bugs": { diff --git a/src/utils/middleware.go b/src/utils/middleware.go index 2588b13..cd75f33 100644 --- a/src/utils/middleware.go +++ b/src/utils/middleware.go @@ -302,31 +302,23 @@ func Restrictions(RestrictToConstellation bool, WhitelistInboundIPs []string) fu } } - 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) { // true - Debug("RestrictToConstellation") - if(!isInConstellation) { // true - Debug("isInConstellation") - if(!isUsingWhiteList) { // false - Debug("isUsingWhiteList") + if(RestrictToConstellation) { + if(!isInConstellation) { + if(!isUsingWhiteList) { Error("Request from " + ip + " is blocked because of restrictions", nil) + Debug("Blocked by RestrictToConstellation isInConstellation isUsingWhiteList") http.Error(w, "Access denied", http.StatusForbidden) return - } else if (!isInWhitelist) { // false - Debug("isInWhitelist") + } else if (!isInWhitelist) { Error("Request from " + ip + " is blocked because of restrictions", nil) + Debug("Blocked by RestrictToConstellation isInConstellation isInWhitelist") 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) + Debug("Blocked by RestrictToConstellation isInConstellation isUsingWhiteList isInWhitelist") http.Error(w, "Access denied", http.StatusForbidden) return }