Url路由 泛解析

server/proxy/http.go

@@ -110,19 +110,22 @@ func (s *httpServer) handleTunneling(w http.ResponseWriter, r *http.Request) {
 func (s *httpServer) process(c *conn.Conn, r *http.Request) {
 	//多客户端域名代理
 	var (
-		isConn = true
-		lk     *conn.Link
-		host   *file.Host
-		tunnel *conn.Conn
-		err    error
+		isConn   = true
+		lk       *conn.Link
+		host     *file.Host
+		tunnel   *conn.Conn
+		lastHost *file.Host
+		err      error
 	)
 	for {
-		//首次获取conn
+		if host, err = file.GetCsvDb().GetInfoByHost(r.Host, r); err != nil {
+			lg.Printf("the url %s %s is not found !", r.Host, r.RequestURI)
+			break
+		} else if host != lastHost {
+			lastHost = host
+			isConn = true
+		}
 		if isConn {
-			if host, err = file.GetCsvDb().GetInfoByHost(r.Host); err != nil {
-				lg.Printf("the host %s is not found !", r.Host)
-				break
-			}
 			//流量限制
 			if host.Client.Flow.FlowLimit > 0 && (host.Client.Flow.FlowLimit<<20) < (host.Client.Flow.ExportFlow+host.Client.Flow.InletFlow) {
 				break
@@ -147,6 +150,7 @@ func (s *httpServer) process(c *conn.Conn, r *http.Request) {
 		//根据设定，修改header和host
 		common.ChangeHostAndHeader(r, host.HostChange, host.HeaderChange, c.Conn.RemoteAddr().String())
 		b, err := httputil.DumpRequest(r, true)
+		lg.Println(string(b), r.RequestURI)
 		if err != nil {
 			break
 		}

server/proxy/socks5.go

@@ -49,7 +49,6 @@ const (
 
 type Sock5ModeServer struct {
 	server
-	isVerify bool
 	listener net.Listener
 }
 
@@ -208,12 +207,12 @@ func (s *Sock5ModeServer) handleConn(c net.Conn) {
 		c.Close()
 		return
 	}
-	if s.isVerify {
+	if s.task.Client.Cnf.U != "" && s.task.Client.Cnf.P != "" {
 		buf[1] = UserPassAuth
 		c.Write(buf)
 		if err := s.Auth(c); err != nil {
 			c.Close()
-			lg.Println("验证失败：", err)
+			lg.Println("Validation failed:", err)
 			return
 		}
 	} else {
@@ -289,10 +288,5 @@ func NewSock5ModeServer(bridge *bridge.Bridge, task *file.Tunnel) *Sock5ModeServ
 	s := new(Sock5ModeServer)
 	s.bridge = bridge
 	s.task = task
-	if s.task.Client.Cnf.U != "" && s.task.Client.Cnf.P != "" {
-		s.isVerify = true
-	} else {
-		s.isVerify = false
-	}
 	return s
 }

server/server.go

@@ -69,7 +69,7 @@ func StartNewServer(bridgePort int, cnf *file.Tunnel, bridgeType string) {
 //new a server by mode name
 func NewMode(Bridge *bridge.Bridge, c *file.Tunnel) interface{} {
 	switch c.Mode {
-	case "tunnelServer":
+	case "tcpServer":
 		return proxy.NewTunnelModeServer(proxy.ProcessTunnel, Bridge, c)
 	case "socks5Server":
 		return proxy.NewSock5ModeServer(Bridge, c)
@@ -96,12 +96,15 @@ func NewMode(Bridge *bridge.Bridge, c *file.Tunnel) interface{} {
 //stop server
 func StopServer(id int) error {
 	if v, ok := RunList[id]; ok {
-		reflect.ValueOf(v).MethodByName("Close").Call(nil)
-		if t, err := file.GetCsvDb().GetTask(id); err != nil {
-			return err
-		} else {
-			t.Status = false
-			file.GetCsvDb().UpdateTask(t)
+		if reflect.ValueOf(v).IsValid() {
+			//TODO 错误处理
+			reflect.ValueOf(v).MethodByName("Close").Call(nil)
+			if t, err := file.GetCsvDb().GetTask(id); err != nil {
+				return err
+			} else {
+				t.Status = false
+				file.GetCsvDb().UpdateTask(t)
+			}
 		}
 		delete(RunList, id)
 		return nil
@@ -113,7 +116,7 @@ func StopServer(id int) error {
 func AddTask(t *file.Tunnel) error {
 	if b := tool.TestServerPort(t.Port, t.Mode); !b && t.Mode != "httpHostServer" {
 		lg.Printf("taskId %d start error Port %d Open Failed", t.Id, t.Port)
-		return errors.New("error")
+		return errors.New("the port open error")
 	}
 	if svr := NewMode(Bridge, t); svr != nil {
 		RunList[t.Id] = svr
@@ -226,7 +229,7 @@ func DelTunnelAndHostByClientId(clientId int) {
 	}
 	for _, v := range file.GetCsvDb().Hosts {
 		if v.Client.Id == clientId {
-			file.GetCsvDb().DelHost(v.Host)
+			file.GetCsvDb().DelHost(v.Id)
 		}
 	}
 }
@@ -256,8 +259,8 @@ func GetDashboardData() map[string]int {
 	data["exportFlowCount"] = int(out)
 	for _, v := range file.GetCsvDb().Tasks {
 		switch v.Mode {
-		case "tunnelServer":
-			data["tunnelServerCount"] += 1
+		case "tcpServer":
+			data["tcpServerCount"] += 1
 		case "socks5Server":
 			data["socks5ServerCount"] += 1
 		case "httpProxyServer":

server/tool/utils.go

@@ -3,43 +3,15 @@ package tool
 import (
 	"github.com/cnlh/nps/lib/beego"
 	"github.com/cnlh/nps/lib/common"
-	"strconv"
-	"strings"
 )
 
 var ports []int
 
 func init() {
 	p := beego.AppConfig.String("allowPorts")
-	arr := strings.Split(p, ",")
-	for _, v := range arr {
-		fw := strings.Split(v, "-")
-		if len(fw) == 2 {
-			if isPort(fw[0]) && isPort(fw[1]) {
-				start, _ := strconv.Atoi(fw[0])
-				end, _ := strconv.Atoi(fw[1])
-				for i := start; i <= end; i++ {
-					ports = append(ports, i)
-				}
-			} else {
-				continue
-			}
-		} else if isPort(v) {
-			p, _ := strconv.Atoi(v)
-			ports = append(ports, p)
-		}
-	}
-}
-func isPort(p string) bool {
-	pi, err := strconv.Atoi(p)
-	if err != nil {
-		return false
-	}
-	if pi > 65536 || pi < 1 {
-		return false
-	}
-	return true
+	ports = common.GetPorts(p)
 }
+
 func TestServerPort(p int, m string) (b bool) {
 	if len(ports) != 0 {
 		if !common.InIntArr(ports, p) {