Files
f2b/cmd/ip_command_pattern.go
Ismo Vuorinen 605f2b9580 refactor: linting, simplification and fixes (#119)
* refactor: consolidate test helpers and reduce code duplication

- Fix prealloc lint issue in cmd_logswatch_test.go
- Add validateIPAndJails helper to consolidate IP/jail validation
- Add WithTestRunner/WithTestSudoChecker helpers for cleaner test setup
- Replace setupBasicMockResponses duplicates with StandardMockSetup
- Add SetupStandardResponses/SetupJailResponses to MockRunner
- Delegate cmd context helpers to fail2ban implementations
- Document context wrapper pattern in context_helpers.go

* refactor: consolidate duplicate code patterns across cmd and fail2ban packages

Add helper functions to reduce code duplication found by dupl:

- safeCloseFile/safeCloseReader: centralize file close error logging
- createTimeoutContext: consolidate timeout context creation pattern
- withContextCheck: wrap context cancellation checks
- recordOperationMetrics: unify metrics recording for commands/clients

Also includes Phase 1 consolidations:
- copyBuckets helper for metrics snapshots
- Table-driven context extraction in logging
- processWithValidation helper for IP processors

* refactor: consolidate LoggerInterface by embedding LoggerEntry

Both interfaces had identical method signatures. LoggerInterface now
embeds LoggerEntry to eliminate code duplication.

* refactor: consolidate test framework helpers and fix test patterns

- Add checkJSONFieldValue and failMissingJSONField helpers to reduce
  duplication in JSON assertion methods
- Add ParallelTimeout to default test config
- Fix test to use WithTestRunner inside test loop for proper mock scoping

* refactor: unify ban/unban operations with OperationType pattern

Introduce OperationType struct to consolidate duplicate ban/unban logic:
- Add ProcessOperation and ProcessOperationWithContext generic functions
- Add ProcessOperationParallel and ProcessOperationParallelWithContext
- Existing ProcessBan*/ProcessUnban* functions now delegate to generic versions
- Reduces ~120 lines of duplicate code between ban and unban operations

* refactor: consolidate time parsing cache pattern

Add ParseWithLayout method to BoundedTimeCache that consolidates the
cache-lookup-parse-store pattern. FastTimeCache and TimeParsingCache
now delegate to this method instead of duplicating the logic.

* refactor: consolidate command execution patterns in fail2ban

- Add validateCommandExecution helper for command/argument validation
- Add runWithTimerContext helper for timed runner operations
- Add executeIPActionWithContext to unify BanIP/UnbanIP implementations
- Reduces duplicate validation and execution boilerplate

* refactor: consolidate logrus adapter with embedded loggerCore

Introduce loggerCore type that provides the 8 standard logging methods
(Debug, Info, Warn, Error, Debugf, Infof, Warnf, Errorf). Both
logrusAdapter and logrusEntryAdapter now embed this type, eliminating
16 duplicate method implementations.

* refactor: consolidate path validation patterns

- Add validateConfigPathWithFallback helper in cmd/config_utils.go
  for the validate-or-fallback-with-logging pattern
- Add validateClientPath helper in fail2ban/helpers.go for client
  path validation delegation

* fix: add context cancellation checks to wrapper functions

- wrapWithContext0/1/2 now check ctx.Err() before invoking wrapped function
- WithCommand now validates and trims empty command strings

* refactor: extract formatLatencyBuckets for deterministic metrics output

Add formatLatencyBuckets helper that writes latency bucket distribution
with sorted keys for deterministic output, eliminating duplicate
formatting code for command and client latency buckets.

* refactor: add generic setNestedMapValue helper for mock configuration

Add setNestedMapValue[T] generic helper that consolidates the repeated
pattern of mutex-protected nested map initialization and value setting
used by SetBanError, SetBanResult, SetUnbanError, and SetUnbanResult.

* fix: use cmd.Context() for signal propagation and correct mock status

- ExecuteIPCommand now uses cmd.Context() instead of context.Background()
  to inherit Cobra's signal cancellation
- MockRunner.SetupJailResponses uses shared.Fail2BanStatusSuccess ("0")
  instead of literal "1" for proper success path simulation

* fix: restore operation-specific log messages in ProcessOperationWithContext

Add back Logger.WithFields().Info(opType.Message) call that was lost
during refactoring. This restores the distinction between ban and unban
operation messages (shared.MsgBanResult vs shared.MsgUnbanResult).

* fix: return aggregated errors from parallel operations

Previously, errors from individual parallel operations were silently
swallowed - converted to status strings but never returned to callers.

Now processOperations collects all errors and returns them aggregated
via errors.Join, allowing callers to distinguish partial failures from
complete success while still receiving all results.

* fix: add input validation to processOperations before parallel execution

Validate IP and jail inputs at the start of processOperations() using
fail2ban.CachedValidateIP and CachedValidateJail. This prevents invalid
or malicious inputs (empty values, path traversal attempts, malformed
IPs) from reaching the operation functions. All validation errors are
aggregated and returned before any operations execute.
2026-01-25 19:07:45 +02:00

137 lines
4.3 KiB
Go

// Package cmd provides command pattern abstractions to reduce code duplication.
// This module handles common patterns for IP-based operations (ban/unban) that
// share identical structure but different processing functions.
package cmd
import (
"context"
"fmt"
"github.com/spf13/cobra"
"github.com/ivuorinen/f2b/fail2ban"
"github.com/ivuorinen/f2b/shared"
)
// IPOperationProcessor defines the interface for processing IP-based operations
type IPOperationProcessor interface {
// ProcessSingle processes a single jail operation
ProcessSingle(ctx context.Context, client fail2ban.Client, ip string, jails []string) ([]OperationResult, error)
// ProcessParallel processes multiple jails in parallel
ProcessParallel(ctx context.Context, client fail2ban.Client, ip string, jails []string) ([]OperationResult, error)
}
// IPCommandConfig holds configuration for IP-based commands
type IPCommandConfig struct {
CommandName string // e.g., "ban", "unban"
Usage string // e.g., "ban <ip> [jail]"
Description string // e.g., "Ban an IP address"
Aliases []string // e.g., ["banip", "b"]
OperationName string // e.g., "ban_command", "unban_command"
Processor IPOperationProcessor
}
// resolveOutputFormat determines the final output format from config and command flags
func resolveOutputFormat(config *Config, cmd *cobra.Command) string {
finalFormat := ""
if config != nil {
finalFormat = config.Format
}
format, _ := cmd.Flags().GetString(shared.FlagFormat)
if format != "" {
finalFormat = format
}
return finalFormat
}
// outputOperationResults outputs the operation results in the specified format
func outputOperationResults(cmd *cobra.Command, results []OperationResult, config *Config, format string) error {
if format == JSONFormat {
OutputResults(cmd, results, config)
return nil
}
for _, r := range results {
if _, err := fmt.Fprintf(GetCmdOutput(cmd), "%s %s in %s\n", r.Status, r.IP, r.Jail); err != nil {
return err
}
}
return nil
}
// processIPOperation handles the parallel vs single processing logic
func processIPOperation(
ctx context.Context,
config *Config,
processor IPOperationProcessor,
client fail2ban.Client,
ip string,
jails []string,
) ([]OperationResult, error) {
if len(jails) > 1 {
// Use parallel timeout for multi-jail operations
parallelCtx, parallelCancel := context.WithTimeout(ctx, config.ParallelTimeout)
defer parallelCancel()
return processor.ProcessParallel(parallelCtx, client, ip, jails)
}
return processor.ProcessSingle(ctx, client, ip, jails)
}
// ExecuteIPCommand provides a unified execution pattern for IP-based commands
func ExecuteIPCommand(
client fail2ban.Client,
config *Config,
cmdConfig IPCommandConfig,
) func(*cobra.Command, []string) error {
return func(cmd *cobra.Command, args []string) error {
// Get the contextual logger
logger := GetContextualLogger()
// Create timeout context for the entire operation
// Use cmd.Context() to inherit Cobra's signal cancellation
ctx, cancel := createTimeoutContext(cmd.Context(), config)
defer cancel()
// Add command context
ctx = WithCommand(ctx, cmdConfig.CommandName)
// Log operation with timing
return logger.LogOperation(ctx, cmdConfig.OperationName, func() error {
// Validate IP argument
ip, err := ValidateIPArgumentWithContext(ctx, args)
if err != nil {
return HandleValidationError(err)
}
// Add IP to context
ctx = WithIP(ctx, ip)
// Get jails from arguments or client (with timeout context)
jails, err := GetJailsFromArgsWithContext(ctx, client, args, 1)
if err != nil {
return HandleClientError(err)
}
// Process operation with timeout context
results, err := processIPOperation(ctx, config, cmdConfig.Processor, client, ip, jails)
if err != nil {
return HandleClientError(err)
}
// Output results in the appropriate format
finalFormat := resolveOutputFormat(config, cmd)
return outputOperationResults(cmd, results, config, finalFormat)
})
}
}
// NewIPCommand creates a new IP-based command using the unified pattern
func NewIPCommand(client fail2ban.Client, config *Config, cmdConfig IPCommandConfig) *cobra.Command {
return NewCommand(
cmdConfig.Usage,
cmdConfig.Description,
cmdConfig.Aliases,
ExecuteIPCommand(client, config, cmdConfig),
)
}