Skip to content

Commit

Permalink
feat(rego): Skip dotfiles
Browse files Browse the repository at this point in the history
Fixes: aquasecurity/trivy#4924

Signed-off-by: Simar <[email protected]>
  • Loading branch information
simar7 committed Aug 4, 2023
1 parent aa6bb16 commit 69a5234
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
3 changes: 1 addition & 2 deletions pkg/rego/embed.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/aquasecurity/defsec/internal/rules"
rules2 "github.com/aquasecurity/defsec/rules"
"github.com/open-policy-agent/opa/ast"
"github.com/open-policy-agent/opa/bundle"
)

func init() {
Expand Down Expand Up @@ -88,7 +87,7 @@ func RecurseEmbeddedModules(fs embed.FS, dir string) (map[string]*ast.Module, er
}
continue
}
if !strings.HasSuffix(entry.Name(), bundle.RegoExt) || strings.HasSuffix(entry.Name(), "_test"+bundle.RegoExt) {
if !isRegoFile(entry.Name()) || isDotFile(entry.Name()) {
continue
}
fullPath := strings.Join([]string{dir, entry.Name()}, "/")
Expand Down
6 changes: 5 additions & 1 deletion pkg/rego/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ func isRegoFile(name string) bool {
return strings.HasSuffix(name, bundle.RegoExt) && !strings.HasSuffix(name, "_test"+bundle.RegoExt)
}

func isDotFile(name string) bool {
return strings.HasPrefix(name, ".")
}

func isJSONFile(name string) bool {
return strings.HasSuffix(name, ".json")
}
Expand All @@ -37,7 +41,7 @@ func (s *Scanner) loadPoliciesFromDirs(target fs.FS, paths []string) (map[string
if info.IsDir() {
return nil
}
if !isRegoFile(info.Name()) {
if !isRegoFile(info.Name()) || isDotFile(info.Name()) {
return nil
}
data, err := fs.ReadFile(target, filepath.ToSlash(path))
Expand Down

0 comments on commit 69a5234

Please sign in to comment.