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

Add RawV2 Results to the JSON Output #1273

Merged

Conversation

yilmi
Copy link
Contributor

@yilmi yilmi commented Apr 20, 2023

@ahrav did work on adding a RawV2 field in the Result struct to permit the collection of multipart secrets. This work was completed in #710 last year.

While the current implementation collects RawV2 for a lot of detector types, this value is never passed to the JSON Result output.

This PR changes this behavior:

  • Adding the RawV2 values to the JSON output
  • Handling RawV2 for the Azure, Datadog and GCP detectors

@yilmi yilmi requested review from a team as code owners April 20, 2023 19:59
@dustin-decker
Copy link
Contributor

Thanks @yilmi. Could you pull the latest from main? There is a conflict with #1271 which was recently merged and added RawV2 to GCP, but using the cleaned marshaled json.

@yilmi
Copy link
Contributor Author

yilmi commented Apr 20, 2023

Thanks @yilmi. Could you pull the latest from main? There is a conflict with #1271 which was recently merged and added RawV2 to GCP, but using the cleaned marshaled json.

@dustin-decker done, I saw the other PR and was waiting for your input, I removed my changes so the GCP detector shouldn't be affected by this PR now. Let me know if there's anything else, thanks!

Copy link
Contributor

@dustin-decker dustin-decker left a comment

Choose a reason for hiding this comment

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

Looks good, thanks @yilmi!

@dustin-decker dustin-decker merged commit a002ba9 into trufflesecurity:main Apr 20, 2023
@yilmi yilmi deleted the add-rawv2-to-results branch April 21, 2023 08:26
@yilmi
Copy link
Contributor Author

yilmi commented Apr 21, 2023

Thanks @dustin-decker, I don't want to push it but do you think you folks could release this change along with the rest of @ahrav work on the utf-8 and base64 decoders? We have our scheduled scan running on Friday evenings, I'd like to consume the latest changes to get all the nice changes from v3.32.0 and this. If not that's ok, I can also wait ;-)

@ahrav
Copy link
Collaborator

ahrav commented Apr 21, 2023

Thanks @dustin-decker, I don't want to push it but do you think you folks could release this change along with the rest of @ahrav work on the utf-8 and base64 decoders? We have our scheduled scan running on Friday evenings, I'd like to consume the latest changes to get all the nice changes from v3.32.0 and this. If not that's ok, I can also wait ;-)

just tagged v3.32.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants