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(misconf): parsing numbers without fraction as int #6834

Merged
merged 1 commit into from
Jun 5, 2024

Conversation

nikpivkin
Copy link
Contributor

@nikpivkin nikpivkin commented May 31, 2024

Description

jfather parses Number without fractional part as int64, but in our types we use int, which causes type casting error.

{
    "AWSTemplateFormatVersion": "2010-09-09",
    "Parameters": {
        "ContainerMemory": {
            "Type": "Number",
            "Default": 512
        }
    },
    "Resources": {
        "TaskDefinition": {
            "Type": "AWS::ECS::TaskDefinition",
            "Properties": {
                "ContainerDefinitions": [
                    {
                        "Memory": {
                            "Ref": "ContainerMemory"
                        }
                    }
                ]
            }
        }
    }
}
trivy conf -d /Users/nikita/projects/aws-cloudformation-templates/ECS/FargateLaunchType/services/private-subnet-private-service.json
2024-05-31T22:01:39+07:00       DEBUG   Parsed severities       severities=[UNKNOWN LOW MEDIUM HIGH CRITICAL]
2024-05-31T22:01:39+07:00       DEBUG   Cache dir       dir="/Users/nikita/Library/Caches/trivy"
2024-05-31T22:01:39+07:00       INFO    Misconfiguration scanning is enabled
2024-05-31T22:01:39+07:00       DEBUG   Policies successfully loaded from disk
2024-05-31T22:01:39+07:00       DEBUG   Enabling misconfiguration scanners      scanners=[azure-arm cloudformation dockerfile helm kubernetes terraform terraformplan-json terraformplan-snapshot]
2024-05-31T22:01:39+07:00       DEBUG   Scanning files for misconfigurations... scanner="CloudFormation"
2024-05-31T22:01:39+07:00       DEBUG   [misconf] 01:39.922532000 cloudformation.scanner.rego      Overriding filesystem for checks!
2024-05-31T22:01:39+07:00       DEBUG   [misconf] 01:39.923069000 cloudformation.scanner.rego      Loaded 3 embedded libraries.
2024-05-31T22:01:39+07:00       DEBUG   [misconf] 01:39.950123000 cloudformation.scanner.rego      Loaded 191 embedded policies.
2024-05-31T22:01:39+07:00       DEBUG   [misconf] 01:39.987149000 cloudformation.scanner.rego      Loaded 194 policies from disk.
2024-05-31T22:01:39+07:00       DEBUG   [misconf] 01:39.987436000 cloudformation.scanner.rego      Overriding filesystem for data!
2024-05-31T22:01:40+07:00       DEBUG   [misconf] 01:40.037709000 cloudformation.scanner.rego      Error occurred while parsing: Users/nikita/Library/Caches/trivy/policy/content/policies/docker/policies/update_instruction_alone.rego, Users/nikita/Library/Caches/trivy/policy/content/policies/docker/policies/update_instruction_alone.rego:48: rego_type_error: undefined function sh.parse_commands. Trying to fallback to embedded check.
2024-05-31T22:01:40+07:00       DEBUG   [misconf] 01:40.037922000 cloudformation.scanner.rego      Found embedded check: checks/docker/update_instruction_alone.rego
2024-05-31T22:01:40+07:00       DEBUG   [misconf] 01:40.037929000 cloudformation.scanner.rego      Error occurred while parsing: Users/nikita/Library/Caches/trivy/policy/content/policies/docker/policies/yum_clean_all_missing.rego, Users/nikita/Library/Caches/trivy/policy/content/policies/docker/policies/yum_clean_all_missing.rego:27: rego_type_error: undefined function sh.parse_commands. Trying to fallback to embedded check.
2024-05-31T22:01:40+07:00       DEBUG   [misconf] 01:40.038135000 cloudformation.scanner.rego      Found embedded check: checks/docker/yum_clean_all_missing.rego
panic: interface conversion: interface {} is int64, not int

goroutine 1 [running]:
github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser.(*Property).AsInt(0x140036be7e0)
        /home/runner/work/trivy/trivy/pkg/iac/scanners/cloudformation/parser/property_helpers.go:116 +0x1cc
github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser.(*Property).AsInt(0x14003243c20)
        /home/runner/work/trivy/trivy/pkg/iac/scanners/cloudformation/parser/property_helpers.go:105 +0x1a0
github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser.(*Property).AsIntValue(0x14003243c20)
        /home/runner/work/trivy/trivy/pkg/iac/scanners/cloudformation/parser/property_helpers.go:123 +0x2a0
