Skip to content

Check files improve path normalization #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
inqrphl wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Check files improve path normalization #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c8bdfe
check_files: improve path normalization
inqrphl May 27, 2026
5fba244
fix typo for citest
inqrphl May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pkg/snclient/check_files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,18 @@ func (l *CheckFiles) normalizePath(path string) string {
// Special handling for Windows drive letters,
// Files directly under the drive do not have separators, e.g: C:pagefile.sys
// This confuses the depth calculation
if runtime.GOOS == "windows" {
// Convert forward slashes to backward slashes
fromSlash := filepath.FromSlash(path)
path = fromSlash
}

// Remove groups of seperators next to each other , and replace them with a single separator
sep := string(os.PathSeparator)
for strings.Contains(path, sep+sep) {
path = strings.ReplaceAll(path, sep+sep, sep)
}

if runtime.GOOS == "windows" {
// C: -> C:\
if len(path) == 2 && unicode.IsUpper(rune(path[0])) && path[1] == ':' {
Expand Down
28 changes: 28 additions & 0 deletions pkg/snclient/check_files_windows_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,31 @@ func TestCheckDriveLetterPaths(t *testing.T) {

StopTestAgent(t, snc)
}

func TestCheckPathSpecifications(t *testing.T) {
snc := StartTestAgent(t, "")
var res *CheckResult

// =============== C:\Windows\Fonts\arial.ttf
// Intended separator is backward slashes like this
res = snc.RunCheck("check_files", []string{"path=C:\\Windows\\fonts", "max-depth=1", "filter= type == 'file' and name == 'arial.ttf' "})
assert.Containsf(t, string(res.BuildPluginOutput()), "OK - All 1 files are ok", "output matches")

// Forward slashes should be converted to backward slashes
res = snc.RunCheck("check_files", []string{"path=C:/Windows/fonts", "max-depth=1", "filter= type == 'file' and name == 'arial.ttf' "})
assert.Containsf(t, string(res.BuildPluginOutput()), "OK - All 1 files are ok", "output matches")

// Multiple backward slashes that do not actually go into subfolders and add depth should be ignored
res = snc.RunCheck("check_files", []string{"path=C:\\\\\\Windows\\\\fonts", "max-depth=1", "filter= type == 'file' and name == 'arial.ttf' "})
assert.Containsf(t, string(res.BuildPluginOutput()), "OK - All 1 files are ok", "output matches")

// Multiple backward slashes that do not actually go into subfolders and add depth should be ignored
res = snc.RunCheck("check_files", []string{"path=C:\\\\Windows\\\\fonts", "max-depth=1", "filter= type == 'file' and name == 'arial.ttf' "})
assert.Containsf(t, string(res.BuildPluginOutput()), "OK - All 1 files are ok", "output matches")

// Multiple forward slashes that do not actually go into subfolders and add depth should be ignored
res = snc.RunCheck("check_files", []string{"path=C://Windows////fonts", "max-depth=1", "filter= type == 'file' and name == 'arial.ttf' "})
assert.Containsf(t, string(res.BuildPluginOutput()), "OK - All 1 files are ok", "output matches")

StopTestAgent(t, snc)
}
Loading