airlock-bot 0.2.35 → 0.2.37
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 +31 -1
- package/dist/audit/api.d.ts +2 -0
- package/dist/audit/api.d.ts.map +1 -1
- package/dist/audit/api.js +3 -13
- package/dist/audit/api.js.map +1 -1
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +41 -1
- package/dist/config/loader.js.map +1 -1
- package/dist/config/profiles.d.ts +3 -6
- package/dist/config/profiles.d.ts.map +1 -1
- package/dist/config/profiles.js +52 -19
- package/dist/config/profiles.js.map +1 -1
- package/dist/config/schema.d.ts +368 -8
- package/dist/config/schema.d.ts.map +1 -1
- package/dist/config/schema.js +35 -0
- package/dist/config/schema.js.map +1 -1
- package/dist/configure-web/cli.d.ts +41 -2
- package/dist/configure-web/cli.d.ts.map +1 -1
- package/dist/configure-web/cli.js +1283 -55
- package/dist/configure-web/cli.js.map +1 -1
- package/dist/gateway.d.ts +7 -1
- package/dist/gateway.d.ts.map +1 -1
- package/dist/gateway.js +81 -26
- package/dist/gateway.js.map +1 -1
- package/dist/hitl/api.d.ts +2 -0
- package/dist/hitl/api.d.ts.map +1 -1
- package/dist/hitl/api.js +3 -13
- package/dist/hitl/api.js.map +1 -1
- package/dist/hitl/approval-dashboard.d.ts +19 -0
- package/dist/hitl/approval-dashboard.d.ts.map +1 -0
- package/dist/hitl/approval-dashboard.js +148 -0
- package/dist/hitl/approval-dashboard.js.map +1 -0
- package/dist/hitl/provider-factory.js +1 -1
- package/dist/hitl/provider-factory.js.map +1 -1
- package/dist/hitl/providers/dashboard.d.ts +4 -5
- package/dist/hitl/providers/dashboard.d.ts.map +1 -1
- package/dist/hitl/providers/dashboard.js +29 -469
- package/dist/hitl/providers/dashboard.js.map +1 -1
- package/dist/hook/api.d.ts +2 -0
- package/dist/hook/api.d.ts.map +1 -1
- package/dist/hook/api.js +3 -13
- package/dist/hook/api.js.map +1 -1
- package/dist/index.js +29 -4
- package/dist/index.js.map +1 -1
- package/dist/middleware/chain-builder.d.ts +1 -1
- package/dist/middleware/chain-builder.d.ts.map +1 -1
- package/dist/middleware/chain-builder.js +4 -2
- package/dist/middleware/chain-builder.js.map +1 -1
- package/dist/middleware/core/arg-policy.d.ts +12 -0
- package/dist/middleware/core/arg-policy.d.ts.map +1 -0
- package/dist/middleware/core/arg-policy.js +91 -0
- package/dist/middleware/core/arg-policy.js.map +1 -0
- package/dist/security/request.d.ts +14 -0
- package/dist/security/request.d.ts.map +1 -0
- package/dist/security/request.js +47 -0
- package/dist/security/request.js.map +1 -0
- package/dist/tools/api.d.ts +2 -0
- package/dist/tools/api.d.ts.map +1 -1
- package/dist/tools/api.js +3 -13
- package/dist/tools/api.js.map +1 -1
- package/dist/transport/http-server.d.ts +2 -0
- package/dist/transport/http-server.d.ts.map +1 -1
- package/dist/transport/http-server.js +9 -22
- package/dist/transport/http-server.js.map +1 -1
- package/dist/transport/sse-server.d.ts +2 -0
- package/dist/transport/sse-server.d.ts.map +1 -1
- package/dist/transport/sse-server.js +9 -26
- package/dist/transport/sse-server.js.map +1 -1
- package/examples/docker-compose.yaml +63 -0
- package/examples/docker-gateway.yaml +61 -0
- package/examples/gateway.yaml +7 -0
- package/examples/profiles.yaml +4 -2
- package/package.json +1 -1
- package/schema.json +79 -0
package/dist/hook/api.js
CHANGED
|
@@ -1,23 +1,13 @@
|
|
|
1
|
-
import { timingSafeEqual } from 'crypto';
|
|
2
1
|
import { normalizeTool } from './normalizer.js';
|
|
3
2
|
import { childLogger } from '../util/logger.js';
|
|
3
|
+
import { checkRequestSecurity } from '../security/request.js';
|
|
4
4
|
const log = childLogger('hook-api');
|
|
5
|
-
function constantTimeEqual(a, b) {
|
|
6
|
-
const bufA = Buffer.from(a);
|
|
7
|
-
const bufB = Buffer.from(b);
|
|
8
|
-
if (bufA.length !== bufB.length)
|
|
9
|
-
return false;
|
|
10
|
-
return timingSafeEqual(bufA, bufB);
|
|
11
|
-
}
|
|
12
5
|
// eslint-disable-next-line @typescript-eslint/require-await
|
|
13
6
|
export async function hookApiPlugin(app, opts) {
|
|
14
|
-
const { allowlist, hitlEngine, hitlBatcher, auditLogger
|
|
7
|
+
const { allowlist, hitlEngine, hitlBatcher, auditLogger } = opts;
|
|
15
8
|
app.addHook('preHandler', async (request, reply) => {
|
|
16
|
-
if (!
|
|
9
|
+
if (!checkRequestSecurity(request, reply, opts)) {
|
|
17
10
|
return;
|
|
18
|
-
const auth = request.headers.authorization ?? '';
|
|
19
|
-
if (!constantTimeEqual(auth, `Bearer ${secret}`)) {
|
|
20
|
-
return reply.status(401).send({ error: 'Unauthorized' });
|
|
21
11
|
}
|
|
22
12
|
});
|
|
23
13
|
app.post('/hook', async (request, reply) => {
|
package/dist/hook/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/hook/api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/hook/api.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -6,7 +6,7 @@ import { Gateway } from './gateway.js';
|
|
|
6
6
|
import { runStdioMode } from './stdio-mode.js';
|
|
7
7
|
import { runDiscover } from './discover/cli.js';
|
|
8
8
|
import { runConfigureAgent } from './configure-agent/cli.js';
|
|
9
|
-
import { runCommandCenter, runConfigureWeb } from './configure-web/cli.js';
|
|
9
|
+
import { runCommandCenter, runConfigureWeb, runDashboard } from './configure-web/cli.js';
|
|
10
10
|
import { runConfigureCli } from './configure-cli/cli.js';
|
|
11
11
|
import { runSetupOpenclaw } from './setup-openclaw/cli.js';
|
|
12
12
|
import { logger } from './util/logger.js';
|
|
@@ -36,6 +36,18 @@ else if (subcommand === 'run') {
|
|
|
36
36
|
process.exit(1);
|
|
37
37
|
});
|
|
38
38
|
}
|
|
39
|
+
else if (subcommand === 'dashboard') {
|
|
40
|
+
runDashboard(process.argv.slice(3)).catch((err) => {
|
|
41
|
+
console.error(err instanceof Error ? err.message : String(err));
|
|
42
|
+
process.exit(1);
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
else if (subcommand === 'gateway') {
|
|
46
|
+
runGateway(process.argv.slice(3), { runtimeOnly: true });
|
|
47
|
+
}
|
|
48
|
+
else if (subcommand === 'serve') {
|
|
49
|
+
runGateway(process.argv.slice(3));
|
|
50
|
+
}
|
|
39
51
|
else if (subcommand === 'configure-cli') {
|
|
40
52
|
runConfigureCli(process.argv.slice(3)).catch((err) => {
|
|
41
53
|
console.error(err instanceof Error ? err.message : String(err));
|
|
@@ -52,10 +64,11 @@ else if (subcommand === 'setup' && process.argv[3] === 'openclaw') {
|
|
|
52
64
|
}
|
|
53
65
|
}
|
|
54
66
|
else {
|
|
55
|
-
runGateway();
|
|
67
|
+
runGateway(process.argv.slice(2));
|
|
56
68
|
}
|
|
57
|
-
function runGateway() {
|
|
69
|
+
function runGateway(argv, options = {}) {
|
|
58
70
|
const { values } = parseArgs({
|
|
71
|
+
args: argv,
|
|
59
72
|
options: {
|
|
60
73
|
config: { type: 'string', short: 'c', default: './airlock.yaml' },
|
|
61
74
|
agent: { type: 'string', short: 'a' },
|
|
@@ -70,6 +83,9 @@ airlock — permissions-aware MCP gateway
|
|
|
70
83
|
|
|
71
84
|
Usage:
|
|
72
85
|
airlock [options]
|
|
86
|
+
airlock gateway [options]
|
|
87
|
+
airlock dashboard [options]
|
|
88
|
+
airlock serve [options]
|
|
73
89
|
airlock discover <cli|api> [options]
|
|
74
90
|
airlock run [options]
|
|
75
91
|
airlock configure-cli <tool> [options]
|
|
@@ -85,6 +101,9 @@ Options:
|
|
|
85
101
|
|
|
86
102
|
Subcommands:
|
|
87
103
|
run Browser command center for provider health and permissions
|
|
104
|
+
gateway MCP/runtime gateway only; disables in-process dashboard provider
|
|
105
|
+
dashboard Standalone admin dashboard for a remote gateway
|
|
106
|
+
serve Combined gateway mode (same behavior as airlock [options])
|
|
88
107
|
discover cli <tool> Auto-discover CLI commands from --help or Fig specs
|
|
89
108
|
discover api <spec> Auto-discover API endpoints from an OpenAPI spec
|
|
90
109
|
configure-cli <tool> Interactive TUI to select and configure CLI commands
|
|
@@ -96,6 +115,12 @@ Examples:
|
|
|
96
115
|
# Start full gateway server
|
|
97
116
|
airlock --config /etc/airlock/gateway.yaml
|
|
98
117
|
|
|
118
|
+
# Start runtime-only gateway for split deployments
|
|
119
|
+
airlock gateway --config /etc/airlock/gateway.yaml
|
|
120
|
+
|
|
121
|
+
# Start standalone admin dashboard for split deployments
|
|
122
|
+
airlock dashboard --config /etc/airlock/gateway.yaml --gateway-url http://gateway:4111
|
|
123
|
+
|
|
99
124
|
# Connect as a specific agent via stdio (for Claude Code, Cursor, etc.)
|
|
100
125
|
airlock --agent helena
|
|
101
126
|
|
|
@@ -130,7 +155,7 @@ Examples:
|
|
|
130
155
|
return;
|
|
131
156
|
}
|
|
132
157
|
// Full gateway mode
|
|
133
|
-
const gateway = new Gateway(config, configPath);
|
|
158
|
+
const gateway = new Gateway(config, configPath, { runtimeOnly: options.runtimeOnly });
|
|
134
159
|
const watcher = new ConfigWatcher(configPath);
|
|
135
160
|
watcher.on('reload', (newConfig) => {
|
|
136
161
|
gateway.reload(newConfig).catch((err) => {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { Middleware, MiddlewareDeps } from './types.js';
|
|
|
4
4
|
* Builds the complete middleware chain for an agent.
|
|
5
5
|
*
|
|
6
6
|
* Core zone (fixed order, always present):
|
|
7
|
-
* allowlist → exec-policy → schema-validator → [detectors from config] → hitl-gate → execute
|
|
7
|
+
* allowlist → exec-policy → schema-validator → arg-policy → [detectors from config] → hitl-gate → execute
|
|
8
8
|
*
|
|
9
9
|
* Post zone (user-configurable, wraps around core):
|
|
10
10
|
* Applied in config order, each wraps the downstream response
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chain-builder.d.ts","sourceRoot":"","sources":["../../src/middleware/chain-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"chain-builder.d.ts","sourceRoot":"","sources":["../../src/middleware/chain-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AA0F7D;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc,GAAG,UAAU,CAqDhG"}
|
|
@@ -5,6 +5,7 @@ import { hitlGateMiddleware } from './core/hitl-gate.js';
|
|
|
5
5
|
import { executeMiddleware } from './core/execute.js';
|
|
6
6
|
import { sandboxMiddleware } from './core/sandbox.js';
|
|
7
7
|
import { schemaValidatorMiddleware } from './core/schema-validator.js';
|
|
8
|
+
import { argPolicyMiddleware } from './core/arg-policy.js';
|
|
8
9
|
import { rateLimiterMiddleware } from './core/rate-limiter.js';
|
|
9
10
|
import { untrustedEnvelopeMiddleware } from './post/untrusted-envelope.js';
|
|
10
11
|
import { stripQueryParamsMiddleware } from './post/strip-query-params.js';
|
|
@@ -88,7 +89,7 @@ const DEFAULT_MIDDLEWARE = [
|
|
|
88
89
|
* Builds the complete middleware chain for an agent.
|
|
89
90
|
*
|
|
90
91
|
* Core zone (fixed order, always present):
|
|
91
|
-
* allowlist → exec-policy → schema-validator → [detectors from config] → hitl-gate → execute
|
|
92
|
+
* allowlist → exec-policy → schema-validator → arg-policy → [detectors from config] → hitl-gate → execute
|
|
92
93
|
*
|
|
93
94
|
* Post zone (user-configurable, wraps around core):
|
|
94
95
|
* Applied in config order, each wraps the downstream response
|
|
@@ -122,11 +123,12 @@ export function buildMiddlewareChain(agentConfig, _deps) {
|
|
|
122
123
|
const schemaValidators = coreUserMiddleware.filter((m) => m.name === 'schema-validator');
|
|
123
124
|
const detectors = coreUserMiddleware.filter((m) => m.name !== 'schema-validator');
|
|
124
125
|
// Core zone: fixed security-critical order
|
|
125
|
-
// allowlist → exec-policy → schema-validator → [detectors] → hitl-gate → sandbox → execute
|
|
126
|
+
// allowlist → exec-policy → schema-validator → arg-policy → [detectors] → hitl-gate → sandbox → execute
|
|
126
127
|
const coreMiddlewares = [
|
|
127
128
|
allowlistMiddleware(),
|
|
128
129
|
execPolicyMiddleware(),
|
|
129
130
|
...schemaValidators.map((m) => withToolFilter(resolveMiddleware(m), m)),
|
|
131
|
+
argPolicyMiddleware(),
|
|
130
132
|
...detectors.map((m) => withToolFilter(resolveMiddleware(m), m)),
|
|
131
133
|
hitlGateMiddleware(),
|
|
132
134
|
sandboxMiddleware(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chain-builder.js","sourceRoot":"","sources":["../../src/middleware/chain-builder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"chain-builder.js","sourceRoot":"","sources":["../../src/middleware/chain-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { ToolArgConstraintConfig } from '../../config/schema.js';
|
|
2
|
+
import type { Middleware } from '../types.js';
|
|
3
|
+
type ToolArgPolicy = Record<string, ToolArgConstraintConfig>;
|
|
4
|
+
export declare function resolveArgPolicy(agentConfig: {
|
|
5
|
+
arg_policy?: Record<string, ToolArgPolicy>;
|
|
6
|
+
tool_overrides?: Record<string, {
|
|
7
|
+
args?: ToolArgPolicy;
|
|
8
|
+
}>;
|
|
9
|
+
}, toolName: string): ToolArgPolicy;
|
|
10
|
+
export declare function argPolicyMiddleware(): Middleware;
|
|
11
|
+
export {};
|
|
12
|
+
//# sourceMappingURL=arg-policy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"arg-policy.d.ts","sourceRoot":"","sources":["../../../src/middleware/core/arg-policy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAoB,MAAM,aAAa,CAAC;AAEhE,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AAiD7D,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE;IACX,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC3C,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,aAAa,CAAA;KAAE,CAAC,CAAC;CAC3D,EACD,QAAQ,EAAE,MAAM,GACf,aAAa,CAKf;AAED,wBAAgB,mBAAmB,IAAI,UAAU,CAwDhD"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { isDeepStrictEqual } from 'util';
|
|
2
|
+
function hasOwn(obj, key) {
|
|
3
|
+
return Object.prototype.hasOwnProperty.call(obj, key);
|
|
4
|
+
}
|
|
5
|
+
function hasConstraintKey(constraint, key) {
|
|
6
|
+
return Object.prototype.hasOwnProperty.call(constraint, key);
|
|
7
|
+
}
|
|
8
|
+
function formatValue(value) {
|
|
9
|
+
const text = typeof value === 'string' ? `"${value}"` : JSON.stringify(value);
|
|
10
|
+
if (text === undefined)
|
|
11
|
+
return String(value);
|
|
12
|
+
return text.length > 160 ? `${text.slice(0, 157)}...` : text;
|
|
13
|
+
}
|
|
14
|
+
function formatAllowed(constraint) {
|
|
15
|
+
if (hasConstraintKey(constraint, 'equals')) {
|
|
16
|
+
const label = constraint.label ? ` (${constraint.label})` : '';
|
|
17
|
+
return `${formatValue(constraint.equals)}${label}`;
|
|
18
|
+
}
|
|
19
|
+
const values = constraint.allow ?? [];
|
|
20
|
+
const formatted = values.map(formatValue).join(', ');
|
|
21
|
+
const label = constraint.label ? ` (${constraint.label})` : '';
|
|
22
|
+
return `${formatted}${label}`;
|
|
23
|
+
}
|
|
24
|
+
function valuesEqual(a, b) {
|
|
25
|
+
return isDeepStrictEqual(a, b);
|
|
26
|
+
}
|
|
27
|
+
function violationResponse(message) {
|
|
28
|
+
return {
|
|
29
|
+
result: { content: [{ type: 'text', text: message }], isError: true },
|
|
30
|
+
text: message,
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
function mergePolicies(base, override) {
|
|
34
|
+
return {
|
|
35
|
+
...(base ?? {}),
|
|
36
|
+
...(override ?? {}),
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
export function resolveArgPolicy(agentConfig, toolName) {
|
|
40
|
+
return mergePolicies(agentConfig.arg_policy?.[toolName], agentConfig.tool_overrides?.[toolName]?.args);
|
|
41
|
+
}
|
|
42
|
+
export function argPolicyMiddleware() {
|
|
43
|
+
return async (ctx, next) => {
|
|
44
|
+
const policy = resolveArgPolicy(ctx.agentConfig, ctx.toolName);
|
|
45
|
+
const entries = Object.entries(policy);
|
|
46
|
+
if (entries.length === 0)
|
|
47
|
+
return next();
|
|
48
|
+
for (const [argName, constraint] of entries) {
|
|
49
|
+
if (!hasOwn(ctx.args, argName)) {
|
|
50
|
+
const message = `${argName} is required by policy for ${ctx.toolName}. ` +
|
|
51
|
+
`Allowed ${argName}: ${formatAllowed(constraint)}. Retry with that value.`;
|
|
52
|
+
ctx.deps.auditLogger.log({
|
|
53
|
+
agent_id: ctx.agentId,
|
|
54
|
+
tool: ctx.toolName,
|
|
55
|
+
args: JSON.stringify(ctx.args),
|
|
56
|
+
result: 'arg_policy_denied',
|
|
57
|
+
error: message,
|
|
58
|
+
});
|
|
59
|
+
return violationResponse(message);
|
|
60
|
+
}
|
|
61
|
+
const actual = ctx.args[argName];
|
|
62
|
+
if (hasConstraintKey(constraint, 'equals') && !valuesEqual(actual, constraint.equals)) {
|
|
63
|
+
const message = `${argName} ${formatValue(actual)} is not permitted for ${ctx.toolName}. ` +
|
|
64
|
+
`Allowed ${argName}: ${formatAllowed(constraint)}. Retry with that value.`;
|
|
65
|
+
ctx.deps.auditLogger.log({
|
|
66
|
+
agent_id: ctx.agentId,
|
|
67
|
+
tool: ctx.toolName,
|
|
68
|
+
args: JSON.stringify(ctx.args),
|
|
69
|
+
result: 'arg_policy_denied',
|
|
70
|
+
error: message,
|
|
71
|
+
});
|
|
72
|
+
return violationResponse(message);
|
|
73
|
+
}
|
|
74
|
+
if (hasConstraintKey(constraint, 'allow') &&
|
|
75
|
+
!(constraint.allow ?? []).some((allowed) => valuesEqual(actual, allowed))) {
|
|
76
|
+
const message = `${argName} ${formatValue(actual)} is not permitted for ${ctx.toolName}. ` +
|
|
77
|
+
`Allowed ${argName}: ${formatAllowed(constraint)}. Retry with one of the allowed values.`;
|
|
78
|
+
ctx.deps.auditLogger.log({
|
|
79
|
+
agent_id: ctx.agentId,
|
|
80
|
+
tool: ctx.toolName,
|
|
81
|
+
args: JSON.stringify(ctx.args),
|
|
82
|
+
result: 'arg_policy_denied',
|
|
83
|
+
error: message,
|
|
84
|
+
});
|
|
85
|
+
return violationResponse(message);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
return next();
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=arg-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"arg-policy.js","sourceRoot":"","sources":["../../../src/middleware/core/arg-policy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { FastifyReply, FastifyRequest } from 'fastify';
|
|
2
|
+
export interface RequestSecurityOptions {
|
|
3
|
+
secret?: string;
|
|
4
|
+
authRequired?: boolean;
|
|
5
|
+
allowedOrigins?: string[];
|
|
6
|
+
}
|
|
7
|
+
export declare function isOriginAllowed(origin: string | undefined, allowedOrigins?: string[]): boolean;
|
|
8
|
+
export declare function checkOrigin(request: FastifyRequest, reply: FastifyReply, allowedOrigins?: string[]): boolean;
|
|
9
|
+
export declare function checkBearerAuth(request: FastifyRequest, reply: FastifyReply, opts: {
|
|
10
|
+
secret?: string;
|
|
11
|
+
authRequired?: boolean;
|
|
12
|
+
}): boolean;
|
|
13
|
+
export declare function checkRequestSecurity(request: FastifyRequest, reply: FastifyReply, opts: RequestSecurityOptions): boolean;
|
|
14
|
+
//# sourceMappingURL=request.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/security/request.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE5D,MAAM,WAAW,sBAAsB;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAiBD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,cAAc,GAAE,MAAM,EAAO,GAAG,OAAO,CAIlG;AAED,wBAAgB,WAAW,CACzB,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,YAAY,EACnB,cAAc,GAAE,MAAM,EAAO,GAC5B,OAAO,CAMT;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GAChD,OAAO,CAaT;AAED,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,sBAAsB,GAC3B,OAAO,CAGT"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { timingSafeEqual } from 'crypto';
|
|
2
|
+
function constantTimeEqual(a, b) {
|
|
3
|
+
const bufA = Buffer.from(a);
|
|
4
|
+
const bufB = Buffer.from(b);
|
|
5
|
+
if (bufA.length !== bufB.length)
|
|
6
|
+
return false;
|
|
7
|
+
return timingSafeEqual(bufA, bufB);
|
|
8
|
+
}
|
|
9
|
+
function getHeader(value) {
|
|
10
|
+
return Array.isArray(value) ? (value[0] ?? '') : (value ?? '');
|
|
11
|
+
}
|
|
12
|
+
function normalizeOrigin(origin) {
|
|
13
|
+
return origin.endsWith('/') ? origin.slice(0, -1) : origin;
|
|
14
|
+
}
|
|
15
|
+
export function isOriginAllowed(origin, allowedOrigins = []) {
|
|
16
|
+
if (!origin)
|
|
17
|
+
return true;
|
|
18
|
+
const normalized = normalizeOrigin(origin);
|
|
19
|
+
return allowedOrigins.map(normalizeOrigin).includes(normalized);
|
|
20
|
+
}
|
|
21
|
+
export function checkOrigin(request, reply, allowedOrigins = []) {
|
|
22
|
+
const origin = getHeader(request.headers.origin);
|
|
23
|
+
if (isOriginAllowed(origin, allowedOrigins))
|
|
24
|
+
return true;
|
|
25
|
+
reply.status(403).send({ error: 'Origin not allowed' });
|
|
26
|
+
return false;
|
|
27
|
+
}
|
|
28
|
+
export function checkBearerAuth(request, reply, opts) {
|
|
29
|
+
if (!opts.secret) {
|
|
30
|
+
if (!opts.authRequired)
|
|
31
|
+
return true;
|
|
32
|
+
reply.status(401).send({ error: 'Unauthorized' });
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
const auth = getHeader(request.headers.authorization);
|
|
36
|
+
if (!constantTimeEqual(auth, `Bearer ${opts.secret}`)) {
|
|
37
|
+
reply.status(401).send({ error: 'Unauthorized' });
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
return true;
|
|
41
|
+
}
|
|
42
|
+
export function checkRequestSecurity(request, reply, opts) {
|
|
43
|
+
if (!checkOrigin(request, reply, opts.allowedOrigins))
|
|
44
|
+
return false;
|
|
45
|
+
return checkBearerAuth(request, reply, opts);
|
|
46
|
+
}
|
|
47
|
+
//# sourceMappingURL=request.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/security/request.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AASzC,SAAS,iBAAiB,CAAC,CAAS,EAAE,CAAS;IAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC9C,OAAO,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,SAAS,CAAC,KAAoC;IACrD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,eAAe,CAAC,MAAc;IACrC,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAA0B,EAAE,iBAA2B,EAAE;IACvF,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAC3C,OAAO,cAAc,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,OAAuB,EACvB,KAAmB,EACnB,iBAA2B,EAAE;IAE7B,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,IAAI,eAAe,CAAC,MAAM,EAAE,cAAc,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC;IACxD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,OAAuB,EACvB,KAAmB,EACnB,IAAiD;IAEjD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO,IAAI,CAAC;QACpC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACtD,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACtD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,OAAuB,EACvB,KAAmB,EACnB,IAA4B;IAE5B,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC;QAAE,OAAO,KAAK,CAAC;IACpE,OAAO,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC"}
|
package/dist/tools/api.d.ts
CHANGED
|
@@ -3,6 +3,8 @@ import type { AgentServerDeps } from '../transport/agent-server.js';
|
|
|
3
3
|
export interface ToolsApiOpts {
|
|
4
4
|
getDeps: (agentId: string) => AgentServerDeps | undefined;
|
|
5
5
|
secret?: string;
|
|
6
|
+
authRequired?: boolean;
|
|
7
|
+
allowedOrigins?: string[];
|
|
6
8
|
}
|
|
7
9
|
export declare function toolsApiPlugin(app: FastifyInstance, opts: ToolsApiOpts): Promise<void>;
|
|
8
10
|
//# sourceMappingURL=api.d.ts.map
|
package/dist/tools/api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/tools/api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/tools/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AASpE,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,eAAe,GAAG,SAAS,CAAC;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAGD,wBAAsB,cAAc,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAgG5F"}
|
package/dist/tools/api.js
CHANGED
|
@@ -1,24 +1,14 @@
|
|
|
1
|
-
import { timingSafeEqual } from 'crypto';
|
|
2
1
|
import { buildMiddlewareChain } from '../middleware/chain-builder.js';
|
|
3
2
|
import { generateId } from '../util/id.js';
|
|
4
3
|
import { childLogger } from '../util/logger.js';
|
|
4
|
+
import { checkRequestSecurity } from '../security/request.js';
|
|
5
5
|
const log = childLogger('tools-api');
|
|
6
|
-
function constantTimeEqual(a, b) {
|
|
7
|
-
const bufA = Buffer.from(a);
|
|
8
|
-
const bufB = Buffer.from(b);
|
|
9
|
-
if (bufA.length !== bufB.length)
|
|
10
|
-
return false;
|
|
11
|
-
return timingSafeEqual(bufA, bufB);
|
|
12
|
-
}
|
|
13
6
|
// eslint-disable-next-line @typescript-eslint/require-await
|
|
14
7
|
export async function toolsApiPlugin(app, opts) {
|
|
15
|
-
const { getDeps
|
|
8
|
+
const { getDeps } = opts;
|
|
16
9
|
app.addHook('preHandler', async (request, reply) => {
|
|
17
|
-
if (!
|
|
10
|
+
if (!checkRequestSecurity(request, reply, opts)) {
|
|
18
11
|
return;
|
|
19
|
-
const auth = request.headers.authorization ?? '';
|
|
20
|
-
if (!constantTimeEqual(auth, `Bearer ${secret}`)) {
|
|
21
|
-
return reply.status(401).send({ error: 'Unauthorized' });
|
|
22
12
|
}
|
|
23
13
|
});
|
|
24
14
|
app.get('/agents/:agentId/tools', async (request, reply) => {
|
package/dist/tools/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/tools/api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/tools/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,7 @@ import type { AgentServerDeps } from './agent-server.js';
|
|
|
3
3
|
export declare function httpServerPlugin(app: FastifyInstance, opts: {
|
|
4
4
|
getDeps: (agentId: string) => AgentServerDeps | undefined;
|
|
5
5
|
secret?: string;
|
|
6
|
+
authRequired?: boolean;
|
|
7
|
+
allowedOrigins?: string[];
|
|
6
8
|
}): Promise<void>;
|
|
7
9
|
//# sourceMappingURL=http-server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-server.d.ts","sourceRoot":"","sources":["../../src/transport/http-server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"http-server.d.ts","sourceRoot":"","sources":["../../src/transport/http-server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAOzD,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE;IACJ,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,eAAe,GAAG,SAAS,CAAC;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B,GACA,OAAO,CAAC,IAAI,CAAC,CA0Ff"}
|
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
import { randomUUID
|
|
1
|
+
import { randomUUID } from 'crypto';
|
|
2
2
|
import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
|
|
3
3
|
import { createAgentServer, connectAgentServer } from './agent-server.js';
|
|
4
4
|
import { childLogger } from '../util/logger.js';
|
|
5
|
+
import { checkBearerAuth, checkOrigin } from '../security/request.js';
|
|
5
6
|
const log = childLogger('http-server');
|
|
6
|
-
function constantTimeEqual(a, b) {
|
|
7
|
-
const bufA = Buffer.from(a);
|
|
8
|
-
const bufB = Buffer.from(b);
|
|
9
|
-
if (bufA.length !== bufB.length)
|
|
10
|
-
return false;
|
|
11
|
-
return timingSafeEqual(bufA, bufB);
|
|
12
|
-
}
|
|
13
7
|
// eslint-disable-next-line @typescript-eslint/require-await
|
|
14
8
|
export async function httpServerPlugin(app, opts) {
|
|
15
9
|
const { secret } = opts;
|
|
@@ -20,23 +14,16 @@ export async function httpServerPlugin(app, opts) {
|
|
|
20
14
|
done(null);
|
|
21
15
|
});
|
|
22
16
|
function checkAgentAuth(request, reply, deps) {
|
|
17
|
+
if (!checkOrigin(request, reply, opts.allowedOrigins))
|
|
18
|
+
return false;
|
|
23
19
|
const token = deps.agentConfig.token;
|
|
24
20
|
if (token) {
|
|
25
|
-
|
|
26
|
-
if (!constantTimeEqual(auth, `Bearer ${token}`)) {
|
|
27
|
-
reply.status(401).send({ error: 'Unauthorized' });
|
|
28
|
-
return false;
|
|
29
|
-
}
|
|
30
|
-
return true;
|
|
31
|
-
}
|
|
32
|
-
if (secret) {
|
|
33
|
-
const auth = request.headers.authorization ?? '';
|
|
34
|
-
if (!constantTimeEqual(auth, `Bearer ${secret}`)) {
|
|
35
|
-
reply.status(401).send({ error: 'Unauthorized' });
|
|
36
|
-
return false;
|
|
37
|
-
}
|
|
21
|
+
return checkBearerAuth(request, reply, { secret: token, authRequired: true });
|
|
38
22
|
}
|
|
39
|
-
return
|
|
23
|
+
return checkBearerAuth(request, reply, {
|
|
24
|
+
secret,
|
|
25
|
+
authRequired: opts.authRequired,
|
|
26
|
+
});
|
|
40
27
|
}
|
|
41
28
|
async function handleMcpRequest(request, reply) {
|
|
42
29
|
const { profileId } = request.params;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-server.js","sourceRoot":"","sources":["../../src/transport/http-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"http-server.js","sourceRoot":"","sources":["../../src/transport/http-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,7 @@ import type { AgentServerDeps } from './agent-server.js';
|
|
|
3
3
|
export declare function sseServerPlugin(app: FastifyInstance, opts: {
|
|
4
4
|
getDeps: (agentId: string) => AgentServerDeps | undefined;
|
|
5
5
|
secret?: string;
|
|
6
|
+
authRequired?: boolean;
|
|
7
|
+
allowedOrigins?: string[];
|
|
6
8
|
}): Promise<void>;
|
|
7
9
|
//# sourceMappingURL=sse-server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse-server.d.ts","sourceRoot":"","sources":["../../src/transport/sse-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sse-server.d.ts","sourceRoot":"","sources":["../../src/transport/sse-server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAE7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAUzD,wBAAsB,eAAe,CACnC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE;IACJ,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,eAAe,GAAG,SAAS,CAAC;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B,GACA,OAAO,CAAC,IAAI,CAAC,CAmHf"}
|