Skip to content

Provenance attestation fixes #3428

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
tonistiigi merged 3 commits into from
Dec 20, 2022
Merged

Provenance attestation fixes #3428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d4b56a
add possibility to override filename for provenance
tonistiigi Dec 20, 2022
103a0a1
provenance: move hermetic field into a correct struct
tonistiigi Dec 20, 2022
ad85ce7
provenance: fix the order of the build steps
tonistiigi Dec 20, 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
4 changes: 2 additions & 2 deletions frontend/dockerfile/dockerfile_provenance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ RUN echo "ok" > /foo

require.False(t, pred.Metadata.Completeness.Materials)
require.False(t, pred.Metadata.Reproducible)
require.False(t, pred.Metadata.Completeness.Hermetic)
require.False(t, pred.Metadata.Hermetic)

if mode == "max" || mode == "" {
require.Equal(t, 2, len(pred.Metadata.BuildKitMetadata.Layers))
Expand Down Expand Up @@ -347,8 +347,8 @@ COPY myapp.Dockerfile /
require.Equal(t, 0, len(pred.Invocation.Parameters.Locals))

require.True(t, pred.Metadata.Completeness.Materials)
require.True(t, pred.Metadata.Completeness.Hermetic)
require.True(t, pred.Metadata.Completeness.Environment)
require.True(t, pred.Metadata.Hermetic)

if isClient {
require.False(t, pred.Metadata.Completeness.Parameters)
Expand Down
7 changes: 6 additions & 1 deletion solver/llbsolver/proc/provenance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ func ProvenanceProcessor(attrs map[string]string) llbsolver.Processor {
return nil, err
}

filename := "provenance.json"
if v, ok := attrs["filename"]; ok {
filename = v
}

res.AddAttestation(p.ID, llbsolver.Attestation{
Kind: gatewaypb.AttestationKindInToto,
Metadata: map[string][]byte{
Expand All @@ -51,7 +56,7 @@ func ProvenanceProcessor(attrs map[string]string) llbsolver.Processor {
InToto: result.InTotoAttestation{
PredicateType: slsa02.PredicateSLSAProvenance,
},
Path: "provenance.json",
Path: filename,
ContentFunc: func() ([]byte, error) {
pr, err := pc.Predicate()
if err != nil {
Expand Down
7 changes: 1 addition & 6 deletions solver/llbsolver/provenance/buildconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,6 @@ func toBuildSteps(def *pb.Definition) ([]BuildStep, map[digest.Digest]int, error
if err != nil {
return nil, nil, err
}
for i := 0; i < len(dgsts)/2; i++ {
j := len(dgsts) - 1 - i
dgsts[i], dgsts[j] = dgsts[j], dgsts[i]
}

indexes := map[digest.Digest]int{}
for i, dgst := range dgsts {
indexes[dgst] = i
Expand Down Expand Up @@ -179,7 +174,6 @@ func walkDigests(dgsts []digest.Digest, ops map[digest.Digest]*pb.Op, dgst diges
if op == nil {
return nil, errors.Errorf("invalid nil input %v", dgst)
}
dgsts = append(dgsts, dgst)
visited[dgst] = struct{}{}
for _, inp := range op.Inputs {
var err error
Expand All @@ -188,5 +182,6 @@ func walkDigests(dgsts []digest.Digest, ops map[digest.Digest]*pb.Op, dgst diges
return nil, err
}
}
dgsts = append(dgsts, dgst)
return dgsts, nil
}
15 changes: 5 additions & 10 deletions solver/llbsolver/provenance/predicate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,8 @@ type Environment struct {

type ProvenanceMetadata struct {
slsa02.ProvenanceMetadata
Completeness ProvenanceComplete `json:"completeness"`
BuildKitMetadata BuildKitMetadata `json:"https://mobyproject.org/buildkit@v1#metadata,omitempty"`
}

type ProvenanceComplete struct {
slsa02.ProvenanceComplete
Hermetic bool `json:"https://mobyproject.org/buildkit@v1#hermetic,omitempty"`
BuildKitMetadata BuildKitMetadata `json:"https://mobyproject.org/buildkit@v1#metadata,omitempty"`
Hermetic bool `json:"https://mobyproject.org/buildkit@v1#hermetic,omitempty"`
}

type BuildKitMetadata struct {
Expand Down Expand Up @@ -211,14 +206,14 @@ func NewPredicate(c *Capture) (*ProvenancePredicate, error) {
Materials: materials,
},
Metadata: &ProvenanceMetadata{
Completeness: ProvenanceComplete{
ProvenanceComplete: slsa02.ProvenanceComplete{
ProvenanceMetadata: slsa02.ProvenanceMetadata{
Completeness: slsa02.ProvenanceComplete{
Parameters: c.Frontend != "",
Environment: true,
Materials: !incompleteMaterials,
},
Hermetic: !incompleteMaterials && !c.NetworkAccess,
},
Hermetic: !incompleteMaterials && !c.NetworkAccess,
},
}

Expand Down