Skip to content
This repository has been archived by the owner on Jan 23, 2025. It is now read-only.

feat(rego): Skip dotfiles #1414

Merged
merged 1 commit into from
Aug 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
5 changes: 3 additions & 2 deletions pkg/rego/load_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require"
)

//go:embed testdata/policies
//go:embed all:testdata/policies
var testEmbedFS embed.FS

func Test_RegoScanning_WithSomeInvalidPolicies(t *testing.T) {
Expand All @@ -21,8 +21,9 @@ func Test_RegoScanning_WithSomeInvalidPolicies(t *testing.T) {
scanner.SetRegoErrorLimit(0)
scanner.SetDebugWriter(&debugBuf)
p, _ := RecurseEmbeddedModules(testEmbedFS, ".")
scanner.policies = p
require.NotNil(t, p)

scanner.policies = p
err := scanner.compilePolicies(testEmbedFS, []string{"policies"})
require.ErrorContains(t, err, `want (one of): ["Cmd" "EndLine" "Flags" "JSON" "Original" "Path" "Stage" "StartLine" "SubCmd" "Value"]`)
assert.Contains(t, debugBuf.String(), "Error(s) occurred while loading policies")
Expand Down
Empty file.