Skip to content

🐛 Fixing how windows paths are created to regex #780

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
merged 1 commit into from
Feb 20, 2025
Merged

🐛 Fixing how windows paths are created to regex #780

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
31 changes: 25 additions & 6 deletions engine/scopes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ package engine
import (
"fmt"
"net/url"
"path/filepath"
"regexp"
"runtime"
"strings"

"github.com/go-logr/logr"
"go.lsp.dev/uri"
Expand Down Expand Up @@ -79,7 +82,7 @@ func (i *includedPathScope) Name() string {
func (i *includedPathScope) AddToContext(conditionCTX *ConditionContext) error {
// If any chain template has the filepaths set, only use those.
for k, chainTemplate := range conditionCTX.Template {
if chainTemplate.Filepaths != nil && len(chainTemplate.Filepaths) > 0 {
if len(chainTemplate.Filepaths) > 0 {
i.log.V(5).Info("includedPathScope not used because filepath set", "filepaths", chainTemplate.Filepaths, "key", k)
return nil
}
Expand All @@ -91,7 +94,6 @@ func (i *includedPathScope) AddToContext(conditionCTX *ConditionContext) error {
Extras: nil,
}
return nil

}

func (i *includedPathScope) FilterResponse(response IncidentContext) bool {
Expand All @@ -116,7 +118,7 @@ func IncludedPathsScope(paths []string, log logr.Logger) Scope {

type excludedPathsScope struct {
paths []string
log logr.Logger
log logr.Logger
}

var _ Scope = &excludedPathsScope{}
Expand All @@ -141,7 +143,11 @@ func (e *excludedPathsScope) FilterResponse(response IncidentContext) bool {
}
for _, path := range e.paths {
e.log.V(5).Info("using path for filtering response", "path", path)
pattern, err := regexp.Compile(path)
regex_path := path
if runtime.GOOS == "windows" {
regex_path = e.convertWindowsPathForRegex(path)
}
pattern, err := regexp.Compile(regex_path)
if err != nil {
e.log.V(5).Error(err, "invalid pattern", "pattern", path)
continue
Expand All @@ -155,9 +161,22 @@ func (e *excludedPathsScope) FilterResponse(response IncidentContext) bool {
return false
}

func (e *excludedPathsScope) convertWindowsPathForRegex(path string) string {
escapedPath := regexp.QuoteMeta(path)

escapedPath = strings.ReplaceAll(escapedPath, `\`, `(\\|/)`)

return escapedPath
}

func ExcludedPathsScope(paths []string, log logr.Logger) Scope {
cleanedPaths := []string{}
for _, path := range paths {
cleanedPath := filepath.Clean(path)
cleanedPaths = append(cleanedPaths, cleanedPath)
}
return &excludedPathsScope{
paths: paths,
log: log.WithName("excludedPathScope"),
paths: cleanedPaths,
log: log.WithName("excludedPathScope"),
}
}
Loading