fix: log index match access_log off incorrectly #1317

Author: 0xJacky

app/components.d.ts

@@ -51,6 +51,7 @@ declare module 'vue' {
     AQrcode: typeof import('ant-design-vue/es')['QRCode']
     ARadio: typeof import('ant-design-vue/es')['Radio']
     ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup']
+    ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
     AResult: typeof import('ant-design-vue/es')['Result']
     ARow: typeof import('ant-design-vue/es')['Row']
     ASegmented: typeof import('ant-design-vue/es')['Segmented']

internal/nginx_log/access_log_off_test.go

@@ -0,0 +1,112 @@
+package nginx_log
+
+import (
+	"testing"
+)
+
+// TestAccessLogOffDirective tests that "access_log off;" directives are properly ignored
+func TestAccessLogOffDirective(t *testing.T) {
+	// Clear cache before test
+	ClearLogCache()
+
+	configPath := "/etc/nginx/sites-available/test.conf"
+
+	// Test 1: Normal logs without "off"
+	t.Run("Normal logs", func(t *testing.T) {
+		ClearLogCache()
+		content := []byte(`
+server {
+    access_log /var/log/nginx/access.log;
+    error_log /var/log/nginx/error.log;
+}`)
+		
+		err := scanForLogDirectives(configPath, content)
+		if err != nil {
+			t.Fatalf("Scan failed: %v", err)
+		}
+		
+		logs := GetAllLogPaths()
+		if len(logs) != 2 {
+			t.Errorf("Expected 2 logs, got %d", len(logs))
+		}
+	})
+
+	// Test 2: Logs with "off" directive
+	t.Run("With off directive", func(t *testing.T) {
+		ClearLogCache()
+		content := []byte(`
+server {
+    access_log /var/log/nginx/access.log;
+    access_log off;
+    error_log off;
+    error_log /var/log/nginx/error.log;
+}`)
+		
+		err := scanForLogDirectives(configPath, content)
+		if err != nil {
+			t.Fatalf("Scan failed: %v", err)
+		}
+		
+		logs := GetAllLogPaths()
+		if len(logs) != 2 {
+			t.Errorf("Expected 2 logs (ignoring 'off'), got %d", len(logs))
+			for _, log := range logs {
+				t.Logf("Found: %s (%s)", log.Path, log.Type)
+			}
+		}
+		
+		// Verify "off" is not treated as a path
+		for _, log := range logs {
+			if log.Path == "off" {
+				t.Errorf("'off' should not be treated as a log path")
+			}
+		}
+	})
+
+	// Test 3: Only "off" directives
+	t.Run("Only off directives", func(t *testing.T) {
+		ClearLogCache()
+		content := []byte(`
+server {
+    access_log off;
+    error_log off;
+}`)
+		
+		err := scanForLogDirectives(configPath, content)
+		if err != nil {
+			t.Fatalf("Scan failed: %v", err)
+		}
+		
+		logs := GetAllLogPaths()
+		if len(logs) != 0 {
+			t.Errorf("Expected 0 logs (all 'off'), got %d", len(logs))
+			for _, log := range logs {
+				t.Logf("Found: %s (%s)", log.Path, log.Type)
+			}
+		}
+	})
+
+	// Test 4: Mixed with format parameters
+	t.Run("With format parameters", func(t *testing.T) {
+		ClearLogCache()
+		content := []byte(`
+server {
+    access_log /var/log/nginx/access.log combined buffer=32k;
+    access_log off;
+    error_log /var/log/nginx/error.log warn;
+}`)
+		
+		err := scanForLogDirectives(configPath, content)
+		if err != nil {
+			t.Fatalf("Scan failed: %v", err)
+		}
+		
+		logs := GetAllLogPaths()
+		if len(logs) != 2 {
+			t.Errorf("Expected 2 logs, got %d", len(logs))
+			for _, log := range logs {
+				t.Logf("Found: %s (%s)", log.Path, log.Type)
+			}
+		}
+	})
+}

internal/nginx_log/nginx_log.go

@@ -46,6 +46,11 @@ func scanForLogDirectives(configPath string, content []byte) error {
 			directiveType := string(match[1]) // "access_log" or "error_log"
 			logPath := string(match[2])       // Path to log file
 
+			// Skip if log is disabled with "off"
+			if logPath == "off" {
+				continue
+			}
+
 			// Handle relative paths by joining with nginx prefix
 			if !filepath.IsAbs(logPath) {
 				logPath = filepath.Join(prefix, logPath)

internal/nginx_log/nginx_log_test.go

@@ -1,6 +1,7 @@
 package nginx_log
 
 import (
+	"strings"
 	"testing"
 )
 
@@ -299,6 +300,78 @@ func TestLogDirectiveRegex(t *testing.T) {
 	}
 }
 
+// TestAccessLogOff tests that "access_log off;" directives are properly ignored
+func TestAccessLogOff(t *testing.T) {
+	// Clear cache before test
+	ClearLogCache()
+
+	configPath := "/etc/nginx/sites-available/test.conf"
+
+	// Content with various access_log directives including "off"
+	content := []byte(`
+server {
+    listen 80;
+    server_name example.com;
+    
+    # Normal access log
+    access_log /var/log/nginx/access.log;
+    
+    # Disabled access log - should be ignored
+    access_log off;
+    
+    # Another normal access log with format
+    access_log /var/log/nginx/custom.log combined;
+    
+    # Error log should work normally
+    error_log /var/log/nginx/error.log;
+    
+    # Error log can also be turned off
+    error_log off;
+}
+`)
+
+	err := scanForLogDirectives(configPath, content)
+	if err != nil {
+		t.Fatalf("Scan failed: %v", err)
+	}
+
+	// Should only find 3 valid log paths (excluding "off" directives)
+	logs := GetAllLogPaths()
+	expectedCount := 3
+	if len(logs) != expectedCount {
+		t.Fatalf("Expected %d logs, got %d. Logs found: %+v", expectedCount, len(logs), logs)
+	}
+
+	// Verify the correct paths were found
+	expectedPaths := map[string]string{
+		"/var/log/nginx/access.log": "access",
+		"/var/log/nginx/custom.log": "access",
+		"/var/log/nginx/error.log":  "error",
+	}
+
+	for _, log := range logs {
+		expectedType, exists := expectedPaths[log.Path]
+		if !exists {
+			t.Errorf("Unexpected log path found: %s", log.Path)
+		} else if log.Type != expectedType {
+			t.Errorf("Expected log type %s for path %s, got %s", expectedType, log.Path, log.Type)
+		}
+		delete(expectedPaths, log.Path)
+	}
+
+	// Check that all expected paths were found
+	for path := range expectedPaths {
+		t.Errorf("Expected log path not found: %s", path)
+	}
+
+	// Verify "off" was not treated as a path
+	for _, log := range logs {
+		if log.Path == "off" || strings.Contains(log.Path, "off") {
+			t.Errorf("'off' should not be treated as a log path: %s", log.Path)
+		}
+	}
+}
+
 // TestIsCommentedMatch tests the isCommentedMatch function directly
 func TestIsCommentedMatch(t *testing.T) {
 	testCases := []struct {