Parse policy materials written in HJSON - #28
Merged
Merged
Conversation
The policy, policy set and policy group parsers fed raw bytes to protojson, so policies authored in HJSON (comments, unquoted keys, multiline strings) failed as unparseable when read through the attestation collector, even though the policy module itself accepts both formats. Normalize input to JSON before unmarshaling: valid JSON is untouched, HJSON is converted, and anything else is reported as not this format so other predicate parsers get their turn. On the HJSON path an empty or non-object document is rejected, since HJSON's braceless root would otherwise turn empty input into an empty policy. Signed-off-by: Adolfo Garc铆a Veytia (Puerco) <adolfo.garcia@uservers.net>
miniprow
Bot
added
lgtm
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: puerco The full list of commands accepted by this bot can be found here. DetailsApproved by a repository administrator.Approvers can indicate their approval by writing |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The policy, policy set and policy group parsers fed raw bytes to protojson, so policies authored in HJSON (comments, unquoted keys, multiline strings) failed as unparseable when read through the attestation collector, even though the policy module itself accepts both formats.
Normalize input to JSON before unmarshaling: valid JSON is untouched, HJSON is converted, and anything else is reported as not this format so other predicate parsers get their turn. On the HJSON path an empty or non-object document is rejected, since HJSON's braceless root would otherwise turn empty input into an empty policy.