[Update] 修改一些变量

pkg/handler/pagination.go

@@ -137,7 +137,7 @@ func (p *AssetPagination) displayPageAssets() {
 		row := make(map[string]string)
 		row["ID"] = strconv.Itoa(i + 1)
 		row["hostname"] = j.Hostname
-		row["IP"] = j.Ip
+		row["IP"] = j.IP
 
 		systemUser := selectHighestPrioritySystemUsers(j.SystemUsers)
 		names := make([]string, len(systemUser))

pkg/handler/session.go

@@ -339,7 +339,7 @@ func (h *interactiveHandler) searchAsset(key string) (assets []model.Asset) {
 	key = strings.ToLower(key)
 	for _, assetValue := range searchData {
 		contents := []string{strings.ToLower(assetValue.Hostname),
-			strings.ToLower(assetValue.Ip), strings.ToLower(assetValue.Comment)}
+			strings.ToLower(assetValue.IP), strings.ToLower(assetValue.Comment)}
 		if isSubstring(contents, key) {
 			assets = append(assets, assetValue)
 		}
@@ -347,7 +347,7 @@ func (h *interactiveHandler) searchAsset(key string) (assets []model.Asset) {
 
 	//	assetsData, _ := Cached.Load(h.user.ID)
 	//	for _, assetValue := range assetsData.([]model.Asset) {
-	//		if isSubstring([]string{assetValue.Ip, assetValue.Hostname, assetValue.Comment}, key) {
+	//		if isSubstring([]string{assetValue.IP, assetValue.Hostname, assetValue.Comment}, key) {
 	//			assets = append(assets, assetValue)
 	//		}
 	//	}
@@ -462,7 +462,7 @@ func selectHighestPrioritySystemUsers(systemUsers []model.SystemUser) []model.Sy
 //	sshConn := userhome.NewSSHConn(i.sess)
 //	serverAuth := transport.ServerAuth{
 //		SessionID: uuid.NewV4().String(),
-//		IP:        asset.Ip,
+//		IP:        asset.IP,
 //		port:      asset.port,
 //		Username:  systemUser.Username,
 //		password:  systemUser.password,

pkg/handler/sftp.go

@@ -224,8 +224,8 @@ func (fs *userSftpRequests) Fileread(r *sftp.Request) (io.ReaderAt, error) {
 
 func (fs *userSftpRequests) GetSftpClient(asset *model.Asset, sysUser *model.SystemUser) (*sftp.Client, error) {
 	logger.Debug("Get Sftp Client")
-	info := service.GetSystemUserAssetAuthInfo(sysUser.Id, asset.Id)
-	return CreateSFTPConn(sysUser.Username, info.Password, info.PrivateKey, asset.Ip, strconv.Itoa(asset.Port))
+	info := service.GetSystemUserAssetAuthInfo(sysUser.ID, asset.ID)
+	return CreateSFTPConn(sysUser.Username, info.Password, info.PrivateKey, asset.IP, strconv.Itoa(asset.Port))
 }
 
 type HostNameDir struct {

pkg/httpd/connection.go

 package httpd
 
 import (
+	"github.com/googollee/go-socket.io"
 	"sync"
 
 	"github.com/gliderlabs/ssh"
-	socketio "github.com/googollee/go-socket.io"
 
 	"cocogo/pkg/model"
 )
 
+var conns = &connections{container: make(map[string]*WebConn), mu: new(sync.RWMutex)}
+
 type connections struct {
 	container map[string]*WebConn
 	mu        *sync.RWMutex

pkg/httpd/handler.go

@@ -80,10 +80,10 @@ func OnErrorHandler(e error) {
 // OnHostHandler 当用户连接Host时触发
 func OnHostHandler(s socketio.Conn, message HostMsg) {
 	// secret 	uuid string
-	logger.Debug("OnHost trigger")
+	logger.Debug("On host event trigger")
 	win := ssh.Window{Height: 24, Width: 80}
 	assetID := message.Uuid
-	systemUserId := message.UserID
+	systemUserID := message.UserID
 	secret := message.Secret
 	width, height := message.Size[0], message.Size[1]
 	if width != 0 {
@@ -97,9 +97,9 @@ func OnHostHandler(s socketio.Conn, message HostMsg) {
 	s.Emit("room", emitMsg)
 	logger.Debug("Asset id: ", assetID)
 	asset := service.GetAsset(assetID)
-	systemUser := service.GetSystemUser(systemUserId)
+	systemUser := service.GetSystemUser(systemUserID)
 
-	if asset.Id == "" || systemUser.Id == "" {
+	if asset.ID == "" || systemUser.ID == "" {
 		return
 	}
 
@@ -123,7 +123,7 @@ func OnHostHandler(s socketio.Conn, message HostMsg) {
 
 // OnTokenHandler 当使用token连接时触发
 func OnTokenHandler(s socketio.Conn, message TokenMsg) {
-	logger.Debug("OnToken trigger")
+	logger.Debug("On token event trigger")
 	win := ssh.Window{Height: 24, Width: 80}
 	token := message.Token
 	secret := message.Secret
@@ -146,18 +146,18 @@ func OnTokenHandler(s socketio.Conn, message TokenMsg) {
 		s.Emit("disconnect")
 	}
 	tokenUser := service.GetTokenAsset(token)
-	if tokenUser.UserId == "" {
+	if tokenUser.UserID == "" {
 		msg := "Token info is none, maybe token expired"
 		dataMsg := EmitDataMsg{Data: msg, Room: clientID}
 		s.Emit("data", dataMsg)
 		s.Emit("disconnect")
 	}
 
-	currentUser := service.GetUserDetail(tokenUser.UserId)
-	asset := service.GetAsset(tokenUser.AssetId)
-	systemUser := service.GetSystemUser(tokenUser.SystemUserId)
+	currentUser := service.GetUserDetail(tokenUser.UserID)
+	asset := service.GetAsset(tokenUser.AssetID)
+	systemUser := service.GetSystemUser(tokenUser.SystemUserID)
 
-	if asset.Id == "" || systemUser.Id == "" {
+	if asset.ID == "" || systemUser.ID == "" {
 		return
 	}
 
@@ -201,7 +201,7 @@ func OnResizeHandler(s socketio.Conn, message ResizeMsg) {
 
 // OnLogoutHandler 用户登出一个会话时触发
 func OnLogoutHandler(s socketio.Conn, message string) {
-	logger.Debug("OnLogout trigger")
+	logger.Debug("On logout event trigger")
 	conn := conns.GetWebConn(s.ID())
 	if conn == nil {
 		logger.Error("No conn found")
@@ -217,7 +217,7 @@ func OnLogoutHandler(s socketio.Conn, message string) {
 
 // OnDisconnect websocket断开后触发
 func OnDisconnect(s socketio.Conn, msg string) {
-	logger.Debug("OnDisconnect trigger")
+	logger.Debug("On disconnect event trigger")
 	conn := conns.GetWebConn(s.ID())
 	conn.Close()
 }

pkg/httpd/server.go

 package httpd
 
 import (
-	"net/http"
-	"sync"
-
 	"github.com/googollee/go-socket.io"
+	"net"
+	"net/http"
 
 	"cocogo/pkg/config"
 	"cocogo/pkg/logger"
@@ -12,7 +11,6 @@ import (
 
 var (
 	httpServer *http.Server
-	conns      = &connections{container: make(map[string]*WebConn), mu: new(sync.RWMutex)}
 )
 
 func StartHTTPServer() {
@@ -34,7 +32,8 @@ func StartHTTPServer() {
 	defer server.Close()
 
 	http.Handle("/socket.io/", server)
-	logger.Debug("start HTTP Serving ", conf.HTTPPort)
-	httpServer = &http.Server{Addr: conf.BindHost + ":" + conf.HTTPPort, Handler: nil}
+	addr := net.JoinHostPort(conf.BindHost, conf.HTTPPort)
+	logger.Debug("Start HTTP server at ", addr)
+	httpServer = &http.Server{Addr: addr, Handler: nil}
 	logger.Fatal(httpServer.ListenAndServe())
 }

pkg/model/assets.go

@@ -17,7 +17,7 @@ func (a AssetList) SortBy(tp string) AssetList {
 	case "ip":
 		sorter := &assetSorter{
 			data:   sortedAssets,
-			sortBy: assetSortbyIP,
+			sortBy: assetSortByIP,
 		}
 		sort.Sort(sorter)
 	default:
@@ -46,9 +46,9 @@ func (s *assetSorter) Less(i, j int) bool {
 	return s.sortBy(&s.data[i], &s.data[j])
 }
 
-func assetSortbyIP(asset1, asset2 *Asset) bool {
-	iIPs := strings.Split(asset1.Ip, ".")
-	jIPs := strings.Split(asset2.Ip, ".")
+func assetSortByIP(asset1, asset2 *Asset) bool {
+	iIPs := strings.Split(asset1.IP, ".")
+	jIPs := strings.Split(asset2.IP, ".")
 	for i := 0; i < len(iIPs); i++ {
 		if i >= len(jIPs) {
 			return false
@@ -75,9 +75,9 @@ func assetSortByHostName(asset1, asset2 *Asset) bool {
 type NodeList []Node
 
 type Asset struct {
-	Id              string       `json:"id"`
+	ID              string       `json:"id"`
 	Hostname        string       `json:"hostname"`
-	Ip              string       `json:"ip"`
+	IP              string       `json:"ip"`
 	Port            int          `json:"port"`
 	SystemUsers     []SystemUser `json:"system_users_granted"`
 	IsActive        bool         `json:"is_active"`
@@ -109,14 +109,14 @@ type Domain struct {
 }
 
 type Node struct {
-	Id            string  `json:"id"`
+	ID            string  `json:"id"`
 	Key           string  `json:"key"`
 	Name          string  `json:"name"`
 	Value         string  `json:"value"`
 	Parent        string  `json:"parent"`
 	AssetsGranted []Asset `json:"assets_granted"`
 	AssetsAmount  int     `json:"assets_amount"`
-	OrgId         string  `json:"org_id"`
+	OrgID         string  `json:"org_id"`
 }
 
 type nodeSortBy func(node1, node2 *Node) bool
@@ -179,7 +179,7 @@ func SortAssetNodesByKey(assetNodes []Node) {
 const LoginModeManual = "manual"
 
 type SystemUser struct {
-	Id         string `json:"id"`
+	ID         string `json:"id"`
 	Name       string `json:"name"`
 	Username   string `json:"username"`
 	Priority   int    `json:"priority"`
@@ -191,7 +191,7 @@ type SystemUser struct {
 }
 
 type SystemUserAuthInfo struct {
-	Id         string `json:"id"`
+	ID         string `json:"id"`
 	Name       string `json:"name"`
 	UserName   string `json:"username"`
 	Protocol   string `json:"protocol"`

pkg/model/session.go

 package model
 
 type Command struct {
-	SessionId  string `json:"session"`
-	OrgId      string `json:"org_id"`
+	SessionID  string `json:"session"`
+	OrgID      string `json:"org_id"`
 	Input      string `json:"input"`
 	Output     string `json:"output"`
 	User       string `json:"user"`

pkg/model/terminal.go

@@ -4,7 +4,7 @@ type Terminal struct {
 	Name           string `json:"name"`
 	Comment        string `json:"comment"`
 	ServiceAccount struct {
-		Id        string `json:"id"`
+		ID        string `json:"id"`
 		Name      string `json:"name"`
 		AccessKey struct {
 			ID     string `json:"id"`
@@ -14,7 +14,7 @@ type Terminal struct {
 }
 
 type TerminalTask struct {
-	Id         string `json:"id"`
+	ID         string `json:"id"`
 	Name       string `json:"name"`
 	Args       string `json:"args"`
 	IsFinished bool

pkg/model/users.go

@@ -36,10 +36,10 @@ type User struct {
 }
 
 type TokenUser struct {
-	UserId         string `json:"user"`
+	UserID         string `json:"user"`
 	UserName       string `json:"username"`
-	AssetId        string `json:"asset"`
+	AssetID        string `json:"asset"`
 	Hostname       string `json:"hostname"`
-	SystemUserId   string `json:"system_user"`
+	SystemUserID   string `json:"system_user"`
 	SystemUserName string `json:"system_user_name"`
 }

pkg/proxy/proxy.go

@@ -24,7 +24,7 @@ type ProxyServer struct {
 
 // getSystemUserAuthOrManualSet 获取系统用户的认证信息或手动设置
 func (p *ProxyServer) getSystemUserAuthOrManualSet() {
-	info := service.GetSystemUserAssetAuthInfo(p.SystemUser.Id, p.Asset.Id)
+	info := service.GetSystemUserAssetAuthInfo(p.SystemUser.ID, p.Asset.ID)
 	p.SystemUser.Password = info.Password
 	p.SystemUser.PrivateKey = info.PrivateKey
 	needManualSet := false
@@ -82,7 +82,7 @@ func (p *ProxyServer) checkProtocolIsGraph() bool {
 // validatePermission 检查是否有权限连接
 func (p *ProxyServer) validatePermission() bool {
 	return service.ValidateUserAssetPermission(
-		p.User.ID, p.Asset.Id, p.SystemUser.Id, "connect",
+		p.User.ID, p.Asset.ID, p.SystemUser.ID, "connect",
 	)
 }
 
@@ -149,7 +149,7 @@ func (p *ProxyServer) getServerConn() (srvConn srvconn.ServerConnection, err err
 // sendConnectingMsg 发送连接信息
 func (p *ProxyServer) sendConnectingMsg(done chan struct{}, delayDuration time.Duration) {
 	delay := 0.0
-	msg := fmt.Sprintf(i18n.T("Connecting to %s@%s  %.1f"), p.SystemUser.Username, p.Asset.Ip, delay)
+	msg := fmt.Sprintf(i18n.T("Connecting to %s@%s  %.1f"), p.SystemUser.Username, p.Asset.IP, delay)
 	utils.IgnoreErrWriteString(p.UserConn, msg)
 	for int(delay) < int(delayDuration/time.Second) {
 		select {

pkg/proxy/recorder.go

@@ -119,13 +119,13 @@ func (r *ReplyRecorder) Record(b []byte) {
 }
 
 func (r *ReplyRecorder) prepare() {
-	sessionId := r.sessionID
+	sessionID := r.sessionID
 	rootPath := config.GetConf().RootPath
 	today := time.Now().UTC().Format("2006-01-02")
-	gzFileName := sessionId + ".replay.gz"
+	gzFileName := sessionID + ".replay.gz"
 	replayDir := filepath.Join(rootPath, "data", "replays", today)
 
-	r.absFilePath = filepath.Join(replayDir, sessionId)
+	r.absFilePath = filepath.Join(replayDir, sessionID)
 	r.AbsGzFilePath = filepath.Join(replayDir, gzFileName)
 	r.Target = strings.Join([]string{today, gzFileName}, "/")
 	r.timeStartNano = time.Now().UnixNano()

pkg/proxy/sessmanager.go

@@ -17,7 +17,7 @@ func HandleSessionTask(task model.TerminalTask) {
 	switch task.Name {
 	case "kill_session":
 		KillSession(task.Args)
-		service.FinishTask(task.Id)
+		service.FinishTask(task.ID)
 	default:
 
 	}
@@ -44,14 +44,14 @@ func GetAliveSessions() []string {
 func RemoveSession(sw *SwitchSession) {
 	lock.Lock()
 	defer lock.Unlock()
-	delete(sessionMap, sw.Id)
+	delete(sessionMap, sw.ID)
 	finishSession(sw)
 }
 
 func AddSession(sw *SwitchSession) {
 	lock.Lock()
 	defer lock.Unlock()
-	sessionMap[sw.Id] = sw
+	sessionMap[sw.ID] = sw
 }
 
 func CreateSession(p *ProxyServer) (sw *SwitchSession, err error) {
@@ -67,7 +67,7 @@ func CreateSession(p *ProxyServer) (sw *SwitchSession, err error) {
 		return
 	}
 	// 获取系统用户的过滤规则，并设置
-	cmdRules, err := service.GetSystemUserFilterRules(p.SystemUser.Id)
+	cmdRules, err := service.GetSystemUserFilterRules(p.SystemUser.ID)
 	if err != nil {
 		msg := i18n.T("Connect with api server failed")
 		msg = utils.WrapperWarn(msg)
@@ -93,6 +93,6 @@ func postSession(s *SwitchSession) bool {
 func finishSession(s *SwitchSession) {
 	data := s.MapData()
 	service.FinishSession(data)
-	service.FinishReply(s.Id)
-	logger.Debugf("Finish session: %s", s.Id)
+	service.FinishReply(s.ID)
+	logger.Debugf("Finish session: %s", s.ID)
 }

pkg/proxy/switch.go

@@ -23,7 +23,7 @@ func NewSwitchSession(p *ProxyServer) (sw *SwitchSession) {
 }
 
 type SwitchSession struct {
-	Id string
+	ID string
 	p  *ProxyServer
 
 	DateStart  string
@@ -45,11 +45,11 @@ type SwitchSession struct {
 }
 
 func (s *SwitchSession) Initial() {
-	s.Id = uuid.NewV4().String()
+	s.ID = uuid.NewV4().String()
 	s.DateStart = time.Now().UTC().Format("2006-01-02 15:04:05 +0000")
 	s.MaxIdleTime = config.GetConf().MaxIdleTime
-	s.cmdRecorder = NewCommandRecorder(s.Id)
-	s.replayRecorder = NewReplyRecord(s.Id)
+	s.cmdRecorder = NewCommandRecorder(s.ID)
+	s.replayRecorder = NewReplyRecord(s.ID)
 	s.parser = newParser()
 	s.ctx, s.cancel = context.WithCancel(context.Background())
 }
@@ -92,8 +92,8 @@ func (s *SwitchSession) generateCommandResult(command [2]string) *model.Command
 	}
 
 	return &model.Command{
-		SessionId:  s.Id,
-		OrgId:      s.p.Asset.OrgID,
+		SessionID:  s.ID,
+		OrgID:      s.p.Asset.OrgID,
 		Input:      input,
 		Output:     output,
 		User:       s.p.User.Username,
@@ -123,11 +123,11 @@ func (s *SwitchSession) SetFilterRules(cmdRules []model.SystemUserFilterRule) {
 func (s *SwitchSession) Bridge(userConn UserConnection, srvConn srvconn.ServerConnection) (err error) {
 	winCh := userConn.WinCh()
 	// 将ReadWriter转换为Channel读写
-	s.srvTran = NewDirectTransport(s.Id, srvConn)
-	s.userTran = NewDirectTransport(s.Id, userConn)
+	s.srvTran = NewDirectTransport(s.ID, srvConn)
+	s.userTran = NewDirectTransport(s.ID, userConn)
 
 	defer func() {
-		logger.Info("Session bridge done: ", s.Id)
+		logger.Info("Session bridge done: ", s.ID)
 		s.postBridge()
 	}()
 
@@ -190,7 +190,7 @@ func (s *SwitchSession) MapData() map[string]interface{} {
 		dataEnd = s.DateEnd
 	}
 	return map[string]interface{}{
-		"id":          s.Id,
+		"id":          s.ID,
 		"user":        s.p.User.Name,
 		"asset":       s.p.Asset.Hostname,
 		"org_id":      s.p.Asset.OrgID,

pkg/service/init.go

@@ -89,7 +89,6 @@ func LoadConfigFromServer() (err error) {
 
 func KeepSyncConfigWithServer() {
 	for {
-		logger.Debug("Sync config with server")
 		err := LoadConfigFromServer()
 		if err != nil {
 			logger.Warn("Sync config with server error: ", err)

pkg/service/perms.go

@@ -20,12 +20,12 @@ func GetUserAssets(userID, cachePolicy string) (assets model.AssetList) {
 	return
 }
 
-func GetUserNodes(userId, cachePolicy string) (nodes model.NodeList) {
+func GetUserNodes(userID, cachePolicy string) (nodes model.NodeList) {
 	if cachePolicy == "" {
 		cachePolicy = "0"
 	}
 	payload := map[string]string{"cache_policy": cachePolicy}
-	Url := fmt.Sprintf(UserNodesAssetsURL, userId)
+	Url := fmt.Sprintf(UserNodesAssetsURL, userID)
 	err := authClient.Get(Url, &nodes, payload)
 	if err != nil {
 		logger.Error("GetUserNodes err")
@@ -33,11 +33,11 @@ func GetUserNodes(userId, cachePolicy string) (nodes model.NodeList) {
 	return
 }
 
-func ValidateUserAssetPermission(userId, assetId, systemUserId, action string) bool {
+func ValidateUserAssetPermission(userID, assetID, systemUserID, action string) bool {
 	payload := map[string]string{
-		"user_id":        userId,
-		"asset_id":       assetId,
-		"system_user_id": systemUserId,
+		"user_id":        userID,
+		"asset_id":       assetID,
+		"system_user_id": systemUserID,
 		"action_name":    action,
 	}
 	Url := ValidateUserAssetPermissionURL

pkg/srvconn/connmanager.go

@@ -132,7 +132,7 @@ func newClient(asset *model.Asset, systemUser *model.SystemUser, timeout time.Du
 		}
 	}
 	sshConfig := SSHClientConfig{
-		Host:       asset.Ip,
+		Host:       asset.IP,
 		Port:       strconv.Itoa(asset.Port),
 		User:       systemUser.Username,
 		Password:   systemUser.Password,
@@ -145,13 +145,13 @@ func newClient(asset *model.Asset, systemUser *model.SystemUser, timeout time.Du
 }
 
 func NewClient(user *model.User, asset *model.Asset, systemUser *model.SystemUser, timeout time.Duration) (client *gossh.Client, err error) {
-	key := fmt.Sprintf("%s_%s_%s", user.ID, asset.Id, systemUser.Id)
+	key := fmt.Sprintf("%s_%s_%s", user.ID, asset.ID, systemUser.ID)
 	clientLock.RLock()
 	client, ok := sshClients[key]
 	clientLock.RUnlock()
 
 	var u = user.Username
-	var ip = asset.Ip
+	var ip = asset.IP
 	var sysName = systemUser.Username
 
 	if ok {
@@ -175,7 +175,7 @@ func NewClient(user *model.User, asset *model.Asset, systemUser *model.SystemUse
 }
 
 func GetClientFromCache(user *model.User, asset *model.Asset, systemUser *model.SystemUser) (client *gossh.Client) {
-	key := fmt.Sprintf("%s_%s_%s", user.ID, asset.Id, systemUser.Id)
+	key := fmt.Sprintf("%s_%s_%s", user.ID, asset.ID, systemUser.ID)
 	clientLock.Lock()
 	defer clientLock.Unlock()
 	client, ok := sshClients[key]

pkg/srvconn/telnetconn.go

@@ -119,11 +119,11 @@ func (tc *ServerTelnetConnection) login(data []byte) AuthStatus {
 		return AuthFailed
 	} else if usernamePattern.Match(data) {
 		_, _ = tc.conn.Write([]byte(tc.SystemUser.Username + "\r\n"))
-		logger.Debug("usernamePattern ", tc.User)
+		logger.Debug("Username pattern match: ", data)
 		return AuthPartial
 	} else if passwordPattern.Match(data) {
 		_, _ = tc.conn.Write([]byte(tc.SystemUser.Password + "\r\n"))
-		logger.Debug("passwordPattern ", tc.SystemUser.Password)
+		logger.Debug("Password pattern ", data)
 		return AuthPartial
 	} else if successPattern.Match(data) {
 		return AuthSuccess
@@ -137,7 +137,7 @@ func (tc *ServerTelnetConnection) login(data []byte) AuthStatus {
 }
 
 func (tc *ServerTelnetConnection) Connect(h, w int, term string) (err error) {
-	var ip = tc.Asset.Ip
+	var ip = tc.Asset.IP
 	var port = strconv.Itoa(tc.Asset.Port)
 	conn, err := net.DialTimeout("tcp", net.JoinHostPort(ip, port), tc.Timeout())
 	if err != nil {