Merge branch 'internal-refactor'

cinode · Nov 19, 2023 · 2821712 · 2821712
2 parents f18e3c9 + 4fa3eb5
commit 2821712
Show file tree

Hide file tree

Showing 84 changed files with 5,054 additions and 1,245 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,6 +6,7 @@
         "blobtype",
         "blobtypes",
         "bmap",
+        "chacha",
         "cinode",
         "cinodefs",
         "cipherfactory",
@@ -15,13 +16,16 @@
         "dynamiclink",
         "elink",
         "fifos",
+        "fsys",
         "goveralls",
         "Hasher",
+        "homefile",
         "jbenet",
         "protobuf",
         "securefifo",
         "shogo",
         "stretchr",
+        "subdir",
         "testblobs",
         "testvectors",
         "validatingreader"

diff --git a/cmd/static_datastore_builder/main.go b/cmd/static_datastore_builder/main.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2022 Bartłomiej Święcki (byo)
+Copyright © 2023 Bartłomiej Święcki (byo)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,8 +16,15 @@ limitations under the License.
 
 package main
 
-import "github.com/cinode/go/pkg/cmd/static_datastore"
+import (
+	"context"
+	"log"
+
+	"github.com/cinode/go/pkg/cmd/static_datastore"
+)
 
 func main() {
-	static_datastore.Execute()
+	if err := static_datastore.Execute(context.Background()); err != nil {
+		log.Fatal(err.Error())
+	}
 }
diff --git a/pkg/blenc/datastore.go b/pkg/blenc/datastore.go
@@ -25,7 +25,6 @@ import (
 	"github.com/cinode/go/pkg/blobtypes"
 	"github.com/cinode/go/pkg/common"
 	"github.com/cinode/go/pkg/datastore"
-	"github.com/cinode/go/pkg/internal/utilities/cipherfactory"
 	"github.com/cinode/go/pkg/internal/utilities/securefifo"
 )
 
@@ -51,7 +50,7 @@ type beDatastore struct {
 	newSecureFifo   secureFifoGenerator
 }
 
