Add support for storing in-toto Attestations outside the log.

This adds an "Attestation" method to the entry interface. Entries can
return an attestation that they would like to store.

The attestations are currently stored in GCS, but it supports any blob store.
The feature is turned off with a flag, and we can set a max size as well.

Signed-off-by: Dan Lorenc <dlorenc@google.com>

Author: Dan Lorenc

cmd/rekor-cli/app/pflags.go

@@ -235,7 +235,7 @@ func CreateIntotoFromPFlags() (models.ProposedEntry, error) {
 	re := intoto_v001.V001Entry{
 		IntotoObj: models.IntotoV001Schema{
 			Content: &models.IntotoV001SchemaContent{
-				Envelope: swag.String(string(b)),
+				Envelope: string(b),
 			},
 			PublicKey: &kb,
 		},

cmd/rekor-server/app/root.go

@@ -69,6 +69,10 @@ func init() {
 	rootCmd.PersistentFlags().String("redis_server.address", "127.0.0.1", "Redis server address")
 	rootCmd.PersistentFlags().Uint16("redis_server.port", 6379, "Redis server port")
 
+	rootCmd.PersistentFlags().Bool("enable_attestation_storage", false, "enables rich attestation storage")
+	rootCmd.PersistentFlags().String("attestation_storage_bucket", "", "url for attestation storage bucket")
+	rootCmd.PersistentFlags().Int("max_attestation_size", 100*1024, "max size for attestation storage, in bytes")
+
 	if err := viper.BindPFlags(rootCmd.PersistentFlags()); err != nil {
 		log.Logger.Fatal(err)
 	}

docker-compose.yml

@@ -87,9 +87,13 @@ services:
       "--redis_server.port=6379",
       "--rekor_server.address=0.0.0.0",
       "--rekor_server.signer=memory",
+      "--enable_attestation_storage",
+      "--attestation_storage_bucket=file:///var/run/attestations",
       # Uncomment this for production logging
       # "--log_type=prod",
       ]
+    volumes:
+    - "/var/run/attestations:/var/run/attestations"
     restart: always # keep the server running
     ports:
       - "3000:3000"

go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/go-openapi/swag v0.19.15
 	github.com/go-openapi/validate v0.20.2
 	github.com/go-playground/validator v9.31.0+incompatible
+	github.com/google/go-cmp v0.5.5
 	github.com/google/rpmpack v0.0.0-20210107155803-d6befbf05148
 	github.com/google/trillian v1.3.14-0.20210413093047-5e12fb368c8f
 	github.com/in-toto/in-toto-golang v0.1.1-0.20210528150343-f7dc21abaccf

go.sum

@@ -253,8 +253,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
 github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
-github.com/dlorenc/in-toto-golang v0.0.0-20210526022216-b77043a23d1d h1:VOo774HqWGdZVX+Pwhb3fTbXfkZ5wDzdmdlzfq4WsO8=
-github.com/dlorenc/in-toto-golang v0.0.0-20210526022216-b77043a23d1d/go.mod h1:kOcoAhaukFZpRm6D53dd2xB++q065UxKi938k81l1aM=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=

pkg/api/api.go

@@ -34,6 +34,7 @@ import (
 	"github.com/sigstore/rekor/pkg/log"
 	pki "github.com/sigstore/rekor/pkg/pki/x509"
 	"github.com/sigstore/rekor/pkg/signer"
+	"github.com/sigstore/rekor/pkg/storage"
 	"github.com/sigstore/sigstore/pkg/signature"
 )
 
@@ -146,8 +147,9 @@ func NewAPI() (*API, error) {
 }
 
 var (
-	api         *API
-	redisClient radix.Client
+	api           *API
+	redisClient   radix.Client
+	storageClient storage.AttestationStorage
 )
 
 func ConfigureAPI() {
@@ -163,4 +165,11 @@ func ConfigureAPI() {
 			log.Logger.Panic(err)
 		}
 	}
+
+	if viper.GetBool("enable_attestation_storage") {
+		storageClient, err = storage.NewAttestationStorage()
+		if err != nil {
+			log.Logger.Panic(err)
+		}
+	}
 }

pkg/api/entries.go

@@ -160,6 +160,18 @@ func CreateLogEntryHandler(params entries.CreateLogEntryParams) middleware.Respo
 		}()
 	}
 
+	if viper.GetBool("enable_attestation_storage") {
+		go func() {
+			typ, attestation := entry.Attestation()
+			if typ == "" {
+				return
+			}
+			if err := storeAttestation(context.Background(), uuid, typ, attestation); err != nil {
+				log.RequestIDLogger(params.HTTPRequest).Error(err)
+			}
+		}()
+	}
+
 	payload, err := logEntryAnon.MarshalBinary()
 	if err != nil {
 		return handleRekorAPIError(params, http.StatusInternalServerError, fmt.Errorf("signing error: %v", err), signingError)

pkg/api/error.go

@@ -89,9 +89,10 @@ func handleRekorAPIError(params interface{}, code int, err error, message string
 			return entries.NewGetLogEntryByUUIDDefault(code).WithPayload(errorMsg(message, code))
 		}
 	case entries.CreateLogEntryParams:
-		logMsg(params.HTTPRequest)
 		switch code {
+		// We treat "duplicate entry" as an error, but it's not really an error, so we don't need to log it as one.
 		case http.StatusBadRequest:
+			logMsg(params.HTTPRequest)
 			return entries.NewCreateLogEntryBadRequest().WithPayload(errorMsg(message, code))
 		case http.StatusConflict:
 			resp := entries.NewCreateLogEntryConflict().WithPayload(errorMsg(message, code))

pkg/api/index.go

@@ -92,3 +92,7 @@ func SearchIndexNotImplementedHandler(params index.SearchIndexParams) middleware
 func addToIndex(ctx context.Context, key, value string) error {
 	return redisClient.Do(ctx, radix.Cmd(nil, "LPUSH", key, value))
 }
+
+func storeAttestation(ctx context.Context, uuid, attestationType string, attestation []byte) error {
+	return storageClient.StoreAttestation(ctx, uuid, attestationType, attestation)
+}