Skip to content

Add index to hashed intoto envelope #761

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
dlorenc merged 2 commits into from
Apr 8, 2022
Merged

Add index to hashed intoto envelope #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de65048
Add index to intoto entry
asraa Apr 7, 2022
c115a32
fix tests
asraa Apr 8, 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: 9 additions & 0 deletions pkg/types/intoto/v0.0.1/entry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"fmt"
"io/ioutil"
"path/filepath"
"strings"

"github.com/in-toto/in-toto-golang/in_toto"
"github.com/secure-systems-lab/go-securesystemslib/dsse"
Expand Down Expand Up @@ -78,6 +79,9 @@ func (v V001Entry) IndexKeys() ([]string, error) {

switch v.env.PayloadType {
case in_toto.PayloadType:
hashkey := strings.ToLower(fmt.Sprintf("%s:%s", *v.IntotoObj.Content.Hash.Algorithm, *v.IntotoObj.Content.Hash.Value))
result = append(result, hashkey)

statement, err := parseStatement(v.env.Payload)
if err != nil {
return result, err
Expand Down Expand Up @@ -270,6 +274,11 @@ func (v V001Entry) CreateFromArtifactProperties(_ context.Context, props types.A
PublicKey: &kb,
},
}
h := sha256.Sum256([]byte(re.IntotoObj.Content.Envelope))
re.IntotoObj.Content.Hash = &models.IntotoV001SchemaContentHash{
Algorithm: swag.String(models.IntotoV001SchemaContentHashAlgorithmSha256),
Value: swag.String(hex.EncodeToString(h[:])),
}

returnVal.Spec = re.IntotoObj
returnVal.APIVersion = swag.String(re.APIVersion())
Expand Down
57 changes: 48 additions & 9 deletions pkg/types/intoto/v0.0.1/entry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ import (
"fmt"
"math/big"
"reflect"
"sort"
"strings"
"testing"

"github.com/go-openapi/strfmt"
"github.com/go-openapi/swag"
"github.com/google/go-cmp/cmp"
"github.com/in-toto/in-toto-golang/in_toto"
"github.com/secure-systems-lab/go-securesystemslib/dsse"
"github.com/sigstore/rekor/pkg/generated/models"
Expand Down Expand Up @@ -156,6 +160,9 @@ func TestV001Entry_Unmarshal(t *testing.T) {
PublicKey: p(pub),
Content: &models.IntotoV001SchemaContent{
Envelope: envelope(t, key, validPayload, "text"),
Hash: &models.IntotoV001SchemaContentHash{
Algorithm: swag.String(models.IntotoV001SchemaContentHashAlgorithmSha256),
},
},
},
wantErr: false,
Expand All @@ -166,6 +173,9 @@ func TestV001Entry_Unmarshal(t *testing.T) {
PublicKey: p([]byte(pemBytes)),
Content: &models.IntotoV001SchemaContent{
Envelope: envelope(t, priv, validPayload, "text"),
Hash: &models.IntotoV001SchemaContentHash{
Algorithm: swag.String(models.IntotoV001SchemaContentHashAlgorithmSha256),
},
},
},
wantErr: false,
Expand All @@ -176,6 +186,9 @@ func TestV001Entry_Unmarshal(t *testing.T) {
PublicKey: p(pub),
Content: &models.IntotoV001SchemaContent{
Envelope: string(invalid),
Hash: &models.IntotoV001SchemaContentHash{
Algorithm: swag.String(models.IntotoV001SchemaContentHashAlgorithmSha256),
},
},
},
wantErr: true,
Expand All @@ -186,6 +199,9 @@ func TestV001Entry_Unmarshal(t *testing.T) {
PublicKey: p([]byte("notavalidkey")),
Content: &models.IntotoV001SchemaContent{
Envelope: envelope(t, key, validPayload, "text"),
Hash: &models.IntotoV001SchemaContentHash{
Algorithm: swag.String(models.IntotoV001SchemaContentHashAlgorithmSha256),
},
},
},
wantErr: true,
Expand All @@ -194,22 +210,31 @@ func TestV001Entry_Unmarshal(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
v := &V001Entry{}
if tt.it.Content != nil {
h := sha256.Sum256([]byte(tt.it.Content.Envelope))
tt.it.Content.Hash.Value = swag.String(hex.EncodeToString(h[:]))
}

it := &models.Intoto{
Spec: tt.it,
}

var uv = func() error {
if err := v.Unmarshal(it); err != nil {
return err
}
if err := v.validate(); err != nil {
return err
}
keys, _ := v.IndexKeys()
h := sha256.Sum256([]byte(v.env.Payload))
sha := "sha256:" + hex.EncodeToString(h[:])
if keys[0] != sha {
return fmt.Errorf("expected index key: %s, got %s", sha, keys[0])
sha := sha256.Sum256([]byte(v.env.Payload))
// Always start with the hash
want := []string{"sha256:" + hex.EncodeToString(sha[:])}
hashkey := strings.ToLower(fmt.Sprintf("%s:%s", *tt.it.Content.Hash.Algorithm, *tt.it.Content.Hash.Value))
want = append(want, hashkey)
if got, _ := v.IndexKeys(); !reflect.DeepEqual(got, want) {
t.Errorf("V001Entry.IndexKeys() = %v, want %v", got, tt.want)
}

return nil
}
if err := uv(); (err != nil) != tt.wantErr {
Expand All @@ -220,6 +245,9 @@ func TestV001Entry_Unmarshal(t *testing.T) {
}

func TestV001Entry_IndexKeys(t *testing.T) {
h := sha256.Sum256([]byte("foo"))
dataSHA := hex.EncodeToString(h[:])
hashkey := strings.ToLower(fmt.Sprintf("%s:%s", "sha256", dataSHA))

tests := []struct {
name string
Expand All @@ -228,14 +256,14 @@ func TestV001Entry_IndexKeys(t *testing.T) {
}{
{
name: "standard",
want: []string{},
want: []string{hashkey},
statement: in_toto.Statement{
Predicate: "hello",
},
},
{
name: "subject",
want: []string{"sha256:foo"},
want: []string{"sha256:foo", hashkey},
statement: in_toto.Statement{
StatementHeader: in_toto.StatementHeader{
Subject: []in_toto.Subject{
Expand All @@ -259,6 +287,14 @@ func TestV001Entry_IndexKeys(t *testing.T) {
}
payload := base64.StdEncoding.EncodeToString(b)
v := V001Entry{
IntotoObj: models.IntotoV001Schema{
Content: &models.IntotoV001SchemaContent{
Hash: &models.IntotoV001SchemaContentHash{
Algorithm: swag.String(models.IntotoV001SchemaContentHashAlgorithmSha256),
Value: swag.String(dataSHA),
},
},
},
env: dsse.Envelope{
Payload: payload,
PayloadType: in_toto.PayloadType,
Expand All @@ -268,8 +304,11 @@ func TestV001Entry_IndexKeys(t *testing.T) {
// Always start with the hash
want := []string{"sha256:" + hex.EncodeToString(sha[:])}
want = append(want, tt.want...)
if got, _ := v.IndexKeys(); !reflect.DeepEqual(got, want) {
t.Errorf("V001Entry.IndexKeys() = %v, want %v", got, tt.want)
got, _ := v.IndexKeys()
sort.Strings(got)
sort.Strings(want)
if !cmp.Equal(got, want) {
t.Errorf("V001Entry.IndexKeys() = %v, want %v", got, want)
}
})
}
Expand Down