feat: ssh timeout

Author: whoisYoges

README.md

@@ -19,7 +19,7 @@ ManagedSSH is a terminal-first SSH connection manager built with Go, Cobra, and
 - Encrypted vault using Argon2 + AES-GCM for stored credentials.
 - Host key verification with known_hosts integration and trust confirmation.
 - Host profiles with:
-	- Alias, hostname, port, group, tags
+	- Alias, hostname, port, SSH timeout, group, tags
 	- Multiple user accounts per host
 	- Per-user password or SSH key authentication
 - Support for SSH key path or inline encrypted key data.
@@ -88,15 +88,35 @@ make install
 Common commands:
 
 ```bash
+make help
 make build
 make run
 make test
+make test-race
+make vet
+make lint
 make fmt
 make tidy
 make install
+make uninstall
 make clean
 ```
 
+Target summary:
+
+- make help: show available targets
+- make build: build the binary as managedssh in the project root
+- make run: run the app with go run
+- make test: run all tests
+- make test-race: run all tests with the race detector
+- make vet: run go vet checks
+- make lint: run golangci-lint if installed, otherwise skip with a message
+- make fmt: format Go files (excluding vendor)
+- make tidy: run go mod tidy
+- make install: install to GOBIN or GOPATH/bin, with ~/.local/bin fallback
+- make uninstall: remove installed binary from GOBIN, GOPATH/bin, or ~/.local/bin fallback
+- make clean: remove the local built binary
+
 Install behavior:
 
 - `make install` uses `go install .` when `GOBIN` or `GOPATH` is set.

internal/host/store.go

