Skip to content

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

Fix infinite server crash on invalid zip import

Chocobozzz71744313f0fb
diff --git a/packages/tests/fixtures/export-crash.zip b/packages/tests/fixtures/export-crash.zip
new file mode 100644
index 0000000000..0c4b0e7111
Binary files /dev/null and b/packages/tests/fixtures/export-crash.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 6c4312bb16..4abd9e0cf9 100644
--- a/packages/tests/src/api/check-params/user-import.ts
+++ b/packages/tests/src/api/check-params/user-import.ts
@@ -3,7 +3,8 @@
import { HttpStatusCode } from '@peertube/peertube-models'
import {
cleanupTests,
- createSingleServer, PeerTubeServer,
+ createSingleServer,
+ PeerTubeServer,
setAccessTokensToServers,
waitJobs
} from '@peertube/peertube-server-commands'
@@ -37,7 +38,6 @@ describe('Test user import API validators', function () {
})
describe('Request import', function () {
-
it('Should fail if import is disabled', async function () {
await server.config.disableUserImport()
@@ -121,7 +121,8 @@ describe('Test user import API validators', function () {
'export-bad-video.zip',
'export-without-videos.zip',
'export-bad-structure.zip',
- 'export-bad-structure.zip'
+ 'export-bad-structure.zip',
+ 'export-crash.zip'
]
const tokens: string[] = []
@@ -141,7 +142,6 @@ describe('Test user import API validators', function () {
})
describe('Get latest import status', function () {
-
it('Should fail without token', async function () {
await server.userImports.getLatestImport({ userId, token: null, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
diff --git a/server/core/helpers/unzip.ts b/server/core/helpers/unzip.ts
index 8a892be7c7..00defd69af 100644
--- a/server/core/helpers/unzip.ts
+++ b/server/core/helpers/unzip.ts
@@ -16,6 +16,8 @@ export async function unzip (source: string, destination: string) {
yauzl.open(source, { lazyEntries: true }, (err, zipFile) => {
if (err) return rej(err)
+ zipFile.on('error', err => rej(err))
+
zipFile.readEntry()
zipFile.on('entry', async entry => {