feat: optional file size limit on standard upload

supabase · Jan 3, 2024 · 822cb32 · 822cb32
1 parent 1438574
commit 822cb32
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -11,6 +11,7 @@ type StorageConfigType = {
   anonKey: string
   encryptionKey: string
   fileSizeLimit: number
+  fileSizeLimitStandardUpload?: number
   fileStoragePath?: string
   globalS3Protocol: 'http' | 'https'
   globalS3MaxSockets?: number
@@ -109,6 +110,9 @@ export function getConfig(): StorageConfigType {
     anonKey: getOptionalIfMultitenantConfigFromEnv('ANON_KEY') || '',
     encryptionKey: getOptionalConfigFromEnv('ENCRYPTION_KEY') || '',
     fileSizeLimit: Number(getConfigFromEnv('FILE_SIZE_LIMIT')),
+    fileSizeLimitStandardUpload: parseInt(
+      getOptionalConfigFromEnv('FILE_SIZE_LIMIT_STANDARD_UPLOAD') || '0'
+    ),
     fileStoragePath: getOptionalConfigFromEnv('FILE_STORAGE_BACKEND_PATH'),
     globalS3MaxSockets: parseInt(getOptionalConfigFromEnv('GLOBAL_S3_MAX_SOCKETS') || '200', 10),
     globalS3Protocol: (getOptionalConfigFromEnv('GLOBAL_S3_PROTOCOL') || 'https') as

diff --git a/src/storage/uploader.ts b/src/storage/uploader.ts
@@ -13,7 +13,7 @@ interface UploaderOptions extends UploadObjectOptions {
   allowedMimeTypes?: string[] | null
 }
 
-const { globalS3Bucket } = getConfig()
+const { globalS3Bucket, fileSizeLimitStandardUpload } = getConfig()
 
 export interface UploadObjectOptions {
   bucketId: string
@@ -247,13 +247,7 @@ export class Uploader {
     options?: Pick<UploaderOptions, 'fileSizeLimit'>
   ) {
     const contentType = request.headers['content-type']
-    let fileSizeLimit = await getFileSizeLimit(request.tenantId)
-
-    if (typeof options?.fileSizeLimit === 'number') {
-      if (options.fileSizeLimit <= fileSizeLimit) {
-        fileSizeLimit = options.fileSizeLimit
-      }
-    }
+    const fileSizeLimit = await this.getFileSizeLimit(request.tenantId, options?.fileSizeLimit)
 
     let body: NodeJS.ReadableStream
     let mimeType: string
@@ -297,4 +291,18 @@ export class Uploader {
       isTruncated,
     }
   }
+
+  protected async getFileSizeLimit(tenantId: string, bucketSizeLimit?: number | null) {
+    let globalFileSizeLimit = await getFileSizeLimit(tenantId)
+
+    if (typeof bucketSizeLimit === 'number') {
+      globalFileSizeLimit = Math.min(bucketSizeLimit, globalFileSizeLimit)
+    }
+
+    if (fileSizeLimitStandardUpload && fileSizeLimitStandardUpload > 0) {
+      globalFileSizeLimit = Math.min(fileSizeLimitStandardUpload, globalFileSizeLimit)
+    }
+
+    return globalFileSizeLimit
+  }
 }