version 1.1.1

Added work mode(blacklist/whitelist) for ipchecker. Now a few countries can be given for ip check

Author: DroidProger

ipchecker.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 )
 
-func isIpValid(site string, ip string, keyName string, value string) bool {
+func isIpValid(site string, ip string, keyName string, value []string, blacklist bool) bool {
 	request := strings.Builder{}
 	request.WriteString(site)
 	request.WriteString(ip)
@@ -26,16 +26,27 @@ func isIpValid(site string, ip string, keyName string, value string) bool {
 			var answer map[string]interface{}
 			err := json.Unmarshal([]byte(body), &answer)
 			if err != nil {
-				fmt.Println("Ошибка при разборе JSON:", err)
+				fmt.Println("Error while unmarshalling JSON:", err)
 				return false
 			}
 			for key, val := range answer {
 				if key == keyName {
-					if val == value {
-						return false
-					} else {
+					j := len(value)
+					for i := range j {
+						if val == value[i] {
+							if blacklist {
+								return false
+							} else {
+								fmt.Println("Country ", val)
+								return true
+							}
+						}
+					}
+					if blacklist {
 						fmt.Println("Country ", val)
 						return true
+					} else {
+						return false
 					}
 				}
 			}

sskeyparser.go

@@ -39,7 +39,8 @@ type Config struct {
 	Links               []Link
 	IpCheckServer       string
 	IpCheckKey          string
-	IpCheckValue        string
+	IpCheckBlackList    bool
+	IpCheckValue        []string
 }
 
 type SsConfigs struct {
@@ -121,7 +122,8 @@ func createSsServerConfig(str string) (errstr string) { //, errcode int
 		} else {
 			conf.Server = spstr[:index]
 			//check ip
-			if !isIpValid(config.IpCheckServer, conf.Server, config.IpCheckKey, config.IpCheckValue) {
+			if !isIpValid(config.IpCheckServer, conf.Server, config.IpCheckKey,
+									config.IpCheckValue, config.IpCheckBlackList) {
 				return "Ip is invalid"
 			}
 			//
@@ -398,6 +400,7 @@ func setSsServiceConfig(path string, middle []byte) bool {
 			}
 		}
 	} else {
+		fmt.Println("Ss config file not exists:")
 		return false
 	}
 	return true