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.

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

Jump to bottom

Fix: jsonl files are rejected #2266

Merged
merged 1 commit into from
Nov 8, 2024
Merged

Fix: jsonl files are rejected #2266

merged 1 commit into from
Nov 8, 2024

Conversation

robert-cronin
Copy link
Contributor

Description of the PR

Fixes #2187

PR Checklist

  • All commits have a Developer Certificate of Origin (DCO) -- they are generated using -s flag to git commit.
  • All new changes are covered by tests
  • If GraphQL schema is changed, make generate has been run
  • If GraphQL schema is changed, GraphQL client updates/additions have been made
  • If OpenAPI spec is changed, make generate has been run
  • If ent schema is changed, make generate has been run
  • If collectsub protobuf has been changed, make proto has been run
  • All CI checks are passing (tests and formatting)
  • All dependent PRs have already been merged

@robert-cronin robert-cronin force-pushed the fix/jsonl-files-rejected branch 2 times, most recently from 563f96a to 168d152 Compare November 7, 2024 08:03
@pxp928
Copy link
Collaborator

pxp928 commented Nov 7, 2024

made a bug report here: #2273 for the test failures

@robert-cronin
Copy link
Contributor Author

robert-cronin commented Nov 8, 2024 •
edited
Loading

As for CLI testing, I think it might be a bit contrived, but here is a test run for collecting a jsonl file which has two SPDX documents (one on each line):

