Skip to content

Add arifactDigest as input option for conformance #859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Add arifactDigest as input option for conformance #859

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions sigstore-cli/src/main/java/dev/sigstore/cli/Verify.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.security.cert.CertPath;
import java.util.Base64;
import java.util.concurrent.Callable;
import org.apache.commons.codec.binary.Hex;
import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
Expand All @@ -48,8 +49,14 @@
aliases = {"verify-bundle"},
description = "verify an artifact")
public class Verify implements Callable<Integer> {
@Parameters(arity = "1", paramLabel = "<artifact>", description = "artifact to verify")
Path artifact;

private static final String SHA256_PREFIX = "sha256:";

@Parameters(
arity = "1",
paramLabel = "<artifact>",
description = "an artifact path or artifact hash (sha256:abc...) to verify")
String artifact;

@ArgGroup(multiplicity = "1", exclusive = true)
SignatureFiles signatureFiles;
Expand Down Expand Up @@ -107,7 +114,10 @@ static class Policy {

@Override
public Integer call() throws Exception {
byte[] digest = asByteSource(artifact.toFile()).hash(Hashing.sha256()).asBytes();
byte[] digest =
artifact.startsWith(SHA256_PREFIX)
? Hex.decodeHex(artifact.substring(SHA256_PREFIX.length()))
: asByteSource(Path.of(artifact).toFile()).hash(Hashing.sha256()).asBytes();

Bundle bundle;
if (signatureFiles.sigAndCert != null) {
Expand Down Expand Up @@ -178,7 +188,11 @@ public Integer call() throws Exception {
} else {
throw new IllegalStateException("Unable to initialize verifier");
}
verifier.verify(artifact, bundle, verificationOptions);
if (artifact.startsWith(SHA256_PREFIX)) {
verifier.verify(digest, bundle, verificationOptions);
} else {
verifier.verify(Path.of(artifact), bundle, verificationOptions);
}
return 0;
}
}
Loading