beenull/Cosmos-Server
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[release] v0.10.1-unstable3

Browse source
This commit is contained in:
Yann Stepienik 2023-10-07 22:55:18 +01:00
parent a732130ca1
commit 112d1aaa99
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/utils/middleware.go
View file

@ -290,7 +290,7 @@ func Restrictions(RestrictToConstellation bool, WhitelistInboundIPs []string) fu
isInConstellation := strings.HasPrefix(ip, "192.168.201.") || strings.HasPrefix(ip, "192.168.202.") isInConstellation := strings.HasPrefix(ip, "192.168.201.") || strings.HasPrefix(ip, "192.168.202.")
for _, ipRange := range WhitelistInboundIPs { for _, ipRange := range WhitelistInboundIPs {
utils.Debug("Checking if " + ip + " is in " + ipRange) Debug("Checking if " + ip + " is in " + ipRange)
if strings.Contains(ipRange, "/") { if strings.Contains(ipRange, "/") {
if ok, _ := IPInRange(ip, ipRange); ok { if ok, _ := IPInRange(ip, ipRange); ok {
isInWhitelist = true isInWhitelist = true
@ -302,24 +302,30 @@ func Restrictions(RestrictToConstellation bool, WhitelistInboundIPs []string) fu
} }
} }
utils.Debug("Is using whitelist: " + fmt.Sprintf("%v", isUsingWhiteList)) Debug("Is using whitelist: " + fmt.Sprintf("%v", isUsingWhiteList))
utils.Debug("Is in whitelist: " + fmt.Sprintf("%v", isInWhitelist)) Debug("Is in whitelist: " + fmt.Sprintf("%v", isInWhitelist))
utils.Debug("Is using constellation: " + fmt.Sprintf("%v", RestrictToConstellation)) Debug("Is using constellation: " + fmt.Sprintf("%v", RestrictToConstellation))
utils.Debug("Is in constellation: " + fmt.Sprintf("%v", isInConstellation)) Debug("Is in constellation: " + fmt.Sprintf("%v", isInConstellation))
if(RestrictToConstellation) { if(RestrictToConstellation) { // true
if(!isInConstellation) { Debug("RestrictToConstellation")
if(!isUsingWhiteList) { if(!isInConstellation) { // true
Debug("isInConstellation")
if(!isUsingWhiteList) { // false
Debug("isUsingWhiteList")
Error("Request from " + ip + " is blocked because of restrictions", nil) Error("Request from " + ip + " is blocked because of restrictions", nil)
http.Error(w, "Access denied", http.StatusForbidden) http.Error(w, "Access denied", http.StatusForbidden)
return return
} else if (!isInWhitelist) { } else if (!isInWhitelist) { // false
Debug("isInWhitelist")
Error("Request from " + ip + " is blocked because of restrictions", nil) Error("Request from " + ip + " is blocked because of restrictions", nil)
http.Error(w, "Access denied", http.StatusForbidden) http.Error(w, "Access denied", http.StatusForbidden)
return return
} }
} }
} else if(isUsingWhiteList && !isInWhitelist) { } else if(isUsingWhiteList && !isInWhitelist) {
Debug("isUsingWhiteList && !isInWhitelist")
Debug("isInWhitelist")
Error("Request from " + ip + " is blocked because of restrictions", nil) Error("Request from " + ip + " is blocked because of restrictions", nil)
http.Error(w, "Access denied", http.StatusForbidden) http.Error(w, "Access denied", http.StatusForbidden)
return return