Add support for ed25519ph user keys in hashedrekord #1945

ret2libc · 2024-01-11T15:11:54Z

Summary

Add support for Ed25519ph user keys in hashedrekord type, so we can test #1724 better with 2 options (ecdsa+sha256 and ed25519ph).

This change requires sigstore/sigstore#1595 and #1959 .

Release Note

Added x509.NewSignatureWithOpts to support ED25519ph
Allow ED25519 public keys when validating hashedrekord entries

Documentation

ret2libc · 2024-01-11T15:13:32Z

cc @woodruffw @tetsuo-cpp

I'm not sure if we need a new version for the change in hashedrekor which allows sha512 as hash algorithm and not only sha256.

woodruffw · 2024-01-11T15:22:48Z

Thanks @ret2libc!

Yeah, I think we may need a 0.0.2 here, which means we'll probably want to hold off on making the complete hashedrekord changes until we have a full list of hashes we want to support. But I'm not 100% sure about that.

CCing @haydentherapper for opinions + @laurentsimon since I know you've been looking at similar changes to Rekor/hashedrekord 🙂

pkg/types/hashedrekord/v0.0.1/hashedrekord_v0_0_1_schema.json

haydentherapper · 2024-01-11T18:30:33Z

pkg/types/hashedrekord/v0.0.1/entry.go

@@ -160,11 +159,6 @@ func (v *V001Entry) validate() (pki.Signature, pki.PublicKey, error) {
 		return nil, nil, types.ValidationError(err)
 	}

-	_, isEd25519 := keyObj.CryptoPubKey().(ed25519.PublicKey)


Just for context, when I wrote up #1325, my intention was to support ed25519ph only for hashedrekord, and ed25519 for all other types. This might mean making some changes to the 'pkg/pki/x509/x509' library to support loading in a custom verifier like on

rekor/pkg/pki/x509/x509.go

Line 87 in 70d6663

verifier, err := sigsig.LoadVerifier(p, crypto.SHA256)

What do you think about this way of customizing the verifier?

pkg/types/hashedrekord/v0.0.1/entry_test.go

codecov · 2024-01-16T17:05:00Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 48.93%. Comparing base (488eb97) to head (4831505).
Report is 41 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff             @@
##             main    #1945       +/-   ##
===========================================
- Coverage   66.46%   48.93%   -17.53%     
===========================================
  Files          92       80       -12     
  Lines        9258     6641     -2617     
===========================================
- Hits         6153     3250     -2903     
- Misses       2359     2987      +628     
+ Partials      746      404      -342

