Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Validate collection file items

Neeraj Gupta552a8d6954d2
diff --git a/server/pkg/controller/collections/file_action.go b/server/pkg/controller/collections/file_action.go
index 665fbcce29..237f469b8b 100644
--- a/server/pkg/controller/collections/file_action.go
+++ b/server/pkg/controller/collections/file_action.go
@@ -10,6 +10,9 @@ import (
)
func (c *CollectionController) AddFiles(ctx *gin.Context, userID int64, files []ente.CollectionFileItem, cID int64) error {
+ if err := validateCollectionFileItems(files); err != nil {
+ return err
+ }
resp, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
CollectionID: cID,
ActorUserID: userID,
@@ -50,6 +53,9 @@ func (c *CollectionController) AddFiles(ctx *gin.Context, userID int64, files []
}
func (c *CollectionController) RestoreFiles(ctx *gin.Context, userID int64, cID int64, files []ente.CollectionFileItem) error {
+ if err := validateCollectionFileItems(files); err != nil {
+ return err
+ }
_, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
CollectionID: cID,
ActorUserID: userID,
@@ -85,6 +91,9 @@ func (c *CollectionController) MoveFiles(ctx *gin.Context, req ente.MoveFilesReq
if req.FromCollectionID == req.ToCollectionID {
return ente.NewBadRequestWithMessage("source and destination collections must differ")
}
+ if err := validateCollectionFileItems(req.Files); err != nil {
+ return err
+ }
userID := auth.GetUserID(ctx.Request.Header)
r1, err := c.AccessCtrl.GetCollection(ctx, &access.GetCollectionParams{
CollectionID: req.FromCollectionID,
diff --git a/server/pkg/controller/collections/file_action_test.go b/server/pkg/controller/collections/file_action_test.go
index ab379ce8c7..0c0f8f654a 100644
--- a/server/pkg/controller/collections/file_action_test.go
+++ b/server/pkg/controller/collections/file_action_test.go
@@ -18,3 +18,39 @@ func TestMoveFilesRejectsSameCollection(t *testing.T) {
t.Fatalf("MoveFiles() error = %v, want %s", err, ente.BadRequest)
}
}
+
+func TestCollectionFileActionsRejectInvalidItems(t *testing.T) {
+ controller := &CollectionController{}
+ valid := ente.CollectionFileItem{
+ ID: 1,
+ EncryptedKey: b64OfLen(encryptedCollectionKeyLen),
+ KeyDecryptionNonce: b64OfLen(secretboxNonceBytes),
+ }
+ if err := validateCollectionFileItems([]ente.CollectionFileItem{valid}); err != nil {
+ t.Fatalf("valid item rejected: %v", err)
+ }
+ add := func(files []ente.CollectionFileItem) error { return controller.AddFiles(nil, 1, files, 1) }
+ restore := func(files []ente.CollectionFileItem) error { return controller.RestoreFiles(nil, 1, 1, files) }
+ move := func(files []ente.CollectionFileItem) error {
+ return controller.MoveFiles(nil, ente.MoveFilesRequest{FromCollectionID: 1, ToCollectionID: 2, Files: files})
+ }
+ tests := []struct {
+ name string
+ invalid ente.CollectionFileItem
+ call func([]ente.CollectionFileItem) error
+ }{
+ {"add missing ID", ente.CollectionFileItem{EncryptedKey: valid.EncryptedKey, KeyDecryptionNonce: valid.KeyDecryptionNonce}, add},
+ {"add short key", ente.CollectionFileItem{ID: 2, EncryptedKey: b64OfLen(encryptedCollectionKeyLen - 1), KeyDecryptionNonce: valid.KeyDecryptionNonce}, add},
+ {"restore missing key", ente.CollectionFileItem{ID: 2, KeyDecryptionNonce: valid.KeyDecryptionNonce}, restore},
+ {"move missing nonce", ente.CollectionFileItem{ID: 2, EncryptedKey: valid.EncryptedKey}, move},
+ }
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ err := tt.call([]ente.CollectionFileItem{valid, tt.invalid})
+ var apiErr *ente.ApiError
+ if !errors.As(err, &apiErr) || apiErr.Code != ente.BadRequest {
+ t.Fatalf("error = %v, want %s", err, ente.BadRequest)
+ }
+ })
+ }
+}
diff --git a/server/pkg/controller/collections/key_validation.go b/server/pkg/controller/collections/key_validation.go
index 1418ddf91b..bd31dd128b 100644
--- a/server/pkg/controller/collections/key_validation.go
+++ b/server/pkg/controller/collections/key_validation.go
@@ -4,6 +4,8 @@ import (
"encoding/base64"
"errors"
"strconv"
+
+ "github.com/ente/museum/ente"
)
const (
@@ -26,7 +28,22 @@ func validateSealedCollectionKey(encryptedKey string) error {
return validateBase64DecodedLength(encryptedKey, sealedCollectionKeyLen, "encryptedKey")
}
+func validateCollectionFileItems(files []ente.CollectionFileItem) error {
+ for _, file := range files {
+ if file.ID == 0 {
+ return ente.NewBadRequestWithMessage("file ID is required")
+ }
+ if err := validateOwnedCollectionKey(file.EncryptedKey, file.KeyDecryptionNonce); err != nil {
+ return ente.NewBadRequestWithMessage(err.Error())
+ }
+ }
+ return nil
+}
+
func validateBase64DecodedLength(value string, expected int, field string) error {
+ if len(value) != base64.StdEncoding.EncodedLen(expected) {
+ return errors.New(field + " must decode to " + strconv.Itoa(expected) + " bytes")
+ }
decoded, err := base64.StdEncoding.DecodeString(value)
if err != nil {
return errors.New(field + " must be valid base64")
diff --git a/server/pkg/controller/collections/key_validation_test.go b/server/pkg/controller/collections/key_validation_test.go
index e1c8ec7f02..e74b92bd93 100644
--- a/server/pkg/controller/collections/key_validation_test.go
+++ b/server/pkg/controller/collections/key_validation_test.go
@@ -3,6 +3,7 @@ package collections
import (
"encoding/base64"
"net/http/httptest"
+ "strings"
"testing"
"github.com/ente/museum/ente"
@@ -97,13 +98,13 @@ func TestValidateSealedCollectionKey(t *testing.T) {
}
func TestValidateCollectionKeyRejectsInvalidBase64(t *testing.T) {
- if err := validateSealedCollectionKey("not-base64@@@"); err == nil {
+ if err := validateSealedCollectionKey(strings.Repeat("!", len(b64OfLen(sealedCollectionKeyLen)))); err == nil {
t.Fatal("validateSealedCollectionKey() error = nil, want error")
}
- if err := validateOwnedCollectionKey("not-base64@@@", b64OfLen(secretboxNonceBytes)); err == nil {
+ if err := validateOwnedCollectionKey(strings.Repeat("!", len(b64OfLen(encryptedCollectionKeyLen))), b64OfLen(secretboxNonceBytes)); err == nil {
t.Fatal("validateOwnedCollectionKey() encryptedKey error = nil, want error")
}
- if err := validateOwnedCollectionKey(b64OfLen(encryptedCollectionKeyLen), "not-base64@@@"); err == nil {
+ if err := validateOwnedCollectionKey(b64OfLen(encryptedCollectionKeyLen), strings.Repeat("!", len(b64OfLen(secretboxNonceBytes)))); err == nil {
t.Fatal("validateOwnedCollectionKey() keyDecryptionNonce error = nil, want error")
}
}