Merge pull request #6 from karol-broda/feat/reverse-dns-lookup

karol-broda · web-flow · commit 6d6d057675ba · 2025-12-23T16:31:03.000+01:00
diff --git a/cmd/cli_test.go b/cmd/cli_test.go
@@ -364,7 +364,8 @@ func resetGlobalFlags() {
 	filterIPv4 = false
 	filterIPv6 = false
 	colorMode = "auto"
-	numeric = false
+	resolveAddrs = true
+	resolvePorts = false
 }
 
 // TestEnvironmentVariables tests that environment variables are properly handled
diff --git a/cmd/ls.go b/cmd/ls.go
@@ -30,7 +30,8 @@ var (
 	sortBy        string
 	fields        string
 	colorMode     string
-	numeric       bool
+	resolveAddrs  bool
+	resolvePorts  bool
 	plainOutput   bool
 )
 
@@ -51,7 +52,7 @@ Available filters:
 }
 
 func runListCommand(outputFormat string, args []string) {
-	rt, err := NewRuntime(args, colorMode, numeric)
+	rt, err := NewRuntime(args, colorMode)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -98,14 +99,18 @@ func getFieldMap(c collector.Connection) map[string]string {
 	lport := strconv.Itoa(c.Lport)
 	rport := strconv.Itoa(c.Rport)
 	
-	// Apply name resolution if not in numeric mode
-	if !numeric {
+	// apply address resolution
+	if resolveAddrs {
 		if resolvedLaddr := resolver.ResolveAddr(c.Laddr); resolvedLaddr != c.Laddr {
 			laddr = resolvedLaddr
 		}
 		if resolvedRaddr := resolver.ResolveAddr(c.Raddr); resolvedRaddr != c.Raddr && c.Raddr != "*" && c.Raddr != "" {
 			raddr = resolvedRaddr
 		}
+	}
+
+	// apply port resolution
+	if resolvePorts {
 		if resolvedLport := resolver.ResolvePort(c.Lport, c.Proto); resolvedLport != strconv.Itoa(c.Lport) {
 			lport = resolvedLport
 		}
@@ -395,7 +400,8 @@ func init() {
 	lsCmd.Flags().StringVarP(&sortBy, "sort", "s", cfg.Defaults.SortBy, "Sort by column (e.g., pid:desc)")
 	lsCmd.Flags().StringVarP(&fields, "fields", "f", strings.Join(cfg.Defaults.Fields, ","), "Comma-separated list of fields to show")
 	lsCmd.Flags().StringVar(&colorMode, "color", cfg.Defaults.Color, "Color mode (auto, always, never)")
-	lsCmd.Flags().BoolVarP(&numeric, "numeric", "n", cfg.Defaults.Numeric, "Don't resolve hostnames")
+	lsCmd.Flags().BoolVar(&resolveAddrs, "resolve-addrs", !cfg.Defaults.Numeric, "Resolve IP addresses to hostnames")
+	lsCmd.Flags().BoolVar(&resolvePorts, "resolve-ports", false, "Resolve port numbers to service names")
 	lsCmd.Flags().BoolVarP(&plainOutput, "plain", "p", false, "Plain output (parsable, no styling)")
 
 	// shared filter flags
diff --git a/cmd/root.go b/cmd/root.go
@@ -44,6 +44,8 @@ func init() {
 	cfg := config.Get()
 	rootCmd.Flags().StringVar(&topTheme, "theme", cfg.Defaults.Theme, "Theme for TUI (dark, light, mono, auto)")
 	rootCmd.Flags().DurationVarP(&topInterval, "interval", "i", 0, "Refresh interval (default 1s)")
+	rootCmd.Flags().BoolVar(&topResolveAddrs, "resolve-addrs", !cfg.Defaults.Numeric, "Resolve IP addresses to hostnames")
+	rootCmd.Flags().BoolVar(&topResolvePorts, "resolve-ports", false, "Resolve port numbers to service names")
 
 	// shared filter flags for root command
 	addFilterFlags(rootCmd)
diff --git a/cmd/runtime.go b/cmd/runtime.go
@@ -20,8 +20,9 @@ type Runtime struct {
 	Connections []collector.Connection
 
 	// common settings
-	ColorMode string
-	Numeric   bool
+	ColorMode    string
+	ResolveAddrs bool
+	ResolvePorts bool
 }
 
 // shared filter flags - used by all commands
@@ -73,7 +74,7 @@ func FetchConnections(filters collector.FilterOptions) ([]collector.Connection,
 }
 
 // NewRuntime creates a runtime with fetched and filtered connections.
-func NewRuntime(args []string, colorMode string, numeric bool) (*Runtime, error) {
+func NewRuntime(args []string, colorMode string) (*Runtime, error) {
 	color.Init(colorMode)
 
 	filters, err := BuildFilters(args)
@@ -87,10 +88,11 @@ func NewRuntime(args []string, colorMode string, numeric bool) (*Runtime, error)
 	}
 
 	return &Runtime{
-		Filters:     filters,
-		Connections: connections,
-		ColorMode:   colorMode,
-		Numeric:     numeric,
+		Filters:      filters,
+		Connections:  connections,
+		ColorMode:    colorMode,
+		ResolveAddrs: resolveAddrs,
+		ResolvePorts: resolvePorts,
 	}, nil
 }
 
diff --git a/cmd/top.go b/cmd/top.go
@@ -12,8 +12,10 @@ import (
 
 // top-specific flags
 var (
-	topTheme    string
-	topInterval time.Duration
+	topTheme        string
+	topInterval     time.Duration
+	topResolveAddrs bool
+	topResolvePorts bool
 )
 
 var topCmd = &cobra.Command{
@@ -28,8 +30,10 @@ var topCmd = &cobra.Command{
 		}
 
 		opts := tui.Options{
-			Theme:    theme,
-			Interval: topInterval,
+			Theme:        theme,
+			Interval:     topInterval,
+			ResolveAddrs: topResolveAddrs,
+			ResolvePorts: topResolvePorts,
 		}
 
 		// if any filter flag is set, use exclusive mode
@@ -58,6 +62,8 @@ func init() {
 	// top-specific flags
 	topCmd.Flags().StringVar(&topTheme, "theme", cfg.Defaults.Theme, "Theme for TUI (dark, light, mono, auto)")
 	topCmd.Flags().DurationVarP(&topInterval, "interval", "i", time.Second, "Refresh interval")
+	topCmd.Flags().BoolVar(&topResolveAddrs, "resolve-addrs", !cfg.Defaults.Numeric, "Resolve IP addresses to hostnames")
+	topCmd.Flags().BoolVar(&topResolvePorts, "resolve-ports", false, "Resolve port numbers to service names")
 
 	// shared filter flags
 	addFilterFlags(topCmd)
diff --git a/internal/tui/helpers.go b/internal/tui/helpers.go
@@ -1,7 +1,6 @@
 package tui
 
 import (
-	"fmt"
 	"regexp"
 	"github.com/karol-broda/snitch/internal/collector"
 	"strings"
@@ -44,10 +43,3 @@ func sortFieldLabel(f collector.SortField) string {
 	}
 }
 
-func formatRemote(addr string, port int) string {
-	if addr == "" || addr == "*" || port == 0 {
-		return "-"
-	}
-	return fmt.Sprintf("%s:%d", addr, port)
-}
-
diff --git a/internal/tui/keys.go b/internal/tui/keys.go
@@ -210,6 +210,28 @@ func (m model) handleNormalKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 				m.showKillConfirm = true
 			}
 		}
+
+	// toggle address resolution
+	case "n":
+		m.resolveAddrs = !m.resolveAddrs
+		if m.resolveAddrs {
+			m.statusMessage = "address resolution: on"
+		} else {
+			m.statusMessage = "address resolution: off"
+		}
+		m.statusExpiry = time.Now().Add(2 * time.Second)
+		return m, clearStatusAfter(2 * time.Second)
+
+	// toggle port resolution
+	case "N":
+		m.resolvePorts = !m.resolvePorts
+		if m.resolvePorts {
+			m.statusMessage = "port resolution: on"
+		} else {
+			m.statusMessage = "port resolution: off"
+		}
+		m.statusExpiry = time.Now().Add(2 * time.Second)
+		return m, clearStatusAfter(2 * time.Second)
 	}
 
 	return m, nil
diff --git a/internal/tui/model.go b/internal/tui/model.go
@@ -28,6 +28,10 @@ type model struct {
 	sortField   collector.SortField
 	sortReverse bool
 
+	// display options
+	resolveAddrs bool // when true, resolve IP addresses to hostnames
+	resolvePorts bool // when true, resolve port numbers to service names
+
 	// ui state
 	theme       *theme.Theme
 	showHelp    bool
@@ -50,14 +54,16 @@ type model struct {
 }
 
 type Options struct {
-	Theme       string
-	Interval    time.Duration
-	TCP         bool
-	UDP         bool
-	Listening   bool
-	Established bool
-	Other       bool
-	FilterSet   bool // true if user specified any filter flags
+	Theme        string
+	Interval     time.Duration
+	TCP          bool
+	UDP          bool
+	Listening    bool
+	Established  bool
+	Other        bool
+	FilterSet    bool // true if user specified any filter flags
+	ResolveAddrs bool // when true, resolve IP addresses to hostnames
+	ResolvePorts bool // when true, resolve port numbers to service names
 }
 
 func New(opts Options) model {
@@ -102,6 +108,8 @@ func New(opts Options) model {
 		showEstablished: showEstablished,
 		showOther:       showOther,
 		sortField:       collector.SortByLport,
+		resolveAddrs:    opts.ResolveAddrs,
+		resolvePorts:    opts.ResolvePorts,
 		theme:           theme.GetTheme(opts.Theme),
 		interval:        interval,
 		lastRefresh:     time.Now(),
diff --git a/internal/tui/model_test.go b/internal/tui/model_test.go
@@ -301,3 +301,132 @@ func TestTUI_ViewRenders(t *testing.T) {
 	}
 }
 
+func TestTUI_ResolutionOptions(t *testing.T) {
+	// test default resolution settings
+	m := New(Options{Theme: "dark", Interval: time.Hour})
+
+	if m.resolveAddrs != false {
+		t.Error("expected resolveAddrs to be false by default (must be explicitly set)")
+	}
+	if m.resolvePorts != false {
+		t.Error("expected resolvePorts to be false by default")
+	}
+
+	// test with explicit options
+	m2 := New(Options{
+		Theme:        "dark",
+		Interval:     time.Hour,
+		ResolveAddrs: true,
+		ResolvePorts: true,
+	})
+
+	if m2.resolveAddrs != true {
+		t.Error("expected resolveAddrs to be true when set")
+	}
+	if m2.resolvePorts != true {
+		t.Error("expected resolvePorts to be true when set")
+	}
+}
+
+func TestTUI_ToggleResolution(t *testing.T) {
+	m := New(Options{Theme: "dark", Interval: time.Hour, ResolveAddrs: true})
+
+	if m.resolveAddrs != true {
+		t.Fatal("expected resolveAddrs to be true initially")
+	}
+
+	// toggle address resolution with 'n'
+	newModel, _ := m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'n'}})
+	m = newModel.(model)
+
+	if m.resolveAddrs != false {
+		t.Error("expected resolveAddrs to be false after toggle")
+	}
+
+	// toggle back
+	newModel, _ = m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'n'}})
+	m = newModel.(model)
+
+	if m.resolveAddrs != true {
+		t.Error("expected resolveAddrs to be true after second toggle")
+	}
+
+	// toggle port resolution with 'N'
+	if m.resolvePorts != false {
+		t.Fatal("expected resolvePorts to be false initially")
+	}
+
+	newModel, _ = m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'N'}})
+	m = newModel.(model)
+
+	if m.resolvePorts != true {
+		t.Error("expected resolvePorts to be true after toggle")
+	}
+
+	// toggle back
+	newModel, _ = m.Update(tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'N'}})
+	m = newModel.(model)
+
+	if m.resolvePorts != false {
+		t.Error("expected resolvePorts to be false after second toggle")
+	}
+}
+
+func TestTUI_ResolveAddrHelper(t *testing.T) {
+	m := New(Options{Theme: "dark", Interval: time.Hour})
+	m.resolveAddrs = false
+
+	// when resolution is off, should return original address
+	addr := m.resolveAddr("192.168.1.1")
+	if addr != "192.168.1.1" {
+		t.Errorf("expected original address when resolution off, got %s", addr)
+	}
+
+	// empty and wildcard addresses should pass through unchanged
+	if m.resolveAddr("") != "" {
+		t.Error("expected empty string to pass through")
+	}
+	if m.resolveAddr("*") != "*" {
+		t.Error("expected wildcard to pass through")
+	}
+}
+
+func TestTUI_ResolvePortHelper(t *testing.T) {
+	m := New(Options{Theme: "dark", Interval: time.Hour})
+	m.resolvePorts = false
+
+	// when resolution is off, should return port number as string
+	port := m.resolvePort(80, "tcp")
+	if port != "80" {
+		t.Errorf("expected '80' when resolution off, got %s", port)
+	}
+
+	port = m.resolvePort(443, "tcp")
+	if port != "443" {
+		t.Errorf("expected '443' when resolution off, got %s", port)
+	}
+}
+
+func TestTUI_FormatRemoteHelper(t *testing.T) {
+	m := New(Options{Theme: "dark", Interval: time.Hour})
+	m.resolveAddrs = false
+	m.resolvePorts = false
+
+	// empty/wildcard addresses should return dash
+	if m.formatRemote("", 80, "tcp") != "-" {
+		t.Error("expected dash for empty address")
+	}
+	if m.formatRemote("*", 80, "tcp") != "-" {
+		t.Error("expected dash for wildcard address")
+	}
+	if m.formatRemote("192.168.1.1", 0, "tcp") != "-" {
+		t.Error("expected dash for zero port")
+	}
+
+	// valid address:port should format correctly
+	result := m.formatRemote("192.168.1.1", 443, "tcp")
+	if result != "192.168.1.1:443" {
+		t.Errorf("expected '192.168.1.1:443', got %s", result)
+	}
+}
+
diff --git a/internal/tui/view.go b/internal/tui/view.go

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,8 @@ func resetGlobalFlags() {`
`364`	`364`	`filterIPv4 = false`
`365`	`365`	`filterIPv6 = false`
`366`	`366`	`colorMode = "auto"`
`367`		`- numeric = false`
	`367`	`+ resolveAddrs = true`
	`368`	`+ resolvePorts = false`
`368`	`369`	`}`
`369`	`370`
`370`	`371`	`// TestEnvironmentVariables tests that environment variables are properly handled`