❯ go run ./cmd/guacone/main.go collect files ./tmp/spdx_vuln.jsonl
{"level":"info","ts":1731040156.5952644,"caller":"logging/logger.go:79","msg":"Logging at info level","guac-version":"v0.0.1-custom"}
{"level":"info","ts":1731040156.5953152,"caller":"cli/init.go:65","msg":"Using config file: /home/rob/go/src/guacsec/guac/guac.yaml","guac-version":"v0.0.1-custom"}
{"level":"info","ts":1731040157.3011687,"caller":"helpers/bulk.go:47","msg":"assembling Package: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.302138,"caller":"helpers/bulk.go:63","msg":"assembling Source: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3025815,"caller":"helpers/bulk.go:73","msg":"assembling Artifact: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3030267,"caller":"helpers/bulk.go:88","msg":"assembling Materials (Artifact): 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3033898,"caller":"helpers/bulk.go:97","msg":"assembling Builder: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.303743,"caller":"helpers/bulk.go:106","msg":"assembling Vulnerability: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3041625,"caller":"helpers/bulk.go:115","msg":"assembling Licenses: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.304605,"caller":"helpers/bulk.go:122","msg":"assembling CertifyScorecard: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3046224,"caller":"helpers/bulk.go:128","msg":"assembling IsDependency: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.304633,"caller":"helpers/bulk.go:137","msg":"assembling IsOccurrence: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.304642,"caller":"helpers/bulk.go:146","msg":"assembling HasSLSA: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3046508,"caller":"helpers/bulk.go:152","msg":"assembling CertifyVuln: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.304659,"caller":"helpers/bulk.go:158","msg":"assembling VulnMetadata: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3046675,"caller":"helpers/bulk.go:164","msg":"assembling VulnEqual: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3046749,"caller":"helpers/bulk.go:170","msg":"assembling HasSourceAt: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3046834,"caller":"helpers/bulk.go:176","msg":"assembling CertifyBad: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.304692,"caller":"helpers/bulk.go:182","msg":"assembling CertifyGood: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3047001,"caller":"helpers/bulk.go:188","msg":"assembling PointOfContact: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3047082,"caller":"helpers/bulk.go:194","msg":"assembling HasMetadata: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.304717,"caller":"helpers/bulk.go:200","msg":"assembling HasSBOM: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3047254,"caller":"helpers/bulk.go:211","msg":"assembling VEX : 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3047338,"caller":"helpers/bulk.go:217","msg":"assembling HashEqual : 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.304741,"caller":"helpers/bulk.go:223","msg":"assembling PkgEqual : 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.3047488,"caller":"helpers/bulk.go:229","msg":"assembling CertifyLegal : 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.32608,"caller":"helpers/bulk.go:47","msg":"assembling Package: 3981","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.6908877,"caller":"helpers/bulk.go:63","msg":"assembling Source: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.6944394,"caller":"helpers/bulk.go:73","msg":"assembling Artifact: 3384","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.783583,"caller":"helpers/bulk.go:88","msg":"assembling Materials (Artifact): 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.7843251,"caller":"helpers/bulk.go:97","msg":"assembling Builder: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.784722,"caller":"helpers/bulk.go:106","msg":"assembling Vulnerability: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.7852316,"caller":"helpers/bulk.go:115","msg":"assembling Licenses: 29","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.7868395,"caller":"helpers/bulk.go:122","msg":"assembling CertifyScorecard: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040157.7868674,"caller":"helpers/bulk.go:128","msg":"assembling IsDependency: 7161","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.2391815,"caller":"helpers/bulk.go:137","msg":"assembling IsOccurrence: 3878","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.849252,"caller":"helpers/bulk.go:146","msg":"assembling HasSLSA: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.849305,"caller":"helpers/bulk.go:152","msg":"assembling CertifyVuln: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.8493211,"caller":"helpers/bulk.go:158","msg":"assembling VulnMetadata: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.8493342,"caller":"helpers/bulk.go:164","msg":"assembling VulnEqual: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.849344,"caller":"helpers/bulk.go:170","msg":"assembling HasSourceAt: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.8493533,"caller":"helpers/bulk.go:176","msg":"assembling CertifyBad: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.8493662,"caller":"helpers/bulk.go:182","msg":"assembling CertifyGood: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.8493824,"caller":"helpers/bulk.go:188","msg":"assembling PointOfContact: 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.8493936,"caller":"helpers/bulk.go:194","msg":"assembling HasMetadata: 462","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.9131582,"caller":"helpers/bulk.go:200","msg":"assembling HasSBOM: 1","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.9971635,"caller":"helpers/bulk.go:211","msg":"assembling VEX : 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.9972134,"caller":"helpers/bulk.go:217","msg":"assembling HashEqual : 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.9972332,"caller":"helpers/bulk.go:223","msg":"assembling PkgEqual : 0","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040159.9972486,"caller":"helpers/bulk.go:229","msg":"assembling CertifyLegal : 125","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040160.0336263,"caller":"ingestor/ingestor.go:79","msg":"[3.432688836s] completed doc {Collector:FileCollector Source:file:///./tmp/spdx_vuln.jsonl DocumentRef:sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241}","guac-version":"v0.0.1-custom","documentHash":"sha256_3245201bb639af7efb54de2f3bcabab3c7c08d69e538d789d70142844ebc7241"}
{"level":"info","ts":1731040160.0336566,"caller":"cmd/files.go:155","msg":"collector ended gracefully","guac-version":"v0.0.1-custom"}
{"level":"info","ts":1731040160.0336747,"caller":"cmd/files.go:170","msg":"completed ingesting 1 documents of 1","guac-version":"v0.0.1-custom"}

@robert-cronin
Fix: jsonl files are rejected
648085b 
Signed-off-by: robert-cronin <robert.owen.cronin@gmail.com>
pxp928
pxp928 approved these changes Nov 8, 2024
View reviewed changes
Copy link
Collaborator

@pxp928 pxp928 left a comment

Choose a reason for hiding this comment

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

LGTM!

@kodiakhq kodiakhq bot merged commit 49693b4 into guacsec:main Nov 8, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pxp928 pxp928 pxp928 approved these changes

@mihaimaruseac mihaimaruseac mihaimaruseac approved these changes

Assignees
No one assigned
Labels
size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[ingestion/data-quality issue] JSON lines files are rejected
3 participants
@robert-cronin @pxp928 @mihaimaruseac