-func (be *beDatastore) Open(ctx context.Context, name common.BlobName, key cipherfactory.Key) (io.ReadCloser, error) {
+func (be *beDatastore) Open(ctx context.Context, name *common.BlobName, key *common.BlobKey) (io.ReadCloser, error) {
 	switch name.Type() {
 	case blobtypes.Static:
 		return be.openStatic(ctx, name, key)
@@ -66,9 +65,9 @@ func (be *beDatastore) Create(
 	blobType common.BlobType,
 	r io.Reader,
 ) (
-	common.BlobName,
-	cipherfactory.Key,
-	AuthInfo,
+	*common.BlobName,
+	*common.BlobKey,
+	*common.AuthInfo,
 	error,
 ) {
 	switch blobType {
@@ -80,7 +79,7 @@ func (be *beDatastore) Create(
 	return nil, nil, nil, blobtypes.ErrUnknownBlobType
 }
 
-func (be *beDatastore) Update(ctx context.Context, name common.BlobName, authInfo AuthInfo, key cipherfactory.Key, r io.Reader) error {
+func (be *beDatastore) Update(ctx context.Context, name *common.BlobName, authInfo *common.AuthInfo, key *common.BlobKey, r io.Reader) error {
 	switch name.Type() {
 	case blobtypes.Static:
 		return be.updateStatic(ctx, name, authInfo, key, r)
@@ -90,10 +89,10 @@ func (be *beDatastore) Update(ctx context.Context, name common.BlobName, authInf
 	return blobtypes.ErrUnknownBlobType
 }
 
-func (be *beDatastore) Exists(ctx context.Context, name common.BlobName) (bool, error) {
+func (be *beDatastore) Exists(ctx context.Context, name *common.BlobName) (bool, error) {
 	return be.ds.Exists(ctx, name)
 }
 
-func (be *beDatastore) Delete(ctx context.Context, name common.BlobName) error {
+func (be *beDatastore) Delete(ctx context.Context, name *common.BlobName) error {
 	return be.ds.Delete(ctx, name)
 }
diff --git a/pkg/blenc/datastore_dynamic_link.go b/pkg/blenc/datastore_dynamic_link.go
@@ -1,5 +1,5 @@
 /*
-Copyright © 2022 Bartłomiej Święcki (byo)
+Copyright © 2023 Bartłomiej Święcki (byo)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,15 +17,13 @@ limitations under the License.
 package blenc
 
 import (
-	"bytes"
 	"context"
 	"errors"
 	"fmt"
 	"io"
 
 	"github.com/cinode/go/pkg/common"
 	"github.com/cinode/go/pkg/internal/blobtypes/dynamiclink"
-	"github.com/cinode/go/pkg/internal/utilities/cipherfactory"
 )
 
 var (
@@ -37,8 +35,8 @@ var (
 
 func (be *beDatastore) openDynamicLink(
 	ctx context.Context,
-	name common.BlobName,
-	key cipherfactory.Key,
+	name *common.BlobName,
+	key *common.BlobKey,
 ) (
 	io.ReadCloser,
 	error,
@@ -77,9 +75,9 @@ func (be *beDatastore) createDynamicLink(
 	ctx context.Context,
 	r io.Reader,
 ) (
-	common.BlobName,
-	cipherfactory.Key,
-	AuthInfo,
+	*common.BlobName,
+	*common.BlobKey,
+	*common.AuthInfo,
 	error,
 ) {
 	version := be.generateVersion()
@@ -109,9 +107,9 @@ func (be *beDatastore) createDynamicLink(
 
 func (be *beDatastore) updateDynamicLink(
 	ctx context.Context,
-	name common.BlobName,
-	authInfo AuthInfo,
-	key cipherfactory.Key,
+	name *common.BlobName,
+	authInfo *common.AuthInfo,
+	key *common.BlobKey,
 	r io.Reader,
 ) error {
 	newVersion := be.generateVersion()
@@ -127,10 +125,10 @@ func (be *beDatastore) updateDynamicLink(
 	}
 
 	// Sanity checks
-	if !bytes.Equal(encryptionKey, key) {
+	if !encryptionKey.Equal(key) {
 		return ErrDynamicLinkUpdateFailedWrongKey
 	}
-	if !bytes.Equal(name, dl.BlobName()) {
+	if !name.Equal(dl.BlobName()) {
 		return ErrDynamicLinkUpdateFailedWrongName
 	}
 

diff --git a/pkg/blenc/datastore_dynamic_link_test.go b/pkg/blenc/datastore_dynamic_link_test.go
@@ -34,18 +34,18 @@ import (
 
 type dsWrapper struct {
 	datastore.DS
-	openFn   func(ctx context.Context, name common.BlobName) (io.ReadCloser, error)
-	updateFn func(ctx context.Context, name common.BlobName, r io.Reader) error
+	openFn   func(ctx context.Context, name *common.BlobName) (io.ReadCloser, error)
+	updateFn func(ctx context.Context, name *common.BlobName, r io.Reader) error
 }
 
-func (w *dsWrapper) Open(ctx context.Context, name common.BlobName) (io.ReadCloser, error) {
+func (w *dsWrapper) Open(ctx context.Context, name *common.BlobName) (io.ReadCloser, error) {
 	if w.openFn != nil {
 		return w.openFn(ctx, name)
 	}
 	return w.DS.Open(ctx, name)
 }
 
-func (w *dsWrapper) Update(ctx context.Context, name common.BlobName, r io.Reader) error {
+func (w *dsWrapper) Update(ctx context.Context, name *common.BlobName, r io.Reader) error {
 	if w.updateFn != nil {
 		return w.updateFn(ctx, name, r)
 	}
@@ -68,7 +68,7 @@ func TestDynamicLinkErrors(t *testing.T) {
 
 	t.Run("handle error while opening blob", func(t *testing.T) {
 		injectedErr := errors.New("test")
-		dsw.openFn = func(ctx context.Context, name common.BlobName) (io.ReadCloser, error) { return nil, injectedErr }
+		dsw.openFn = func(ctx context.Context, name *common.BlobName) (io.ReadCloser, error) { return nil, injectedErr }
 
 		rc, err := be.Open(context.Background(), bn, key)
 		require.ErrorIs(t, err, injectedErr)
@@ -84,7 +84,7 @@ func TestDynamicLinkErrors(t *testing.T) {
 
 			t.Run(fmt.Sprintf("error at byte %d", i), func(t *testing.T) {
 
-				dsw.openFn = func(ctx context.Context, name common.BlobName) (io.ReadCloser, error) {
+				dsw.openFn = func(ctx context.Context, name *common.BlobName) (io.ReadCloser, error) {
 					origRC, err := dsw.DS.Open(ctx, name)
 					require.NoError(t, err)
 
@@ -124,9 +124,9 @@ func TestDynamicLinkErrors(t *testing.T) {
 
 		bn, key, ai, err := be.Create(context.Background(), blobtypes.DynamicLink, bytes.NewReader(nil))
 		require.ErrorIs(t, err, injectedErr)
-		require.Nil(t, bn)
-		require.Nil(t, key)
-		require.Nil(t, ai)
+		require.Empty(t, bn)
+		require.Empty(t, key)
+		require.Empty(t, ai)
 
 		be.(*beDatastore).rand = rand.Reader
 
@@ -135,13 +135,13 @@ func TestDynamicLinkErrors(t *testing.T) {
 	t.Run("fail to store new dynamic link blob", func(t *testing.T) {
 		injectedErr := errors.New("test")
 
-		dsw.updateFn = func(ctx context.Context, name common.BlobName, r io.Reader) error { return injectedErr }
+		dsw.updateFn = func(ctx context.Context, name *common.BlobName, r io.Reader) error { return injectedErr }
 
 		bn, key, ai, err := be.Create(context.Background(), blobtypes.DynamicLink, bytes.NewReader(nil))
 		require.ErrorIs(t, err, injectedErr)
-		require.Nil(t, bn)
-		require.Nil(t, key)
-		require.Nil(t, ai)
+		require.Empty(t, bn)
+		require.Empty(t, key)
+		require.Empty(t, ai)
 
 		dsw.updateFn = nil
 	})
@@ -152,7 +152,7 @@ func TestDynamicLinkErrors(t *testing.T) {
 		bn, key, ai, err := be.Create(context.Background(), blobtypes.DynamicLink, bytes.NewReader(nil))
 		require.NoError(t, err)
 
-		dsw.updateFn = func(ctx context.Context, name common.BlobName, r io.Reader) error { return injectedErr }
+		dsw.updateFn = func(ctx context.Context, name *common.BlobName, r io.Reader) error { return injectedErr }
 
 		err = be.Update(context.Background(), bn, ai, key, bytes.NewReader(nil))
 		require.ErrorIs(t, err, injectedErr)

diff --git a/pkg/blenc/datastore_static.go b/pkg/blenc/datastore_static.go
@@ -17,7 +17,6 @@ limitations under the License.
 package blenc
 
 import (
-	"bytes"
 	"context"
 	"crypto/sha256"
 	"errors"
@@ -33,14 +32,14 @@ var (
 	ErrCanNotUpdateStaticBlob = errors.New("blob update is not supported for static blobs")
 )
 
-func (be *beDatastore) openStatic(ctx context.Context, name common.BlobName, key cipherfactory.Key) (io.ReadCloser, error) {
+func (be *beDatastore) openStatic(ctx context.Context, name *common.BlobName, key *common.BlobKey) (io.ReadCloser, error) {
 
 	rc, err := be.ds.Open(ctx, name)
 	if err != nil {
 		return nil, err
 	}
 
-	scr, err := cipherfactory.StreamCipherReader(key, key.DefaultIV(), rc)
+	scr, err := cipherfactory.StreamCipherReader(key, cipherfactory.DefaultIV(key), rc)
 	if err != nil {
 		return nil, err
 	}
@@ -54,7 +53,7 @@ func (be *beDatastore) openStatic(ctx context.Context, name common.BlobName, key
 		Reader: validatingreader.CheckOnEOF(
 			io.TeeReader(scr, keyGenerator),
 			func() error {
-				if !bytes.Equal(key, keyGenerator.Generate()) {
+				if !key.Equal(keyGenerator.Generate()) {
 					return blobtypes.ErrValidationFailed
 				}
 				return nil
@@ -68,9 +67,9 @@ func (be *beDatastore) createStatic(
 	ctx context.Context,
 	r io.Reader,
 ) (
-	common.BlobName,
-	cipherfactory.Key,
-	AuthInfo,
+	*common.BlobName,
+	*common.BlobKey,
+	*common.AuthInfo,
 	error,
 ) {
 	tempWriteBufferPlain, err := be.newSecureFifo()
@@ -92,7 +91,7 @@ func (be *beDatastore) createStatic(
 	}
 
 	key := keyGenerator.Generate()
-	iv := key.DefaultIV() // We can use this since each blob will have different key
+	iv := cipherfactory.DefaultIV(key) // We can use this since each blob will have different key
 
 	rClone, err := tempWriteBufferPlain.Done() // rClone will allow re-reading the source data
 	if err != nil {
@@ -141,9 +140,9 @@ func (be *beDatastore) createStatic(
 
 func (be *beDatastore) updateStatic(
 	ctx context.Context,
-	name common.BlobName,
-	authInfo AuthInfo,
-	key cipherfactory.Key,
+	name *common.BlobName,
+	authInfo *common.AuthInfo,
+	key *common.BlobKey,
 	r io.Reader,
 ) error {
 	return ErrCanNotUpdateStaticBlob