[Update] Telnet支持网关

Gopkg.lock

@@ -42,7 +42,7 @@
   revision = "648efa622239a2f6ff949fed78ee37b48d499ba4"
 
 [[projects]]
-  digest = "1:9cc80abecc469330afaa9cc72744b258419f5be8adc78b7898ada5d299152048"
+  digest = "1:7b072517183e1d319b9127c2c43798e1e48f2d30b88e5a7e4f261a13c6ce5bbc"
   name = "github.com/aws/aws-sdk-go"
   packages = [
     "aws",
@@ -84,8 +84,8 @@
     "service/sts",
   ]
   pruneopts = "UT"
-  revision = "d6c5ccab427af7408a67e0f45c6e6a3d515fdaee"
-  version = "v1.19.39"
+  revision = "742c1495174cefd893992396b014bd6b7c91a293"
+  version = "v1.19.42"
 
 [[projects]]
   digest = "1:2af3a6e1f12e54cef95c6051cd1cb1e154629a4b82c692ac8a92f00259f570eb"
@@ -286,14 +286,14 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:079999f5a3a0db923759948975e14ec0cee7195b9d99c566139307d971e7fc3c"
+  digest = "1:4bb3e552e0c6745f9cf718126fcfb615775178146e6435ea8ba01b105f07102e"
   name = "golang.org/x/sys"
   packages = [
     "cpu",
     "unix",
   ]
   pruneopts = "UT"
-  revision = "854af27f14a7156d646cb0812811bbc293b2d6a7"
+  revision = "4c4f7f33c9ed00de01c4c741d2177abfcfe19307"
 
 [[projects]]
   branch = "master"
@@ -329,7 +329,6 @@
     "github.com/aws/aws-sdk-go/aws",
     "github.com/aws/aws-sdk-go/aws/credentials",
     "github.com/aws/aws-sdk-go/aws/session",
-    "github.com/aws/aws-sdk-go/service/s3",
     "github.com/aws/aws-sdk-go/service/s3/s3manager",
     "github.com/elastic/go-elasticsearch",
     "github.com/gliderlabs/ssh",

pkg/service/assets.go

@@ -88,7 +88,7 @@ func GetDomainWithGateway(gID string) (domain model.Domain) {
 	url := fmt.Sprintf(DomainDetailURL, gID)
 	err := authClient.Get(url, &domain)
 	if err != nil {
-		logger.Errorf("Get domain %s failed", gID)
+		logger.Errorf("Get domain %s failed: %s", gID, err)
 	}
 	return
 }

pkg/service/urls.go

