Feat/object streaming

cmd/archivist/main.go

@@ -31,7 +31,7 @@ import (
 	"github.com/testifysec/archivist-api/pkg/api/archivist"
 	"github.com/testifysec/archivist/internal/config"
 	"github.com/testifysec/archivist/internal/metadatastorage/mysqlstore"
-	"github.com/testifysec/archivist/internal/objectstorage/blobstore"
+	blob "github.com/testifysec/archivist/internal/objectstorage/blobstore"
 	"github.com/testifysec/archivist/internal/objectstorage/filestore"
 	"github.com/testifysec/archivist/internal/server"
 
@@ -105,7 +105,7 @@ func main() {
 		logrus.Fatalf("error initializing storage clients: %+v", err)
 	}
 
-	mysqlStore, mysqlStoreCh, err := mysqlstore.NewServer(ctx, cfg.SQLStoreConnectionString)
+	mysqlStore, mysqlStoreCh, err := mysqlstore.New(ctx, cfg.SQLStoreConnectionString)
 
 	log.FromContext(ctx).WithField("duration", time.Since(now)).Infof("completed phase 3: initializing storage clients")
 	// ********************************************************************************
@@ -166,13 +166,13 @@ func initSpiffeConnection(ctx context.Context, cfg *config.Config) []grpc.Server
 	return opts
 }
 