github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation/parser.(*Property).GetIntProperty(0x140032439e0, {0x106521795?, 0x106517f54?}, {0x0?, 0x0?, 0x14002201700?})
        /home/runner/work/trivy/trivy/pkg/iac/scanners/cloudformation/parser/property.go:216 +0x2ec
github.com/aquasecurity/trivy/pkg/iac/adapters/cloudformation/aws/ecs.getContainerDefinitions(0x140011f9c20)
        /home/runner/work/trivy/trivy/pkg/iac/adapters/cloudformation/aws/ecs/task_definition.go:49 +0x470
github.com/aquasecurity/trivy/pkg/iac/adapters/cloudformation/aws/ecs.getTaskDefinitions({{0x14002f66f30, 0x23}, {0x14002c92000, 0x18, 0x18}, {0x106514bc7, 0x4}, {0x0, 0x0, 0x0}, ...})
        /home/runner/work/trivy/trivy/pkg/iac/adapters/cloudformation/aws/ecs/task_definition.go:14 +0x174
github.com/aquasecurity/trivy/pkg/iac/adapters/cloudformation/aws/ecs.Adapt({{0x14002f66f30, 0x23}, {0x14002c92000, 0x18, 0x18}, {0x106514bc7, 0x4}, {0x0, 0x0, 0x0}, ...})
        /home/runner/work/trivy/trivy/pkg/iac/adapters/cloudformation/aws/ecs/ecs.go:12 +0xfc
github.com/aquasecurity/trivy/pkg/iac/adapters/cloudformation/aws.Adapt({{_, _}, {_, _, _}, {_, _}, {_, _, _}, ...})
        /home/runner/work/trivy/trivy/pkg/iac/adapters/cloudformation/aws/adapt.go:53 +0x6d0
github.com/aquasecurity/trivy/pkg/iac/adapters/cloudformation.Adapt(...)
        /home/runner/work/trivy/trivy/pkg/iac/adapters/cloudformation/adapt.go:12
github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation.(*Scanner).scanFileContext(0x140034628f0, {0x1090bd5f0, 0x14001237810}, 0x14000a37e60, 0x14001221400, {0x10900d6c0, 0x14000e67560})
        /home/runner/work/trivy/trivy/pkg/iac/scanners/cloudformation/scanner.go:210 +0xe0
github.com/aquasecurity/trivy/pkg/iac/scanners/cloudformation.(*Scanner).ScanFS(0x140034628f0, {0x1090bd5f0, 0x14001237810}, {0x10900d6c0, 0x14000e67560}, {0x107c96ba0?, 0x14003a68908?})
        /home/runner/work/trivy/trivy/pkg/iac/scanners/cloudformation/scanner.go:173 +0x124
github.com/aquasecurity/trivy/pkg/misconf.(*Scanner).Scan(0x140026b34d0, {0x1090bd5f0, 0x14001237810}, {0x10900d6c0?, 0x14000e67488?})
        /home/runner/work/trivy/trivy/pkg/misconf/scanner.go:157 +0x1bc
github.com/aquasecurity/trivy/pkg/fanal/analyzer/config.(*Analyzer).PostAnalyze(0x14003471f40, {0x1090bd5f0?, 0x14001237810?}, {{0x10900d6c0?, 0x14000e67488?}, {0xe?, 0x0?}})
        /home/runner/work/trivy/trivy/pkg/fanal/analyzer/config/config.go:45 +0x38
github.com/aquasecurity/trivy/pkg/fanal/analyzer.AnalyzerGroup.PostAnalyze({0x14003590860, {0x1400313b680, 0x3, 0x4}, {0x14000e47800, 0x8, 0x8}, 0x14003846b10}, {0x1090bd5f0, 0x14001237810}, ...)
        /home/runner/work/trivy/trivy/pkg/fanal/analyzer/analyzer.go:493 +0x228
github.com/aquasecurity/trivy/pkg/fanal/artifact/local.Artifact.Inspect({{0x16f9aaade, 0x76}, {0x134421a90, 0x14003590330}, {0x10900d600, 0x10ca35b60}, {0x14003590860, {0x1400313b680, 0x3, 0x4}, ...}, ...}, ...)
        /home/runner/work/trivy/trivy/pkg/fanal/artifact/local/fs.go:120 +0x37c
