Updates for parsing hashedrekord LogEntry #152
Conversation
src/rekor/models/hashedrekord.rs
Outdated
| let decoded_str = std::str::from_utf8(&decoded)?; | ||
| Ok(String::from(decoded_str)) |
There was a problem hiding this comment.
nitpicking, this can replaced with something like String::from_utf8
src/rekor/models/log_entry.rs
Outdated
| let decoded_str = std::str::from_utf8(&decoded)?; | ||
| let body = serde_json::from_str::<Body>(decoded_str)?; |
There was a problem hiding this comment.
I think this could be replaced with:
let body = serde_json::from_slice(decoded)?;
lkatalin
force-pushed
the
parse_logentry
branch
from
8b023da to
5cff63a
Compare
The presence of the url field does not allow a hashedrekord entry to be parsed properly. The hash field should be public for parsing also. Signed-off-by: Lily Sturmann <lsturman@redhat.com>
The presence of the field does not allow a hashedrekord entry to be parsed properly. Signed-off-by: Lily Sturmann <lsturman@redhat.com>
lkatalin
force-pushed
the
parse_logentry
branch
2 times, most recently
from
b088532 to
112ccee
Compare
- Make signature fields public - Add Body struct and implementation - add base64 decoding Signed-off-by: Lily Sturmann <lsturman@redhat.com>
|
You are right, thank you @flavio! |
|
|
||
| pub fn decode(&self) -> Result<String, SigstoreError> { | ||
| let decoded = decode(&self.content)?; | ||
| String::from_utf8(decoded).map_err(|e| SigstoreError::from(e.utf8_error())) |
There was a problem hiding this comment.
This is totally fine, but if you want to save some keystrokes (and avoid to go crazy figuring out how to convert the error), I find totally acceptable to do something like that:
let response = String::from_utf8(decoded)?;
Ok(response)There was a problem hiding this comment.
let me know if you want me to merge this as it is, or if you want to use the code from above. I'm totally fine with the current PR
There was a problem hiding this comment.
Thanks, I was going a little bit crazy. 🙃 However, I just tried this and it gives me an error
error[E0277]: `?` couldn't convert the error to `errors::SigstoreError`
--> src/rekor/models/hashedrekord.rs:86:50
|
86 | let response = String::from_utf8(decoded)?;
| ^ the trait `From<FromUtf8Error>` is not implemented for `errors::SigstoreError`
I can always implement FromUtf8Error as a SigstoreError in errors.rs, but it is so similar to Utf8Error that it seemed redundant. Is there still a way to use your trick in this case?
There was a problem hiding this comment.
ouch, yes... that would be redundant.
I think you could map this error into a more generic Sigstore one, like the UnexpectedError, you could build a message string with format! and provide some more context about the failure
There was a problem hiding this comment.
Hmm, yes, that is an option. I think mapping it to Unexpected with a string format would be more verbose (and in a sense less precise). Would you want to keep it as-is since we can't automatically convert to SigstoreError cleanly? Unless you think we do need more context, then I can add some.
There was a problem hiding this comment.
let's leave as it currently is, it's much cleaner. If we need to map this type of error again, we can then implement a StringFromUf8Error or something like that inside of SigstoreError
Fixes ===== * Fix typo in cosign/mod.rs doc comment by @danbev in sigstore#148 * Fix typo in KeyPair trait doc comment by @danbev in sigstore#149 * Update cached requirement from 0.39.0 to 0.40.0 by @dependabot in sigstore#154 * Fix typos in PublicKeyVerifier doc comments by @danbev in sigstore#155 * Fix: CI error for auto deref by @Xynnn007 in sigstore#160 * Fix typo and grammar in signature_layers.rs by @danbev in sigstore#161 * Remove unused imports in examples/rekor by @danbev in sigstore#162 * Update link to verification example by @danbev in sigstore#156 * Fix typos in from_encrypted_pem doc comments by @danbev in sigstore#164 * Fix typos in doc comments by @danbev in sigstore#163 * Update path to fulcio-cert in verify example by @danbev in sigstore#168 Enhancements ============ * Add getter functions for LogEntry fields by @lkatalin in sigstore#147 * Add TreeSize alias to Rekor by @avery-blanchard in sigstore#151 * Updates for parsing hashedrekord LogEntry by @lkatalin in sigstore#152 * Add certificate based verification by @flavio in sigstore#159 * Add support for OCI Image signing (spec v1.0) by @Xynnn007 in sigstore#158 Contributors ============ * Avery Blanchard (@avery-blanchardmade) * Daniel Bevenius (@danbev) * Flavio Castelli (@flavio) * Lily Sturmann (@lkatalin) * Xynnn (@Xynnn007) Signed-off-by: Flavio Castelli <fcastelli@suse.com>
Summary
Updates to remove nonexistent fields and add functionality to parse hashedrekord LogEntry struct.