Skip to content
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.

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

fix(parser): Fixed Bug with invalid terraform returning panic #3304 #3305

Merged
merged 1 commit into from
May 13, 2021
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
7 changes: 4 additions & 3 deletions pkg/kics/resolver_sink.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/Checkmarx/kics/pkg/model"
"github.com/getsentry/sentry-go"
"github.com/google/uuid"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
)

Expand All @@ -18,7 +17,8 @@ func (s *Service) resolverSink(ctx context.Context, filename, scanID string) ([]
}
resFiles, err := s.Resolver.Resolve(filename, kind)
if err != nil {
return []string{}, errors.Wrap(err, "failed to render file content")
log.Err(err).Msgf("failed to render file content")
return []string{}, nil
}

excluded := make([]string, len(resFiles.File))
Expand All @@ -31,7 +31,8 @@ func (s *Service) resolverSink(ctx context.Context, filename, scanID string) ([]
if retParse == "break" {
return []string{}, nil
}
return []string{}, errors.Wrap(err, "failed to parse file content")
log.Err(err).Msgf("failed to parse file content")
return []string{}, nil
}
for _, document := range documents {
_, err = json.Marshal(document)
Expand Down
3 changes: 2 additions & 1 deletion pkg/kics/sink.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ func (s *Service) sink(ctx context.Context, filename, scanID string, rc io.Reade

documents, kind, err := s.Parser.Parse(filename, *content)
if err != nil {
return errors.Wrap(err, "failed to parse file content")
log.Err(err).Msgf("failed to parse file content: %s", filename)
return nil
}
for _, document := range documents {
_, err = json.Marshal(document)
Expand Down
27 changes: 20 additions & 7 deletions pkg/parser/terraform/terraform.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,27 +57,36 @@ func processElements(elements model.Document, path string) {
}
}

func processResources(doc model.Document, path string) {
func processResources(doc model.Document, path string) error {
var resourcesElements model.Document
var elements model.Document

for _, resources := range doc { // iterate over resources
resourcesElements = resources.(model.Document)
for _, v2 := range resourcesElements { // resource name
elements = v2.(model.Document)
processElements(elements, path)
switch t := v2.(type) {
case []interface{}:
return errors.New("failed to process resources")
case interface{}:
elements = t.(model.Document)
processElements(elements, path)
}
}
}
return nil
}

func addExtraInfo(json []model.Document, path string) []model.Document {
func addExtraInfo(json []model.Document, path string) ([]model.Document, error) {
for _, documents := range json { // iterate over documents
if documents["resource"] != nil {
processResources(documents["resource"].(model.Document), path)
err := processResources(documents["resource"].(model.Document), path)
if err != nil {
return []model.Document{}, err
}
}
}

return json
return json, nil
}

// Parse execute parser for the content in a file
Expand All @@ -90,8 +99,12 @@ func (p *Parser) Parse(path string, content []byte) ([]model.Document, error) {
}

fc, parseErr := p.convertFunc(file, inputVariableMap)
json, err := addExtraInfo([]model.Document{fc}, path)
if err != nil {
return json, errors.Wrap(err, "failed terraform parse")
}

return addExtraInfo([]model.Document{fc}, path), errors.Wrap(parseErr, "failed terraform parse")
return json, errors.Wrap(parseErr, "failed terraform parse")
}

// SupportedExtensions returns Terraform extensions
Expand Down