Merge pull request #34 from blacknon/develop

Version 0.1.11

Author: blacknon

.gitignore

@@ -19,3 +19,5 @@
 
 _TEST
 _test
+
+test_termlog

.travis.yml

@@ -6,7 +6,7 @@ env:
   - GO111MODULE=on
 
 go:
-  - 1.12.x
+  - 1.22.x
 
 git:
   depth: 1

_example/example_http_dynamic_forward_shell.go

@@ -0,0 +1,65 @@
+// Copyright (c) 2024 Blacknon. All rights reserved.
+// Use of this source code is governed by an MIT license
+// that can be found in the LICENSE file.
+
+// Shell connection and http dynamic forwarding Example file.
+// Change the value of the variable and compile to make sure that you can actually connect.
+//
+// This file uses password authentication. Please replace as appropriate.
+
+package main
+
+import (
+	"fmt"
+	"os"
+
+	sshlib "github.com/blacknon/go-sshlib"
+	"golang.org/x/crypto/ssh"
+)
+
+var (
+	host       = "proxy.com"
+	port       = "22"
+	user       = "user"
+	password   = "password"
+	localAddr  = "localhost:10080"
+	remoteAddr = "localhost:10080"
+
+	termlog = "./test_termlog"
+)
+
+func main() {
+	// Create sshlib.Connect
+	con := &sshlib.Connect{}
+
+	// Create ssh.AuthMethod
+	authMethod := sshlib.CreateAuthMethodPassword(password)
+
+	// Connect ssh server
+	err := con.CreateClient(host, port, user, []ssh.AuthMethod{authMethod})
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	// Dynamic PortForward
+	go func() {
+		err = con.HTTPDynamicForward("localhost", "10080")
+		if err != nil {
+			fmt.Println(err)
+		}
+	}()
+
+	// Set terminal log
+	con.SetLog(termlog, false)
+
+	// Create session
+	session, err := con.CreateSession()
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	// Start ssh shell
+	con.Shell(session)
+}

_example/example_set_host_key_callback_shell.go

@@ -0,0 +1,73 @@
+// Copyright (c) 2020 Blacknon. All rights reserved.
+// Use of this source code is governed by an MIT license
+// that can be found in the LICENSE file.
+
+// Shell connection and any HostKeyCallback use Example file.
+// Change the value of the variable and compile to make sure that you can actually connect.
+//
+// This file uses key authentication. Please replace as appropriate.
+
+package main
+
+import (
+	"fmt"
+	"os"
+
+	sshlib "github.com/blacknon/go-sshlib"
+	"golang.org/x/crypto/ssh"
+)
+
+var (
+	host    = "target.com"
+	port    = "22"
+	user    = "user"
+	privkey = "~/.ssh/sshenc_key"
+	keypass = "password"
+
+	termlog = "./test_termlog"
+)
+
+func main() {
+	// Create sshlib.Connect
+	con := &sshlib.Connect{
+		// If you use x11 forwarding, please set to true.
+		ForwardX11: false,
+
+		// If you use ssh-agent forwarding, please set to true.
+		// And after, run `con.ConnectSshAgent()`.
+		ForwardAgent: false,
+	}
+
+	// set any HostKeyCallback.
+	con.HostKeyCallback = ssh.InsecureIgnoreHostKey()
+
+	// Create ssh.AuthMethods
+	authMethod, err := sshlib.CreateAuthMethodPublicKey(privkey, keypass)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	// If you use ssh-agent forwarding, uncomment it.
+	// con.ConnectSshAgent()
+
+	// Connect ssh server
+	err = con.CreateClient(host, port, user, []ssh.AuthMethod{authMethod})
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	// Set terminal log
+	// con.SetLog(termlog, false)
+
+	// Create Session
+	session, err := con.CreateSession()
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	// Start ssh shell
+	con.Shell(session)
+}

common.go

@@ -12,7 +12,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"golang.org/x/crypto/ssh/terminal"
+	terminal "golang.org/x/term"
 )
 
 // getAbsPath return absolute path convert.

connect.go

@@ -6,15 +6,16 @@ package sshlib
 
 import (
 	"io"
+	"log"
 	"net"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
 
 	"golang.org/x/crypto/ssh"
-	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/net/proxy"
+	terminal "golang.org/x/term"
 )
 
 // Connect structure to store contents about ssh connection.
@@ -41,14 +42,23 @@ type Connect struct {
 	SendKeepAliveInterval int
 
 	// Session use tty flag.
+	// Set it before CraeteClient.
 	TTY bool
 
 	// Forward ssh agent flag.
+	// Set it before CraeteClient.
 	ForwardAgent bool
 
 	// CheckKnownHosts if true, check knownhosts.
+	// Ignored if HostKeyCallback is set.
+	// Set it before CraeteClient.
 	CheckKnownHosts bool
 
+	// HostKeyCallback is ssh.HostKeyCallback.
+	// This item takes precedence over `CheckKnownHosts`.
+	// Set it before CraeteClient.
+	HostKeyCallback ssh.HostKeyCallback
+
 	// OverwriteKnownHosts if true, if the knownhost is different, check whether to overwrite.
 	OverwriteKnownHosts bool
 
@@ -73,11 +83,21 @@ type Connect struct {
 
 	// ssh-agent interface.
 	// agent.Agent or agent.ExtendedAgent
+	// Set it before CraeteClient.
 	Agent AgentInterface
 
 	// Forward x11 flag.
+	// Set it before CraeteClient.
 	ForwardX11 bool
 
+	// Forward X11 trusted flag.
+	// This flag is ssh -Y option like flag.
+	// Set it before CraeteClient.
+	ForwardX11Trusted bool
+
+	//
+	DynamicForwardLogger *log.Logger
+
 	// shell terminal log flag
 	logging bool
 
@@ -107,14 +127,18 @@ func (c *Connect) CreateClient(host, port, user string, authMethods []ssh.AuthMe
 		Timeout: time.Duration(timeout) * time.Second,
 	}
 
-	if c.CheckKnownHosts {
-		if len(c.KnownHostsFiles) == 0 {
-			// append default files
-			c.KnownHostsFiles = append(c.KnownHostsFiles, "~/.ssh/known_hosts")
-		}
-		config.HostKeyCallback = c.verifyAndAppendNew
+	if c.HostKeyCallback != nil {
+		config.HostKeyCallback = c.HostKeyCallback
 	} else {
-		config.HostKeyCallback = ssh.InsecureIgnoreHostKey()
+		if c.CheckKnownHosts {
+			if len(c.KnownHostsFiles) == 0 {
+				// append default files
+				c.KnownHostsFiles = append(c.KnownHostsFiles, "~/.ssh/known_hosts")
+			}
+			config.HostKeyCallback = c.verifyAndAppendNew
+		} else {
+			config.HostKeyCallback = ssh.InsecureIgnoreHostKey()
+		}
 	}
 
 	// check Dialer
@@ -197,7 +221,6 @@ func (c *Connect) CheckClientAlive() error {
 
 // RequestTty requests the association of a pty with the session on the remote
 // host. Terminal size is obtained from the currently connected terminal
-//
 func RequestTty(session *ssh.Session) (err error) {
 	modes := ssh.TerminalModes{
 		ssh.ECHO:          1,