Merge pull request #123 from jumpserver/dev

Dev

pkg/httpd/websshws.go

@@ -119,9 +119,21 @@ func OnHostHandler(c *neffos.NSConn, msg neffos.Message) (err error) {
 		c.Emit("data", neffos.Marshal(dataMsg))
 		return
 	}
-
 	userR, userW := io.Pipe()
-	addr, _, _ := net.SplitHostPort(cc.Socket().Request().RemoteAddr)
+	var addr string
+	request := cc.Socket().Request()
+	header := request.Header
+	remoteAddr := header.Get("X-Forwarded-For")
+	if remoteAddr == "" {
+		if host, _, err := net.SplitHostPort(request.RemoteAddr); err == nil {
+			addr = host
+		} else {
+			addr = request.RemoteAddr
+		}
+	} else {
+		addr = strings.Split(remoteAddr, ",")[0]
+	}
+
 	client := &Client{
 		Uuid: roomID, addr: addr,
 		WinChan: make(chan ssh.Window, 100), Conn: c,

pkg/service/perms.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"fmt"
+	"net/url"
 	"strconv"
 
 	"github.com/jumpserver/koko/pkg/logger"
@@ -13,7 +14,7 @@ func GetUserAssets(userID, search string, pageSize, offset int) (resp model.Asse
 		pageSize = 0
 	}
 	params := map[string]string{
-		"search": search,
+		"search": url.QueryEscape(search),
 		"limit":  strconv.Itoa(pageSize),
 		"offset": strconv.Itoa(offset),
 	}