Flag	Coverage Δ
e2etests	`?`
unittests	`48.93% <100.00%> (+1.25%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

pkg/types/hashedrekord/v0.0.1/entry.go

bobcallaway · 2024-01-17T18:59:00Z

I threw this together as the smallest change to add sha384 and sha512 to the rekor type. I'm happy to use your PR as the definitive change, but wanted to compare/contrast what was strictly needed to extend the enum, VS what was needed for the ed25519ph key types.

i don't think we need a 0.0.2 version of hashedrekord for this, since we're not actually changing the structure or canonicalization logic of the type.

bobcallaway · 2024-01-17T19:04:01Z

go.mod

@@ -204,3 +204,5 @@ require (
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+replace github.com/sigstore/sigstore => github.com/trail-of-forks/sigstore v0.0.0-20240117103256-3095d93bafe8


this would need to be removed before merging.

Yep! I believe this is here until sigstore/sigstore#1595 gets merged (correct me if I'm wrong @ret2libc), so it probably makes sense to merge #1958 first and then we can rebase here 🙂

haydentherapper

LGTM, this looks good.

While this might be obvious from the change since it only modifies hashedrekord, i wanted to double check that this won't affect other types. rekord also uses x509.NewSignature indirectly through a factory, but given that we've added a new signature function rather than modify the existing one, this has no impact on other types.

Let's merge #1958 first (or split this into two) if that works for you, just to make it easier to see the two different changes.

ret2libc · 2024-01-18T10:20:26Z

I threw this together as the smallest change to add sha384 and sha512 to the rekor type. I'm happy to use your PR as the definitive change, but wanted to compare/contrast what was strictly needed to extend the enum, VS what was needed for the ed25519ph key types.

i don't think we need a 0.0.2 version of hashedrekord for this, since we're not actually changing the structure or canonicalization logic of the type.

I have included the changes in your PR into mine, and mentioned you in the commit 2577342 . If that's not the proper way to "borrow" code let me know how I should note your help!

By the way, @haydentherapper I'm going to split this into SHA* additions and ED25519ph support.

haydentherapper · 2024-01-19T01:00:57Z

LGTM, thanks for splitting. Will approve once the sigstore/sigstore PR is merged.

haydentherapper

LGTM, thanks for splitting this PR up. Will approve once we merge s/s and remove the replace.

go.mod

haydentherapper

LGTM, thanks for your patience and for all the discussion on the underlying verifier interface. This came out really clean!

Can you update the test for this (https://github.com/sigstore/rekor/blob/main/pkg/types/hashedrekord/v0.0.1/entry_test.go#L116-L120 and https://github.com/sigstore/rekor/blob/main/pkg/types/hashedrekord/v0.0.1/entry_test.go#L195-L211), which I would have expected to be failing now (so it might not have been testing the right thing)?

haydentherapper · 2024-02-15T21:35:26Z

@ret2libc can you rebase?

ret2libc · 2024-02-19T08:48:16Z

@ret2libc can you rebase?

@haydentherapper rebased! Sorry for the delay

haydentherapper · 2024-02-19T16:35:23Z

No worries! Sorry, need one more rebase

haydentherapper · 2024-02-28T22:27:58Z

go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/rs/cors v1.10.1
 	github.com/sassoftware/relic v7.2.1+incompatible
 	github.com/secure-systems-lab/go-securesystemslib v0.8.0
-	github.com/sigstore/sigstore v1.8.1
+	github.com/sigstore/sigstore v1.8.2-0.20240215213640-922069a3bc39


can you also bump to v1.8.2, we just cut a release

Sure, doing now!

bobcallaway · 2024-03-04T16:08:43Z

other than fixing the merge conflict, I think this is ready to go

Signed-off-by: Riccardo Schirone <riccardo.schirone@trailofbits.com>

- Made X509 Signatures configurable with LoadOptions - Removed existing check that limited the use of Ed25519 keys in HashedRekord entries - Used Ed25519ph Signer/Verifier for HashedRekord entries Signed-off-by: Riccardo Schirone <riccardo.schirone@trailofbits.com>

Signed-off-by: Riccardo Schirone <riccardo.schirone@trailofbits.com>

ret2libc mentioned this pull request Jan 11, 2024

Allow configurable client signing algorithms #1724

Open

ret2libc force-pushed the support-ed25519ph branch from f4cebe8 to f791e53 Compare January 11, 2024 15:15

haydentherapper reviewed Jan 11, 2024

View reviewed changes

ret2libc commented Jan 15, 2024

View reviewed changes

pkg/types/hashedrekord/v0.0.1/entry_test.go Outdated Show resolved Hide resolved

haydentherapper self-requested a review January 17, 2024 05:06

ret2libc force-pushed the support-ed25519ph branch from 2d93686 to 51caf32 Compare January 17, 2024 14:20

ret2libc commented Jan 17, 2024

View reviewed changes

pkg/types/hashedrekord/v0.0.1/entry.go Outdated Show resolved Hide resolved

ret2libc marked this pull request as ready for review January 17, 2024 14:22

ret2libc requested review from bobcallaway and a team as code owners January 17, 2024 14:22

ret2libc changed the title ~~Add support for ed25519ph user keys~~ Add support for ed25519ph user keys in hashedrekord Jan 17, 2024

bobcallaway reviewed Jan 17, 2024

View reviewed changes

haydentherapper reviewed Jan 18, 2024

View reviewed changes

ret2libc mentioned this pull request Jan 18, 2024

add support for sha384 and sha512 to hashedrekord type #1958

Closed

ret2libc force-pushed the support-ed25519ph branch from 51caf32 to 9e56691 Compare January 18, 2024 10:18

ret2libc mentioned this pull request Jan 18, 2024

Added support for sha384/sha512 hash algorithms in hashedrekords #1959

Merged

ret2libc force-pushed the support-ed25519ph branch from 9e56691 to e1fb2d1 Compare January 18, 2024 10:26

ret2libc mentioned this pull request Jan 19, 2024

Add support for ED25519ph for sign/verify(-blob) commands sigstore/cosign#3479

Open

haydentherapper reviewed Jan 24, 2024

View reviewed changes

ret2libc force-pushed the support-ed25519ph branch 2 times, most recently from 3007336 to e5112b6 Compare January 26, 2024 13:29

haydentherapper reviewed Jan 29, 2024

View reviewed changes

go.mod Outdated Show resolved Hide resolved

ret2libc force-pushed the support-ed25519ph branch from 3ac4c89 to 3971e51 Compare January 30, 2024 08:34

tetsuo-cpp mentioned this pull request Jan 30, 2024

Allow configurable algorithms in verification sigstore/sigstore-go#76

Draft

haydentherapper reviewed Feb 5, 2024

View reviewed changes

ret2libc force-pushed the support-ed25519ph branch from 9ce4b39 to 1dece02 Compare February 6, 2024 09:09

ret2libc requested a review from haydentherapper February 6, 2024 09:41

haydentherapper previously approved these changes Feb 6, 2024

View reviewed changes

haydentherapper requested a review from bobcallaway February 6, 2024 17:19

ret2libc dismissed haydentherapper’s stale review via 2461e69 February 19, 2024 08:47

ret2libc force-pushed the support-ed25519ph branch from 1dece02 to 2461e69 Compare February 19, 2024 08:47

haydentherapper reviewed Feb 28, 2024

View reviewed changes

haydentherapper previously approved these changes Feb 28, 2024

View reviewed changes

bobcallaway previously approved these changes Feb 28, 2024

View reviewed changes

ret2libc added 3 commits March 4, 2024 17:22

Update sigstore/sigstore and use LoadOptions

890523d

Signed-off-by: Riccardo Schirone <riccardo.schirone@trailofbits.com>

Fix entry tests to ensure ed25519 is now accepted

4831505

Signed-off-by: Riccardo Schirone <riccardo.schirone@trailofbits.com>

ret2libc dismissed stale reviews from bobcallaway and haydentherapper via 4831505 March 4, 2024 16:22

ret2libc force-pushed the support-ed25519ph branch from d5141b6 to 4831505 Compare March 4, 2024 16:22

ret2libc requested a review from bobcallaway March 4, 2024 16:23

haydentherapper approved these changes Mar 4, 2024

View reviewed changes

bobcallaway merged commit 92742be into sigstore:main Mar 4, 2024
14 checks passed

github-actions bot added this to the v1.2.2 milestone Mar 4, 2024

woodruffw deleted the support-ed25519ph branch March 4, 2024 16:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for ed25519ph user keys in hashedrekord #1945

Add support for ed25519ph user keys in hashedrekord #1945

ret2libc commented Jan 11, 2024 •

edited

ret2libc commented Jan 11, 2024

woodruffw commented Jan 11, 2024

haydentherapper Jan 11, 2024

ret2libc Jan 12, 2024

codecov bot commented Jan 16, 2024 •

edited

bobcallaway commented Jan 17, 2024

bobcallaway Jan 17, 2024

woodruffw Jan 17, 2024

haydentherapper left a comment

ret2libc commented Jan 18, 2024

haydentherapper commented Jan 19, 2024

haydentherapper left a comment

haydentherapper left a comment

haydentherapper commented Feb 15, 2024

ret2libc commented Feb 19, 2024

haydentherapper commented Feb 19, 2024

haydentherapper Feb 28, 2024

woodruffw Feb 28, 2024

bobcallaway commented Mar 4, 2024

Add support for ed25519ph user keys in hashedrekord #1945

Add support for ed25519ph user keys in hashedrekord #1945

Conversation

ret2libc commented Jan 11, 2024 • edited

Summary

Release Note

Documentation

ret2libc commented Jan 11, 2024

woodruffw commented Jan 11, 2024

haydentherapper Jan 11, 2024

Choose a reason for hiding this comment

ret2libc Jan 12, 2024

Choose a reason for hiding this comment

codecov bot commented Jan 16, 2024 • edited

Codecov Report

bobcallaway commented Jan 17, 2024

bobcallaway Jan 17, 2024

Choose a reason for hiding this comment

woodruffw Jan 17, 2024

Choose a reason for hiding this comment

haydentherapper left a comment

Choose a reason for hiding this comment

ret2libc commented Jan 18, 2024

haydentherapper commented Jan 19, 2024

haydentherapper left a comment

Choose a reason for hiding this comment

haydentherapper left a comment

Choose a reason for hiding this comment

haydentherapper commented Feb 15, 2024

ret2libc commented Feb 19, 2024

haydentherapper commented Feb 19, 2024

haydentherapper Feb 28, 2024

Choose a reason for hiding this comment

woodruffw Feb 28, 2024

Choose a reason for hiding this comment

bobcallaway commented Mar 4, 2024

ret2libc commented Jan 11, 2024 •

edited

codecov bot commented Jan 16, 2024 •

edited