types: refactor multiple fuzzers

Signed-off-by: AdamKorcz <adam@adalogics.com>

pkg/fuzz/fuzz_utils.go

@@ -0,0 +1,74 @@
+//
+// Copyright 2022 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package fuzz
+
+import (
+	"net/url"
+	"os"
+	"path/filepath"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+
+	fuzz "github.com/AdaLogics/go-fuzz-headers"
+
+	"github.com/sigstore/rekor/pkg/log"
+	"github.com/sigstore/rekor/pkg/types"
+)
+
+func CreateProps(ff *fuzz.ConsumeFuzzer) (types.ArtifactProperties, func(), error) {
+	props := types.ArtifactProperties{}
+	ff.GenerateStruct(&props) //nolint:all
+
+	if props.ArtifactBytes == nil {
+		artifactBytes, err := ff.GetBytes()
+		if err != nil {
+			return props, nil, err
+		}
+		artifactFile, err := os.Create("ArtifactFile")
+		if err != nil {
+			return props, nil, err
+		}
+		defer artifactFile.Close()
+
+		artifactPath, err := filepath.Abs("ArtifactFile")
+		if err != nil {
+			return props, nil, err
+		}
+		artifactURL, err := url.Parse(artifactPath)
+		if err != nil {
+			return props, nil, err
+		}
+		props.ArtifactPath = artifactURL
+
+		_, err = artifactFile.Write(artifactBytes)
+		return props, func() {
+			os.Remove("ArtifactFile")
+		}, err
+
+	}
+	return props, func() {}, nil
+}
+
+func SetFuzzLogger() {
+	config := zap.NewProductionConfig()
+	config.Level = zap.NewAtomicLevelAt(zapcore.FatalLevel)
+	logger, err := config.Build()
+	if err != nil {
+		panic(err)
+	}
+	log.Logger = logger.Named("rekor-fuzz-logger").Sugar()
+}

pkg/types/cose/fuzz_test.go

@@ -17,13 +17,18 @@ package cose
 
 import (
 	"context"
+	"sync"
 	"testing"
 
+	fuzzUtils "github.com/sigstore/rekor/pkg/fuzz"
 	"github.com/sigstore/rekor/pkg/types"
 )
 