github.com/aquasecurity/trivy/pkg/scanner.Scanner.ScanArtifact({{_, _}, {_, _}}, {_, _}, {{0x0, 0x0, 0x0}, {0x14003590210, ...}, ...})
        /home/runner/work/trivy/trivy/pkg/scanner/scan.go:146 +0xa4
github.com/aquasecurity/trivy/pkg/commands/artifact.scan({_, _}, {{{0x10653b08b, 0xa}, 0x0, 0x0, 0x1, 0x0, 0x45d964b800, {0x140006434d0, ...}, ...}, ...}, ...)
        /home/runner/work/trivy/trivy/pkg/commands/artifact/run.go:691 +0x32c
github.com/aquasecurity/trivy/pkg/commands/artifact.(*runner).scanArtifact(_, {_, _}, {{{0x10653b08b, 0xa}, 0x0, 0x0, 0x1, 0x0, 0x45d964b800, ...}, ...}, ...)
        /home/runner/work/trivy/trivy/pkg/commands/artifact/run.go:264 +0xa8
github.com/aquasecurity/trivy/pkg/commands/artifact.(*runner).scanFS(_, {_, _}, {{{0x10653b08b, 0xa}, 0x0, 0x0, 0x1, 0x0, 0x45d964b800, ...}, ...})
        /home/runner/work/trivy/trivy/pkg/commands/artifact/run.go:212 +0xac
github.com/aquasecurity/trivy/pkg/commands/artifact.(*runner).ScanFilesystem(_, {_, _}, {{{0x10653b08b, 0xa}, 0x0, 0x0, 0x1, 0x0, 0x45d964b800, ...}, ...})
        /home/runner/work/trivy/trivy/pkg/commands/artifact/run.go:192 +0x1b8
github.com/aquasecurity/trivy/pkg/commands/artifact.Run({_, _}, {{{0x10653b08b, 0xa}, 0x0, 0x0, 0x1, 0x0, 0x45d964b800, {0x140006434d0, ...}, ...}, ...}, ...)
        /home/runner/work/trivy/trivy/pkg/commands/artifact/run.go:425 +0x408
github.com/aquasecurity/trivy/pkg/commands.NewConfigCommand.func2(0x1400061f208, {0x140035faee0, 0x1, 0x2})
        /home/runner/work/trivy/trivy/pkg/commands/app.go:699 +0x294
github.com/spf13/cobra.(*Command).execute(0x1400061f208, {0x140035faec0, 0x2, 0x2})
        /home/runner/go/pkg/mod/github.com/spf13/cobra@v1.8.0/command.go:983 +0x840
github.com/spf13/cobra.(*Command).ExecuteC(0x14000b47508)
        /home/runner/go/pkg/mod/github.com/spf13/cobra@v1.8.0/command.go:1115 +0x344
github.com/spf13/cobra.(*Command).Execute(0x1065a3ed5?)
        /home/runner/go/pkg/mod/github.com/spf13/cobra@v1.8.0/command.go:1039 +0x1c
main.run()
        /home/runner/work/trivy/trivy/cmd/trivy/main.go:41 +0x158
main.main()
        /home/runner/work/trivy/trivy/cmd/trivy/main.go:19 +0x20

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@nikpivkin nikpivkin changed the title fix(misconf): parsing numbers as int fix(misconf): parsing numbers without fraction as int Jun 3, 2024
@nikpivkin nikpivkin marked this pull request as ready for review June 3, 2024 13:51
@nikpivkin nikpivkin requested a review from simar7 as a code owner June 3, 2024 13:51
Comment on lines +30 to +47

var inner parameterInner

if err := node.Decode(&inner); err != nil {
return err
}

// jfather parses Number without fraction as int64
// https://github.com/liamg/jfather/blob/4ef05d70c05af167226d3333a4ec7d8ac3c9c281/parse_number.go#L33-L42
switch v := inner.Default.(type) {
case int64:
inner.Default = int(v)
default:
inner.Default = v
}

p.inner = inner
return nil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we extract this into a function? Looks like there are other callsites like this one:

return node.Decode(&r.Inner)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The resource does not store a primitive value. This conversion is needed for the parameter and property of the resource.

@simar7 simar7 self-requested a review June 5, 2024 03:20
@simar7 simar7 added this pull request to the merge queue Jun 5, 2024
Merged via the queue into aquasecurity:main with commit 8141a13 Jun 5, 2024
13 checks passed
@aqua-bot aqua-bot mentioned this pull request Jun 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants