mirror of
https://github.com/ivuorinen/f2b.git
synced 2026-01-26 03:13:58 +00:00
* Go rewrite * chore(cr): apply suggestions Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net> * 📝 CodeRabbit Chat: Add NoOpClient to fail2ban and initialize when skip flag is true * 📝 CodeRabbit Chat: Fix malformed if-else structure and add no-op client for skip-only commands * 📝 CodeRabbit Chat: Fix malformed if-else structure and add no-op client for skip-only commands * fix(main): correct no-op branch syntax (#10) * chore(gitignore): ignore env and binary files (#11) * chore(config): remove indent_size for go files (#12) * feat(cli): inject version via ldflags (#13) * fix(security): validate filter parameter to prevent path traversal (#15) * chore(repo): anchor ignore for build artifacts (#16) * chore(ci): use golangci-lint action (#17) * feat(fail2ban): expose GetLogDir (#19) * test(cmd): improve IP mock validation (#20) * chore(ci): update golanglint * fix(ci): golanglint * fix(ci): correct args indentation in pr-lint workflow (#21) * fix(ci): avoid duplicate releases (#22) * refactor(fail2ban): remove test check from OSRunner (#23) * refactor(fail2ban): make log and filter dirs configurable (#24) * fix(ci): create single release per tag (#14) Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net> * chore(dev): add codex setup script (#27) * chore(lint): enable staticcheck (#26) * chore(ci): verify golangci config (#28) * refactor(cmd): centralize env config (#29) * chore(dev): add pre-commit config (#30) * fix(ci): disable cgo in cross compile (#31) * fix(ci): fail on formatting issues (#32) * feat(cmd): add context to logs watch (#33) * chore: fixes, roadmap, claude.md, linting * chore: fixes, linting * fix(ci): gh actions update, fixes and tweaks * chore: use reviewdog actionlint * chore: use wow-rp-addons/actions-editorconfig-check * chore: combine agent instructions, add comments, fixes * chore: linting, fixes, go revive * chore(deps): update pre-commit hooks * chore: bump go to 1.21, pin workflows * fix: install tools in lint.yml * fix: sudo timeout * fix: service command injection * fix: memory exhaustion with large logs * fix: enhanced path traversal and file security vulns * fix: race conditions * fix: context support * chore: simplify fail2ban/ code * feat: major refactoring with GoReleaser integration and code consolidation - Add GoReleaser configuration for automated multi-platform releases - Support for Linux, macOS, Windows, and BSD builds - Docker images, Homebrew tap, and Linux packages (.deb, .rpm, .apk) - GitHub Actions workflow for release automation - Consolidate duplicate code and improve architecture - Extract common command helpers to cmd/helpers.go (~230 lines) - Remove duplicate MockClient implementation from tests (~250 lines) - Create context wrapper helpers in fail2ban/context_helpers.go - Standardize error messages in fail2ban/errors.go - Enhance validation and security - Add proper IP address validation with fail2ban.ValidateIP - Fix path traversal and command injection vulnerabilities - Improve thread-safety in MockClient with consistent ordering - Optimize documentation - Reduce CLAUDE.md from 190 to 81 lines (57% reduction) - Reduce TODO.md from 633 to 93 lines (85% reduction) - Move README.md to root directory with installation instructions - Improve test reliability - Fix race conditions and test flakiness - Add sorting to ensure deterministic test output - Enhance MockClient with configurable behavior * feat: comprehensive code quality improvements and documentation reorganization This commit represents a major overhaul of code quality, documentation structure, and development tooling: **Documentation & Structure:** - Move CODE_OF_CONDUCT.md from .github to root directory - Reorganize documentation with dedicated docs/ directory - Create comprehensive architecture, security, and testing documentation - Update all references and cross-links for new documentation structure **Code Quality & Linting:** - Add 120-character line length limit across all files via EditorConfig - Enable comprehensive linting with golines, lll, usetesting, gosec, and revive - Fix all 86 revive linter issues (unused parameters, missing export comments) - Resolve security issues (file permissions 0644 → 0600, gosec warnings) - Replace deprecated os.Setenv with t.Setenv in all tests - Configure golangci-lint with auto-fix capabilities and formatter integration **Development Tooling:** - Enhance pre-commit configuration with additional hooks and formatters - Update GoReleaser configuration with improved YAML formatting - Improve GitHub workflows and issue templates for CLI-specific context - Add comprehensive Makefile with proper dependency checking **Testing & Security:** - Standardize mock patterns and context wrapper implementations - Enhance error handling with centralized error constants - Improve concurrent access testing for thread safety * perf: implement major performance optimizations with comprehensive test coverage This commit introduces three significant performance improvements along with complete linting compliance and robust test coverage: **Performance Optimizations:** 1. **Time Parsing Cache (8.6x improvement)** - Add TimeParsingCache with sync.Map for caching parsed times - Implement object pooling for string builders to reduce allocations - Create optimized BanRecordParser with pooled string slices 2. **Gzip Detection Consolidation (55x improvement)** - Consolidate ~100 lines of duplicate gzip detection logic - Fast-path extension checking before magic byte detection - Unified GzipDetector with comprehensive file handling utilities 3. **Parallel Processing (2.5-5.0x improvement)** - Generic WorkerPool implementation for concurrent operations - Smart fallback to sequential processing for single operations - Context-aware cancellation support for long-running tasks - Applied to ban/unban operations across multiple jails **New Files Added:** - fail2ban/time_parser.go: Cached time parsing with global instances - fail2ban/ban_record_parser.go: Optimized ban record parsing - fail2ban/gzip_detection.go: Unified gzip handling utilities - fail2ban/parallel_processing.go: Generic parallel processing framework - cmd/parallel_operations.go: Command-level parallel operation support **Code Quality & Linting:** - Resolve all golangci-lint issues (0 remaining) - Add proper #nosec annotations for legitimate file operations - Implement sentinel errors replacing nil/nil anti-pattern - Fix context parameter handling and error checking **Comprehensive Test Coverage:** - 500+ lines of new tests with benchmarks validating all improvements - Concurrent access testing for thread safety - Edge case handling and error condition testing - Performance benchmarks demonstrating measured improvements **Modified Files:** - fail2ban/fail2ban.go: Integration with new optimized parsers - fail2ban/logs.go: Use consolidated gzip detection (-91 lines) - cmd/ban.go & cmd/unban.go: Add conditional parallel processing * test: comprehensive test infrastructure overhaul with real test data Major improvements to test code quality and organization: • Added comprehensive test data infrastructure with 6 anonymized log files • Extracted common test helpers reducing ~200 lines to ~50 reusable functions • Enhanced ban record parser tests with real production log patterns • Improved gzip detection tests with actual compressed test data • Added integration tests for full log processing and concurrent operations • Updated .gitignore to allow testdata log files while excluding others • Updated TODO.md to reflect completed test infrastructure improvements * fix: comprehensive security hardening and critical bug fixes Security Enhancements: - Add command injection protection with allowlist validation for all external commands - Add security documentation to gzip functions warning about path traversal risks - Complete TODO.md security audit - all critical vulnerabilities addressed Bug Fixes: - Fix negative index access vulnerability in parallel operations (prevent panic) - Fix parsing inconsistency between BannedIn and BannedInWithContext functions - Fix nil error handling in concurrent log reading tests - Fix benchmark error simulation to measure actual performance vs error paths Implementation Details: - Add ValidateCommand() with allowlist for fail2ban-client, fail2ban-regex, service, systemctl, sudo - Integrate command validation into all OSRunner methods before execution - Replace manual string parsing with ParseBracketedList() for consistency - Add bounds checking (index >= 0) to prevent negative array access - Replace nil error with descriptive error message in concurrent error channels - Update banFunc in benchmark to return success instead of permanent errors Test Coverage: - Add comprehensive security validation tests with injection attempt patterns - Add parallel operations safety tests with index validation - Add parsing consistency tests between context/non-context functions - Add error handling demonstration tests for concurrent operations - Add gzip function security requirement documentation tests * perf: implement ultra-optimized log and ban record parsing with significant performance gains Major performance improvements to core fail2ban processing with comprehensive benchmarking: Performance Achievements: • Ban record parsing: 15% faster, 39% less memory, 45% fewer allocations • Log processing: 27% faster, 64% less memory, 32% fewer allocations • Cache performance: 624x faster cache hits with zero allocations • String pooling: 4.7x improvement with zero memory allocations Core Optimizations: • Object pooling (sync.Pool) for string slices, scanner buffers, and line buffers • Comprehensive caching (sync.Map) for gzip detection, file info, and path patterns • Fast path optimizations with extension-based gzip detection • Byte-level operations to reduce string allocations in filtering • Ultra-optimized parsers with smart field parsing and efficient time handling New Files: • fail2ban/ban_record_parser_optimized.go - High-performance ban record parser • fail2ban/log_performance_optimized.go - Ultra-optimized log processor with caching • fail2ban/ban_record_parser_benchmark_test.go - Ban record parsing benchmarks • fail2ban/log_performance_benchmark_test.go - Log performance benchmarks • fail2ban/ban_record_parser_compatibility_test.go - Compatibility verification tests Updated: • fail2ban/fail2ban.go - Integration with ultra-optimized parsers • TODO.md - Marked performance optimization tasks as completed * fix(ci): install dev dependencies for pre-commit * refactor: streamline pre-commit config and extract test helpers - Replace local hooks with upstream pre-commit repositories for better maintainability - Add new hooks: shellcheck, shfmt, checkov for enhanced code quality - Extract common test helpers into dedicated test_helpers.go to reduce duplication - Add warning logs for unreadable log files in fail2ban and logs packages - Remove hard-coded GID checks in sudo.go for better cross-platform portability - Update golangci-lint installation method in Makefile * fix(security): path traversal, log file validation * feat: complete pre-release modernization with comprehensive testing - Remove all deprecated legacy functions and dead code paths - Add security hardening with sanitized error messages - Implement comprehensive performance benchmarks and security audit tests - Mark all pre-release modernization tasks as completed (10/10) - Update project documentation to reflect full completion status * fix(ci): linting, and update gosec install source * feat: implement comprehensive test framework with 60-70% code reduction Major test infrastructure modernization: - Create fluent CommandTestBuilder framework for streamlined test creation - Add MockClientBuilder pattern for advanced mock configuration - Standardize table test field naming (expectedOut→wantOutput, expectError→wantError) - Consolidate test code: 3,796 insertions, 3,104 deletions (net +692 lines with enhanced functionality) Framework achievements: - 168+ tests passing with zero regressions - 5 cmd test files fully migrated to new framework - 63 field name standardizations applied - Advanced mock patterns with fluent interface File organization improvements: - Rename all test files with consistent prefixes (cmd_*, fail2ban_*, main_*) - Split monolithic test files into focused, maintainable modules - Eliminate cmd_test.go (622 lines) and main_test.go (825 lines) - Create specialized test files for better organization Documentation enhancements: - Update docs/testing.md with complete framework documentation - Optimize TODO.md from 231→72 lines (69% token reduction) - Add comprehensive migration guides and best practices Test framework components: - command_test_framework.go: Core fluent interface implementation - MockClientBuilder: Advanced mock configuration with builder pattern - table_test_standards.go: Standardized field naming conventions - Enhanced test helpers with error checking consolidation * chore: fixes, .go-version, linting * fix(ci) editorconfig in .pre-commit-config.yaml * fix: too broad gitignore * chore: update fail2ban/fail2ban_path_security_test.go Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net> * chore: code review fixes * chore: code review fixes * fix: more code review fixes * fix: more code review fixes * feat: cleanup, fixes, testing * chore: minor config file updates - Add quotes to F2B_TIMEOUT value in .env.example for clarity - Remove testdata log exception from .gitignore (simplified) * feat: implement comprehensive monitoring with structured logging and metrics - Add structured logging with context propagation throughout codebase - Implement ContextualLogger with request tracking and operation timing - Add context values for operation, IP, jail, command, and request ID - Integrate with existing logrus logging infrastructure - Add request/response timing metrics collection - Create comprehensive Metrics system with atomic counters - Track command executions, ban/unban operations, and client operations - Implement latency distribution buckets for performance analysis - Add validation cache hit/miss tracking - Enhance ban/unban commands with structured logging - Add LogOperation wrapper for automatic timing and context - Log individual jail operations with success/failure status - Integrate metrics recording with ban/unban operations - Add new 'metrics' command to expose collected metrics - Support both plain text and JSON output formats - Display system metrics (uptime, memory, goroutines) - Show operation counts, failures, and average latencies - Include latency distribution histograms - Update test infrastructure - Add tests for metrics command - Fix test helper to support persistent flags - Ensure all tests pass with new logging This completes the high-priority performance monitoring and structured logging requirements from TODO.md, providing comprehensive operational visibility into the f2b application. * docs: update TODO.md to reflect completed monitoring work - Mark structured logging and timing metrics as completed - Update test coverage stats (cmd/ improved from 66.4% to 76.8%) - Add completed infrastructure section for today's work - Update current status date and add monitoring to health indicators * feat: complete TODO.md technical debt cleanup Complete all remaining TODO.md tasks with comprehensive implementation: ## 🎯 Validation Caching Implementation - Thread-safe validation cache with sync.RWMutex protection - MetricsRecorder interface to avoid circular dependencies - Cached validation for IP, jail, filter, and command validation - Integration with existing metrics system for cache hit/miss tracking - 100% test coverage for caching functionality ## 🔧 Constants Extraction - Fail2Ban status codes: Fail2BanStatusSuccess, Fail2BanStatusAlreadyProcessed - Command constants: Fail2BanClientCommand, Fail2BanRegexCommand, Fail2BanServerCommand - File permissions: DefaultFilePermissions (0600), DefaultDirectoryPermissions (0750) - Timeout limits: MaxCommandTimeout, MaxFileTimeout, MaxParallelTimeout - Updated all references throughout codebase to use named constants ## 📊 Test Coverage Improvement - Increased fail2ban package coverage from 62.0% to 70.3% (target: 70%+) - Added 6 new comprehensive test files with 200+ additional test cases - Coverage improvements across all major components: - Context helpers, validation cache, mock clients, OS runner methods - Error constructors, timing operations, cache statistics - Thread safety and concurrency testing ## 🛠️ Code Quality & Fixes - Fixed all linting issues (golangci-lint, revive, errcheck) - Resolved unused parameter warnings and error handling - Fixed timing-dependent test failures in worker pool cancellation - Enhanced thread safety in validation caching ## 📈 Final Metrics - Overall test coverage: 72.4% (up from ~65%) - fail2ban package: 70.3% (exceeds 70% target) - cmd package: 76.9% - Zero TODO/FIXME/HACK comments in production code - 100% linting compliance * fix: resolve test framework issues and update documentation - Remove unnecessary defer/recover block in comprehensive_framework_test.go - Fix compilation error in command_test_framework.go variable redeclaration - Update TODO.md to reflect all 12 completed code quality fixes - Clean up dead code and improve test maintainability - Fix linting issues: error handling, code complexity, security warnings - Break down complex test function to reduce cyclomatic complexity * fix: replace dangerous test commands with safe placeholders Replaces actual dangerous commands in test cases with safe placeholder patterns to prevent accidental execution while maintaining comprehensive security testing. - Replace 'rm -rf /', 'cat /etc/passwd' with 'DANGEROUS_RM_COMMAND', 'DANGEROUS_SYSTEM_CALL' - Update GetDangerousCommandPatterns() to recognize both old and new patterns - Enhance filter validation with command injection protection (semicolons, pipes, backticks, dollar signs) - Add package documentation comments for all packages (main, cmd, fail2ban) - Fix GoReleaser static linking configuration for cross-platform builds - Remove Docker platform restriction to enable multi-arch support - Apply code formatting and linting fixes All security validation tests continue to pass with the safe placeholders. * fix: resolve TestMixedConcurrentOperations race condition and command key mismatches The concurrency test was failing due to several issues: 1. **Command Key Mismatch**: Test setup used "sudo test arg" key but MockRunner looked for "test arg" because "test" command doesn't require sudo 2. **Invalid Commands**: Using "test" and "echo" commands that aren't in the fail2ban command allowlist, causing validation failures 3. **Race Conditions**: Multiple goroutines setting different MockRunners simultaneously, overwriting responses **Solution:** - Replace invalid test commands ("test", "echo") with valid fail2ban commands ("fail2ban-client status", "fail2ban-client -V") - Pre-configure shared MockRunner with all required response keys for both sudo and non-sudo execution paths - Improve test structure to reduce race conditions between setup and execution All tests now pass reliably, resolving the CI failure. * fix: address code quality issues and improve test coverage - Replace unsafe type assertion with comma-ok idiom in logging - Fix TestTestFilter to use created filter instead of nonexistent - Add warning logs for invalid log level configurations - Update TestVersionCommand to use consistent test framework pattern - Remove unused LoggerContextKey constant - Add version command support to test framework - Fix trailing whitespace in test files * feat: add timeout handling and multi-architecture Docker support * test: enhance path traversal security test coverage * chore: comprehensive documentation update and linting fixes Updated all documentation to reflect current capabilities including context-aware operations, multi-architecture Docker support, advanced security features, and performance monitoring. Removed unused functions and fixed all linting issues. * fix(lint): .goreleaser.yaml * feat: add markdown link checker and fix all linting issues - Add markdown-link-check to pre-commit hooks with comprehensive configuration - Fix GitHub workflow structure (sync-labels.yml) with proper job setup - Add JSON schemas to all configuration files for better IDE support - Update tool installation in Makefile for markdown-link-check dependency - Fix all revive linting issues (Boolean literals, defer in loop, if-else simplification, method naming) - Resolve broken relative link in CONTRIBUTING.md - Configure rate limiting and ignore patterns for GitHub URLs - Enhance CLAUDE.md with link checking documentation * fix(ci): sync-labels permissions * docs: comprehensive documentation update reflecting current project status - Updated TODO.md to show production-ready status with 21 commands - Enhanced README.md with enterprise-grade features and capabilities - Added performance monitoring and timeout configuration to FAQ - Updated CLAUDE.md with accurate project architecture overview - Fixed all line length issues to meet EditorConfig requirements - Added .mega-linter.yml configuration for enhanced linting * fix: address CodeRabbitAI review feedback - Split .goreleaser.yaml builds for static/dynamic linking by architecture - Update docs to accurately reflect 7 path traversal patterns (not 17) - Fix containsPathTraversal to allow valid absolute paths - Replace runnerCombinedRunWithSudoContext with RunnerCombinedOutputWithSudoContext - Fix ldflags to use uppercase Version variable name - Remove duplicate test coverage metrics in TODO.md - Fix .markdown-link-check.json schema violations - Add v8r JSON validator to pre-commit hooks * chore(ci): update workflows, switch v8r to check-jsonschema * fix: restrict static linking to amd64 only in .goreleaser.yaml - Move arm64 from static to dynamic build configuration - Static linking now only applies to linux/amd64 - Prevents build failures due to missing static libc on ARM64 - All architectures remain supported with appropriate linking * fix(ci): caching * fix(ci): python caching with pip, node with npm * fix(ci): no caching for node then * fix(ci): no requirements.txt, no cache * refactor: address code review feedback - Pin Alpine base image to v3.20 for reproducible builds - Remove redundant --platform flags in GoReleaser Docker configs - Fix unused parameters in concurrency test goroutines - Simplify string search helper using strings.Contains() - Remove redundant error checking logic in security tests --------- Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
585 lines
16 KiB
Go
585 lines
16 KiB
Go
package cmd
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/ivuorinen/f2b/fail2ban"
|
|
)
|
|
|
|
// CommandTestResult represents the result of a command execution
|
|
type CommandTestResult struct {
|
|
Output string
|
|
Error error
|
|
t *testing.T
|
|
name string
|
|
}
|
|
|
|
// CommandTestBuilder provides a fluent interface for testing commands
|
|
type CommandTestBuilder struct {
|
|
t *testing.T
|
|
name string
|
|
command string
|
|
args []string
|
|
mockClient *fail2ban.MockClient
|
|
config *Config
|
|
expectError bool
|
|
expectedOut string
|
|
exactMatch bool
|
|
setupFunc func(*fail2ban.MockClient)
|
|
environment *TestEnvironment
|
|
}
|
|
|
|
// TestEnvironment manages test environment setup and cleanup
|
|
type TestEnvironment struct {
|
|
originalChecker fail2ban.SudoChecker
|
|
originalRunner fail2ban.Runner
|
|
originalStdout *os.File
|
|
stdoutReader *os.File
|
|
stdoutWriter *os.File
|
|
cleanup []func()
|
|
}
|
|
|
|
// NewTestEnvironment creates a new test environment manager
|
|
func NewTestEnvironment() *TestEnvironment {
|
|
return &TestEnvironment{
|
|
cleanup: make([]func(), 0),
|
|
}
|
|
}
|
|
|
|
// WithPrivileges sets up sudo checker with specified privileges
|
|
func (env *TestEnvironment) WithPrivileges(hasPrivileges bool) *TestEnvironment {
|
|
env.originalChecker = fail2ban.GetSudoChecker()
|
|
mockChecker := &fail2ban.MockSudoChecker{
|
|
MockHasPrivileges: hasPrivileges,
|
|
ExplicitPrivilegesSet: true,
|
|
}
|
|
fail2ban.SetSudoChecker(mockChecker)
|
|
env.cleanup = append(env.cleanup, func() {
|
|
fail2ban.SetSudoChecker(env.originalChecker)
|
|
})
|
|
return env
|
|
}
|
|
|
|
// WithMockRunner sets up a mock runner with common responses
|
|
func (env *TestEnvironment) WithMockRunner() *TestEnvironment {
|
|
env.originalRunner = fail2ban.GetRunner()
|
|
mockRunner := fail2ban.NewMockRunner()
|
|
// Set up common responses
|
|
mockRunner.SetResponse("fail2ban-client -V", []byte("fail2ban-client v0.11.2"))
|
|
mockRunner.SetResponse("fail2ban-client ping", []byte("pong"))
|
|
mockRunner.SetResponse(
|
|
"fail2ban-client status",
|
|
[]byte("Status\n|- Number of jail:\t2\n`- Jail list:\tsshd, apache"),
|
|
)
|
|
mockRunner.SetResponse("sudo service fail2ban status", []byte("● fail2ban.service - Fail2Ban Service"))
|
|
fail2ban.SetRunner(mockRunner)
|
|
|
|
env.cleanup = append(env.cleanup, func() {
|
|
fail2ban.SetRunner(env.originalRunner)
|
|
})
|
|
return env
|
|
}
|
|
|
|
// WithStdoutCapture captures stdout for testing output
|
|
func (env *TestEnvironment) WithStdoutCapture() *TestEnvironment {
|
|
env.originalStdout = os.Stdout
|
|
r, w, err := os.Pipe()
|
|
if err != nil {
|
|
// Return early with nil fields to indicate failure
|
|
return env
|
|
}
|
|
env.stdoutReader = r
|
|
env.stdoutWriter = w
|
|
os.Stdout = w
|
|
|
|
env.cleanup = append(env.cleanup, func() {
|
|
os.Stdout = env.originalStdout
|
|
if env.stdoutWriter != nil {
|
|
_ = env.stdoutWriter.Close()
|
|
}
|
|
if env.stdoutReader != nil {
|
|
_ = env.stdoutReader.Close()
|
|
}
|
|
})
|
|
return env
|
|
}
|
|
|
|
// Cleanup restores the original environment
|
|
func (env *TestEnvironment) Cleanup() {
|
|
for i := len(env.cleanup) - 1; i >= 0; i-- {
|
|
env.cleanup[i]()
|
|
}
|
|
}
|
|
|
|
// ReadStdout reads the captured stdout content
|
|
func (env *TestEnvironment) ReadStdout() string {
|
|
if env.stdoutWriter == nil || env.stdoutReader == nil {
|
|
return ""
|
|
}
|
|
|
|
// Close writer if not already closed
|
|
if env.stdoutWriter != nil {
|
|
_ = env.stdoutWriter.Close()
|
|
env.stdoutWriter = nil // Prevent multiple closures
|
|
}
|
|
|
|
// Use io.ReadAll for dynamic buffer reading
|
|
if data, err := io.ReadAll(env.stdoutReader); err == nil {
|
|
return string(data)
|
|
}
|
|
return ""
|
|
}
|
|
|
|
// NewCommandTest creates a new command test builder
|
|
func NewCommandTest(t *testing.T, commandName string) *CommandTestBuilder {
|
|
t.Helper()
|
|
return &CommandTestBuilder{
|
|
t: t,
|
|
name: commandName,
|
|
command: commandName,
|
|
args: make([]string, 0),
|
|
config: &Config{Format: "plain"},
|
|
}
|
|
}
|
|
|
|
// WithName sets the test name for better error reporting
|
|
func (ctb *CommandTestBuilder) WithName(name string) *CommandTestBuilder {
|
|
ctb.name = name
|
|
return ctb
|
|
}
|
|
|
|
// WithArgs sets the command arguments
|
|
func (ctb *CommandTestBuilder) WithArgs(args ...string) *CommandTestBuilder {
|
|
ctb.args = args
|
|
return ctb
|
|
}
|
|
|
|
// WithMockClient sets the mock client for the test
|
|
func (ctb *CommandTestBuilder) WithMockClient(mock *fail2ban.MockClient) *CommandTestBuilder {
|
|
ctb.mockClient = mock
|
|
return ctb
|
|
}
|
|
|
|
// WithJSONFormat sets the output format to JSON
|
|
func (ctb *CommandTestBuilder) WithJSONFormat() *CommandTestBuilder {
|
|
if ctb.config == nil {
|
|
ctb.config = &Config{}
|
|
}
|
|
ctb.config.Format = JSONFormat
|
|
return ctb
|
|
}
|
|
|
|
// WithSetup provides a function to set up the mock client with specific data
|
|
func (ctb *CommandTestBuilder) WithSetup(setupFunc func(*fail2ban.MockClient)) *CommandTestBuilder {
|
|
ctb.setupFunc = setupFunc
|
|
return ctb
|
|
}
|
|
|
|
// WithServiceSetup provides a function to set up mock runner for service commands
|
|
func (ctb *CommandTestBuilder) WithServiceSetup(setupFunc func(*fail2ban.MockRunner)) *CommandTestBuilder {
|
|
ctb.setupFunc = func(_ *fail2ban.MockClient) {
|
|
// Set up sudo checker
|
|
mockChecker := &fail2ban.MockSudoChecker{
|
|
MockHasPrivileges: true,
|
|
ExplicitPrivilegesSet: true,
|
|
}
|
|
fail2ban.SetSudoChecker(mockChecker)
|
|
|
|
// Create and set up mock runner
|
|
mockRunner := &fail2ban.MockRunner{
|
|
Responses: make(map[string][]byte),
|
|
Errors: make(map[string]error),
|
|
}
|
|
setupFunc(mockRunner)
|
|
fail2ban.SetRunner(mockRunner)
|
|
}
|
|
return ctb
|
|
}
|
|
|
|
// WithEnvironment sets the test environment
|
|
func (ctb *CommandTestBuilder) WithEnvironment(env *TestEnvironment) *CommandTestBuilder {
|
|
ctb.environment = env
|
|
return ctb
|
|
}
|
|
|
|
// ExpectError indicates that the command should fail
|
|
func (ctb *CommandTestBuilder) ExpectError() *CommandTestBuilder {
|
|
ctb.expectError = true
|
|
return ctb
|
|
}
|
|
|
|
// ExpectSuccess indicates that the command should succeed
|
|
func (ctb *CommandTestBuilder) ExpectSuccess() *CommandTestBuilder {
|
|
ctb.expectError = false
|
|
return ctb
|
|
}
|
|
|
|
// ExpectOutput sets the expected output substring
|
|
func (ctb *CommandTestBuilder) ExpectOutput(expectedOut string) *CommandTestBuilder {
|
|
ctb.expectedOut = expectedOut
|
|
return ctb
|
|
}
|
|
|
|
// ExpectExactOutput sets the expected output for exact matching
|
|
func (ctb *CommandTestBuilder) ExpectExactOutput(expectedOut string) *CommandTestBuilder {
|
|
ctb.expectedOut = expectedOut
|
|
ctb.exactMatch = true
|
|
return ctb
|
|
}
|
|
|
|
// Run executes the command test and performs all validations
|
|
func (ctb *CommandTestBuilder) Run() *CommandTestResult {
|
|
ctb.t.Helper()
|
|
|
|
// Set up default mock client if none provided
|
|
if ctb.mockClient == nil {
|
|
ctb.mockClient = fail2ban.NewMockClient()
|
|
}
|
|
|
|
// Apply setup function if provided
|
|
if ctb.setupFunc != nil {
|
|
ctb.setupFunc(ctb.mockClient)
|
|
}
|
|
|
|
// Execute the command
|
|
output, err := ctb.executeCommand()
|
|
|
|
// Create result
|
|
result := &CommandTestResult{
|
|
Output: output,
|
|
Error: err,
|
|
t: ctb.t,
|
|
name: ctb.name,
|
|
}
|
|
|
|
// Perform basic validations
|
|
result.AssertError(ctb.expectError)
|
|
|
|
if ctb.expectedOut != "" {
|
|
if ctb.exactMatch {
|
|
result.AssertExactOutput(ctb.expectedOut)
|
|
} else {
|
|
result.AssertContains(ctb.expectedOut)
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// executeCommand runs the actual command with the configured parameters
|
|
func (ctb *CommandTestBuilder) executeCommand() (string, error) {
|
|
var cmd *cobra.Command
|
|
|
|
switch ctb.command {
|
|
case "ban":
|
|
cmd = BanCmd(ctb.mockClient, ctb.config)
|
|
case "unban":
|
|
cmd = UnbanCmd(ctb.mockClient, ctb.config)
|
|
case "status":
|
|
cmd = StatusCmd(ctb.mockClient, ctb.config)
|
|
case "list-jails":
|
|
cmd = ListJailsCmd(ctb.mockClient, ctb.config)
|
|
case "banned":
|
|
cmd = BannedCmd(ctb.mockClient, ctb.config)
|
|
case "test":
|
|
cmd = TestIPCmd(ctb.mockClient, ctb.config)
|
|
case "logs":
|
|
cmd = LogsCmd(ctb.mockClient, ctb.config)
|
|
case "service":
|
|
cmd = ServiceCmd(ctb.config)
|
|
case "version":
|
|
cmd = VersionCmd(ctb.config)
|
|
default:
|
|
return "", fmt.Errorf("unknown command: %s", ctb.command)
|
|
}
|
|
|
|
// For service commands, we need to capture os.Stdout since PrintOutput writes directly to it
|
|
if ctb.command == "service" {
|
|
return ctb.executeServiceCommand(cmd)
|
|
}
|
|
|
|
// Execute regular commands
|
|
var outBuf, errBuf bytes.Buffer
|
|
cmd.SetOut(&outBuf)
|
|
cmd.SetErr(&errBuf)
|
|
cmd.SetArgs(ctb.args)
|
|
err := cmd.Execute()
|
|
output := outBuf.String() + errBuf.String()
|
|
|
|
return output, err
|
|
}
|
|
|
|
// executeServiceCommand handles service command execution with stdout/stderr capture
|
|
func (ctb *CommandTestBuilder) executeServiceCommand(cmd *cobra.Command) (string, error) {
|
|
// Capture os.Stdout since service command uses PrintOutput
|
|
oldStdout := os.Stdout
|
|
stdoutR, stdoutW, err := os.Pipe()
|
|
if err != nil {
|
|
return "", fmt.Errorf("failed to create stdout pipe: %w", err)
|
|
}
|
|
os.Stdout = stdoutW
|
|
|
|
// Also capture os.Stderr since PrintError uses it
|
|
oldStderr := os.Stderr
|
|
stderrR, stderrW, err := os.Pipe()
|
|
if err != nil {
|
|
// Clean up stdout pipe before returning error
|
|
_ = stdoutR.Close()
|
|
_ = stdoutW.Close()
|
|
os.Stdout = oldStdout
|
|
return "", fmt.Errorf("failed to create stderr pipe: %w", err)
|
|
}
|
|
os.Stderr = stderrW
|
|
|
|
var cmdErrBuf bytes.Buffer
|
|
cmd.SetErr(&cmdErrBuf)
|
|
cmd.SetArgs(ctb.args)
|
|
err = cmd.Execute()
|
|
|
|
// Close writers and restore
|
|
if closeErr := stdoutW.Close(); closeErr != nil {
|
|
os.Stdout = oldStdout
|
|
os.Stderr = oldStderr
|
|
return "", fmt.Errorf("failed to close stdout writer: %v", closeErr)
|
|
}
|
|
if closeErr := stderrW.Close(); closeErr != nil {
|
|
os.Stdout = oldStdout
|
|
os.Stderr = oldStderr
|
|
return "", fmt.Errorf("failed to close stderr writer: %v", closeErr)
|
|
}
|
|
os.Stdout = oldStdout
|
|
os.Stderr = oldStderr
|
|
|
|
// Read captured output
|
|
var stdoutBuf bytes.Buffer
|
|
if _, readErr := stdoutBuf.ReadFrom(stdoutR); readErr != nil {
|
|
return "", fmt.Errorf("failed to read stdout: %v", readErr)
|
|
}
|
|
|
|
var stderrBuf bytes.Buffer
|
|
if _, readErr := stderrBuf.ReadFrom(stderrR); readErr != nil {
|
|
return "", fmt.Errorf("failed to read stderr: %v", readErr)
|
|
}
|
|
|
|
output := stdoutBuf.String() + stderrBuf.String() + cmdErrBuf.String()
|
|
return output, err
|
|
}
|
|
|
|
// AssertError validates the error state
|
|
func (result *CommandTestResult) AssertError(expectError bool) *CommandTestResult {
|
|
result.t.Helper()
|
|
if expectError && result.Error == nil {
|
|
result.t.Fatalf("%s: expected error but got none", result.name)
|
|
}
|
|
if !expectError && result.Error != nil {
|
|
result.t.Fatalf("%s: unexpected error: %v, output: %s", result.name, result.Error, result.Output)
|
|
}
|
|
return result
|
|
}
|
|
|
|
// AssertContains validates that output contains expected text
|
|
func (result *CommandTestResult) AssertContains(expected string) *CommandTestResult {
|
|
result.t.Helper()
|
|
if !strings.Contains(result.Output, expected) {
|
|
result.t.Fatalf("%s: expected output to contain %q, got: %s", result.name, expected, result.Output)
|
|
}
|
|
return result
|
|
}
|
|
|
|
// AssertNotContains validates that output does not contain specified text
|
|
func (result *CommandTestResult) AssertNotContains(notExpected string) *CommandTestResult {
|
|
result.t.Helper()
|
|
if strings.Contains(result.Output, notExpected) {
|
|
result.t.Fatalf("%s: expected output to not contain %q, got: %s", result.name, notExpected, result.Output)
|
|
}
|
|
return result
|
|
}
|
|
|
|
// AssertExactOutput validates exact output match
|
|
func (result *CommandTestResult) AssertExactOutput(expected string) *CommandTestResult {
|
|
result.t.Helper()
|
|
if result.Output != expected {
|
|
result.t.Fatalf("%s: expected exact output %q, got %q", result.name, expected, result.Output)
|
|
}
|
|
return result
|
|
}
|
|
|
|
// AssertJSONField validates a specific field in JSON output
|
|
func (result *CommandTestResult) AssertJSONField(fieldPath, expected string) *CommandTestResult {
|
|
result.t.Helper()
|
|
|
|
var data interface{}
|
|
if err := json.Unmarshal([]byte(result.Output), &data); err != nil {
|
|
result.t.Fatalf("%s: failed to parse JSON output: %v, output: %s", result.name, err, result.Output)
|
|
}
|
|
|
|
// Simple field path parsing (can be enhanced later)
|
|
// For now, support simple paths like "$.field", "[0].field" or direct field names
|
|
fieldName := strings.TrimPrefix(fieldPath, "$.")
|
|
|
|
switch v := data.(type) {
|
|
case map[string]interface{}:
|
|
if val, ok := v[fieldName]; ok {
|
|
if fmt.Sprintf("%v", val) != expected {
|
|
result.t.Fatalf("%s: expected JSON field %q to be %q, got %v", result.name, fieldName, expected, val)
|
|
}
|
|
} else {
|
|
result.t.Fatalf("%s: JSON field %q not found in output: %s", result.name, fieldName, result.Output)
|
|
}
|
|
case []interface{}:
|
|
// Handle array case - look in first element
|
|
if len(v) > 0 {
|
|
if firstItem, ok := v[0].(map[string]interface{}); ok {
|
|
if val, ok := firstItem[fieldName]; ok {
|
|
if fmt.Sprintf("%v", val) != expected {
|
|
result.t.Fatalf("%s: expected JSON field %q to be %q, got %v", result.name, fieldName, expected, val)
|
|
}
|
|
} else {
|
|
result.t.Fatalf("%s: JSON field %q not found in first array element: %s", result.name, fieldName, result.Output)
|
|
}
|
|
} else {
|
|
result.t.Fatalf("%s: first array element is not an object in output: %s", result.name, result.Output)
|
|
}
|
|
} else {
|
|
result.t.Fatalf("%s: JSON array is empty in output: %s", result.name, result.Output)
|
|
}
|
|
default:
|
|
result.t.Fatalf("%s: expected JSON object or array but got %T in output: %s", result.name, data, result.Output)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
// AssertEmpty validates that output is empty
|
|
func (result *CommandTestResult) AssertEmpty() *CommandTestResult {
|
|
result.t.Helper()
|
|
if strings.TrimSpace(result.Output) != "" {
|
|
result.t.Fatalf("%s: expected empty output, got: %s", result.name, result.Output)
|
|
}
|
|
return result
|
|
}
|
|
|
|
// AssertNotEmpty validates that output is not empty
|
|
func (result *CommandTestResult) AssertNotEmpty() *CommandTestResult {
|
|
result.t.Helper()
|
|
if strings.TrimSpace(result.Output) == "" {
|
|
result.t.Fatalf("%s: expected non-empty output", result.name)
|
|
}
|
|
return result
|
|
}
|
|
|
|
// MockClientBuilder provides a fluent interface for building complex mock configurations
|
|
type MockClientBuilder struct {
|
|
client *fail2ban.MockClient
|
|
jails []string
|
|
banRecords []fail2ban.BanRecord
|
|
logLines []string
|
|
responses map[string]string
|
|
errors map[string]error
|
|
}
|
|
|
|
// NewMockClientBuilder creates a new mock client builder
|
|
func NewMockClientBuilder() *MockClientBuilder {
|
|
return &MockClientBuilder{
|
|
client: fail2ban.NewMockClient(),
|
|
responses: make(map[string]string),
|
|
errors: make(map[string]error),
|
|
}
|
|
}
|
|
|
|
// WithJails configures available jails
|
|
func (b *MockClientBuilder) WithJails(jails ...string) *MockClientBuilder {
|
|
b.jails = append(b.jails, jails...)
|
|
return b
|
|
}
|
|
|
|
// WithBannedIP adds a banned IP to specific jail
|
|
func (b *MockClientBuilder) WithBannedIP(ip, jail string) *MockClientBuilder {
|
|
if b.client.BanResults == nil {
|
|
b.client.BanResults = make(map[string]map[string]int)
|
|
}
|
|
if b.client.BanResults[ip] == nil {
|
|
b.client.BanResults[ip] = make(map[string]int)
|
|
}
|
|
b.client.BanResults[ip][jail] = 1 // 1 indicates banned
|
|
return b
|
|
}
|
|
|
|
// WithBanRecord adds a ban record
|
|
func (b *MockClientBuilder) WithBanRecord(jail, ip, remaining string) *MockClientBuilder {
|
|
b.banRecords = append(b.banRecords, fail2ban.BanRecord{
|
|
Jail: jail,
|
|
IP: ip,
|
|
Remaining: remaining,
|
|
})
|
|
return b
|
|
}
|
|
|
|
// WithLogLine adds a log line
|
|
func (b *MockClientBuilder) WithLogLine(logLine string) *MockClientBuilder {
|
|
b.logLines = append(b.logLines, logLine)
|
|
return b
|
|
}
|
|
|
|
// WithStatusResponse sets status response for specific target
|
|
func (b *MockClientBuilder) WithStatusResponse(target, response string) *MockClientBuilder {
|
|
if b.client.StatusJailData == nil {
|
|
b.client.StatusJailData = make(map[string]string)
|
|
}
|
|
if target == "all" {
|
|
b.client.StatusAllData = response
|
|
} else {
|
|
b.client.StatusJailData[target] = response
|
|
}
|
|
return b
|
|
}
|
|
|
|
// WithBanError sets an error for banning specific IP in jail
|
|
func (b *MockClientBuilder) WithBanError(jail, ip string, err error) *MockClientBuilder {
|
|
b.client.SetBanError(jail, ip, err)
|
|
return b
|
|
}
|
|
|
|
// WithUnbanError sets an error for unbanning specific IP in jail
|
|
func (b *MockClientBuilder) WithUnbanError(jail, ip string, err error) *MockClientBuilder {
|
|
b.client.SetUnbanError(jail, ip, err)
|
|
return b
|
|
}
|
|
|
|
// WithLogError is not supported by MockClient - logs are returned via LogLines field
|
|
// Use WithLogLine to add log entries or modify LogLines directly
|
|
|
|
// Build creates the configured mock client
|
|
func (b *MockClientBuilder) Build() *fail2ban.MockClient {
|
|
// Apply jails
|
|
if len(b.jails) > 0 {
|
|
setMockJails(b.client, b.jails)
|
|
}
|
|
|
|
// Apply ban records
|
|
if len(b.banRecords) > 0 {
|
|
b.client.BanRecords = b.banRecords
|
|
}
|
|
|
|
// Apply log lines
|
|
if len(b.logLines) > 0 {
|
|
b.client.LogLines = b.logLines
|
|
}
|
|
|
|
return b.client
|
|
}
|
|
|
|
// WithMockBuilder configures the test with a MockClientBuilder for advanced mock setup
|
|
func (ctb *CommandTestBuilder) WithMockBuilder(builder *MockClientBuilder) *CommandTestBuilder {
|
|
ctb.mockClient = builder.Build()
|
|
return ctb
|
|
}
|