mirror of
https://github.com/n8n-io/n8n.git
synced 2024-12-28 05:59:42 -08:00
33991e92d0
Story: https://linear.app/n8n/issue/PAY-839 This is a longstanding bug, fixed now so that the S3 backend for binary data can use execution IDs as part of the filename. To reproduce: 1. Set up a workflow with a POST Webhook node that accepts binary data. 2. Activate the workflow and call it sending a binary file, e.g. `curl -X POST -F "file=@/path/to/binary/file/test.jpg" http://localhost:5678/webhook/uuid` 3. Check `~/.n8n/binaryData`. The binary data and metadata files will be missing the execution ID, e.g. `11869055-83c4-4493-876a-9092c4708b9b` instead of `39011869055-83c4-4493-876a-9092c4708b9b`.
88 lines
2.2 KiB
TypeScript
88 lines
2.2 KiB
TypeScript
import { restoreBinaryDataId } from '@/executionLifecycleHooks/restoreBinaryDataId';
|
|
import { BinaryDataService } from 'n8n-core';
|
|
import { mockInstance } from '../integration/shared/utils/mocking';
|
|
import type { IRun } from 'n8n-workflow';
|
|
|
|
function toIRun(item: object) {
|
|
return {
|
|
data: {
|
|
resultData: {
|
|
runData: {
|
|
myNode: [
|
|
{
|
|
data: {
|
|
main: [[item]],
|
|
},
|
|
},
|
|
],
|
|
},
|
|
},
|
|
},
|
|
} as unknown as IRun;
|
|
}
|
|
|
|
function getDataId(run: IRun, kind: 'binary' | 'json') {
|
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
// @ts-ignore
|
|
return run.data.resultData.runData.myNode[0].data.main[0][0][kind].data.id;
|
|
}
|
|
|
|
describe('restoreBinaryDataId()', () => {
|
|
const binaryDataService = mockInstance(BinaryDataService);
|
|
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
});
|
|
|
|
it('should restore if binary data ID is missing execution ID', async () => {
|
|
const executionId = '999';
|
|
const incorrectFileId = 'a5c3f1ed-9d59-4155-bc68-9a370b3c51f6';
|
|
const run = toIRun({
|
|
binary: {
|
|
data: { id: `filesystem:${incorrectFileId}` },
|
|
},
|
|
});
|
|
|
|
await restoreBinaryDataId(run, executionId);
|
|
|
|
const correctFileId = `${executionId}${incorrectFileId}`;
|
|
const correctBinaryDataId = `filesystem:${correctFileId}`;
|
|
|
|
expect(binaryDataService.rename).toHaveBeenCalledWith(incorrectFileId, correctFileId);
|
|
expect(getDataId(run, 'binary')).toBe(correctBinaryDataId);
|
|
});
|
|
|
|
it('should do nothing if binary data ID is not missing execution ID', async () => {
|
|
const executionId = '999';
|
|
const fileId = `${executionId}a5c3f1ed-9d59-4155-bc68-9a370b3c51f6`;
|
|
const binaryDataId = `filesystem:${fileId}`;
|
|
const run = toIRun({
|
|
binary: {
|
|
data: {
|
|
id: binaryDataId,
|
|
},
|
|
},
|
|
});
|
|
|
|
await restoreBinaryDataId(run, executionId);
|
|
|
|
expect(binaryDataService.rename).not.toHaveBeenCalled();
|
|
expect(getDataId(run, 'binary')).toBe(binaryDataId);
|
|
});
|
|
|
|
it('should do nothing if no binary data ID', async () => {
|
|
const executionId = '999';
|
|
const dataId = '123';
|
|
const run = toIRun({
|
|
json: {
|
|
data: { id: dataId },
|
|
},
|
|
});
|
|
|
|
await restoreBinaryDataId(run, executionId);
|
|
|
|
expect(binaryDataService.rename).not.toHaveBeenCalled();
|
|
expect(getDataId(run, 'json')).toBe(dataId);
|
|
});
|
|
});
|