Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion packages/zip/lib/extract.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,28 @@ function throwOnSymlinks(entry) {
if (symlink) {
throw new errors.UnsupportedMediaTypeError({
message: 'Symlinks are not allowed in the zip folder.',
context: 'The zip contains a symlink entry.',
code: 'SYMLINK_NOT_ALLOWED',
errorDetails: {
entryName: entry.fileName,
},
});
}
}

function throwOnLargeFilenames(entry) {
if (Buffer.byteLength(entry.fileName, 'utf8') >= 254) {
const filenameBytes = Buffer.byteLength(entry.fileName, 'utf8');

if (filenameBytes >= 254) {
throw new errors.UnsupportedMediaTypeError({
message: 'File names in the zip folder must be shorter than 254 characters.',
context: 'The zip contains a filename that is too long.',
code: 'FILENAME_TOO_LONG',
errorDetails: {
entryName: entry.fileName,
observedBytes: filenameBytes,
limitBytes: 254,
},
});
}
}
Expand Down
27 changes: 25 additions & 2 deletions packages/zip/test/zip.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,21 @@ describe('Extract zip', function () {
await compress(themeFolder, zipDestination);
await assert.rejects(
() => extract(zipDestination, unzipDestination),
/File names in the zip folder must be shorter than 254 characters\./,
(err) => {
assert.equal(err.errorType, 'UnsupportedMediaTypeError');
assert.equal(
err.message,
'File names in the zip folder must be shorter than 254 characters.',
);
assert.equal(err.context, 'The zip contains a filename that is too long.');
assert.equal(err.code, 'FILENAME_TOO_LONG');
assert.deepEqual(err.errorDetails, {
entryName: longFileName,
observedBytes: 254,
limitBytes: 254,
});
return true;
},
);
});

Expand All @@ -187,7 +201,16 @@ describe('Extract zip', function () {

await assert.rejects(
() => extract(zipDestination, unzipDestination),
/Symlinks are not allowed in the zip folder\./,
(err) => {
assert.equal(err.errorType, 'UnsupportedMediaTypeError');
assert.equal(err.message, 'Symlinks are not allowed in the zip folder.');
assert.equal(err.context, 'The zip contains a symlink entry.');
assert.equal(err.code, 'SYMLINK_NOT_ALLOWED');
assert.deepEqual(err.errorDetails, {
entryName: 'themes/test-target',
});
return true;
},
);
});

Expand Down