yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-23 17:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16553 from strapi/fix/protect-assets-backup

Browse Source
This commit is contained in:
Christian 2023-04-28 17:17:23 +02:00 committed by GitHub
commit af7b42e8d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/data-transfer/src/engine/index.ts
View File

@ -727,6 +727,9 @@ class TransferEngine<
async transferAssets(): Promise<void> { async transferAssets(): Promise<void> {
const stage: TransferStage = 'assets'; const stage: TransferStage = 'assets';
if (this.shouldSkipStage(stage)) {
return;
}
const source = await this.sourceProvider.createAssetsReadStream?.(); const source = await this.sourceProvider.createAssetsReadStream?.();
const destination = await this.destinationProvider.createAssetsWriteStream?.(); const destination = await this.destinationProvider.createAssetsWriteStream?.();

6
packages/core/data-transfer/src/strapi/providers/local-destination/index.ts
View File

@ -156,10 +156,16 @@ class LocalStrapiDestinationProvider implements IDestinationProvider {
`uploads_backup_${Date.now()}` `uploads_backup_${Date.now()}`
); );
try {
await fse.move(assetsDirectory, backupDirectory); await fse.move(assetsDirectory, backupDirectory);
await fse.mkdir(assetsDirectory); await fse.mkdir(assetsDirectory);
// Create a .gitkeep file to ensure the directory is not empty // Create a .gitkeep file to ensure the directory is not empty
await fse.outputFile(path.join(assetsDirectory, '.gitkeep'), ''); await fse.outputFile(path.join(assetsDirectory, '.gitkeep'), '');
} catch (err) {
throw new ProviderTransferError(
'The backup folder for the assets could not be created inside the public folder. Please ensure Strapi has write permissions on the public directory'
);
}
return new Writable({ return new Writable({
objectMode: true, objectMode: true,