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

fix race condition opening file

Browse Source
This commit is contained in:
Ben Irvin 2022-12-12 21:01:29 +01:00
parent a94ba8d31e
commit aa22bd243d
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/core/data-transfer/lib/providers/local-file-source-provider.ts
View File

@ -1,6 +1,6 @@
import type { Readable } from 'stream';
import fs from 'fs';
import { createReadStream } from 'fs-extra';
import zip from 'zlib';
import tar from 'tar';
import { keyBy } from 'lodash/fp';
@ -48,6 +48,8 @@ class LocalFileSourceProvider implements ISourceProvider {
options: ILocalFileSourceProviderOptions;
#filestream?: Readable;
constructor(options: ILocalFileSourceProviderOptions) {
this.options = options;
@ -59,17 +61,13 @@ class LocalFileSourceProvider implements ISourceProvider {
}
/**
* Pre flight checks regarding the provided options (making sure that the provided path is correct, etc...)
* Pre flight checks regarding the provided options, opening the file
*/
bootstrap() {
const { path } = this.options.file;
const isValidBackupPath = fs.existsSync(path);
// Check if the provided path exists
if (!isValidBackupPath) {
throw new Error(
`Invalid backup file path provided. "${path}" does not exist on the filesystem.`
);
async bootstrap() {
try {
this.#filestream = createReadStream(this.options.file.path);
} catch (e) {
throw new Error(`Could not read backup file path provided at "${this.options.file.path}"`);
}
}
@ -104,10 +102,14 @@ class LocalFileSourceProvider implements ISourceProvider {
}
#getBackupStream() {
const { file, encryption, compression } = this.options;
const { encryption, compression } = this.options;
const fileStream = fs.createReadStream(file.path);
const streams: StreamItemArray = [fileStream];
// This should be impossible as long as bootstrap was called first
if (!this.#filestream) {
throw new Error('Could not read file stream');
}
const streams: StreamItemArray = [this.#filestream];
if (encryption.enabled && encryption.key) {
streams.push(createDecryptionCipher(encryption.key));