@@ -21,6 +21,7 @@ type Host struct {
 	Alias       string     `json:"alias"`
 	Hostname    string     `json:"hostname"`
 	Port        int        `json:"port"`
+	TimeoutSec  int        `json:"timeout_sec,omitempty"`
 	Group       string     `json:"group,omitempty"`
 	Tags        []string   `json:"tags,omitempty"`
 	DefaultUser string     `json:"default_user,omitempty"`
@@ -113,6 +114,9 @@ func (s *Store) Add(h Host) error {
 	if h.Port == 0 {
 		h.Port = 22
 	}
+	if h.TimeoutSec == 0 {
+		h.TimeoutSec = 10
+	}
 	h.Normalize()
 	s.Hosts = append(s.Hosts, h)
 	return s.Save()
@@ -195,6 +199,9 @@ func (h *Host) Normalize() {
 	if h.Port == 0 {
 		h.Port = 22
 	}
+	if h.TimeoutSec <= 0 {
+		h.TimeoutSec = 10
+	}
 
 	defaultAuth := normalizeAuthType(h.DefaultAuthType)
 	if defaultAuth == "" {

internal/host/store_test.go

@@ -143,3 +143,21 @@ func TestStoreUpdateRejectsDuplicateIdentity(t *testing.T) {
 		t.Fatalf("expected ErrDuplicateAlias, got %v", err)
 	}
 }
+
+func TestHostNormalizeTimeoutDefaultsAndCustom(t *testing.T) {
+	t.Run("defaults to ten seconds", func(t *testing.T) {
+		h := Host{}
+		h.Normalize()
+		if h.TimeoutSec != 10 {
+			t.Fatalf("expected default timeout 10, got %d", h.TimeoutSec)
+		}
+	})
+
+	t.Run("preserves positive timeout", func(t *testing.T) {
+		h := Host{TimeoutSec: 17}
+		h.Normalize()
+		if h.TimeoutSec != 17 {
+			t.Fatalf("expected timeout 17, got %d", h.TimeoutSec)
+		}
+	})
+}

internal/sshclient/client.go

@@ -26,6 +26,7 @@ const defaultDialTimeout = 10 * time.Second
 type VerifyConfig struct {
 	Host          string
 	Port          int
+	DialTimeout   time.Duration
 	User          string
 	Password      []byte
 	KeyPath       string
@@ -58,6 +59,7 @@ func (e *UnknownHostError) Error() string {
 type Session struct {
 	Host          string
 	Port          int
+	DialTimeout   time.Duration
 	User          string
 	Password      []byte
 	KeyPath       string
@@ -83,7 +85,7 @@ func (s *Session) RunWithContext(ctx context.Context) error {
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	dialCtx, cancel := withDefaultTimeout(ctx)
+	dialCtx, cancel := withDefaultTimeout(ctx, s.DialTimeout)
 	defer cancel()
 
 	defer s.zeroPassword()
@@ -454,7 +456,7 @@ func VerifyWithContext(ctx context.Context, cfg VerifyConfig) error {
 	if ctx == nil {
 		ctx = context.Background()
 	}
-	dialCtx, cancel := withDefaultTimeout(ctx)
+	dialCtx, cancel := withDefaultTimeout(ctx, cfg.DialTimeout)
 	defer cancel()
 
 	authMethods, err := buildAuthMethods(cfg.Password, cfg.KeyPath, cfg.KeyData, cfg.KeyPassphrase)
@@ -545,11 +547,14 @@ func ensureKnownHostsFile() (string, error) {
 	return khPath, nil
 }
 
-func withDefaultTimeout(ctx context.Context) (context.Context, context.CancelFunc) {
+func withDefaultTimeout(ctx context.Context, timeout time.Duration) (context.Context, context.CancelFunc) {
 	if _, ok := ctx.Deadline(); ok {
 		return ctx, func() {}
 	}
-	return context.WithTimeout(ctx, defaultDialTimeout)
+	if timeout <= 0 {
+		timeout = defaultDialTimeout
+	}
+	return context.WithTimeout(ctx, timeout)
 }
 
 func dialSSHClientWithContext(ctx context.Context, addr string, config *ssh.ClientConfig) (*ssh.Client, error) {

internal/tui/app.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
@@ -126,6 +127,13 @@ func zeroBytes(b []byte) {
 	}
 }
 
+func hostDialTimeout(h host.Host) time.Duration {
+	if h.TimeoutSec <= 0 {
+		return 10 * time.Second
+	}
+	return time.Duration(h.TimeoutSec) * time.Second
+}
+
 func newPasswordInput(placeholder string) textinput.Model {
 	ti := textinput.New()
 	ti.Placeholder = placeholder
@@ -968,12 +976,13 @@ func verifyHostBeforeSave(h host.Host, encKey []byte) (host.Host, error) {
 		}
 
 		err := sshclient.Verify(sshclient.VerifyConfig{
-			Host:     h.Hostname,
-			Port:     h.Port,
-			User:     username,
-			Password: password,
-			KeyPath:  resolved.KeyPath,
-			KeyData:  keyData,
+			Host:        h.Hostname,
+			Port:        h.Port,
+			DialTimeout: hostDialTimeout(h),
+			User:        username,
+			Password:    password,
+			KeyPath:     resolved.KeyPath,
+			KeyData:     keyData,
 		})
 		zeroBytes(password)
 		zeroBytes(keyData)

internal/tui/dashboard.go

@@ -208,6 +208,7 @@ func (m model) connectSSHWithResolved(h host.Host, user string, resolved host.Re
 	sess := &sshclient.Session{
 		Host:          h.Hostname,
 		Port:          h.Port,
+		DialTimeout:   hostDialTimeout(h),
 		User:          user,
 		Password:      password,
 		KeyPath:       keyPath,
@@ -484,6 +485,7 @@ func (m model) renderDetails() string {
 		render("Host", h.Hostname),
 		render("Users", strings.Join(users, ", ")),
 		render("Port", fmt.Sprintf("%d", h.Port)),
+		render("Timeout", fmt.Sprintf("%ds", h.TimeoutSec)),
 		render("Group", h.Group),
 		render("Tags", strings.Join(h.Tags, ", ")),
 	}

internal/tui/healthcheck.go

@@ -118,17 +118,16 @@ func checkHostHealth(h host.Host, encKey []byte) hostHealthStatus {
 			keyPassphrase = dec
 		}
 
-		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-		err := sshclient.VerifyWithContext(ctx, sshclient.VerifyConfig{
+		err := sshclient.Verify(sshclient.VerifyConfig{
 			Host:          h.Hostname,
 			Port:          h.Port,
+			DialTimeout:   hostDialTimeout(h),
 			User:          username,
 			Password:      password,
 			KeyPath:       resolved.KeyPath,
 			KeyData:       keyData,
 			KeyPassphrase: keyPassphrase,
 		})
-		cancel()
 		zeroBytes(password)
 		zeroBytes(keyData)
 		zeroBytes(keyPassphrase)