Skip to content

armgit / ente

Public Imported from GitHub
0

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

Allow larger uploads for internal Photos users

Neeraj Guptaa4da1b116c0d
diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index 814f112410..d5a4b61ab0 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -327,6 +327,7 @@ func main() {
ObjectCleanupRepo: objectCleanupRepo,
TrashRepository: trashRepo,
UserRepo: userRepo,
+ RemoteStoreRepo: remoteStoreRepository,
UsageCtrl: usageController,
AccessCtrl: accessCtrl,
CollectionRepo: collectionRepo,
diff --git a/server/pkg/controller/file.go b/server/pkg/controller/file.go
index 6f887ee9f7..3fe68a8e28 100644
--- a/server/pkg/controller/file.go
+++ b/server/pkg/controller/file.go
@@ -32,6 +32,7 @@ import (
"github.com/aws/aws-sdk-go/service/s3"
"github.com/ente/museum/ente"
"github.com/ente/museum/pkg/repo"
+ "github.com/ente/museum/pkg/repo/remotestore"
enteArray "github.com/ente/museum/pkg/utils/array"
"github.com/ente/museum/pkg/utils/s3config"
"github.com/ente/museum/pkg/utils/time"
@@ -45,6 +46,7 @@ type FileController struct {
ObjectCleanupRepo *repo.ObjectCleanupRepository
TrashRepository *repo.TrashRepository
UserRepo *repo.UserRepository
+ RemoteStoreRepo *remotestore.Repository
UsageCtrl *UsageController
CollectionRepo *repo.CollectionRepository
TaskLockingRepo *repo.TaskLockRepository
@@ -67,6 +69,9 @@ const StorageOverflowAboveSubscriptionLimit = int64(1024 * 1024 * 50)
// MaxFileSize is the maximum file size a user can upload
const MaxFileSize = int64(1024 * 1024 * 1024 * 10)
+// InternalUserMaxFileSize is the maximum file size an internal user can upload
+const InternalUserMaxFileSize = int64(1024 * 1024 * 1024 * 20)
+
// MaxUploadURLsLimit indicates the max number of upload urls which can be request in one go
const MaxUploadURLsLimit = 50
@@ -79,6 +84,26 @@ const (
DeletedObjectQueueLock = "deleted_objects_queue_lock"
)
+func (c *FileController) isFileSizeAllowed(ctx context.Context, userID int64, fileSize int64, app ente.App) (bool, error) {
+ if fileSize <= MaxFileSize {
+ return true, nil
+ }
+ if fileSize > InternalUserMaxFileSize {
+ return false, nil
+ }
+ if app != ente.Photos {
+ return false, nil
+ }
+ value, err := c.RemoteStoreRepo.GetValue(ctx, userID, string(ente.IsInternalUser))
+ if errors.Is(err, sql.ErrNoRows) {
+ return false, nil
+ }
+ if err != nil {
+ return false, stacktrace.Propagate(err, "failed to get internal user flag")
+ }
+ return value == "true", nil
+}
+
func (c *FileController) validateFileCreateOrUpdateReq(userID int64, file ente.File, app ente.App) error {
objectPathPrefix := strconv.FormatInt(userID, 10) + "/"
if !strings.HasPrefix(file.File.ObjectKey, objectPathPrefix) || !strings.HasPrefix(file.Thumbnail.ObjectKey, objectPathPrefix) {
@@ -161,7 +186,11 @@ func (c *FileController) Create(ctx *gin.Context, userID int64, file ente.File,
}
fileSize := fileResult.size
thumbnailSize := thumbResult.size
- if fileSize > MaxFileSize {
+ isFileSizeAllowed, err := c.isFileSizeAllowed(ctx, userID, fileSize, app)
+ if err != nil {
+ return file, stacktrace.Propagate(err, "")
+ }
+ if !isFileSizeAllowed {
return file, stacktrace.Propagate(ente.ErrFileTooLarge, "")
}
@@ -264,7 +293,11 @@ func (c *FileController) Update(ctx context.Context, userID int64, file ente.Fil
if err != nil {
return response, stacktrace.Propagate(err, "")
}
- if fileSize > MaxFileSize {
+ isFileSizeAllowed, err := c.isFileSizeAllowed(ctx, userID, fileSize, app)
+ if err != nil {
+ return response, stacktrace.Propagate(err, "")
+ }
+ if !isFileSizeAllowed {
return response, stacktrace.Propagate(ente.ErrFileTooLarge, "")
}
if file.File.Size != 0 && file.File.Size != fileSize {
@@ -362,7 +395,11 @@ func (c *FileController) GetUploadURLWithMetadata(ctx context.Context, userID in
if req.ContentLength <= 0 {
return ente.UploadURL{}, stacktrace.Propagate(ente.ErrBadRequest, "contentLength must be greater than 0")
}
- if req.ContentLength > MaxFileSize {
+ isFileSizeAllowed, err := c.isFileSizeAllowed(ctx, userID, req.ContentLength, app)
+ if err != nil {
+ return ente.UploadURL{}, stacktrace.Propagate(err, "")
+ }
+ if !isFileSizeAllowed {
return ente.UploadURL{}, stacktrace.Propagate(ente.ErrBadRequest, "contentLength exceeds max file size %d", MaxFileSize)
}
checksum, err := normalizeMD5String(req.ContentMD5)
@@ -1177,7 +1214,11 @@ func (c *FileController) GetMultipartUploadURLWithMetadata(ctx context.Context,
if req.ContentLength <= 0 {
return ente.MultipartUploadURLs{}, stacktrace.Propagate(ente.ErrBadRequest, "contentLength must be greater than 0")
}
- if req.ContentLength > MaxFileSize {
+ isFileSizeAllowed, err := c.isFileSizeAllowed(ctx, userID, req.ContentLength, app)
+ if err != nil {
+ return ente.MultipartUploadURLs{}, stacktrace.Propagate(err, "")
+ }
+ if !isFileSizeAllowed {
return ente.MultipartUploadURLs{}, stacktrace.Propagate(ente.ErrBadRequest, "contentLength exceeds max file size %d", MaxFileSize)
}
if req.PartMD5s != nil && len(req.PartMD5s) == 0 {