@@ -12,7 +12,7 @@ const (
 	SystemUserCmdFilterRules = "/api/assets/v1/system-user/%s/cmd-filter-rules/"   // 过滤规则url
 	SystemUserDetailURL      = "/api/assets/v1/system-user/%s/"                    // 某个系统用户的信息
 	AssetDetailURL           = "/api/assets/v1/assets/%s/"                         // 某一个资产信息
-	DomainDetailURL          = "/api/assets/v1/domain/%s/"
+	DomainDetailURL          = "/api/assets/v1/domain/%s/?gateway=1"
 
 	TerminalRegisterURL  = "/api/terminal/v2/terminal-registrations/" // 注册当前coco
 	TerminalConfigURL    = "/api/terminal/v1/terminal/config/"        // 从jumpserver获取coco的配置

pkg/srvconn/connmanager.go

@@ -66,9 +66,13 @@ func (sc *SSHClientConfig) Config() (config *gossh.ClientConfig, err error) {
 
 func (sc *SSHClientConfig) DialProxy() (client *gossh.Client, err error) {
 	for _, p := range sc.Proxy {
+		logger.Debug("Connect proxy: .......")
 		client, err = p.Dial()
 		if err == nil {
+			logger.Debug("Connect proxy host %s:%s success", p.Host, p.Port)
 			return
+		} else {
+			logger.Errorf("Connect proxy host %s:%s error: ", p.Host, p.Port, err)
 		}
 	}
 	return
@@ -113,12 +117,12 @@ func (sc *SSHClientConfig) String() string {
 	return fmt.Sprintf("%s@%s:%s", sc.User, sc.Host, sc.Port)
 }
 
-func newClient(asset *model.Asset, systemUser *model.SystemUser, timeout time.Duration) (client *gossh.Client, err error) {
+func MakeConfig(asset *model.Asset, systemUser *model.SystemUser, timeout time.Duration) (conf *SSHClientConfig) {
 	proxyConfigs := make([]*SSHClientConfig, 0)
 	// 如果有网关则从网关中连接
 	if asset.Domain != "" {
 		domain := service.GetDomainWithGateway(asset.Domain)
-		if domain.ID != "" && len(domain.Gateways) > 1 {
+		if domain.ID != "" && len(domain.Gateways) > 0 {
 			for _, gateway := range domain.Gateways {
 				proxyConfigs = append(proxyConfigs, &SSHClientConfig{
 					Host:       gateway.IP,
@@ -131,7 +135,7 @@ func newClient(asset *model.Asset, systemUser *model.SystemUser, timeout time.Du
 			}
 		}
 	}
-	sshConfig := SSHClientConfig{
+	conf = &SSHClientConfig{
 		Host:       asset.IP,
 		Port:       strconv.Itoa(asset.Port),
 		User:       systemUser.Username,
@@ -140,6 +144,11 @@ func newClient(asset *model.Asset, systemUser *model.SystemUser, timeout time.Du
 		Timeout:    timeout,
 		Proxy:      proxyConfigs,
 	}
+	return
+}
+
+func newClient(asset *model.Asset, systemUser *model.SystemUser, timeout time.Duration) (client *gossh.Client, err error) {
+	sshConfig := MakeConfig(asset, systemUser, timeout)
 	client, err = sshConfig.Dial()
 	return
 }

pkg/srvconn/sshconn.go

@@ -21,7 +21,6 @@ type ServerSSHConnection struct {
 	stdin     io.WriteCloser
 	stdout    io.Reader
 	closed    bool
-	refCount  int
 	connected bool
 }
 

pkg/srvconn/telnetconn.go

@@ -2,14 +2,16 @@ package srvconn
 
 import (
 	"bytes"
-	"cocogo/pkg/model"
 	"errors"
 	"net"
 	"regexp"
 	"strconv"
 	"time"
 
+	gossh "golang.org/x/crypto/ssh"
+
 	"cocogo/pkg/logger"
+	"cocogo/pkg/model"
 )
 
 const (
@@ -139,7 +141,29 @@ func (tc *ServerTelnetConnection) login(data []byte) AuthStatus {
 func (tc *ServerTelnetConnection) Connect(h, w int, term string) (err error) {
 	var ip = tc.Asset.IP
 	var port = strconv.Itoa(tc.Asset.Port)
-	conn, err := net.DialTimeout("tcp", net.JoinHostPort(ip, port), tc.Timeout())
+	var asset = tc.Asset
+	var proxyConn *gossh.Client
+
+	if asset.Domain != "" {
+		sshConfig := MakeConfig(tc.Asset, tc.SystemUser, tc.Timeout())
+		proxyConn, err = sshConfig.DialProxy()
+		logger.Errorf("Proxy conn: ", proxyConn)
+		if err != nil {
+			logger.Error("Dial proxy host error")
+			return
+		}
+	}
+
+	addr := net.JoinHostPort(ip, port)
+	var conn net.Conn
+	// 判断是否有合适的proxy连接
+	if proxyConn != nil {
+		logger.Debug("Connect host via proxy")
+		conn, err = proxyConn.Dial("tcp", addr)
+	} else {
+		logger.Debug("Direct connect host")
+		conn, err = net.DialTimeout("tcp", addr, tc.Timeout())
+	}
 	if err != nil {
 		return
 	}