1
0
mirror of https://github.com/tw93/Mole.git synced 2026-02-15 18:05:05 +00:00

fix(windows): fix property access errors and scanning performance

- Fix analyze: Add timeout and depth limits to calculateDirSize() to prevent
  indefinite scanning on large directories like user profile
- Fix purge: Add null checks for .Count property access under StrictMode
- Fix uninstall: Wrap registry property access in try/catch for items without
  DisplayName, and add null checks throughout
- Fix mole.ps1: Add null check for Arguments.Count
- Add try/catch around CursorVisible calls for non-interactive terminals

All 73 Pester tests and all Go tests pass.
This commit is contained in:
Bhadra
2026-01-08 19:33:26 +05:30
parent 3ebaeefa18
commit 3653900e2d
4 changed files with 180 additions and 70 deletions

View File

@@ -3,6 +3,7 @@
package main
import (
"context"
"flag"
"fmt"
"os"
@@ -17,6 +18,13 @@ import (
tea "github.com/charmbracelet/bubbletea"
)
// Scanning limits to prevent infinite scanning
const (
dirSizeTimeout = 5 * time.Second // Max time to calculate a single directory size
maxFilesPerDir = 50000 // Max files to scan per directory
maxScanDepth = 50 // Max recursion depth
)
// ANSI color codes
const (
colorReset = "\033[0m"
@@ -555,23 +563,88 @@ func scanDirectory(path string) ([]dirEntry, []fileEntry, int64, error) {
return dirEntries, largeFiles, totalSize, nil
}
// calculateDirSize calculates the size of a directory
// calculateDirSize calculates the size of a directory with timeout and limits
func calculateDirSize(path string) int64 {
var size int64
ctx, cancel := context.WithTimeout(context.Background(), dirSizeTimeout)
defer cancel()
filepath.Walk(path, func(p string, info os.FileInfo, err error) error {
if err != nil {
return nil // Skip errors
}
if !info.IsDir() {
size += info.Size()
}
return nil
})
var size int64
var fileCount int64
// Use a channel to signal completion
done := make(chan struct{})
go func() {
defer close(done)
walkDirWithLimit(ctx, path, 0, &size, &fileCount)
}()
select {
case <-done:
// Completed normally
case <-ctx.Done():
// Timeout - return partial size
}
return size
}
// walkDirWithLimit walks a directory with depth limit and file count limit
func walkDirWithLimit(ctx context.Context, path string, depth int, size *int64, fileCount *int64) {
// Check context cancellation
select {
case <-ctx.Done():
return
default:
}
// Check depth limit
if depth > maxScanDepth {
return
}
// Check file count limit
if atomic.LoadInt64(fileCount) > maxFilesPerDir {
return
}
entries, err := os.ReadDir(path)
if err != nil {
return
}
for _, entry := range entries {
// Check cancellation frequently
select {
case <-ctx.Done():
return
default:
}
// Check file count limit
if atomic.LoadInt64(fileCount) > maxFilesPerDir {
return
}
entryPath := filepath.Join(path, entry.Name())
if entry.IsDir() {
// Skip system/protected directories
name := entry.Name()
if skipPatterns[name] || strings.HasPrefix(name, ".") && len(name) > 1 {
continue
}
walkDirWithLimit(ctx, entryPath, depth+1, size, fileCount)
} else {
info, err := entry.Info()
if err == nil {
atomic.AddInt64(size, info.Size())
atomic.AddInt64(fileCount, 1)
}
}
}
}
// formatBytes formats bytes to human readable string
func formatBytes(bytes int64) string {
const unit = 1024