Skip to content
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

Jump to bottom

fix: remove signing certificate output #160

Merged
merged 5 commits into from
Jul 22, 2022
Merged

fix: remove signing certificate output #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc1d297
remove signing certificate output
asraa Jul 21, 2022
4423925
add verified
asraa Jul 21, 2022
cef1c63
update readme
asraa Jul 21, 2022
4a65e23
Merge branch 'main' into remove-signing-cert-info
asraa Jul 21, 2022
f56f880
add error message about pem
asraa Jul 22, 2022
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
9 changes: 1 addition & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,7 @@ $ go run . --help
```bash
$ go run . -artifact-path ~/Downloads/slsa-verifier-linux-amd64 -provenance ~/Downloads/slsa-verifier-linux-amd64.intoto.jsonl -source github.com/slsa-framework/slsa-verifier -tag v1.1.1
Verified signature against tlog entry index 2727751 at URL: https://rekor.sigstore.dev/api/v1/log/entries/8f3d898ef17d9c4c028fe3da09fb786c900bf786361e75432f325b4848fdba24
Signing certificate information:
{
"caller": "slsa-framework/slsa-verifier",
"commit": "5875b0a74f4c04e1f123a3ad81d6c7c5a86860ce",
"job_workflow_ref": "/slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@refs/tags/v1.1.1",
"trigger": "push",
"issuer": "https://token.actions.githubusercontent.com"
}
Verified build using builder https://github.com/slsa-framework/slsa-github-generator/.github/workflows/builder_go_slsa3.yml@refs/tags/v1.1.0 at commit 76a59d8413f27259b97298da91bbb6511fc775d1
PASSED: Verified SLSA provenance
```

Expand Down
10 changes: 3 additions & 7 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"crypto/sha256"
"encoding/base64"
"encoding/hex"
"encoding/json"
"flag"
"fmt"
"io"
Expand Down Expand Up @@ -48,12 +47,6 @@ func verify(ctx context.Context,
return nil, err
}

b, err := json.MarshalIndent(workflowInfo, "", "\t")
if err != nil {
return nil, err
}
fmt.Fprintf(os.Stderr, "Signing certificate information:\n %s\n", b)

// Verify the workflow identity.
if err := pkg.VerifyWorkflowIdentity(workflowInfo, source); err != nil {
return nil, err
Expand All @@ -65,6 +58,9 @@ func verify(ctx context.Context,
return nil, err
}

fmt.Fprintf(os.Stderr, "Verified build using builder https://github.com%s at commit %s\n",
workflowInfo.JobWobWorkflowRef,
workflowInfo.CallerHash)
// Return verified provenance.
return base64.StdEncoding.DecodeString(env.Payload)
}
Expand Down
3 changes: 3 additions & 0 deletions pkg/rekor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ func extractCert(e *models.LogEntryAnon) (*x509.Certificate, error) {
}

func intotoEntry(certPem []byte, provenance []byte) (*intotod.V001Entry, error) {
if len(certPem) == 0 {
return nil, fmt.Errorf("no signing certificate found in intoto envelope")
}
cert := strfmt.Base64(certPem)
return &intotod.V001Entry{
IntotoObj: models.IntotoV001Schema{
Expand Down