Merge branch 'development'

Author: whoisYoges

Makefile

@@ -1,16 +1,20 @@
 APP := managedssh
 LOCAL_BIN := $(HOME)/.local/bin
 
-.PHONY: help build run test fmt tidy install clean
+.PHONY: help build run test test-race vet lint fmt tidy install uninstall clean
 
 help:
 	@printf "Available targets:\n"
 	@printf "  make build    Build the binary\n"
 	@printf "  make run      Run the app\n"
 	@printf "  make test     Run tests\n"
+	@printf "  make test-race Run tests with race detector\n"
+	@printf "  make vet      Run go vet\n"
+	@printf "  make lint     Run golangci-lint (if installed)\n"
 	@printf "  make fmt      Format Go files\n"
 	@printf "  make tidy     Tidy Go modules\n"
 	@printf "  make install  Install to GOBIN/GOPATH/bin, or ~/.local/bin fallback\n"
+	@printf "  make uninstall Remove installed binary\n"
 	@printf "  make clean    Remove build artifacts and Go caches\n"
 
 build:
@@ -22,6 +26,19 @@ run:
 test:
 	go test ./...
 
+test-race:
+	go test -race ./...
+
+vet:
+	go vet ./...
+
+lint:
+	@if command -v golangci-lint >/dev/null 2>&1; then \
+		golangci-lint run; \
+	else \
+		printf "golangci-lint not installed; skipping lint target.\n"; \
+	fi
+
 fmt:
 	gofmt -w $$(find . -name '*.go' -not -path './vendor/*')
 
@@ -42,6 +59,21 @@ install:
 		esac; \
 	fi
 
+uninstall:
+	@if [ -n "$$GOBIN" ]; then \
+		target="$$GOBIN/$(APP)"; \
+	elif [ -n "$$GOPATH" ]; then \
+		target="$${GOPATH%%:*}/bin/$(APP)"; \
+	else \
+		target="$(LOCAL_BIN)/$(APP)"; \
+	fi; \
+	if [ -f "$$target" ]; then \
+		rm -f "$$target"; \
+		printf "Removed $$target\n"; \
+	else \
+		printf "No installed binary found at $$target\n"; \
+	fi
+
 clean:
 	rm -f $(APP)
 	rm -f *.test *.out coverage.out

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.

cmd/root_test.go

@@ -6,28 +6,27 @@ import (
 	"testing"
 )
 
-func TestRootCmdRejectsPositionalArgs(t *testing.T) {
-	err := rootCmd.Args(rootCmd, []string{"extra"})
-	if err == nil {
-		t.Fatal("expected positional args to be rejected")
-	}
-}
-
-func TestRootCmdHelpIncludesInterfaceControls(t *testing.T) {
+func TestHelpIncludesInterfaceControls(t *testing.T) {
 	var out bytes.Buffer
 	rootCmd.SetOut(&out)
 	rootCmd.SetErr(&out)
 	rootCmd.SetArgs([]string{"--help"})
 
 	if err := rootCmd.Execute(); err != nil {
-		t.Fatalf("expected help to render without error: %v", err)
+		t.Fatalf("execute help command: %v", err)
 	}
 
 	help := out.String()
 	if !strings.Contains(help, "Interface Controls:") {
-		t.Fatal("expected help output to include interface controls header")
+		t.Fatal("expected help output to include interface controls section")
 	}
 	if !strings.Contains(help, "change master key") {
 		t.Fatal("expected help output to include at least one dashboard control")
 	}
 }
+
+func TestRootRejectsPositionalArguments(t *testing.T) {
+	if err := rootCmd.Args(rootCmd, []string{"extra"}); err == nil {
+		t.Fatal("expected positional arguments to be rejected")
+	}
+}

internal/backup/transfer.go

@@ -69,14 +69,9 @@ func Export(path string) error {
 	if err := os.MkdirAll(filepath.Dir(path), 0700); err != nil {
 		return fmt.Errorf("creating export directory: %w", err)
 	}
-
-	tmp := path + ".tmp"
-	if err := os.WriteFile(tmp, out, 0600); err != nil {
+	if err := atomicWrite(path, out, 0600); err != nil {
 		return fmt.Errorf("writing export bundle: %w", err)
 	}
-	if err := os.Rename(tmp, path); err != nil {
-		return fmt.Errorf("finalizing export bundle: %w", err)
-	}
 	return nil
 }
 
@@ -154,9 +149,42 @@ func loadBundle(path string) (*bundle, error) {
 }
 
 func atomicWrite(path string, data []byte, perm os.FileMode) error {
-	tmp := path + ".tmp"
-	if err := os.WriteFile(tmp, data, perm); err != nil {
+	tmpFile, err := os.CreateTemp(filepath.Dir(path), filepath.Base(path)+".tmp-*")
+	if err != nil {
+		return err
+	}
+	tmpPath := tmpFile.Name()
+	closed := false
+	defer func() {
+		if !closed {
+			_ = tmpFile.Close()
+		}
+		_ = os.Remove(tmpPath)
+	}()
+
+	if err := tmpFile.Chmod(perm); err != nil {
+		return err
+	}
+	if _, err := tmpFile.Write(data); err != nil {
+		return err
+	}
+	if err := tmpFile.Sync(); err != nil {
+		return err
+	}
+	if err := tmpFile.Close(); err != nil {
+		return err
+	}
+	closed = true
+
+	if err := os.Rename(tmpPath, path); err != nil {
 		return err
 	}
-	return os.Rename(tmp, path)
+
+	dir, err := os.Open(filepath.Dir(path))
+	if err == nil {
+		_ = dir.Sync()
+		_ = dir.Close()
+	}
+
+	return nil
 }

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"`
@@ -92,11 +93,7 @@ func (s *Store) Save() error {
 	if err != nil {
 		return err
 	}
-	tmp := s.path + ".tmp"
-	if err := os.WriteFile(tmp, data, 0600); err != nil {
-		return err
-	}
-	return os.Rename(tmp, s.path)
+	return atomicWrite(s.path, data, 0600)
 }
 
 func (s *Store) Add(h Host) error {
@@ -117,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()
@@ -199,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 == "" {
@@ -403,3 +406,44 @@ func cloneBytes(src []byte) []byte {
 	copy(out, src)
 	return out
 }
+
+func atomicWrite(path string, data []byte, perm os.FileMode) error {
+	tmpFile, err := os.CreateTemp(filepath.Dir(path), filepath.Base(path)+".tmp-*")
+	if err != nil {
+		return err
+	}
+	tmpPath := tmpFile.Name()
+	closed := false
+	defer func() {
+		if !closed {
+			_ = tmpFile.Close()
+		}
+		_ = os.Remove(tmpPath)
+	}()
+
+	if err := tmpFile.Chmod(perm); err != nil {
+		return err
+	}
+	if _, err := tmpFile.Write(data); err != nil {
+		return err
+	}
+	if err := tmpFile.Sync(); err != nil {
+		return err
+	}
+	if err := tmpFile.Close(); err != nil {
+		return err
+	}
+	closed = true
+
+	if err := os.Rename(tmpPath, path); err != nil {
+		return err
+	}
+
+	dir, err := os.Open(filepath.Dir(path))
+	if err == nil {
+		_ = dir.Sync()
+		_ = dir.Close()
+	}
+
+	return nil
+}

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)
+		}
+	})
+}