n8n-core 1.122.3 → 1.122.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/execution-engine/node-execution-context/utils/file-system-helper-functions.d.ts +0 -1
- package/dist/execution-engine/node-execution-context/utils/file-system-helper-functions.js +55 -18
- package/dist/execution-engine/node-execution-context/utils/file-system-helper-functions.js.map +1 -1
- package/package.json +8 -8
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getFileSystemHelperFunctions = void 0;
|
|
4
|
-
exports.isFilePathBlocked = isFilePathBlocked;
|
|
5
4
|
const backend_common_1 = require("@n8n/backend-common");
|
|
5
|
+
const config_1 = require("@n8n/config");
|
|
6
6
|
const di_1 = require("@n8n/di");
|
|
7
7
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
8
8
|
const node_fs_1 = require("node:fs");
|
|
@@ -21,33 +21,50 @@ const getAllowedPaths = () => {
|
|
|
21
21
|
.filter((path) => path);
|
|
22
22
|
return allowedPaths;
|
|
23
23
|
};
|
|
24
|
-
async function
|
|
25
|
-
const allowedPaths = getAllowedPaths();
|
|
26
|
-
let resolvedFilePath = '';
|
|
24
|
+
async function resolvePath(path) {
|
|
27
25
|
try {
|
|
28
|
-
|
|
26
|
+
return (await (0, promises_1.realpath)(path));
|
|
29
27
|
}
|
|
30
28
|
catch (error) {
|
|
31
29
|
if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
|
|
32
|
-
|
|
33
|
-
}
|
|
34
|
-
else {
|
|
35
|
-
throw error;
|
|
30
|
+
return (0, node_path_1.resolve)(path.toString());
|
|
36
31
|
}
|
|
32
|
+
throw error;
|
|
37
33
|
}
|
|
34
|
+
}
|
|
35
|
+
function isFilePatternBlocked(resolvedFilePath) {
|
|
36
|
+
const { blockFilePatterns } = di_1.Container.get(config_1.SecurityConfig);
|
|
37
|
+
return blockFilePatterns
|
|
38
|
+
.split(';')
|
|
39
|
+
.map((pattern) => pattern.trim())
|
|
40
|
+
.filter((pattern) => pattern)
|
|
41
|
+
.some((pattern) => {
|
|
42
|
+
try {
|
|
43
|
+
return new RegExp(pattern, 'mi').test(resolvedFilePath);
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
function isFilePathBlocked(resolvedFilePath) {
|
|
51
|
+
const allowedPaths = getAllowedPaths();
|
|
38
52
|
const blockFileAccessToN8nFiles = process.env[constants_1.BLOCK_FILE_ACCESS_TO_N8N_FILES] !== 'false';
|
|
39
53
|
const restrictedPaths = blockFileAccessToN8nFiles ? getN8nRestrictedPaths() : [];
|
|
40
54
|
if (restrictedPaths.some((restrictedPath) => (0, backend_common_1.isContainedWithin)(restrictedPath, resolvedFilePath))) {
|
|
41
55
|
return true;
|
|
42
56
|
}
|
|
57
|
+
if (isFilePatternBlocked(resolvedFilePath)) {
|
|
58
|
+
return true;
|
|
59
|
+
}
|
|
43
60
|
if (allowedPaths.length) {
|
|
44
61
|
return !allowedPaths.some((allowedPath) => (0, backend_common_1.isContainedWithin)(allowedPath, resolvedFilePath));
|
|
45
62
|
}
|
|
46
63
|
return false;
|
|
47
64
|
}
|
|
48
65
|
const getFileSystemHelperFunctions = (node) => ({
|
|
49
|
-
async createReadStream(
|
|
50
|
-
if (
|
|
66
|
+
async createReadStream(resolvedFilePath) {
|
|
67
|
+
if (isFilePathBlocked(resolvedFilePath)) {
|
|
51
68
|
const allowedPaths = getAllowedPaths();
|
|
52
69
|
const message = allowedPaths.length ? ` Allowed paths: ${allowedPaths.join(', ')}` : '';
|
|
53
70
|
throw new n8n_workflow_1.NodeOperationError(node, `Access to the file is not allowed.${message}`, {
|
|
@@ -55,30 +72,50 @@ const getFileSystemHelperFunctions = (node) => ({
|
|
|
55
72
|
});
|
|
56
73
|
}
|
|
57
74
|
try {
|
|
58
|
-
await (0, promises_1.access)(
|
|
75
|
+
await (0, promises_1.access)(resolvedFilePath);
|
|
59
76
|
}
|
|
60
77
|
catch (error) {
|
|
61
78
|
throw error.code === 'ENOENT'
|
|
62
79
|
?
|
|
63
80
|
new n8n_workflow_1.NodeOperationError(node, error, {
|
|
64
|
-
message: `The file "${String(
|
|
81
|
+
message: `The file "${String(resolvedFilePath)}" could not be accessed.`,
|
|
65
82
|
level: 'warning',
|
|
66
83
|
})
|
|
67
84
|
: error;
|
|
68
85
|
}
|
|
69
|
-
|
|
86
|
+
const stream = (0, node_fs_1.createReadStream)(resolvedFilePath, {
|
|
87
|
+
flags: (node_fs_1.constants.O_RDONLY | node_fs_1.constants.O_NOFOLLOW),
|
|
88
|
+
});
|
|
89
|
+
return await new Promise((resolve, reject) => {
|
|
90
|
+
stream.once('error', (error) => {
|
|
91
|
+
if (error.code === 'ELOOP') {
|
|
92
|
+
reject(new n8n_workflow_1.NodeOperationError(node, error, {
|
|
93
|
+
level: 'warning',
|
|
94
|
+
description: 'Symlinks are not allowed.',
|
|
95
|
+
}));
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
reject(error);
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
stream.once('open', () => resolve(stream));
|
|
102
|
+
});
|
|
70
103
|
},
|
|
71
104
|
getStoragePath() {
|
|
72
105
|
return (0, backend_common_1.safeJoinPath)(di_1.Container.get(instance_settings_1.InstanceSettings).n8nFolder, `storage/${node.type}`);
|
|
73
106
|
},
|
|
74
|
-
async writeContentToFile(
|
|
75
|
-
if (
|
|
76
|
-
throw new n8n_workflow_1.NodeOperationError(node, `The file "${String(
|
|
107
|
+
async writeContentToFile(resolvedFilePath, content, flag) {
|
|
108
|
+
if (isFilePathBlocked(resolvedFilePath)) {
|
|
109
|
+
throw new n8n_workflow_1.NodeOperationError(node, `The file "${String(resolvedFilePath)}" is not writable.`, {
|
|
77
110
|
level: 'warning',
|
|
78
111
|
});
|
|
79
112
|
}
|
|
80
|
-
return await (0, promises_1.writeFile)(
|
|
113
|
+
return await (0, promises_1.writeFile)(resolvedFilePath, content, {
|
|
114
|
+
encoding: 'binary',
|
|
115
|
+
flag: (flag ?? 0) | node_fs_1.constants.O_NOFOLLOW,
|
|
116
|
+
});
|
|
81
117
|
},
|
|
118
|
+
resolvePath,
|
|
82
119
|
isFilePathBlocked,
|
|
83
120
|
});
|
|
84
121
|
exports.getFileSystemHelperFunctions = getFileSystemHelperFunctions;
|
package/dist/execution-engine/node-execution-context/utils/file-system-helper-functions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-system-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"file-system-helper-functions.js","sourceRoot":"","sources":["../../../../src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n-core",
|
|
3
|
-
"version": "1.122.
|
|
3
|
+
"version": "1.122.5",
|
|
4
4
|
"description": "Core functionality of n8n",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"@types/proxy-from-env": "^1.0.4",
|
|
24
24
|
"@types/uuid": "^10.0.0",
|
|
25
25
|
"@types/xml2js": "^0.4.14",
|
|
26
|
-
"@n8n/
|
|
27
|
-
"@n8n/
|
|
26
|
+
"@n8n/errors": "0.5.0",
|
|
27
|
+
"@n8n/typescript-config": "1.3.0"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@aws-sdk/client-s3": "3.808.0",
|
|
@@ -58,13 +58,13 @@
|
|
|
58
58
|
"winston": "3.14.2",
|
|
59
59
|
"xml2js": "0.6.2",
|
|
60
60
|
"zod": "3.25.67",
|
|
61
|
-
"@n8n/backend-common": "0.33.2",
|
|
62
|
-
"@n8n/constants": "0.14.0",
|
|
63
|
-
"@n8n/config": "1.65.1",
|
|
64
|
-
"@n8n/decorators": "0.33.1",
|
|
65
61
|
"@n8n/client-oauth2": "0.33.0",
|
|
62
|
+
"@n8n/constants": "0.14.0",
|
|
63
|
+
"@n8n/config": "1.65.2",
|
|
64
|
+
"@n8n/backend-common": "0.33.4",
|
|
66
65
|
"@n8n/di": "0.10.0",
|
|
67
|
-
"n8n-workflow": "1.120.
|
|
66
|
+
"n8n-workflow": "1.120.3",
|
|
67
|
+
"@n8n/decorators": "0.33.3"
|
|
68
68
|
},
|
|
69
69
|
"license": "SEE LICENSE IN LICENSE.md",
|
|
70
70
|
"homepage": "https://n8n.io",
|