public key bug and multiuser enhancement and server ip support and config file of client optimization

lib/config/config.go

@@ -20,6 +20,7 @@ type CommonConfig struct {
 type LocalServer struct {
 	Type     string
 	Port     int
+	Ip       string
 	Password string
 	Target   string
 }
@@ -112,11 +113,11 @@ func dealCommon(s string) *CommonConfig {
 			item = append(item, "")
 		}
 		switch item[0] {
-		case "server":
+		case "server_addr":
 			c.Server = item[1]
 		case "vkey":
 			c.VKey = item[1]
-		case "tp":
+		case "conn_type":
 			c.Tp = item[1]
 		case "auto_reconnection":
 			c.AutoReconnection = common.GetBoolByStr(item[1])
@@ -156,7 +157,7 @@ func dealHost(s string) *file.Host {
 		switch strings.TrimSpace(item[0]) {
 		case "host":
 			h.Host = item[1]
-		case "target":
+		case "target_addr":
 			h.Target = strings.Replace(item[1], ",", "\n", -1)
 		case "host_change":
 			h.HostChange = item[1]
@@ -211,13 +212,15 @@ func dealTunnel(s string) *file.Tunnel {
 			item = append(item, "")
 		}
 		switch strings.TrimSpace(item[0]) {
-		case "port":
+		case "server_port":
 			t.Ports = item[1]
+		case "server_ip":
+			t.ServerIp = item[1]
 		case "mode":
 			t.Mode = item[1]
-		case "target":
+		case "target_port", "target_addr":
 			t.Target = strings.Replace(item[1], ",", "\n", -1)
-		case "targetAddr":
+		case "target_ip":
 			t.TargetAddr = item[1]
 		case "password":
 			t.Password = item[1]
@@ -241,11 +244,13 @@ func delLocalService(s string) *LocalServer {
 			item = append(item, "")
 		}
 		switch item[0] {
-		case "port":
+		case "local_port":
 			l.Port = common.GetIntNoErrByStr(item[1])
+		case "local_ip":
+			l.Ip = item[1]
 		case "password":
 			l.Password = item[1]
-		case "target":
+		case "target_addr":
 			l.Target = item[1]
 		}
 	}

lib/conn/conn.go

@@ -316,7 +316,7 @@ func (s *Conn) SendTaskInfo(t *file.Tunnel) (int, error) {
 	*/
 	raw := bytes.NewBuffer([]byte{})
 	binary.Write(raw, binary.LittleEndian, []byte(common.NEW_TASK))
-	common.BinaryWrite(raw, t.Mode, t.Ports, t.Target, t.Remark, t.TargetAddr, t.Password, t.LocalPath, t.StripPre)
+	common.BinaryWrite(raw, t.Mode, t.Ports, t.Target, t.Remark, t.TargetAddr, t.Password, t.LocalPath, t.StripPre, t.ServerIp)
 	s.Lock()
 	defer s.Unlock()
 	return s.Write(raw.Bytes())
@@ -345,6 +345,9 @@ func (s *Conn) GetTaskInfo() (t *file.Tunnel, err error) {
 		t.Password = arr[5]
 		t.LocalPath = arr[6]
 		t.StripPre = arr[7]
+		if len(arr) > 8 {
+			t.ServerIp = arr[8]
+		}
 		t.NoStore = true
 	}
 	return

lib/file/file.go

@@ -7,6 +7,7 @@ import (
 	"github.com/cnlh/nps/lib/common"
 	"github.com/cnlh/nps/lib/crypt"
 	"github.com/cnlh/nps/lib/rate"
+	"github.com/cnlh/nps/vender/github.com/astaxie/beego"
 	"github.com/cnlh/nps/vender/github.com/astaxie/beego/logs"
 	"net/http"
 	"os"
@@ -59,6 +60,7 @@ func (s *Csv) StoreTasksToCsv() {
 			strconv.Itoa(int(task.Flow.ExportFlow)),
 			strconv.Itoa(int(task.Flow.InletFlow)),
 			task.Password,
+			task.ServerIp,
 		}
 		err := writer.Write(record)
 		if err != nil {
@@ -111,6 +113,11 @@ func (s *Csv) LoadTaskFromCsv() {
 		if post.Client, err = s.GetClient(common.GetIntNoErrByStr(item[5])); err != nil {
 			continue
 		}
+		if len(item) > 10 {
+			post.ServerIp = item[10]
+		} else {
+			post.ServerIp = "0.0.0.0"
+		}
 		s.Tasks.Store(post.Id, post)
 		if post.Id > int(s.TaskIncreaseId) {
 			s.TaskIncreaseId = int32(s.TaskIncreaseId)
@@ -440,7 +447,7 @@ func (s *Csv) UpdateClient(t *Client) error {
 	return nil
 }
 
-func (s *Csv) GetClientList(start, length int, search string) ([]*Client, int) {
+func (s *Csv) GetClientList(start, length int, search string, clientId int) ([]*Client, int) {
 	list := make([]*Client, 0)
 	var cnt int
 	keys := common.GetMapKeys(s.Clients)
@@ -450,6 +457,9 @@ func (s *Csv) GetClientList(start, length int, search string) ([]*Client, int) {
 			if v.NoDisplay {
 				continue
 			}
+			if clientId != 0 && clientId != v.Id {
+				continue
+			}
 			if search != "" && !(v.Id == common.GetIntNoErrByStr(search) || strings.Contains(v.VerifyKey, search) || strings.Contains(v.Remark, search)) {
 				continue
 			}
@@ -464,6 +474,18 @@ func (s *Csv) GetClientList(start, length int, search string) ([]*Client, int) {
 	return list, cnt
 }
 
+func (s *Csv) IsPubClient(id int) bool {
+	client, err := s.GetClient(id)
+	if err == nil {
+		if client.VerifyKey == beego.AppConfig.String("public_vkey") {
+			return true
+		} else {
+			return false
+		}
+	}
+	return false
+}
+
 func (s *Csv) GetClient(id int) (c *Client, err error) {
 	if v, ok := s.Clients.Load(id); ok {
 		c = v.(*Client)

lib/file/obj.go

@@ -111,8 +111,9 @@ func (s *Client) HasHost(h *Host) bool {
 }
 
 type Tunnel struct {
-	Id         int      //Id
-	Port       int      //服务端监听端口
+	Id         int //Id
+	Port       int //服务端监听端口
+	ServerIp   string
 	Mode       string   //启动方式
 	Target     string   //目标
 	TargetArr  []string //目标

lib/version/version.go

@@ -1,6 +1,6 @@
 package version
 
-const VERSION = "0.20.0"
+const VERSION = "0.20.1"
 
 // Compulsory minimum version, Minimum downward compatibility to this version
 func GetVersion() string {