Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Check max ZIP uncompressed size

Chocobozzz473cd4f7efae
diff --git a/packages/tests/fixtures/zip-bomb.zip b/packages/tests/fixtures/zip-bomb.zip
new file mode 100644
index 0000000000..b4d00682f2
Binary files /dev/null and b/packages/tests/fixtures/zip-bomb.zip differ
diff --git a/packages/tests/src/api/check-params/user-import.ts b/packages/tests/src/api/check-params/user-import.ts
index 4abd9e0cf9..545a3e46f5 100644
--- a/packages/tests/src/api/check-params/user-import.ts
+++ b/packages/tests/src/api/check-params/user-import.ts
@@ -122,7 +122,8 @@ describe('Test user import API validators', function () {
'export-without-videos.zip',
'export-bad-structure.zip',
'export-bad-structure.zip',
- 'export-crash.zip'
+ 'export-crash.zip',
+ 'zip-bomb.zip'
]
const tokens: string[] = []
diff --git a/server/core/helpers/unzip.ts b/server/core/helpers/unzip.ts
index 00defd69af..5e04d9aaf7 100644
--- a/server/core/helpers/unzip.ts
+++ b/server/core/helpers/unzip.ts
@@ -7,7 +7,14 @@ import { logger, loggerTagsFactory } from './logger.js'
const lTags = loggerTagsFactory('unzip')
-export async function unzip (source: string, destination: string) {
+export async function unzip (options: {
+ source: string
+ destination: string
+ maxSize: number // in bytes
+ maxFiles: number
+}) {
+ const { source, destination } = options
+
await ensureDir(destination)
logger.info(`Unzip ${source} to ${destination}`, lTags())
@@ -18,9 +25,25 @@ export async function unzip (source: string, destination: string) {
zipFile.on('error', err => rej(err))
+ let decompressedSize = 0
+ let entries = 0
+
zipFile.readEntry()
zipFile.on('entry', async entry => {
+ decompressedSize += entry.uncompressedSize
+ entries++
+
+ if (decompressedSize > options.maxSize) {
+ zipFile.close()
+ return rej(new Error(`Unzipped size exceeds ${options.maxSize} bytes`))
+ }
+
+ if (entries > options.maxFiles) {
+ zipFile.close()
+ return rej(new Error(`Unzipped files count exceeds ${options.maxFiles}`))
+ }
+
const entryPath = join(destination, entry.fileName)
try {
diff --git a/server/core/lib/user-import-export/user-importer.ts b/server/core/lib/user-import-export/user-importer.ts
index f48344c565..53f0a20554 100644
--- a/server/core/lib/user-import-export/user-importer.ts
+++ b/server/core/lib/user-import-export/user-importer.ts
@@ -1,5 +1,5 @@
import { UserImportResultSummary, UserImportState } from '@peertube/peertube-models'
-import { getFilenameWithoutExt } from '@peertube/peertube-node-utils'
+import { getFilenameWithoutExt, getFileSize } from '@peertube/peertube-node-utils'
import { saveInTransactionWithRetries } from '@server/helpers/database-utils.js'
import { logger, loggerTagsFactory } from '@server/helpers/logger.js'
import { unzip } from '@server/helpers/unzip.js'
@@ -20,6 +20,7 @@ import { UserVideoHistoryImporter } from './importers/user-video-history-importe
import { VideoPlaylistsImporter } from './importers/video-playlists-importer.js'
import { VideosImporter } from './importers/videos-importer.js'
import { WatchedWordsListsImporter } from './importers/watched-words-lists-importer.js'
+import { parseBytes } from '@server/helpers/core-utils.js'
const lTags = loggerTagsFactory('user-import')
@@ -51,7 +52,14 @@ export class UserImporter {
const inputZip = getFSUserImportFilePath(importModel)
this.extractedDirectory = join(dirname(inputZip), getFilenameWithoutExt(inputZip))
- await unzip(inputZip, this.extractedDirectory)
+ await unzip({
+ source: inputZip,
+ destination: this.extractedDirectory,
+ // Videos that take a lot of space don't have a good compression ratio
+ // Keep a minimum of 1GB if the archive doesn't contain video files
+ maxSize: Math.max(await getFileSize(inputZip) * 2, parseBytes('1GB')),
+ maxFiles: 10000
+ })
const user = await UserModel.loadByIdFull(importModel.userId)