feat: allow to create entry without read limit

if the expiration is nil, the entry should never expire if the max reads is nil the entry can be read unlimited many times
Ajnasz · Jun 13, 2024 · 24e1ef6 · 24e1ef6
1 parent 0c320d3
commit 24e1ef6
Show file tree

Hide file tree

Showing 13 changed files with 230 additions and 141 deletions.
diff --git a/api/api_test.go b/api/api_test.go
@@ -387,7 +387,9 @@ func TestGetEntry(t *testing.T) {
 
 			keyManager := services.NewEntryKeyManager(db, &models.EntryKeyModel{}, hasher.NewSHA256Hasher(), encrypter)
 			entryManager := services.NewEntryManager(db, &models.EntryModel{}, encrypter, keyManager)
-			meta, encKey, err := entryManager.CreateEntry(ctx, "text/plain", []byte(testCase.Value), 1, time.Second*10)
+			expire := time.Second * 10
+			maxReads := 1
+			meta, encKey, err := entryManager.CreateEntry(ctx, "text/plain", []byte(testCase.Value), &expire, &maxReads)
 
 			if err != nil {
 				t.Fatal(err)
@@ -444,7 +446,9 @@ func TestGetEntryJSON(t *testing.T) {
 
 	keyManager := services.NewEntryKeyManager(db, &models.EntryKeyModel{}, hasher.NewSHA256Hasher(), encrypter)
 	entryManager := services.NewEntryManager(db, &models.EntryModel{}, encrypter, keyManager)
-	meta, encKey, err := entryManager.CreateEntry(ctx, "text/plain", []byte(testCase.Value), 1, time.Second*10)
+	expire := time.Second * 10
+	maxReads := 1
+	meta, encKey, err := entryManager.CreateEntry(ctx, "text/plain", []byte(testCase.Value), &expire, &maxReads)
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/internal/api/createentry.go b/internal/api/createentry.go
@@ -20,7 +20,7 @@ type CreateEntryParser interface {
 
 // CreateEntryManager is an interface for creating entries
 type CreateEntryManager interface {
-	CreateEntry(ctx context.Context, contentType string, body []byte, maxReads int, expiration time.Duration) (*services.EntryMeta, key.Key, error)
+	CreateEntry(ctx context.Context, contentType string, body []byte, expiration *time.Duration, maxReads *int) (*services.EntryMeta, key.Key, error)
 }
 
 // CreateEntryView is an interface for rendering the create entry response
@@ -63,7 +63,7 @@ func (c CreateHandler) handle(w http.ResponseWriter, r *http.Request) error {
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	entry, key, err := c.entryManager.CreateEntry(ctx, data.ContentType, data.Body, data.MaxReads, data.Expiration)
+	entry, key, err := c.entryManager.CreateEntry(ctx, data.ContentType, data.Body, &data.Expiration, &data.MaxReads)
 
 	if err != nil {
 		return err

diff --git a/internal/api/createentry_test.go b/internal/api/createentry_test.go
@@ -36,10 +36,9 @@ func (m *MockEntryManager) CreateEntry(
 	ctx context.Context,
 	contentType string,
 	body []byte,
-	maxReads int,
-	expiration time.Duration,
+	expiration *time.Duration,
+	maxReads *int,
 ) (*services.EntryMeta, key.Key, error) {
-	fmt.Println("content type", contentType)
 	args := m.Called(ctx, contentType, body, maxReads, expiration)
 
 	if args.Get(1) == nil {

diff --git a/internal/api/generateentrykey.go b/internal/api/generateentrykey.go
@@ -2,7 +2,6 @@ package api
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"time"
 
@@ -18,7 +17,7 @@ type GenerateEntryKeyView interface {
 }
 
 type GenerateEntryKeyManager interface {
-	GenerateEntryKey(ctx context.Context, UUID string, k key.Key, expire time.Duration, maxReads int) (*services.EntryKeyData, error)
+	GenerateEntryKey(ctx context.Context, UUID string, k key.Key, expire *time.Duration, maxReads *int) (*services.EntryKeyData, error)
 }
 
 type GenerateEntryKeyHandler struct {
@@ -46,12 +45,10 @@ func (g GenerateEntryKeyHandler) handle(w http.ResponseWriter, r *http.Request)
 		return err
 	}
 
-	fmt.Println(request)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	entry, err := g.entryManager.GenerateEntryKey(ctx, request.UUID, request.Key, request.Expiration, request.MaxReads)
+	entry, err := g.entryManager.GenerateEntryKey(ctx, request.UUID, request.Key, &request.Expiration, &request.MaxReads)
 	if err != nil {
 		return err
 	}

diff --git a/internal/api/generateentrykey_test.go b/internal/api/generateentrykey_test.go
@@ -30,7 +30,12 @@ type MockGenerateEntryKeyManager struct {
 	mock.Mock
 }
 
-func (m *MockGenerateEntryKeyManager) GenerateEntryKey(ctx context.Context, UUID string, k key.Key, expire time.Duration, maxReads int) (*services.EntryKeyData, error) {
+func (m *MockGenerateEntryKeyManager) GenerateEntryKey(ctx context.Context,
+	UUID string,
+	k key.Key,
+	expire *time.Duration,
+	maxReads *int,
+) (*services.EntryKeyData, error) {
 	args := m.Called(ctx, UUID, k)
 	return args.Get(0).(*services.EntryKeyData), args.Error(2)
 }

diff --git a/internal/models/entrykey.go b/internal/models/entrykey.go
@@ -18,7 +18,14 @@ type EntryKey struct {
 
 type EntryKeyModel struct{}
 
-func (e *EntryKeyModel) Create(ctx context.Context, tx *sql.Tx, entryUUID string, encryptedKey []byte, hash []byte, expire time.Time, remainingReads int) (*EntryKey, error) {
+func (e *EntryKeyModel) Create(ctx context.Context,
+	tx *sql.Tx,
+	entryUUID string,
+	encryptedKey []byte,
+	hash []byte,
+	expire *time.Time,
+	remainingReads *int,
+) (*EntryKey, error) {
 
 	now := time.Now()
 	res := tx.QueryRowContext(ctx, `

diff --git a/internal/models/entrykey_test.go b/internal/models/entrykey_test.go
@@ -41,7 +41,9 @@ func createTestEntryKey(ctx context.Context, tx *sql.Tx) (string, string, error)
 
 	model := &EntryKeyModel{}
 
-	entryKey, err := model.Create(ctx, tx, uid, []byte("test"), []byte("hash entrykey use tx"), time.Now().Add(time.Hour), 2)
+	expire := time.Now().Add(time.Hour)
+	maxReads := 2
+	entryKey, err := model.Create(ctx, tx, uid, []byte("test"), []byte("hash entrykey use tx"), &expire, &maxReads)
 
 	if err != nil {
 		return "", "", err
@@ -73,7 +75,9 @@ func Test_EntryKeyModel_Create(t *testing.T) {
 
 	model := &EntryKeyModel{}
 
-	entryKey, err := model.Create(ctx, tx, uid, []byte("test"), []byte("hashke"), time.Now().Add(time.Hour), 2)
+	expire := time.Now().Add(time.Hour)
+	remainingReads := 2
+	entryKey, err := model.Create(ctx, tx, uid, []byte("test"), []byte("hashke"), &expire, &remainingReads)
 
 	if err != nil {
 		if err := tx.Rollback(); err != nil {
@@ -135,7 +139,9 @@ func Test_EntryKeyModel_Get(t *testing.T) {
 	model := &EntryKeyModel{}
 
 	for i := 0; i < 10; i++ {
-		_, err = model.Create(ctx, tx, uid, []byte("test"), []byte(fmt.Sprintf("hashke %d", i)), time.Now().Add(time.Hour), 2)
+		expire := time.Now().Add(time.Hour)
+		maxReads := 2
+		_, err = model.Create(ctx, tx, uid, []byte("test"), []byte(fmt.Sprintf("hashke %d", i)), &expire, &maxReads)
 
 		if err != nil {
 			if err := tx.Rollback(); err != nil {
@@ -156,7 +162,6 @@ func Test_EntryKeyModel_Get(t *testing.T) {
 	}
 
 	entryKeys, err := model.Get(ctx, tx, uid)
-	fmt.Println("ENTRY KEYS", entryKeys)
 
 	if err != nil {
 		if err := tx.Rollback(); err != nil {

diff --git a/internal/services/entrykeymanager.go b/internal/services/entrykeymanager.go
@@ -18,7 +18,14 @@ var ErrEntryCreateFailed = errors.New("entry create failed")
 var ErrGetDEKFailed = errors.New("get DEK failed")
 
 type EntryKeyModel interface {
-	Create(ctx context.Context, tx *sql.Tx, entryUUID string, encryptedKey []byte, hash []byte, expire time.Time, remainingReads int) (*models.EntryKey, error)
+	Create(ctx context.Context,
+		tx *sql.Tx,
+		entryUUID string,
+		encryptedKey []byte,
+		hash []byte,
+		expire *time.Time,
+		remainingReads *int,
+	) (*models.EntryKey, error)
 	Get(ctx context.Context, tx *sql.Tx, entryUUID string) ([]models.EntryKey, error)
 	Delete(ctx context.Context, tx *sql.Tx, uuid string) error
 	SetExpire(ctx context.Context, tx *sql.Tx, uuid string, expire time.Time) error
@@ -42,7 +49,12 @@ func NewEntryKeyManager(db *sql.DB, model EntryKeyModel, hasher hasher.Hasher, e
 	}
 }
 
-func (e *EntryKeyManager) Create(ctx context.Context, entryUUID string, dek key.Key, expire time.Time, maxRead int) (*EntryKey, key.Key, error) {
+func (e *EntryKeyManager) Create(ctx context.Context,
+	entryUUID string,
+	dek key.Key,
+	expire *time.Time,
+	maxRead *int,
+) (*EntryKey, key.Key, error) {
 
 	tx, err := e.db.BeginTx(ctx, nil)
 	if err != nil {
@@ -87,7 +99,14 @@ func modelEntryKeyToEntryKey(m *models.EntryKey) *EntryKey {
 	}
 }
 
-func (e *EntryKeyManager) CreateWithTx(ctx context.Context, tx *sql.Tx, entryUUID string, dek key.Key, expire time.Time, maxRead int) (*EntryKey, key.Key, error) {
+func (e *EntryKeyManager) CreateWithTx(ctx context.Context,
+	tx *sql.Tx,
+	entryUUID string,
+	dek key.Key,
+	expire *time.Time,
+	maxRead *int,
+) (*EntryKey, key.Key,
+	error) {
 	k, err := key.NewGeneratedKey()
 
 	if err != nil {
@@ -202,7 +221,13 @@ func (e *EntryKeyManager) GetDEKTx(ctx context.Context, tx *sql.Tx, entryUUID st
 }
 
 // GenerateEncryptionKey creates a new key for the entry
-func (e EntryKeyManager) GenerateEncryptionKey(ctx context.Context, entryUUID string, existingKey key.Key, expire time.Time, maxRead int) (*EntryKey, key.Key, error) {
+func (e EntryKeyManager) GenerateEncryptionKey(
+	ctx context.Context,
+	entryUUID string,
+	existingKey key.Key,
+	expire *time.Time,
+	maxRead *int,
+) (*EntryKey, key.Key, error) {
 	tx, err := e.db.BeginTx(ctx, nil)
 	if err != nil {
 		return nil, nil, err