-func initObjectStore(ctx context.Context, cfg *config.Config) (archivist.CollectorServer, <-chan error, error) {
+func initObjectStore(ctx context.Context, cfg *config.Config) (server.ObjectStorer, <-chan error, error) {
 	switch strings.ToUpper(cfg.StorageBackend) {
 	case "FILE":
-		return filestore.NewServer(ctx, cfg.FileDir, cfg.FileServeOn)
+		return filestore.New(ctx, cfg.FileDir, cfg.FileServeOn)
 
 	case "BLOB":
-		return blob.NewMinioClient(
+		return blob.New(
 			ctx,
 			cfg.BlobStoreEndpoint,
 			cfg.BlobStoreAccessKeyId,

cmd/archivistctl/cmd/retrieve.go

@@ -1,10 +1,10 @@
 package cmd
 
 import (
+	"bytes"
 	"context"
 	"io"
 	"os"
-	"strings"
 
 	"github.com/spf13/cobra"
 	"github.com/testifysec/archivist-api/pkg/api/archivist"
@@ -46,13 +46,24 @@ func init() {
 }
 
 func retrieveEnvelope(ctx context.Context, client archivist.CollectorClient, gitoid string, out io.Writer) error {
-	resp, err := client.Get(ctx, &archivist.GetRequest{Gitoid: gitoid})
+	stream, err := client.Get(ctx, &archivist.GetRequest{Gitoid: gitoid})
 	if err != nil {
 		return err
 	}
 
-	if _, err := io.Copy(out, strings.NewReader(resp.Object)); err != nil {
-		return err
+	for {
+		chunk, err := stream.Recv()
+		if err == io.EOF {
+			break
+		}
+
+		if err != nil {
+			return err
+		}
+
+		if _, err := io.Copy(out, bytes.NewReader(chunk.GetChunk())); err != nil {
+			return err
+		}
 	}
 
 	return nil

cmd/archivistctl/cmd/store.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/testifysec/archivist-api/pkg/api/archivist"
+	"github.com/testifysec/archivist/internal/server"
 	"github.com/testifysec/go-witness/dsse"
 )
 
@@ -17,21 +18,23 @@ var (
 		Use:          "store",
 		Short:        "stores an attestation on the archivist server",
 		SilenceUsage: true,
-		Args:         cobra.ExactArgs(1),
+		Args:         cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			conn, err := newConn(archivistUrl)
 			defer conn.Close()
 			if err != nil {
 				return err
 			}
 
-			file, err := os.Open(args[0])
-			defer file.Close()
-			if err != nil {
-				return err
+			for _, filePath := range args {
+				if gitoid, err := storeAttestationByPath(cmd.Context(), archivist.NewCollectorClient(conn), filePath); err != nil {
+					return fmt.Errorf("failed to store %s: %w", filePath, err)
+				} else {
+					fmt.Printf("%s stored with gitoid %s\n", filePath, gitoid)
+				}
 			}
 
-			return storeAttestation(cmd.Context(), archivist.NewCollectorClient(conn), file)
+			return nil
 		},
 	}
 )
@@ -40,24 +43,53 @@ func init() {
 	rootCmd.AddCommand(storeCmd)
 }
 
-func storeAttestation(ctx context.Context, client archivist.CollectorClient, envelope io.Reader) error {
+func storeAttestationByPath(ctx context.Context, client archivist.CollectorClient, path string) (string, error) {
+	file, err := os.Open(path)
+	defer file.Close()
+	if err != nil {
+		return "", err
+	}
+
+	return storeAttestation(ctx, client, file)
+}
+
+func storeAttestation(ctx context.Context, client archivist.CollectorClient, envelope io.Reader) (string, error) {
 	objBytes, err := io.ReadAll(envelope)
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	obj := &dsse.Envelope{}
 	if err := json.Unmarshal(objBytes, &obj); err != nil {
-		return err
+		return "", err
 	}
 
 	if len(obj.Payload) == 0 || obj.PayloadType == "" || len(obj.Signatures) == 0 {
-		return fmt.Errorf("obj is not DSSE %d %d %d", len(obj.Payload), len(obj.PayloadType), len(obj.Signatures))
+		return "", fmt.Errorf("obj is not DSSE %d %d %d", len(obj.Payload), len(obj.PayloadType), len(obj.Signatures))
 	}
 
-	if _, err := client.Store(ctx, &archivist.StoreRequest{Object: string(objBytes)}); err != nil {
-		return err
+	stream, err := client.Store(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	chunk := &archivist.Chunk{}
+	for curr := 0; curr < len(objBytes); curr += server.ChunkSize {
+		if curr+server.ChunkSize > len(objBytes) {
+			chunk.Chunk = objBytes[curr:]
+		} else {
+			chunk.Chunk = objBytes[curr : curr+server.ChunkSize]
+		}
+
+		if err := stream.Send(chunk); err != nil {
+			return "", err
+		}
+	}
+
+	resp, err := stream.CloseAndRecv()
+	if err != nil {
+		return "", err
 	}
 
-	return nil
+	return resp.GetGitoid(), nil
 }

go.mod

@@ -15,10 +15,9 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.4.0
 	github.com/spiffe/go-spiffe/v2 v2.0.0
-	github.com/testifysec/archivist-api v0.0.0-20220707182002-b803369e93a4
+	github.com/testifysec/archivist-api v0.0.0-20220719182705-980989009502
 	github.com/testifysec/go-witness v0.1.11
 	google.golang.org/grpc v1.46.0
-	google.golang.org/protobuf v1.28.0
 )
 
 require (
@@ -65,5 +64,6 @@ require (
 	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
 	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 )

go.sum

@@ -272,8 +272,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/testifysec/archivist-api v0.0.0-20220707182002-b803369e93a4 h1:osCfJqj8ohaHzxY7Ssn1XMUvUiLAUUSY8F0jYqgvUTA=
-github.com/testifysec/archivist-api v0.0.0-20220707182002-b803369e93a4/go.mod h1:HWpNFd8qFXCoU8gEF/xiuG10ni9EBFhPcpAFTcWDAmc=
+github.com/testifysec/archivist-api v0.0.0-20220719182705-980989009502 h1:9y2qBW9yrxDa5R+mHr4uHmPIOIkyjhCD5XzNtynHVMU=
+github.com/testifysec/archivist-api v0.0.0-20220719182705-980989009502/go.mod h1:HWpNFd8qFXCoU8gEF/xiuG10ni9EBFhPcpAFTcWDAmc=
 github.com/testifysec/go-witness v0.1.11 h1:CK5I7g7yu+ObXraYN96KHZu9VmLLs4vKEvfcEi4E35E=
 github.com/testifysec/go-witness v0.1.11/go.mod h1:EGTMK84vV6/7kiCbJYonESTvaeOW2eMJVHh3mW/EWYU=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=

internal/metadatastorage/mysqlstore/mysql.go

@@ -24,7 +24,6 @@ import (
 
 	"ariga.io/sqlcomment"
 	"entgo.io/ent/dialect/sql"
-	"github.com/git-bom/gitbom-go"
 	"github.com/sirupsen/logrus"
 	"github.com/testifysec/archivist-api/pkg/api/archivist"
 	"github.com/testifysec/archivist/ent"
@@ -38,25 +37,15 @@ import (
 	"github.com/testifysec/go-witness/cryptoutil"
 	"github.com/testifysec/go-witness/dsse"
 	"github.com/testifysec/go-witness/intoto"
-	"google.golang.org/protobuf/types/known/emptypb"
 
 	_ "github.com/go-sql-driver/mysql"
 )
 
-type UnifiedStorage interface {
-	archivist.ArchivistServer
-	archivist.CollectorServer
+type Store struct {
+	client *ent.Client
 }
 
-type store struct {
-	archivist.UnimplementedArchivistServer
-	archivist.UnimplementedCollectorServer
-
-	client        *ent.Client
-	objectStorage archivist.CollectorServer
-}
-
-func NewServer(ctx context.Context, connectionstring string) (UnifiedStorage, <-chan error, error) {
+func New(ctx context.Context, connectionstring string) (*Store, <-chan error, error) {
 	drv, err := sql.Open("mysql", connectionstring)
 	if err != nil {
 		return nil, nil, err
@@ -92,13 +81,12 @@ func NewServer(ctx context.Context, connectionstring string) (UnifiedStorage, <-
 		logrus.WithContext(ctx).Fatalf("failed creating schema resources: %v", err)
 	}
 
-	return &store{
+	return &Store{
 		client: client,
 	}, errCh, nil
 }
 
-func (s *store) GetBySubjectDigest(request *archivist.GetBySubjectDigestRequest, server archivist.Archivist_GetBySubjectDigestServer) error {
-	ctx := server.Context()
+func (s *Store) GetBySubjectDigest(ctx context.Context, request *archivist.GetBySubjectDigestRequest) (<-chan *archivist.GetBySubjectDigestResponse, error) {
 	statementPredicates := []predicate.Statement{statement.HasSubjectsWith(
 		subject.HasSubjectDigestsWith(
 			subjectdigest.And(
@@ -122,26 +110,32 @@ func (s *store) GetBySubjectDigest(request *archivist.GetBySubjectDigestRequest,
 	}).All(ctx)
 
 	if err != nil {
-		return err
+		return nil, err
 	}
 
-	for _, curDsse := range res {
-		response := &archivist.GetBySubjectDigestResponse{}
-		response.Gitoid = curDsse.GitbomSha256
-		response.CollectionName = curDsse.Edges.Statement.Edges.AttestationCollections.Name
-		for _, curAttestation := range curDsse.Edges.Statement.Edges.AttestationCollections.Edges.Attestations {
-			response.Attestations = append(response.Attestations, curAttestation.Type)
-		}
+	out := make(chan *archivist.GetBySubjectDigestResponse, 1)
+	go func() {
+		defer close(out)
+		for _, curDsse := range res {
+			response := &archivist.GetBySubjectDigestResponse{}
+			response.Gitoid = curDsse.GitbomSha256
+			response.CollectionName = curDsse.Edges.Statement.Edges.AttestationCollections.Name
+			for _, curAttestation := range curDsse.Edges.Statement.Edges.AttestationCollections.Edges.Attestations {
+				response.Attestations = append(response.Attestations, curAttestation.Type)
+			}
 
-		if err := server.Send(response); err != nil {
-			return err
+			select {
+			case <-ctx.Done():
+				return
+			case out <- response:
+			}
 		}
-	}
+	}()
 
-	return nil
+	return out, nil
 }
 
-func (s *store) withTx(ctx context.Context, fn func(tx *ent.Tx) error) error {
+func (s *Store) withTx(ctx context.Context, fn func(tx *ent.Tx) error) error {
 	tx, err := s.client.Tx(ctx)
 	if err != nil {
 		return err
@@ -173,41 +167,31 @@ type parsedCollection struct {
 	} `json:"attestations"`
 }
 
-func (s *store) Store(ctx context.Context, request *archivist.StoreRequest) (*emptypb.Empty, error) {
-	fmt.Println("STORING")
-
-	obj := request.GetObject()
+func (s *Store) Store(ctx context.Context, gitoid string, obj []byte) error {
 	envelope := &dsse.Envelope{}
-	if err := json.Unmarshal([]byte(obj), envelope); err != nil {
-		return nil, err
+	if err := json.Unmarshal(obj, envelope); err != nil {
+		return err
 	}
 
 	payloadDigestSet, err := cryptoutil.CalculateDigestSetFromBytes(envelope.Payload, []crypto.Hash{crypto.SHA256})
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	payload := &intoto.Statement{}
 	if err := json.Unmarshal(envelope.Payload, payload); err != nil {
-		return nil, err
+		return err
 	}
 
 	parsedCollection := &parsedCollection{}
 	if err := json.Unmarshal(payload.Predicate, parsedCollection); err != nil {
-		return nil, err
-	}
-
-	// generate gitbom
-	gb := gitbom.NewSha256GitBom()
-	if err := gb.AddReference([]byte(obj), nil); err != nil {
-		logrus.WithContext(ctx).Errorf("gitbom tag generation failed: %+v", err)
-		return nil, err
+		return err
 	}
 
 	err = s.withTx(ctx, func(tx *ent.Tx) error {
 		dsse, err := tx.Dsse.Create().
 			SetPayloadType(envelope.PayloadType).
-			SetGitbomSha256(gb.Identity()).
+			SetGitbomSha256(gitoid).
 			Save(ctx)
 		if err != nil {
 			return err
@@ -288,9 +272,8 @@ func (s *store) Store(ctx context.Context, request *archivist.StoreRequest) (*em
 
 	if err != nil {
 		logrus.Errorf("unable to store metadata: %+v", err)
-		return nil, err
+		return err
 	}
 
-	fmt.Println("metadata stored")
-	return &emptypb.Empty{}, nil
+	return nil
 }