Skip to content

Commit ee9b1b9

Browse files
authored
Merge pull request #1037 from sigstore/enable-rekor-v2
fix(test): Verify signing result for Rekor v1 vs. v2
2 parents 47f52ac + 7108383 commit ee9b1b9

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

sigstore-java/src/test/java/dev/sigstore/KeylessTest.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void sign_production() throws Exception {
6464
var signer = KeylessSigner.builder().sigstorePublicDefaults().build();
6565
var results = signer.sign(artifactDigests);
6666

67-
verifySigningResult(results);
67+
verifySigningResult(results, false);
6868

6969
var verifier = KeylessVerifier.builder().sigstorePublicDefaults().build();
7070
for (int i = 0; i < results.size(); i++) {
@@ -81,7 +81,7 @@ public void sign_staging(boolean enableRekorV2) throws Exception {
8181
var signer =
8282
KeylessSigner.builder().sigstoreStagingDefaults().enableRekorV2(enableRekorV2).build();
8383
var results = signer.sign(artifactDigests);
84-
verifySigningResult(results);
84+
verifySigningResult(results, enableRekorV2);
8585

8686
var verifier = KeylessVerifier.builder().sigstoreStagingDefaults().build();
8787
for (int i = 0; i < results.size(); i++) {
@@ -90,7 +90,7 @@ public void sign_staging(boolean enableRekorV2) throws Exception {
9090
}
9191
}
9292

93-
private void verifySigningResult(List<Bundle> results) throws IOException {
93+
private void verifySigningResult(List<Bundle> results, boolean enableRekorV2) throws IOException {
9494

9595
Assertions.assertEquals(artifactDigests.size(), results.size());
9696

@@ -111,6 +111,14 @@ private void verifySigningResult(List<Bundle> results) throws IOException {
111111
result.getMessageSignature().get().getMessageDigest().get().getHashAlgorithm());
112112
// check if required inclusion proof exists
113113
Assertions.assertNotNull(result.getEntries().get(0).getVerification().getInclusionProof());
114+
115+
if (enableRekorV2) {
116+
Assertions.assertEquals(
117+
"0.0.2", result.getEntries().get(0).getBodyDecoded().getApiVersion());
118+
} else {
119+
Assertions.assertEquals(
120+
"0.0.1", result.getEntries().get(0).getBodyDecoded().getApiVersion());
121+
}
114122
}
115123
}
116124

0 commit comments

Comments
 (0)