@forestadmin/agent 1.80.0 → 1.81.1
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.
|
@@ -8,8 +8,9 @@ const http_1 = require("http");
|
|
|
8
8
|
const https_1 = require("https");
|
|
9
9
|
const types_1 = require("../../types");
|
|
10
10
|
const base_route_1 = __importDefault(require("../base-route"));
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
// Any sub-path under this prefix is forwarded verbatim to the executor root, so a new executor
|
|
12
|
+
// route needs no agent change.
|
|
13
|
+
const AGENT_PREFIX = '/_internal/executor';
|
|
13
14
|
// Never forwarded: hop-by-hop headers, Host (Node derives the executor's from the target URL),
|
|
14
15
|
// and length/encoding the HTTP client recomputes.
|
|
15
16
|
const SKIPPED_HEADERS = new Set([
|
|
@@ -24,8 +25,8 @@ const SKIPPED_HEADERS = new Set([
|
|
|
24
25
|
'host',
|
|
25
26
|
'content-length',
|
|
26
27
|
]);
|
|
27
|
-
// Substrings that could let the wildcard escape
|
|
28
|
-
// backslash, null byte).
|
|
28
|
+
// Substrings that could let the wildcard escape the executor origin (traversal, encoded dots,
|
|
29
|
+
// backslash, null byte). SSRF hygiene — not a namespace allowlist.
|
|
29
30
|
const UNSAFE_PATH_FRAGMENTS = ['..', '%2e', '%2E', '\\', '\0'];
|
|
30
31
|
const REQUEST_TIMEOUT_MS = 120000;
|
|
31
32
|
class WorkflowExecutorProxyRoute extends base_route_1.default {
|
|
@@ -34,11 +35,8 @@ class WorkflowExecutorProxyRoute extends base_route_1.default {
|
|
|
34
35
|
this.type = types_1.RouteType.PrivateRoute;
|
|
35
36
|
// Overridable so tests can exercise the timeout branch without waiting the full default.
|
|
36
37
|
this.requestTimeoutMs = REQUEST_TIMEOUT_MS;
|
|
37
|
-
// Remove trailing slash for clean URL joining
|
|
38
38
|
this.executorUrl = new URL(options.workflowExecutorUrl.replace(/\/+$/, ''));
|
|
39
39
|
}
|
|
40
|
-
// Single catch-all: any sub-path/verb under AGENT_PREFIX is forwarded to EXECUTOR_PREFIX, so a
|
|
41
|
-
// new executor route needs no change here (PRD-567).
|
|
42
40
|
setupRoutes(router) {
|
|
43
41
|
router.all(`${AGENT_PREFIX}/:path(.*)`, this.handleProxy.bind(this));
|
|
44
42
|
}
|
|
@@ -53,7 +51,7 @@ class WorkflowExecutorProxyRoute extends base_route_1.default {
|
|
|
53
51
|
});
|
|
54
52
|
context.response.status = response.status;
|
|
55
53
|
// Forward every executor response header (minus hop-by-hop) so new executor headers never
|
|
56
|
-
// require an agent change
|
|
54
|
+
// require an agent change — the agent stays a transparent proxy.
|
|
57
55
|
for (const [name, value] of Object.entries(response.headers)) {
|
|
58
56
|
if (value !== undefined && !SKIPPED_HEADERS.has(name.toLowerCase())) {
|
|
59
57
|
context.response.set(name, value);
|
|
@@ -64,19 +62,23 @@ class WorkflowExecutorProxyRoute extends base_route_1.default {
|
|
|
64
62
|
buildTargetUrl(context) {
|
|
65
63
|
const path = this.executorPath(String(context.params.path ?? ''));
|
|
66
64
|
const qs = context.querystring ? `?${context.querystring}` : '';
|
|
67
|
-
|
|
65
|
+
const targetUrl = new URL(`${path}${qs}`, this.executorUrl);
|
|
66
|
+
// Authoritative SSRF check: URL parsing strips control chars the string guard can't see
|
|
67
|
+
// (e.g. a decoded `\t//host` collapses to `//host`), so confirm we never left the executor.
|
|
68
|
+
if (targetUrl.origin !== this.executorUrl.origin) {
|
|
69
|
+
throw new datasource_toolkit_1.NotFoundError('Invalid workflow executor path');
|
|
70
|
+
}
|
|
71
|
+
return targetUrl;
|
|
68
72
|
}
|
|
69
|
-
//
|
|
70
|
-
// could escape it so executor routes outside EXECUTOR_PREFIX stay unreachable through the proxy.
|
|
73
|
+
// First-pass rejection of escape attempts; the authoritative origin check is in buildTargetUrl.
|
|
71
74
|
executorPath(wildcard) {
|
|
72
75
|
const unsafe = wildcard === '' ||
|
|
73
76
|
wildcard.startsWith('/') ||
|
|
74
77
|
UNSAFE_PATH_FRAGMENTS.some(fragment => wildcard.includes(fragment));
|
|
75
78
|
if (unsafe)
|
|
76
79
|
throw new datasource_toolkit_1.NotFoundError('Invalid workflow executor path');
|
|
77
|
-
return
|
|
80
|
+
return `/${wildcard}`;
|
|
78
81
|
}
|
|
79
|
-
// Forwards every client header except the ones in SKIPPED_HEADERS.
|
|
80
82
|
forwardedHeaders(context) {
|
|
81
83
|
const headers = {};
|
|
82
84
|
for (const [name, value] of Object.entries(context.request.headers)) {
|
|
@@ -119,4 +121,4 @@ class WorkflowExecutorProxyRoute extends base_route_1.default {
|
|
|
119
121
|
}
|
|
120
122
|
}
|
|
121
123
|
exports.default = WorkflowExecutorProxyRoute;
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2Zsb3ctZXhlY3V0b3ItcHJveHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGVzL3dvcmtmbG93L3dvcmtmbG93LWV4ZWN1dG9yLXByb3h5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBTUEsd0VBQWdFO0FBQ2hFLCtCQUE4QztBQUM5QyxpQ0FBZ0Q7QUFFaEQsdUNBQWtEO0FBQ2xELCtEQUFzQztBQUV0QywrRkFBK0Y7QUFDL0YsK0JBQStCO0FBQy9CLE1BQU0sWUFBWSxHQUFHLHFCQUFxQixDQUFDO0FBQzNDLCtGQUErRjtBQUMvRixrREFBa0Q7QUFDbEQsTUFBTSxlQUFlLEdBQUcsSUFBSSxHQUFHLENBQUM7SUFDOUIsWUFBWTtJQUNaLFlBQVk7SUFDWixtQkFBbUI7SUFDbkIsU0FBUztJQUNULElBQUk7SUFDSixTQUFTO0lBQ1Qsb0JBQW9CO0lBQ3BCLHFCQUFxQjtJQUNyQixNQUFNO0lBQ04sZ0JBQWdCO0NBQ2pCLENBQUMsQ0FBQztBQUNILDhGQUE4RjtBQUM5RixtRUFBbUU7QUFDbkUsTUFBTSxxQkFBcUIsR0FBRyxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztBQUMvRCxNQUFNLGtCQUFrQixHQUFHLE1BQU8sQ0FBQztBQUVuQyxNQUFxQiwwQkFBMkIsU0FBUSxvQkFBUztJQU0vRCxZQUFZLFFBQXVDLEVBQUUsT0FBaUM7UUFDcEYsS0FBSyxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQztRQU5sQixTQUFJLEdBQUcsaUJBQVMsQ0FBQyxZQUFZLENBQUM7UUFFdkMseUZBQXlGO1FBQ3RFLHFCQUFnQixHQUFXLGtCQUFrQixDQUFDO1FBSS9ELElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQztJ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
|
package/dist/types.d.ts
CHANGED
|
@@ -46,8 +46,8 @@ export type AgentOptions = {
|
|
|
46
46
|
useUnsafeActionEndpoint?: boolean;
|
|
47
47
|
/**
|
|
48
48
|
* Base URL of the workflow executor to proxy requests to.
|
|
49
|
-
* When set, the agent
|
|
50
|
-
*
|
|
49
|
+
* When set, the agent forwards `/_internal/executor/*` to the executor verbatim,
|
|
50
|
+
* benefiting from the agent's authentication layer.
|
|
51
51
|
* @example 'http://localhost:4001'
|
|
52
52
|
*/
|
|
53
53
|
workflowExecutorUrl?: string | null;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@forestadmin/agent",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.81.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"@forestadmin/datasource-customizer": "1.69.3",
|
|
18
18
|
"@forestadmin/datasource-toolkit": "1.53.1",
|
|
19
19
|
"@forestadmin/forestadmin-client": "1.40.3",
|
|
20
|
-
"@forestadmin/mcp-server": "1.
|
|
20
|
+
"@forestadmin/mcp-server": "1.14.0",
|
|
21
21
|
"@koa/bodyparser": "^6.0.0",
|
|
22
22
|
"@koa/cors": "^5.0.0",
|
|
23
23
|
"@koa/router": "^13.1.0",
|