@wunderio/wdrmcp 0.1.9 → 0.1.11
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/README.md +15 -5
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +29 -1
- package/dist/config.js.map +1 -1
- package/dist/executors/command.d.ts +4 -0
- package/dist/executors/command.d.ts.map +1 -1
- package/dist/executors/command.js +73 -12
- package/dist/executors/command.js.map +1 -1
- package/dist/executors/mcp-proxy.d.ts +1 -3
- package/dist/executors/mcp-proxy.d.ts.map +1 -1
- package/dist/executors/mcp-proxy.js +22 -28
- package/dist/executors/mcp-proxy.js.map +1 -1
- package/dist/executors/ssh.d.ts +6 -6
- package/dist/executors/ssh.d.ts.map +1 -1
- package/dist/executors/ssh.js +41 -40
- package/dist/executors/ssh.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/logger.d.ts +4 -2
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +8 -3
- package/dist/logger.js.map +1 -1
- package/dist/registry.d.ts +1 -0
- package/dist/registry.d.ts.map +1 -1
- package/dist/registry.js +153 -15
- package/dist/registry.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +42 -6
- package/dist/server.js.map +1 -1
- package/dist/types.d.ts +6 -1
- package/dist/types.d.ts.map +1 -1
- package/package.json +6 -5
package/README.md
CHANGED
|
@@ -40,6 +40,7 @@ wdrmcp --tools-config /path/to/tools-config [options]
|
|
|
40
40
|
| `--tools-config <path>` | Path to YAML tool config directory | *(required)* |
|
|
41
41
|
| `--log-level <level>` | Log level (debug, info, warn, error) | `info` |
|
|
42
42
|
| `--log-file <path>` | Log file path | `/tmp/wdrmcp.log` |
|
|
43
|
+
| `--strict-host-key-checking` | Enforce SSH host key verification | `false` |
|
|
43
44
|
|
|
44
45
|
**Environment variables:**
|
|
45
46
|
|
|
@@ -48,6 +49,7 @@ wdrmcp --tools-config /path/to/tools-config [options]
|
|
|
48
49
|
| `DDEV_PROJECT` | DDEV project name | `default-project` |
|
|
49
50
|
| `HOST_PROJECT_ROOT` | Host filesystem project root | `/workspace` |
|
|
50
51
|
| `CONTAINER_PROJECT_ROOT` | Container filesystem project root | `/var/www/html` |
|
|
52
|
+
| `SSH_STRICT_HOST_KEY_CHECKING` | Enforce SSH host key verification (`true`/`false`) | `false` |
|
|
51
53
|
|
|
52
54
|
### VS Code / GitHub Copilot Configuration
|
|
53
55
|
|
|
@@ -71,7 +73,7 @@ Tools are defined in YAML files within the tools-config directory. Each file mus
|
|
|
71
73
|
|
|
72
74
|
### Command Tool
|
|
73
75
|
|
|
74
|
-
Executes shell commands
|
|
76
|
+
Executes shell commands over SSH:
|
|
75
77
|
|
|
76
78
|
```yaml
|
|
77
79
|
tools:
|
|
@@ -80,8 +82,9 @@ tools:
|
|
|
80
82
|
description: "What this tool does"
|
|
81
83
|
type: command
|
|
82
84
|
command_template: "my-command {arg1} {arg2}"
|
|
83
|
-
|
|
84
|
-
|
|
85
|
+
ssh_target: "web"
|
|
86
|
+
ssh_user: "${DDEV_SSH_USER}"
|
|
87
|
+
working_dir: "/var/www/html"
|
|
85
88
|
shell: "/bin/bash"
|
|
86
89
|
default_args:
|
|
87
90
|
arg2: "default-value"
|
|
@@ -91,6 +94,7 @@ tools:
|
|
|
91
94
|
validation_rules:
|
|
92
95
|
- pattern: "dangerous-pattern"
|
|
93
96
|
message: "This pattern is not allowed"
|
|
97
|
+
max_arg_length: 4096
|
|
94
98
|
input_schema:
|
|
95
99
|
type: object
|
|
96
100
|
properties:
|
|
@@ -115,8 +119,7 @@ tools:
|
|
|
115
119
|
expose_remote_tools: true
|
|
116
120
|
tool_prefix: "remote_"
|
|
117
121
|
timeout: 30
|
|
118
|
-
auth_token: "
|
|
119
|
-
verify_ssl: true
|
|
122
|
+
auth_token: "${REMOTE_MCP_TOKEN}"
|
|
120
123
|
```
|
|
121
124
|
|
|
122
125
|
## Architecture
|
|
@@ -139,3 +142,10 @@ src/
|
|
|
139
142
|
## License
|
|
140
143
|
|
|
141
144
|
MIT
|
|
145
|
+
|
|
146
|
+
## Security Notes
|
|
147
|
+
|
|
148
|
+
- Argument placeholders in `command_template` are shell-escaped per argument before execution.
|
|
149
|
+
- `disallowed_commands` are matched against both argument values and rendered command strings.
|
|
150
|
+
- Host key verification is configurable; set `--strict-host-key-checking` (or `SSH_STRICT_HOST_KEY_CHECKING=true`) for production-like environments.
|
|
151
|
+
- Use environment placeholders for credentials (`${VAR}`) instead of literal secrets in YAML.
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAwD/C,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,YAAY,CA2EtD"}
|
package/dist/config.js
CHANGED
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
* CLI argument parsing and configuration loading.
|
|
3
3
|
*/
|
|
4
4
|
import { existsSync, readFileSync } from "node:fs";
|
|
5
|
-
|
|
5
|
+
import { resolve } from "node:path";
|
|
6
|
+
import dotenv from "dotenv";
|
|
7
|
+
const DEFAULT_SSH_USER_FILE = "/workspace/.ddev/.agents/.runtime.env";
|
|
6
8
|
function readSshUserFromFile(filePath) {
|
|
7
9
|
if (!existsSync(filePath)) {
|
|
8
10
|
return undefined;
|
|
@@ -17,6 +19,16 @@ function readSshUserFromFile(filePath) {
|
|
|
17
19
|
}
|
|
18
20
|
return undefined;
|
|
19
21
|
}
|
|
22
|
+
function loadEnvFileIfExists(filePath) {
|
|
23
|
+
if (!existsSync(filePath)) {
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
26
|
+
dotenv.config({ path: filePath, override: false });
|
|
27
|
+
}
|
|
28
|
+
function loadProjectEnvFromToolsConfigPath(toolsConfigPath) {
|
|
29
|
+
const toolsConfigEnv = resolve(toolsConfigPath, ".env");
|
|
30
|
+
loadEnvFileIfExists(toolsConfigEnv);
|
|
31
|
+
}
|
|
20
32
|
function printUsage() {
|
|
21
33
|
console.error(`
|
|
22
34
|
Usage: wdrmcp --tools-config <path> [options]
|
|
@@ -25,6 +37,8 @@ Options:
|
|
|
25
37
|
--tools-config <path> Path to directory containing YAML tool configuration files (required)
|
|
26
38
|
--log-level <level> Log level: debug, info, warn, error (default: info)
|
|
27
39
|
--log-file <path> Path to log file (default: /tmp/wdrmcp.log)
|
|
40
|
+
--strict-host-key-checking Enforce SSH host key verification (default: false)
|
|
41
|
+
--verbose Enable extensive logging (full outputs, command details, debug info)
|
|
28
42
|
--help Show this help message
|
|
29
43
|
|
|
30
44
|
Environment variables:
|
|
@@ -34,6 +48,7 @@ Environment variables:
|
|
|
34
48
|
DDEV_SSH_USER SSH user for container connections (preferred)
|
|
35
49
|
DDEV_SSH_USER_FILE Path to a file containing SSH user (fallback)
|
|
36
50
|
SSH_USER SSH user for container connections (fallback, default: $USER)
|
|
51
|
+
SSH_STRICT_HOST_KEY_CHECKING true/false toggle for SSH host key checking
|
|
37
52
|
`);
|
|
38
53
|
}
|
|
39
54
|
export function parseArgs(argv) {
|
|
@@ -41,6 +56,8 @@ export function parseArgs(argv) {
|
|
|
41
56
|
let toolsConfigPath;
|
|
42
57
|
let logLevel = "info";
|
|
43
58
|
let logFile = "/tmp/wdrmcp.log";
|
|
59
|
+
let verboseLogging = false;
|
|
60
|
+
let strictHostKeyChecking = (process.env.SSH_STRICT_HOST_KEY_CHECKING ?? "false").toLowerCase() === "true";
|
|
44
61
|
for (let i = 0; i < args.length; i++) {
|
|
45
62
|
switch (args[i]) {
|
|
46
63
|
case "--tools-config":
|
|
@@ -52,6 +69,12 @@ export function parseArgs(argv) {
|
|
|
52
69
|
case "--log-file":
|
|
53
70
|
logFile = args[++i];
|
|
54
71
|
break;
|
|
72
|
+
case "--verbose":
|
|
73
|
+
verboseLogging = true;
|
|
74
|
+
break;
|
|
75
|
+
case "--strict-host-key-checking":
|
|
76
|
+
strictHostKeyChecking = true;
|
|
77
|
+
break;
|
|
55
78
|
case "--help":
|
|
56
79
|
printUsage();
|
|
57
80
|
process.exit(0);
|
|
@@ -66,6 +89,9 @@ export function parseArgs(argv) {
|
|
|
66
89
|
printUsage();
|
|
67
90
|
process.exit(1);
|
|
68
91
|
}
|
|
92
|
+
// Load project .env early so placeholders in tools config can resolve
|
|
93
|
+
// without requiring shell-level exports.
|
|
94
|
+
loadProjectEnvFromToolsConfigPath(toolsConfigPath);
|
|
69
95
|
// SSH user resolution strategy:
|
|
70
96
|
// 1. Primary: DDEV_SSH_USER env var (explicit override)
|
|
71
97
|
// 2. Secondary: Read from .env file (auto-detected in container)
|
|
@@ -83,9 +109,11 @@ export function parseArgs(argv) {
|
|
|
83
109
|
ddevProject: process.env.DDEV_PROJECT ?? "default-project",
|
|
84
110
|
logLevel,
|
|
85
111
|
logFile,
|
|
112
|
+
verboseLogging,
|
|
86
113
|
hostProjectRoot: process.env.HOST_PROJECT_ROOT ?? "/workspace",
|
|
87
114
|
containerProjectRoot: process.env.CONTAINER_PROJECT_ROOT ?? "/var/www/html",
|
|
88
115
|
sshUser,
|
|
116
|
+
strictHostKeyChecking,
|
|
89
117
|
};
|
|
90
118
|
}
|
|
91
119
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export interface CommandExecutorOptions {
|
|
|
13
13
|
defaultArgs?: Record<string, string>;
|
|
14
14
|
disallowedCommands?: string[];
|
|
15
15
|
validationRules?: ValidationRule[];
|
|
16
|
+
maxArgLength?: number;
|
|
16
17
|
}
|
|
17
18
|
export declare class CommandToolExecutor implements ToolExecutor {
|
|
18
19
|
private readonly commandTemplate;
|
|
@@ -24,10 +25,13 @@ export declare class CommandToolExecutor implements ToolExecutor {
|
|
|
24
25
|
private readonly defaultArgs;
|
|
25
26
|
private readonly disallowedCommands;
|
|
26
27
|
private readonly validationRules;
|
|
28
|
+
private readonly maxArgLength;
|
|
27
29
|
constructor(options: CommandExecutorOptions);
|
|
28
30
|
execute(args: Record<string, unknown>): Promise<ToolExecutionResult>;
|
|
29
31
|
validateArguments(args: Record<string, unknown>): void;
|
|
30
32
|
/** Check validation rules against a value. Returns error message or null. */
|
|
31
33
|
private checkRules;
|
|
34
|
+
private escapeShellArg;
|
|
35
|
+
private matchesDisallowed;
|
|
32
36
|
}
|
|
33
37
|
//# sourceMappingURL=command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/executors/command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAExG,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/executors/command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAExG,MAAM,WAAW,sBAAsB;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,eAAe,CAAC,EAAE,cAAc,EAAE,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,mBAAoB,YAAW,YAAY;IACtD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyB;IACrD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAc;IACjD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;IACnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,OAAO,EAAE,sBAAsB;IAarC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAkF1E,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IA6BtD,6EAA6E;IAC7E,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,iBAAiB;CAmB1B"}
|
|
@@ -13,6 +13,7 @@ export class CommandToolExecutor {
|
|
|
13
13
|
defaultArgs;
|
|
14
14
|
disallowedCommands;
|
|
15
15
|
validationRules;
|
|
16
|
+
maxArgLength;
|
|
16
17
|
constructor(options) {
|
|
17
18
|
this.commandTemplate = options.commandTemplate;
|
|
18
19
|
this.host = options.host;
|
|
@@ -23,36 +24,55 @@ export class CommandToolExecutor {
|
|
|
23
24
|
this.defaultArgs = options.defaultArgs ?? {};
|
|
24
25
|
this.disallowedCommands = new Set(options.disallowedCommands ?? []);
|
|
25
26
|
this.validationRules = options.validationRules ?? [];
|
|
27
|
+
this.maxArgLength = options.maxArgLength ?? 4096;
|
|
26
28
|
}
|
|
27
29
|
async execute(args) {
|
|
28
30
|
const log = getLogger();
|
|
31
|
+
const startTime = Date.now();
|
|
29
32
|
// Merge with defaults.
|
|
30
33
|
const mergedArgs = { ...this.defaultArgs, ...args };
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
34
|
+
if (log.isVerbose()) {
|
|
35
|
+
log.debug(`Executing with args:`, mergedArgs);
|
|
36
|
+
}
|
|
37
|
+
// Check disallowed patterns against all provided string arguments.
|
|
38
|
+
for (const value of Object.values(mergedArgs)) {
|
|
39
|
+
if (typeof value === "string" && this.matchesDisallowed(value)) {
|
|
40
|
+
log.warn(`Blocked disallowed command in arguments`);
|
|
41
|
+
return { content: "Error: Command contains blocked pattern", isError: true };
|
|
42
|
+
}
|
|
35
43
|
}
|
|
36
44
|
// Substitute arguments into template.
|
|
37
45
|
let cmdStr;
|
|
38
46
|
try {
|
|
47
|
+
if (log.isVerbose()) {
|
|
48
|
+
log.debug(`Command template: ${this.commandTemplate}`);
|
|
49
|
+
}
|
|
39
50
|
cmdStr = this.commandTemplate.replace(/\{(\w+)\}/g, (_match, key) => {
|
|
40
51
|
if (key in mergedArgs)
|
|
41
|
-
return String(mergedArgs[key]);
|
|
52
|
+
return this.escapeShellArg(String(mergedArgs[key]));
|
|
42
53
|
throw new Error(`Missing required argument: ${key}`);
|
|
43
54
|
});
|
|
55
|
+
if (log.isVerbose()) {
|
|
56
|
+
log.debug(`Rendered command: ${cmdStr}`);
|
|
57
|
+
}
|
|
44
58
|
}
|
|
45
59
|
catch (e) {
|
|
60
|
+
log.warn(`Argument substitution failed: ${e.message}`);
|
|
46
61
|
return { content: `Error: ${e.message}`, isError: true };
|
|
47
62
|
}
|
|
48
63
|
// Validate rendered command against rules.
|
|
49
64
|
const ruleError = this.checkRules(cmdStr);
|
|
50
65
|
if (ruleError) {
|
|
66
|
+
log.warn(`Validation failed: ${ruleError}`);
|
|
51
67
|
return { content: `Validation error: ${ruleError}`, isError: true };
|
|
52
68
|
}
|
|
69
|
+
if (this.matchesDisallowed(cmdStr)) {
|
|
70
|
+
log.warn(`Blocked disallowed command in rendered template`);
|
|
71
|
+
return { content: "Error: Command contains blocked pattern", isError: true };
|
|
72
|
+
}
|
|
53
73
|
// Execute via injected executor (SSH or other).
|
|
54
74
|
try {
|
|
55
|
-
log.info(`EXEC: ${this.host} via ${this.executor.constructor.name}`);
|
|
75
|
+
log.info(`EXEC: ${this.host} via ${this.executor.constructor.name}, shell: ${this.shell}, workdir: ${this.workingDir || "default"}`);
|
|
56
76
|
const output = await this.executor.execute({
|
|
57
77
|
host: this.host,
|
|
58
78
|
command: [cmdStr],
|
|
@@ -60,21 +80,42 @@ export class CommandToolExecutor {
|
|
|
60
80
|
shell: this.shell,
|
|
61
81
|
workingDir: this.workingDir,
|
|
62
82
|
});
|
|
63
|
-
|
|
83
|
+
const trimmedOutput = output.trim();
|
|
84
|
+
const duration = Date.now() - startTime;
|
|
85
|
+
log.info(`EXEC SUCCESS: ${this.host} (${duration}ms)`);
|
|
86
|
+
// Add success message for empty outputs
|
|
87
|
+
if (trimmedOutput.length === 0) {
|
|
88
|
+
return { content: "Command completed successfully (no output)" };
|
|
89
|
+
}
|
|
90
|
+
return { content: trimmedOutput };
|
|
64
91
|
}
|
|
65
92
|
catch (e) {
|
|
93
|
+
const duration = Date.now() - startTime;
|
|
66
94
|
const errorMsg = e.message;
|
|
95
|
+
log.error(`EXEC FAILED: ${this.host} (${duration}ms), error: ${errorMsg}`);
|
|
96
|
+
if (log.isVerbose()) {
|
|
97
|
+
log.debug(`Failed command: ${cmdStr}`);
|
|
98
|
+
}
|
|
67
99
|
return {
|
|
68
|
-
content: `Command failed: ${
|
|
100
|
+
content: `Command failed: ${errorMsg}`,
|
|
69
101
|
isError: true
|
|
70
102
|
};
|
|
71
103
|
}
|
|
72
104
|
}
|
|
73
105
|
validateArguments(args) {
|
|
74
|
-
// Check validation rules against
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
|
|
106
|
+
// Check validation rules and max-length against each string argument value.
|
|
107
|
+
for (const [key, value] of Object.entries(args)) {
|
|
108
|
+
if (typeof value !== "string") {
|
|
109
|
+
continue;
|
|
110
|
+
}
|
|
111
|
+
if (value.length > this.maxArgLength) {
|
|
112
|
+
throw new Error(`Argument '${key}' exceeds max length of ${this.maxArgLength}`);
|
|
113
|
+
}
|
|
114
|
+
const ruleError = this.checkRules(value);
|
|
115
|
+
if (ruleError) {
|
|
116
|
+
throw new Error(ruleError);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
78
119
|
// Verify required placeholders are provided.
|
|
79
120
|
const placeholders = new Set([...this.commandTemplate.matchAll(/\{(\w+)\}/g)].map((m) => m[1]));
|
|
80
121
|
const provided = new Set([...Object.keys(this.defaultArgs), ...Object.keys(args)]);
|
|
@@ -92,5 +133,25 @@ export class CommandToolExecutor {
|
|
|
92
133
|
}
|
|
93
134
|
return null;
|
|
94
135
|
}
|
|
136
|
+
escapeShellArg(value) {
|
|
137
|
+
return `'${value.replace(/'/g, `'"'"'`)}'`;
|
|
138
|
+
}
|
|
139
|
+
matchesDisallowed(value) {
|
|
140
|
+
for (const disallowed of this.disallowedCommands) {
|
|
141
|
+
if (!disallowed) {
|
|
142
|
+
continue;
|
|
143
|
+
}
|
|
144
|
+
const trimmed = disallowed.trim();
|
|
145
|
+
if (!trimmed) {
|
|
146
|
+
continue;
|
|
147
|
+
}
|
|
148
|
+
const escaped = trimmed.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
149
|
+
const pattern = new RegExp(`(?:^|[\\s;&|()])${escaped}(?:$|[\\s;&|()])`, "i");
|
|
150
|
+
if (pattern.test(value)) {
|
|
151
|
+
return true;
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
return false;
|
|
155
|
+
}
|
|
95
156
|
}
|
|
96
157
|
//# sourceMappingURL=command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/executors/command.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/executors/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,13 +20,13 @@ export interface McpProxyOptions {
|
|
|
20
20
|
authPassword?: string;
|
|
21
21
|
authToken?: string;
|
|
22
22
|
authTokenBasic?: boolean;
|
|
23
|
-
verifySsl?: boolean;
|
|
24
23
|
}
|
|
25
24
|
export declare class McpProxyExecutor implements ToolExecutor {
|
|
26
25
|
private readonly serverUrl;
|
|
27
26
|
private readonly forwardArgs;
|
|
28
27
|
private readonly timeout;
|
|
29
28
|
private readonly headers;
|
|
29
|
+
private requestId;
|
|
30
30
|
constructor(options: McpProxyOptions);
|
|
31
31
|
/** Fetch available tools from the remote MCP server via tools/list. */
|
|
32
32
|
fetchRemoteTools(): Promise<RemoteToolDefinition[]>;
|
|
@@ -42,8 +42,6 @@ export declare class McpProxyExecutor implements ToolExecutor {
|
|
|
42
42
|
private rpc;
|
|
43
43
|
/** Parse a JSON-RPC response into a ToolExecutionResult. */
|
|
44
44
|
private parseResponse;
|
|
45
|
-
/** Determine the type of data for metadata. */
|
|
46
|
-
private getDataType;
|
|
47
45
|
}
|
|
48
46
|
/**
|
|
49
47
|
* A thin wrapper that binds a specific remote tool name to a McpProxyExecutor.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-proxy.d.ts","sourceRoot":"","sources":["../../src/executors/mcp-proxy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAErE,wDAAwD;AACxD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-proxy.d.ts","sourceRoot":"","sources":["../../src/executors/mcp-proxy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAErE,wDAAwD;AACxD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,qBAAa,gBAAiB,YAAW,YAAY;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAU;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;IACjD,OAAO,CAAC,SAAS,CAAK;gBAEV,OAAO,EAAE,eAAe;IAqBpC,uEAAuE;IACjE,gBAAgB,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC;IA2BzD,gDAAgD;IAC1C,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAI1E;;;OAGG;IACG,QAAQ,CACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,mBAAmB,CAAC;IA0B/B,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAIvD,oDAAoD;YACtC,GAAG;IAqBjB,4DAA4D;IAC5D,OAAO,CAAC,aAAa;CA2CtB;AAED;;;;GAIG;AACH,qBAAa,uBAAwB,YAAW,YAAY;IAExD,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc;gBADd,KAAK,EAAE,gBAAgB,EACvB,cAAc,EAAE,MAAM;IAGnC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAI1E,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;CAGxD"}
|
|
@@ -11,6 +11,7 @@ export class McpProxyExecutor {
|
|
|
11
11
|
forwardArgs;
|
|
12
12
|
timeout;
|
|
13
13
|
headers;
|
|
14
|
+
requestId = 1;
|
|
14
15
|
constructor(options) {
|
|
15
16
|
this.serverUrl = options.serverUrl;
|
|
16
17
|
this.forwardArgs = options.forwardArgs ?? true;
|
|
@@ -95,11 +96,12 @@ export class McpProxyExecutor {
|
|
|
95
96
|
async rpc(method, params) {
|
|
96
97
|
const controller = new AbortController();
|
|
97
98
|
const timer = setTimeout(() => controller.abort(), this.timeout);
|
|
99
|
+
const id = this.requestId++;
|
|
98
100
|
try {
|
|
99
101
|
const response = await fetch(this.serverUrl, {
|
|
100
102
|
method: "POST",
|
|
101
103
|
headers: this.headers,
|
|
102
|
-
body: JSON.stringify({ jsonrpc: "2.0", method, params, id
|
|
104
|
+
body: JSON.stringify({ jsonrpc: "2.0", method, params, id }),
|
|
103
105
|
signal: controller.signal,
|
|
104
106
|
});
|
|
105
107
|
if (!response.ok) {
|
|
@@ -117,44 +119,36 @@ export class McpProxyExecutor {
|
|
|
117
119
|
return { content: typeof result === "string" ? result : JSON.stringify(result) };
|
|
118
120
|
}
|
|
119
121
|
const r = result;
|
|
122
|
+
// Handle JSON-RPC result field — return raw data without wrapping
|
|
120
123
|
if ("result" in r) {
|
|
121
124
|
const res = r.result;
|
|
122
|
-
|
|
123
|
-
const response = {
|
|
124
|
-
data: res,
|
|
125
|
-
type: this.getDataType(res),
|
|
126
|
-
status: "success"
|
|
127
|
-
};
|
|
128
|
-
return { content: JSON.stringify(response) };
|
|
125
|
+
return { content: typeof res === "string" ? res : JSON.stringify(res) };
|
|
129
126
|
}
|
|
127
|
+
// Handle MCP-style content array
|
|
130
128
|
const content = r.content;
|
|
131
129
|
if (Array.isArray(content) && content.length > 0) {
|
|
132
130
|
const textContent = content[0].text;
|
|
131
|
+
// Try to parse JSON-escaped strings
|
|
132
|
+
if (textContent && typeof textContent === 'string') {
|
|
133
|
+
try {
|
|
134
|
+
const parsed = JSON.parse(textContent);
|
|
135
|
+
return { content: typeof parsed === 'string' ? parsed : JSON.stringify(parsed) };
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
// Not JSON, return as-is
|
|
139
|
+
return { content: textContent };
|
|
140
|
+
}
|
|
141
|
+
}
|
|
133
142
|
return { content: textContent ?? JSON.stringify(result) };
|
|
134
143
|
}
|
|
144
|
+
// Handle JSON-RPC error field
|
|
135
145
|
if ("error" in r) {
|
|
136
146
|
const err = r.error;
|
|
137
|
-
const
|
|
138
|
-
|
|
139
|
-
code: err.code ?? -1,
|
|
140
|
-
status: "error"
|
|
141
|
-
};
|
|
142
|
-
return { content: JSON.stringify(response), isError: true };
|
|
147
|
+
const message = err.message ?? String(err);
|
|
148
|
+
return { content: String(message), isError: true };
|
|
143
149
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
type: this.getDataType(result),
|
|
147
|
-
status: "success"
|
|
148
|
-
};
|
|
149
|
-
return { content: JSON.stringify(response) };
|
|
150
|
-
}
|
|
151
|
-
/** Determine the type of data for metadata. */
|
|
152
|
-
getDataType(value) {
|
|
153
|
-
if (value === null)
|
|
154
|
-
return "null";
|
|
155
|
-
if (Array.isArray(value))
|
|
156
|
-
return "array";
|
|
157
|
-
return typeof value;
|
|
150
|
+
// Fallback: return raw data as-is
|
|
151
|
+
return { content: typeof result === "string" ? result : JSON.stringify(result) };
|
|
158
152
|
}
|
|
159
153
|
}
|
|
160
154
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-proxy.js","sourceRoot":"","sources":["../../src/executors/mcp-proxy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-proxy.js","sourceRoot":"","sources":["../../src/executors/mcp-proxy.ts"],"names":[],"mappings":"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"}
|
package/dist/executors/ssh.d.ts
CHANGED
|
@@ -5,7 +5,11 @@ import type { ContainerExecutor } from "../types.js";
|
|
|
5
5
|
*/
|
|
6
6
|
export declare class SshExecutor implements ContainerExecutor {
|
|
7
7
|
private readonly defaultUser;
|
|
8
|
-
|
|
8
|
+
private readonly strictHostKeyChecking;
|
|
9
|
+
constructor(options?: {
|
|
10
|
+
defaultUser?: string;
|
|
11
|
+
strictHostKeyChecking?: boolean;
|
|
12
|
+
});
|
|
9
13
|
execute(options: {
|
|
10
14
|
host: string;
|
|
11
15
|
command: string[];
|
|
@@ -24,11 +28,7 @@ export declare class SshExecutor implements ContainerExecutor {
|
|
|
24
28
|
* Wraps the entire command in single quotes and escapes any embedded single quotes.
|
|
25
29
|
*/
|
|
26
30
|
private escapeShellCommand;
|
|
31
|
+
private escapeShellArg;
|
|
27
32
|
private buildDdevEnvPrelude;
|
|
28
|
-
/**
|
|
29
|
-
* Extract the most relevant error information from stderr.
|
|
30
|
-
* Removes file paths, line numbers, and stack traces, keeping only actionable error lines.
|
|
31
|
-
*/
|
|
32
|
-
private extractErrorMessage;
|
|
33
33
|
}
|
|
34
34
|
//# sourceMappingURL=ssh.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh.d.ts","sourceRoot":"","sources":["../../src/executors/ssh.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD;;;GAGG;AACH,qBAAa,WAAY,YAAW,iBAAiB;IACnD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;
|
|
1
|
+
{"version":3,"file":"ssh.d.ts","sourceRoot":"","sources":["../../src/executors/ssh.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD;;;GAGG;AACH,qBAAa,WAAY,YAAW,iBAAiB;IACnD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAU;gBAEpC,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,qBAAqB,CAAC,EAAE,OAAO,CAAA;KAAE;IAKzE,OAAO,CAAC,OAAO,EAAE;QACrB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC,MAAM,CAAC;IA8EnB;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAOtB;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,mBAAmB;CAU5B"}
|