mirror of
https://github.com/n8n-io/n8n.git
synced 2024-11-13 16:14:07 -08:00
fix(SSH Node): Cleanup temporary binary files as soon as possible (#11305)
This commit is contained in:
parent
8404282046
commit
08a7b5b742
|
@ -1,4 +1,4 @@
|
|||
import { rm, writeFile } from 'fs/promises';
|
||||
import { writeFile } from 'fs/promises';
|
||||
import type { Readable } from 'stream';
|
||||
import type {
|
||||
ICredentialTestFunctions,
|
||||
|
@ -285,8 +285,6 @@ export class Ssh implements INodeType {
|
|||
): Promise<INodeCredentialTestResult> {
|
||||
const credentials = credential.data as IDataObject;
|
||||
const ssh = new NodeSSH();
|
||||
const temporaryFiles: string[] = [];
|
||||
|
||||
try {
|
||||
if (!credentials.privateKey) {
|
||||
await ssh.connect({
|
||||
|
@ -317,7 +315,6 @@ export class Ssh implements INodeType {
|
|||
};
|
||||
} finally {
|
||||
ssh.dispose();
|
||||
for (const tempFile of temporaryFiles) await rm(tempFile);
|
||||
}
|
||||
return {
|
||||
status: 'OK',
|
||||
|
@ -336,8 +333,6 @@ export class Ssh implements INodeType {
|
|||
const operation = this.getNodeParameter('operation', 0);
|
||||
const authentication = this.getNodeParameter('authentication', 0) as string;
|
||||
|
||||
const temporaryFiles: string[] = [];
|
||||
|
||||
const ssh = new NodeSSH();
|
||||
|
||||
try {
|
||||
|
@ -396,10 +391,9 @@ export class Ssh implements INodeType {
|
|||
i,
|
||||
);
|
||||
|
||||
const { path } = await tmpFile({ prefix: 'n8n-ssh-' });
|
||||
temporaryFiles.push(path);
|
||||
|
||||
await ssh.getFile(path, parameterPath);
|
||||
const binaryFile = await tmpFile({ prefix: 'n8n-ssh-' });
|
||||
try {
|
||||
await ssh.getFile(binaryFile.path, parameterPath);
|
||||
|
||||
const newItem: INodeExecutionData = {
|
||||
json: items[i].json,
|
||||
|
@ -420,9 +414,12 @@ export class Ssh implements INodeType {
|
|||
|
||||
const fileName = this.getNodeParameter('options.fileName', i, '') as string;
|
||||
items[i].binary![dataPropertyNameDownload] = await this.nodeHelpers.copyBinaryFile(
|
||||
path,
|
||||
binaryFile.path,
|
||||
fileName || parameterPath,
|
||||
);
|
||||
} finally {
|
||||
await binaryFile.cleanup();
|
||||
}
|
||||
}
|
||||
|
||||
if (operation === 'upload') {
|
||||
|
@ -444,12 +441,12 @@ export class Ssh implements INodeType {
|
|||
uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
|
||||
}
|
||||
|
||||
const { path } = await tmpFile({ prefix: 'n8n-ssh-' });
|
||||
temporaryFiles.push(path);
|
||||
await writeFile(path, uploadData);
|
||||
const binaryFile = await tmpFile({ prefix: 'n8n-ssh-' });
|
||||
try {
|
||||
await writeFile(binaryFile.path, uploadData);
|
||||
|
||||
await ssh.putFile(
|
||||
path,
|
||||
binaryFile.path,
|
||||
`${parameterPath}${
|
||||
parameterPath.charAt(parameterPath.length - 1) === '/' ? '' : '/'
|
||||
}${fileName || binaryData.fileName}`,
|
||||
|
@ -463,6 +460,9 @@ export class Ssh implements INodeType {
|
|||
item: i,
|
||||
},
|
||||
});
|
||||
} finally {
|
||||
await binaryFile.cleanup();
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
|
@ -488,16 +488,10 @@ export class Ssh implements INodeType {
|
|||
throw error;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
} finally {
|
||||
ssh.dispose();
|
||||
for (const tempFile of temporaryFiles) await rm(tempFile);
|
||||
throw error;
|
||||
}
|
||||
|
||||
for (const tempFile of temporaryFiles) await rm(tempFile);
|
||||
|
||||
ssh.dispose();
|
||||
|
||||
if (resource === 'file' && operation === 'download') {
|
||||
// For file downloads the files get attached to the existing items
|
||||
return [items];
|
||||
|
|
Loading…
Reference in a new issue