+var initter sync.Once
+
 func FuzzCreateProposedEntry(f *testing.F) {
 	f.Fuzz(func(t *testing.T, version string) {
+		initter.Do(fuzzUtils.SetFuzzLogger)
 		ctx := context.Background()
 		brt := New()
 		props := types.ArtifactProperties{}

pkg/types/helm/fuzz_test.go → pkg/types/helm/v0.0.1/fuzz_test.go

@@ -18,19 +18,32 @@ package helm
 import (
 	"bytes"
 	"context"
+	"sync"
 	"testing"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
-	"github.com/sigstore/rekor/pkg/types"
+	fuzzUtils "github.com/sigstore/rekor/pkg/fuzz"
+	"github.com/sigstore/rekor/pkg/types/helm"
 )
 
+var initter sync.Once
+
 func FuzzHelmCreateProposedEntry(f *testing.F) {
-	f.Fuzz(func(t *testing.T, version string, propsData []byte) {
+	f.Fuzz(func(t *testing.T, propsData []byte) {
+		initter.Do(fuzzUtils.SetFuzzLogger)
+
+		version := "0.0.1"
+
 		ff := fuzz.NewConsumer(propsData)
-		props := types.ArtifactProperties{}
-		ff.GenerateStruct(&props)
-		it := New()
+
+		props, cleanup, err := fuzzUtils.CreateProps(ff)
+		if err != nil {
+			t.Skip()
+		}
+		defer cleanup()
+
+		it := helm.New()
 		entry, err := it.CreateProposedEntry(context.Background(), version, props)
 		if err != nil {
 			t.Skip()
@@ -44,7 +57,7 @@ func FuzzHelmCreateProposedEntry(f *testing.F) {
 
 func FuzzHelmProvenanceUnmarshal(f *testing.F) {
 	f.Fuzz(func(t *testing.T, provenanceData []byte) {
-		p := &Provenance{}
+		p := &helm.Provenance{}
 		r := bytes.NewReader(provenanceData)
 		p.Unmarshal(r)
 	})

pkg/types/intoto/fuzz_test.go → pkg/types/intoto/v0.0.1/fuzz_test.go

@@ -17,19 +17,32 @@ package intoto
 
 import (
 	"context"
+	"sync"
 	"testing"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
-	"github.com/sigstore/rekor/pkg/types"
+	fuzzUtils "github.com/sigstore/rekor/pkg/fuzz"
+	"github.com/sigstore/rekor/pkg/types/intoto"
 )
 
+var initter sync.Once
+
 func FuzzIntotoCreateProposedEntry(f *testing.F) {
-	f.Fuzz(func(t *testing.T, version string, propsData []byte) {
+	f.Fuzz(func(t *testing.T, propsData []byte) {
+		initter.Do(fuzzUtils.SetFuzzLogger)
+
+		version := "0.0.1"
+
 		ff := fuzz.NewConsumer(propsData)
-		props := types.ArtifactProperties{}
-		ff.GenerateStruct(&props)
-		it := New()
+
+		props, cleanup, err := fuzzUtils.CreateProps(ff)
+		if err != nil {
+			t.Skip()
+		}
+		defer cleanup()
+
+		it := intoto.New()
 		entry, err := it.CreateProposedEntry(context.Background(), version, props)
 		if err != nil {
 			t.Skip()

pkg/types/intoto/v0.0.2/fuzz_test.go

@@ -0,0 +1,55 @@
+//
+// Copyright 2022 The Sigstore Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package intoto
+
+import (
+	"context"
+	"sync"
+	"testing"
+
+	fuzz "github.com/AdaLogics/go-fuzz-headers"
+
+	fuzzUtils "github.com/sigstore/rekor/pkg/fuzz"
+	"github.com/sigstore/rekor/pkg/types/intoto"
+)
+
+var initter sync.Once
+
+func FuzzIntotoCreateProposedEntry(f *testing.F) {
+	f.Fuzz(func(t *testing.T, propsData []byte) {
+		initter.Do(fuzzUtils.SetFuzzLogger)
+
+		version := "0.0.2"
+
+		ff := fuzz.NewConsumer(propsData)
+
+		props, cleanup, err := fuzzUtils.CreateProps(ff)
+		if err != nil {
+			t.Skip()
+		}
+		defer cleanup()
+
+		it := intoto.New()
+		entry, err := it.CreateProposedEntry(context.Background(), version, props)
+		if err != nil {
+			t.Skip()
+		}
+		_, err = it.UnmarshalEntry(entry)
+		if err != nil {
+			t.Skip()
+		}
+	})
+}

pkg/types/rekord/fuzz_test.go → pkg/types/rekord/v0.0.1/fuzz_test.go

@@ -17,19 +17,32 @@ package rekord
 
 import (
 	"context"
+	"sync"
 	"testing"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
-	"github.com/sigstore/rekor/pkg/types"
+	fuzzUtils "github.com/sigstore/rekor/pkg/fuzz"
+	"github.com/sigstore/rekor/pkg/types/rekord"
 )
 
+var initter sync.Once
+
 func FuzzRekordCreateProposedEntry(f *testing.F) {
-	f.Fuzz(func(t *testing.T, version string, propsData []byte) {
+	f.Fuzz(func(t *testing.T, propsData []byte) {
+		initter.Do(fuzzUtils.SetFuzzLogger)
+
+		version := "0.0.1"
+
 		ff := fuzz.NewConsumer(propsData)
-		props := types.ArtifactProperties{}
-		ff.GenerateStruct(&props)
-		it := New()
+
+		props, cleanup, err := fuzzUtils.CreateProps(ff)
+		if err != nil {
+			t.Skip()
+		}
+		defer cleanup()
+
+		it := rekord.New()
 		entry, err := it.CreateProposedEntry(context.Background(), version, props)
 		if err != nil {
 			t.Skip()

pkg/types/rfc3161/fuzz_test.go → pkg/types/rfc3161/v0.0.1/fuzz_test.go

@@ -17,19 +17,32 @@ package rfc3161
 
 import (
 	"context"
+	"sync"
 	"testing"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
-	"github.com/sigstore/rekor/pkg/types"
+	fuzzUtils "github.com/sigstore/rekor/pkg/fuzz"
+	"github.com/sigstore/rekor/pkg/types/rfc3161"
 )
 
+var initter sync.Once
+
 func FuzzRfc3161CreateProposedEntry(f *testing.F) {
-	f.Fuzz(func(t *testing.T, version string, propsData []byte) {
+	f.Fuzz(func(t *testing.T, propsData []byte) {
+		initter.Do(fuzzUtils.SetFuzzLogger)
+
+		version := "0.0.1"
+
 		ff := fuzz.NewConsumer(propsData)
-		props := types.ArtifactProperties{}
-		ff.GenerateStruct(&props)
-		it := New()
+
+		props, cleanup, err := fuzzUtils.CreateProps(ff)
+		if err != nil {
+			t.Skip()
+		}
+		defer cleanup()
+
+		it := rfc3161.New()
 		entry, err := it.CreateProposedEntry(context.Background(), version, props)
 		if err != nil {
 			t.Skip()

pkg/types/rpm/fuzz_test.go → pkg/types/rpm/v0.0.1/fuzz_test.go

@@ -17,19 +17,32 @@ package rpm
 
 import (
 	"context"
+	"sync"
 	"testing"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
-	"github.com/sigstore/rekor/pkg/types"
+	fuzzUtils "github.com/sigstore/rekor/pkg/fuzz"
+	"github.com/sigstore/rekor/pkg/types/rpm"
 )
 
+var initter sync.Once
+
 func FuzzRpmCreateProposedEntry(f *testing.F) {
-	f.Fuzz(func(t *testing.T, version string, propsData []byte) {
+	f.Fuzz(func(t *testing.T, propsData []byte) {
+		initter.Do(fuzzUtils.SetFuzzLogger)
+
+		version := "0.0.1"
+
 		ff := fuzz.NewConsumer(propsData)
-		props := types.ArtifactProperties{}
-		ff.GenerateStruct(&props)
-		it := New()
+
+		props, cleanup, err := fuzzUtils.CreateProps(ff)
+		if err != nil {
+			t.Skip()
+		}
+		defer cleanup()
+
+		it := rpm.New()
 		entry, err := it.CreateProposedEntry(context.Background(), version, props)
 		if err != nil {
 			t.Skip()

pkg/types/tuf/fuzz_test.go → pkg/types/tuf/v0.0.1/fuzz_test.go

@@ -17,19 +17,32 @@ package tuf
 
 import (
 	"context"
+	"sync"
 	"testing"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 
-	"github.com/sigstore/rekor/pkg/types"
+	fuzzUtils "github.com/sigstore/rekor/pkg/fuzz"
+	"github.com/sigstore/rekor/pkg/types/tuf"
 )
 
+var initter sync.Once
+
 func FuzzTufCreateProposedEntry(f *testing.F) {
-	f.Fuzz(func(t *testing.T, version string, propsData []byte) {
+	f.Fuzz(func(t *testing.T, propsData []byte) {
+		initter.Do(fuzzUtils.SetFuzzLogger)
+
+		version := "0.0.1"
+
 		ff := fuzz.NewConsumer(propsData)
-		props := types.ArtifactProperties{}
-		ff.GenerateStruct(&props)
-		it := New()
+
+		props, cleanup, err := fuzzUtils.CreateProps(ff)
+		if err != nil {
+			t.Skip()
+		}
+		defer cleanup()
+
+		it := tuf.New()
 		entry, err := it.CreateProposedEntry(context.Background(), version, props)
 		if err != nil {
 			t.Skip()