refactor: update Go module versions and enhance SSH client functionality

Author: ayanrajpoot10

go.mod

@@ -1,14 +1,18 @@
 module tunn
 
-go 1.21
+go 1.23.0
+
+toolchain go1.24.4
 
 require (
 	github.com/spf13/cobra v1.9.1
 	golang.org/x/crypto v0.33.0
+	golang.org/x/net v0.21.0
 )
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
-	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/term v0.31.0 // indirect
 )

go.sum

@@ -8,9 +8,11 @@ github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
 golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
+golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
+golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/ssh/client.go

@@ -3,9 +3,12 @@ package ssh
 import (
 	"fmt"
 	"net"
+	"os"
+	"strings"
 	"time"
 
 	"golang.org/x/crypto/ssh"
+	"golang.org/x/net/html"
 )
 
 // Client represents an SSH client that can operate over any net.Conn
@@ -31,6 +34,26 @@ func NewOverWebSocket(conn net.Conn, username, password string) *OverWebSocket {
 	}
 }
 
+// stripHTMLTags removes HTML tags from a string and returns plain text.
+func stripHTMLTags(htmlStr string) string {
+	doc, err := html.Parse(strings.NewReader(htmlStr))
+	if err != nil {
+		return htmlStr // fallback to original if parsing fails
+	}
+	var b strings.Builder
+	var f func(*html.Node)
+	f = func(n *html.Node) {
+		if n.Type == html.TextNode {
+			b.WriteString(n.Data)
+		}
+		for c := n.FirstChild; c != nil; c = c.NextSibling {
+			f(c)
+		}
+	}
+	f(doc)
+	return b.String()
+}
+
 // StartTransport initializes the SSH client over the WebSocket connection
 func (s *OverWebSocket) StartTransport() error {
 	fmt.Println("→ Starting SSH transport over WebSocket connection...")
@@ -42,27 +65,38 @@ func (s *OverWebSocket) StartTransport() error {
 		tcpConn.SetKeepAlivePeriod(30 * time.Second)
 	}
 
-	// Clear any previous deadlines
-	s.conn.SetReadDeadline(time.Time{})
-	s.conn.SetWriteDeadline(time.Time{})
+	// Set a deadline for the SSH handshake to avoid hanging
+	handshakeTimeout := 15 * time.Second
+	s.conn.SetDeadline(time.Now().Add(handshakeTimeout))
 
 	config := &ssh.ClientConfig{
 		User: s.username,
 		Auth: []ssh.AuthMethod{
 			ssh.Password(s.password),
 		},
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(), // WARNING: This is insecure for production
-		Timeout:         15 * time.Second,
+		Timeout:         handshakeTimeout,
+		BannerCallback: func(message string) error {
+			plain := stripHTMLTags(message)
+			fmt.Fprintln(stderrOrStdout(), plain)
+			return nil
+		},
 	}
 
 	fmt.Printf("→ Attempting SSH connection with user: %s\n", s.username)
 
 	// Create SSH client using the WebSocket connection
 	sshConn, chans, reqs, err := ssh.NewClientConn(s.conn, "tcp", config)
 	if err != nil {
+		if nErr, ok := err.(net.Error); ok && nErr.Timeout() {
+			return fmt.Errorf("SSH handshake timed out after %v", handshakeTimeout)
+		}
 		return fmt.Errorf("failed to create SSH connection: %v", err)
 	}
 
+	// Clear deadline after handshake
+	s.conn.SetDeadline(time.Time{})
+
 	s.sshClient = ssh.NewClient(sshConn, chans, reqs)
 	fmt.Println("✓ SSH transport established and authenticated.")
 	return nil
@@ -80,3 +114,9 @@ func (s *OverWebSocket) Close() error {
 	}
 	return nil
 }
+
+// stderrOrStdout returns stderr if available, otherwise stdout.
+func stderrOrStdout() *os.File {
+	// fallback to stdout if stderr is not available
+	return os.Stderr
+}