添加proxy

Author: hXoreyer

.gitignore

@@ -1,2 +1,4 @@
 ktool.exe
-*.rar
+*.rar
+server.yaml
+public

ctl/clientConfig.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/pkg/sftp"
 	"golang.org/x/crypto/ssh"
+	"golang.org/x/net/proxy"
 )
 
 const (
@@ -33,7 +34,7 @@ type ClientConfig struct {
 	LastResult string
 }
 
-func CreateClient(host string, port string, username, password string) *ClientConfig {
+func CreateClient(host string, port string, username, password string, proxyUrl string) *ClientConfig {
 	cf := &ClientConfig{}
 	var (
 		sshClient  *ssh.Client
@@ -57,19 +58,46 @@ func CreateClient(host string, port string, username, password string) *ClientCo
 
 	addr := fmt.Sprintf("%s:%s", cf.Host, cf.Port)
 
-	if sshClient, err = ssh.Dial("tcp", addr, &config); err != nil {
-		log.Fatalf("connect ssh error: %s", err.Error())
-		return nil
-	}
+	if proxyUrl != "" {
+		// 创建SOCKS5代理拨号器
+		log.Printf("Start proxy: %s", proxyUrl)
+		dialer, err := proxy.SOCKS5("tcp", proxyUrl, nil, proxy.Direct)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		conn, err := dialer.Dial("tcp", addr)
+		if err != nil {
+			fmt.Println(err)
+			return nil
+		}
+
+		c, cn, req, err := ssh.NewClientConn(conn, addr, &config)
+		if err != nil {
+			log.Fatalf("connect ssh error: %s", err.Error())
+			return nil
+		}
+
+		sshClient = ssh.NewClient(c, cn, req)
+
+		cf.sshClient = sshClient
+	} else {
 
-	cf.sshClient = sshClient
+		if sshClient, err = ssh.Dial("tcp", addr, &config); err != nil {
+			log.Fatalf("connect ssh error: %s", err.Error())
+			return nil
+		}
+
+		cf.sshClient = sshClient
+	}
 
 	if sftpClient, err = sftp.NewClient(sshClient); err != nil {
 		log.Fatalf("connect sftp error: %s", err.Error())
 		return nil
 	}
 
 	cf.sftpClient = sftpClient
+	log.Println("connect server success...")
 	return cf
 }
 

ctl/parse.go

@@ -20,6 +20,7 @@ type ServerAddr struct {
 	Port     string `yaml:"port"`
 	Account  string `yaml:"account"`
 	Password string `yaml:"password"`
+	Proxy    string `yarml:"proxy"`
 }
 
 type FileCtl struct {
@@ -47,7 +48,7 @@ func NewYaml(path string) *Yaml {
 
 func (yal Yaml) Run() {
 
-	srv := CreateClient(yal.Server.IP, yal.Server.Port, yal.Server.Account, yal.Server.Password)
+	srv := CreateClient(yal.Server.IP, yal.Server.Port, yal.Server.Account, yal.Server.Password, yal.Server.Proxy)
 	for _, v := range yal.UploadFiles {
 		srv.Upload(v.Src, v.Dst)
 	}

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/pkg/sftp v1.13.5
 	github.com/spf13/cobra v1.7.0
 	golang.org/x/crypto v0.9.0
+	golang.org/x/net v0.10.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 

go.sum

@@ -21,6 +21,8 @@ golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=