Skip to content

fix: check the CrowdSec diagnostics paths against the data folder properly #1563

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

Merged
Wikid82 merged 1 commit into from
Oct 11, 2026
Merged

fix: check the CrowdSec diagnostics paths against the data folder properly #1563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions backend/internal/api/handlers/crowdsec_files_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,12 @@ func TestPathWithin(t *testing.T) {
assert.False(t, pathWithin("/a/b", "/a"))
assert.False(t, pathWithin("/a/b", "/x/y"))
assert.False(t, pathWithin("/a/b", "relative"))
// A name that merely starts with two dots is inside the folder; real parent traversal is not.
assert.True(t, pathWithin("/a/b", "/a/b/..foo"))
assert.True(t, pathWithin("/a/b", "/a/b/..foo/bar"))
assert.False(t, pathWithin("/a/b", "/a/b/../c"))
assert.False(t, pathWithin("/a/b", "/a/b/../../etc/passwd"))
assert.False(t, pathWithin("/a/b", "/a/b_sibling/config.yaml"))
}

func TestCrowdsecFiles_Read_UnreadableFileIs500(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions backend/internal/api/handlers/crowdsec_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2216,7 +2216,7 @@ func (h *CrowdsecHandler) DiagnosticsConfig(c *gin.Context) {
if configPath := crowdsec.FindConfigFile(h.DataDir); configPath != "" {
// Path traversal protection: ensure path is within DataDir
cleanConfigPath = filepath.Clean(configPath)
if !strings.HasPrefix(cleanConfigPath, filepath.Clean(h.DataDir)) {
if !pathWithin(filepath.Clean(h.DataDir), cleanConfigPath) {
c.JSON(http.StatusBadRequest, gin.H{"error": "invalid config path"})
return
}
Expand Down Expand Up @@ -2262,7 +2262,7 @@ func (h *CrowdsecHandler) DiagnosticsConfig(c *gin.Context) {
cleanDataDir := filepath.Clean(h.DataDir)
// Path traversal protection
cleanAcquisPath := filepath.Clean(acquisPath)
if !strings.HasPrefix(cleanAcquisPath, cleanDataDir) {
if !pathWithin(cleanDataDir, cleanAcquisPath) {
c.JSON(http.StatusBadRequest, gin.H{"error": "invalid acquis path"})
return
}
Expand Down
Loading