openapi: more hackery #5
Merged
Conversation
This file contains 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
Signed-off-by: William Woodruff <william@trailofbits.com>
Signed-off-by: William Woodruff <william@trailofbits.com>
Signed-off-by: William Woodruff <william@trailofbits.com>
woodruffw
commented
Apr 19, 2024
Comment on lines
+47
to
+55
| # LogEntry.body is incorrectly marked as an object in the current | ||
| # schema; adjust to a string. Technically the same condition as | ||
| # below, but separate for easy removal when fixed upstream. | ||
| # https://github.com/sigstore/rekor/pull/2091 | ||
| elif .key == "body" and .value.type? == "object" then | ||
| .value = {"type": "string"} | ||
| # Fix missing inner type on LogEntry.attestation.data. | ||
| elif .key == "attestation" and .value.type? == "object" then | ||
| .value = {"type": "object", "properties": { "data": {"type": "string", "format": "byte"}}} |
There was a problem hiding this comment.
This applies two fixes:
LogEntry.bodyis marked as a JSON object in the upstream schema, but it's really a (base64) string.- The previous patch for
LogEntry.attestationwas slightly wrong, but went un-noticed since relatively few entries have an attestation:attestationis an object not a string, but its innerdatamember is a bas64 string.
There was a problem hiding this comment.
Looks pretty reasonable (or as reasonable as this pile of hacks can be); thanks for digging into this: I took the schema at its word when it claimed that LogEntry.body was type: object.
Signed-off-by: William Woodruff <william@trailofbits.com>
|
Blocked on merge of sigstore/rekor#2092. Once that's in, I can update the repo + ref for Rekor back to upstream. |
Signed-off-by: William Woodruff <william@trailofbits.com>
tnytown
approved these changes
Apr 19, 2024
Signed-off-by: William Woodruff <william@trailofbits.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a temporary workaround for sigstore/rekor#2091:
LogEntry.bodyis marked as an object but is really a base64 string.