@1mcp/agent 0.36.0 → 0.37.0
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/build/admin/assets/{admin-OAuthServicesWorkspace-BCGj2hP4.js → admin-OAuthServicesWorkspace-BHyDoEos.js} +1 -1
- package/build/admin/assets/admin-console-DnlZpz5X.js +3 -0
- package/build/admin/assets/admin-vendor-62eL-qdH.js +1 -0
- package/build/admin/assets/admin-vendor-BbMrl7MK.js +3 -0
- package/build/admin/assets/admin-vendor-DpjVwd81.js +62 -0
- package/build/admin/index.html +4 -1
- package/build/auth/sdkOAuthServerProvider.d.ts.map +1 -1
- package/build/auth/sdkOAuthServerProvider.js +49 -48
- package/build/auth/sdkOAuthServerProvider.js.map +1 -1
- package/build/auth/storage/authCodeRepository.js +2 -2
- package/build/auth/storage/authCodeRepository.js.map +1 -1
- package/build/auth/storage/authRequestRepository.js +2 -2
- package/build/auth/storage/authRequestRepository.js.map +1 -1
- package/build/auth/storage/fileStorageService.d.ts +39 -0
- package/build/auth/storage/fileStorageService.d.ts.map +1 -1
- package/build/auth/storage/fileStorageService.js +171 -38
- package/build/auth/storage/fileStorageService.js.map +1 -1
- package/build/auth/storage/oauthStorageService.d.ts +5 -0
- package/build/auth/storage/oauthStorageService.d.ts.map +1 -1
- package/build/auth/storage/oauthStorageService.js +6 -0
- package/build/auth/storage/oauthStorageService.js.map +1 -1
- package/build/commands/mcp/install.d.ts +47 -3
- package/build/commands/mcp/install.d.ts.map +1 -1
- package/build/commands/mcp/install.js +22 -14
- package/build/commands/mcp/install.js.map +1 -1
- package/build/commands/registry/options.d.ts +3 -0
- package/build/commands/registry/options.d.ts.map +1 -1
- package/build/commands/registry/options.js +27 -0
- package/build/commands/registry/options.js.map +1 -1
- package/build/commands/registry/search.d.ts.map +1 -1
- package/build/commands/registry/search.js +2 -10
- package/build/commands/registry/search.js.map +1 -1
- package/build/commands/registry/show.d.ts.map +1 -1
- package/build/commands/registry/show.js +2 -10
- package/build/commands/registry/show.js.map +1 -1
- package/build/commands/registry/status.d.ts.map +1 -1
- package/build/commands/registry/status.js +2 -10
- package/build/commands/registry/status.js.map +1 -1
- package/build/commands/registry/versions.d.ts.map +1 -1
- package/build/commands/registry/versions.js +2 -10
- package/build/commands/registry/versions.js.map +1 -1
- package/build/commands/serve/asyncLoadingOptions.d.ts +16 -0
- package/build/commands/serve/asyncLoadingOptions.d.ts.map +1 -1
- package/build/commands/serve/asyncLoadingOptions.js +29 -0
- package/build/commands/serve/asyncLoadingOptions.js.map +1 -1
- package/build/commands/serve/index.d.ts +24 -0
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +24 -0
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serve.d.ts +6 -0
- package/build/commands/serve/serve.d.ts.map +1 -1
- package/build/commands/serve/serve.js +45 -2
- package/build/commands/serve/serve.js.map +1 -1
- package/build/commands/serve/serveBackground.d.ts +2 -1
- package/build/commands/serve/serveBackground.d.ts.map +1 -1
- package/build/commands/serve/serveBackground.js +6 -0
- package/build/commands/serve/serveBackground.js.map +1 -1
- package/build/commands/wait/wait.js +1 -1
- package/build/commands/wait/wait.js.map +1 -1
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +19 -6
- package/build/config/configManager.js.map +1 -1
- package/build/config/configuredServerTargets.d.ts +1 -0
- package/build/config/configuredServerTargets.d.ts.map +1 -1
- package/build/config/configuredServerTargets.js +6 -0
- package/build/config/configuredServerTargets.js.map +1 -1
- package/build/constants/mcp.d.ts +1 -1
- package/build/constants/mcp.js +1 -1
- package/build/core/loading/backendLoadingPolicy.d.ts +11 -0
- package/build/core/loading/backendLoadingPolicy.d.ts.map +1 -0
- package/build/core/loading/backendLoadingPolicy.js +10 -0
- package/build/core/loading/backendLoadingPolicy.js.map +1 -0
- package/build/core/loading/mcpLoadingManager.d.ts +8 -24
- package/build/core/loading/mcpLoadingManager.d.ts.map +1 -1
- package/build/core/loading/mcpLoadingManager.js +116 -70
- package/build/core/loading/mcpLoadingManager.js.map +1 -1
- package/build/core/server/agentConfig.d.ts +26 -0
- package/build/core/server/agentConfig.d.ts.map +1 -1
- package/build/core/server/agentConfig.js +11 -0
- package/build/core/server/agentConfig.js.map +1 -1
- package/build/core/server/clientInstancePool.d.ts +4 -6
- package/build/core/server/clientInstancePool.d.ts.map +1 -1
- package/build/core/server/clientInstancePool.js +63 -63
- package/build/core/server/clientInstancePool.js.map +1 -1
- package/build/core/server/clientInstancePoolTypes.d.ts +9 -2
- package/build/core/server/clientInstancePoolTypes.d.ts.map +1 -1
- package/build/core/server/clientInstancePoolTypes.js +8 -3
- package/build/core/server/clientInstancePoolTypes.js.map +1 -1
- package/build/core/server/requestContextPreparation.d.ts.map +1 -1
- package/build/core/server/requestContextPreparation.js +2 -1
- package/build/core/server/requestContextPreparation.js.map +1 -1
- package/build/core/server/serverManager.d.ts.map +1 -1
- package/build/core/server/serverManager.js +2 -1
- package/build/core/server/serverManager.js.map +1 -1
- package/build/core/server/templateServerManager.d.ts +14 -1
- package/build/core/server/templateServerManager.d.ts.map +1 -1
- package/build/core/server/templateServerManager.js +64 -9
- package/build/core/server/templateServerManager.js.map +1 -1
- package/build/core/tools/internal/schemas/index.d.ts +1 -1
- package/build/core/tools/internal/schemas/installation.d.ts +1 -1
- package/build/core/types/transport.d.ts +82 -2
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +72 -0
- package/build/core/types/transport.js.map +1 -1
- package/build/domains/admin/adminConfiguredServerService.d.ts +146 -2
- package/build/domains/admin/adminConfiguredServerService.d.ts.map +1 -1
- package/build/domains/admin/adminConfiguredServerService.js +729 -81
- package/build/domains/admin/adminConfiguredServerService.js.map +1 -1
- package/build/domains/admin/adminDomain.d.ts +5 -0
- package/build/domains/admin/adminDomain.d.ts.map +1 -1
- package/build/domains/admin/adminDomain.js +11 -0
- package/build/domains/admin/adminDomain.js.map +1 -1
- package/build/domains/admin/adminOperationService.d.ts +1 -0
- package/build/domains/admin/adminOperationService.d.ts.map +1 -1
- package/build/domains/admin/adminOperationService.js +6 -2
- package/build/domains/admin/adminOperationService.js.map +1 -1
- package/build/domains/admin/templateServerDefinitionAnalyzer.d.ts +26 -0
- package/build/domains/admin/templateServerDefinitionAnalyzer.d.ts.map +1 -0
- package/build/domains/admin/templateServerDefinitionAnalyzer.js +148 -0
- package/build/domains/admin/templateServerDefinitionAnalyzer.js.map +1 -0
- package/build/domains/config-change/configChange.d.ts +1 -1
- package/build/domains/config-change/configChange.d.ts.map +1 -1
- package/build/domains/config-change/configChange.js +168 -49
- package/build/domains/config-change/configChange.js.map +1 -1
- package/build/domains/config-change/types.d.ts +16 -2
- package/build/domains/config-change/types.d.ts.map +1 -1
- package/build/domains/registry/mcpRegistryClient.d.ts +3 -3
- package/build/domains/registry/mcpRegistryClient.d.ts.map +1 -1
- package/build/domains/registry/mcpRegistryClient.js +8 -7
- package/build/domains/registry/mcpRegistryClient.js.map +1 -1
- package/build/logger/secureLogger.d.ts.map +1 -1
- package/build/logger/secureLogger.js +160 -23
- package/build/logger/secureLogger.js.map +1 -1
- package/build/server.d.ts +2 -1
- package/build/server.d.ts.map +1 -1
- package/build/server.js +8 -7
- package/build/server.js.map +1 -1
- package/build/transport/http/middlewares/securityMiddleware.d.ts +6 -0
- package/build/transport/http/middlewares/securityMiddleware.d.ts.map +1 -1
- package/build/transport/http/middlewares/securityMiddleware.js +35 -29
- package/build/transport/http/middlewares/securityMiddleware.js.map +1 -1
- package/build/transport/http/routes/adminRoutes.d.ts +17 -1
- package/build/transport/http/routes/adminRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/adminRoutes.js +281 -17
- package/build/transport/http/routes/adminRoutes.js.map +1 -1
- package/build/transport/http/routes/healthRoutes.d.ts +6 -1
- package/build/transport/http/routes/healthRoutes.d.ts.map +1 -1
- package/build/transport/http/routes/healthRoutes.js +7 -3
- package/build/transport/http/routes/healthRoutes.js.map +1 -1
- package/build/transport/http/server.d.ts.map +1 -1
- package/build/transport/http/server.js +21 -3
- package/build/transport/http/server.js.map +1 -1
- package/build/transport/http/storage/streamableSessionRepository.d.ts +1 -0
- package/build/transport/http/storage/streamableSessionRepository.d.ts.map +1 -1
- package/build/transport/http/storage/streamableSessionRepository.js +6 -3
- package/build/transport/http/storage/streamableSessionRepository.js.map +1 -1
- package/package.json +1 -1
- package/build/admin/assets/admin-console-xbgqUjbT.js +0 -3
|
@@ -467,7 +467,7 @@ function convertCliOptionsToClientOptions(cliOptions = {}) {
|
|
|
467
467
|
proxy = parseProxyFromStandardEnv();
|
|
468
468
|
}
|
|
469
469
|
return {
|
|
470
|
-
baseUrl: cliOptions.url || 'https://registry.modelcontextprotocol.io',
|
|
470
|
+
baseUrl: (cliOptions.url || 'https://registry.modelcontextprotocol.io').replace(/\/$/, ''),
|
|
471
471
|
timeout: cliOptions.timeout || 10000,
|
|
472
472
|
cache: {
|
|
473
473
|
defaultTtl: cliOptions.cacheTtl || 300,
|
|
@@ -487,15 +487,16 @@ function parseProxyFromStandardEnv() {
|
|
|
487
487
|
.find((value) => typeof value === 'string' && value.length > 0);
|
|
488
488
|
return proxyUrl ? { url: proxyUrl } : undefined;
|
|
489
489
|
}
|
|
490
|
-
/**
|
|
491
|
-
|
|
492
|
-
*/
|
|
493
|
-
export function createRegistryClient(cliOptions) {
|
|
490
|
+
/** Resolve registry client options while preserving CLI-over-default precedence. */
|
|
491
|
+
export function resolveRegistryClientOptions(cliOptions) {
|
|
494
492
|
const testRegistryUrl = process.env.NODE_ENV === 'test' && typeof process.env.TEST_MCP_REGISTRY_URL === 'string'
|
|
495
493
|
? process.env.TEST_MCP_REGISTRY_URL
|
|
496
494
|
: undefined;
|
|
497
495
|
const effectiveOptions = testRegistryUrl && !cliOptions?.url ? { ...cliOptions, url: testRegistryUrl } : cliOptions;
|
|
498
|
-
|
|
499
|
-
|
|
496
|
+
return convertCliOptionsToClientOptions(effectiveOptions);
|
|
497
|
+
}
|
|
498
|
+
/** Create a registry client instance with CLI options or defaults. */
|
|
499
|
+
export function createRegistryClient(cliOptions) {
|
|
500
|
+
return new MCPRegistryClient(resolveRegistryClientOptions(cliOptions));
|
|
500
501
|
}
|
|
501
502
|
//# sourceMappingURL=mcpRegistryClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpRegistryClient.js","sourceRoot":"","sources":["../../../src/domains/registry/mcpRegistryClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"mcpRegistryClient.js","sourceRoot":"","sources":["../../../src/domains/registry/mcpRegistryClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secureLogger.d.ts","sourceRoot":"","sources":["../../src/logger/secureLogger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"secureLogger.d.ts","sourceRoot":"","sources":["../../src/logger/secureLogger.ts"],"names":[],"mappings":"AAyOA;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAQzD;AAsBD;;GAEG;AACH,eAAO,MAAM,YAAY;qBAnBN,MAAM,SAAS,OAAO;oBAAtB,MAAM,SAAS,OAAO;oBAAtB,MAAM,SAAS,OAAO;qBAAtB,MAAM,SAAS,OAAO;CAwBxC,CAAC;AAEF;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAOnE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAO5D"}
|
|
@@ -1,23 +1,98 @@
|
|
|
1
1
|
import logger from './logger.js';
|
|
2
2
|
/**
|
|
3
|
-
*
|
|
3
|
+
* Patterns matching value-bearing credentials (used for both values and object keys)
|
|
4
4
|
*/
|
|
5
|
-
const
|
|
6
|
-
//
|
|
7
|
-
|
|
5
|
+
const KEY_SENSITIVE_PATTERNS = [
|
|
6
|
+
// PEM Private Key blocks (CWE-532, matches full block or unterminated block through string boundary)
|
|
7
|
+
/-----BEGIN [A-Z ]*PRIVATE KEY-----[\s\S]*?(?:-----END [A-Z ]*PRIVATE KEY-----|$)/gi,
|
|
8
|
+
// Bearer tokens in Authorization headers / raw Bearer prefixes (supports space and colon separators)
|
|
9
|
+
/bearer(?:\s+|:\s*)[a-zA-Z0-9_\-.~+/]+=*/gi,
|
|
10
|
+
// Basic authentication credentials (Authorization: Basic <base64>)
|
|
11
|
+
/basic\s+[a-zA-Z0-9+/=]{8,}/gi,
|
|
12
|
+
// JWT tokens (Header.Payload.Signature)
|
|
13
|
+
/\beyJ[a-zA-Z0-9_-]{10,}\.[a-zA-Z0-9_-]{10,}\.[a-zA-Z0-9_-]{10,}\b/gi,
|
|
14
|
+
// Key-value credential assignments (supports unquoted, quoted, JSON-stringified, camelCase, snake_case, and kebab-case)
|
|
15
|
+
/(?:[?&]|["']|\b)(?:[tT]oken|[cC]ode|[sS]ecret|client_secret|clientSecret|[pP]assword|[pP]asswd|api[_-]?key|apiKey|auth[_-]?token|authToken|access[_-]?token|accessToken|refresh[_-]?token|refreshToken|private[_-]?key|privateKey|authorization[_-]?code|authorizationCode)\s*["']?\s*[:=]\s*(?:"(?:\\[\s\S]|[^"\\])*(?:"|$)|'(?:\\[\s\S]|[^'\\])*(?:'|$)|[^\s,;&{}"]+)/gi,
|
|
8
16
|
// URLs with sensitive parameters (consolidates 4 patterns)
|
|
9
|
-
/https?:\/\/[^\s]*[?&](?:[tT]oken|[cC]ode)=[^\s&]*/gi,
|
|
17
|
+
/https?:\/\/[^\s]*[?&](?:[tT]oken|[cC]ode|[sS]ecret|[kK]ey|client_secret|clientSecret|refreshToken|accessToken|authorization_code|authorizationCode)=[^\s&]*/gi,
|
|
10
18
|
// Query parameters with sensitive data (consolidates 2 patterns)
|
|
11
|
-
/[?&](?:[tT]oken|[cC]ode)=[^\s&]*/gi,
|
|
19
|
+
/[?&](?:[tT]oken|[cC]ode|[sS]ecret|[kK]ey|client_secret|clientSecret|refreshToken|accessToken|authorization_code|authorizationCode)=[^\s&]*/gi,
|
|
20
|
+
];
|
|
21
|
+
/**
|
|
22
|
+
* Consolidated patterns for sensitive data detection in string values
|
|
23
|
+
*/
|
|
24
|
+
const SENSITIVE_PATTERNS = [
|
|
25
|
+
...KEY_SENSITIVE_PATTERNS,
|
|
26
|
+
// OAuth tokens and credentials (consolidates 6 patterns)
|
|
27
|
+
/(?:access_token|refresh_token|authorization_code|client_secret)/gi,
|
|
12
28
|
// OAuth configuration patterns (consolidates 4 patterns)
|
|
13
29
|
/(?:scopes?|redirect_uris?|with\s+scope):\s*(?:\[[^\]]*\]|[^\s,}]+(?:\s+[^\s]+)*)/gi,
|
|
14
|
-
// Generic secret patterns (consolidates 5 patterns)
|
|
15
|
-
/(?:api[_-]?key|secret|password|passwd|auth[_-]?token)/gi,
|
|
30
|
+
// Generic secret patterns (consolidates 5 patterns) - fallback keywords
|
|
31
|
+
/(?:api[_-]?key|secret|password|passwd|auth[_-]?token|private[_-]?key)/gi,
|
|
16
32
|
];
|
|
17
33
|
/**
|
|
18
34
|
* Base patterns for sensitive key detection (case-insensitive)
|
|
19
35
|
*/
|
|
20
|
-
const SENSITIVE_KEY_PATTERNS = [
|
|
36
|
+
const SENSITIVE_KEY_PATTERNS = [
|
|
37
|
+
'secret',
|
|
38
|
+
'token',
|
|
39
|
+
'password',
|
|
40
|
+
'passwd',
|
|
41
|
+
'key',
|
|
42
|
+
'authorization_code',
|
|
43
|
+
'auth_code',
|
|
44
|
+
'auth_token',
|
|
45
|
+
'authtoken',
|
|
46
|
+
];
|
|
47
|
+
/**
|
|
48
|
+
* C0 + C1 control characters + DEL + Unicode Line/Paragraph Separators + Bidi overrides (CWE-117, CWE-150, Trojan Source CVE-2021-42574).
|
|
49
|
+
* Covers \x00-\x1F (C0), \x7F (DEL), \x80-\x9F (C1 including 8-bit CSI \x9B),
|
|
50
|
+
* \u2028/\u2029 (Unicode line/paragraph separators), \u202A-\u202E/\u2066-\u2069 (Bidi overrides),
|
|
51
|
+
* and \u200B-\u200D/\uFEFF (Zero-width formatting characters).
|
|
52
|
+
* Single character class — linear time, no nested quantifiers, no ReDoS risk.
|
|
53
|
+
*/
|
|
54
|
+
// eslint-disable-next-line no-control-regex -- intentional: this IS the sanitization pattern
|
|
55
|
+
const CONTROL_CHARS_PATTERN = /[\x00-\x1F\x7F-\x9F\u200B-\u200D\u2028\u2029\u202A-\u202E\u2066-\u2069\uFEFF]/g;
|
|
56
|
+
/**
|
|
57
|
+
* Escape control characters as visible literals (log4j2 %encode{}{CRLF} /
|
|
58
|
+
* Veracode CWE-117 guidance style) so attacker-controlled input cannot forge
|
|
59
|
+
* log lines or inject ANSI escape sequences, while preserving audit intent.
|
|
60
|
+
*/
|
|
61
|
+
function escapeControlChars(value) {
|
|
62
|
+
return value.replace(CONTROL_CHARS_PATTERN, (char) => {
|
|
63
|
+
if (char === '\n')
|
|
64
|
+
return '\\n';
|
|
65
|
+
if (char === '\r')
|
|
66
|
+
return '\\r';
|
|
67
|
+
if (char === '\t')
|
|
68
|
+
return '\\t';
|
|
69
|
+
const code = char.charCodeAt(0);
|
|
70
|
+
if (code <= 0xff) {
|
|
71
|
+
return `\\x${code.toString(16).padStart(2, '0').toUpperCase()}`;
|
|
72
|
+
}
|
|
73
|
+
return `\\u${code.toString(16).padStart(4, '0').toUpperCase()}`;
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Sanitize a string by applying pattern redaction followed by control character escaping.
|
|
78
|
+
*/
|
|
79
|
+
function sanitizeString(value) {
|
|
80
|
+
let sanitized = value;
|
|
81
|
+
for (const pattern of SENSITIVE_PATTERNS) {
|
|
82
|
+
sanitized = sanitized.replace(pattern, '[REDACTED]');
|
|
83
|
+
}
|
|
84
|
+
return escapeControlChars(sanitized);
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Sanitize an object key: redacts credential patterns and escapes control characters.
|
|
88
|
+
*/
|
|
89
|
+
function sanitizeKey(key) {
|
|
90
|
+
let redactedKey = key;
|
|
91
|
+
for (const pattern of KEY_SENSITIVE_PATTERNS) {
|
|
92
|
+
redactedKey = redactedKey.replace(pattern, '[REDACTED]');
|
|
93
|
+
}
|
|
94
|
+
return escapeControlChars(redactedKey);
|
|
95
|
+
}
|
|
21
96
|
/**
|
|
22
97
|
* Check if a key contains sensitive patterns
|
|
23
98
|
*/
|
|
@@ -38,27 +113,88 @@ function sanitize(value, depth = 0) {
|
|
|
38
113
|
return value;
|
|
39
114
|
}
|
|
40
115
|
if (typeof value === 'string') {
|
|
41
|
-
|
|
42
|
-
let sanitized = value;
|
|
43
|
-
for (const pattern of SENSITIVE_PATTERNS) {
|
|
44
|
-
sanitized = sanitized.replace(pattern, '[REDACTED]');
|
|
45
|
-
}
|
|
46
|
-
return sanitized;
|
|
116
|
+
return sanitizeString(value);
|
|
47
117
|
}
|
|
48
118
|
if (typeof value === 'number' || typeof value === 'boolean') {
|
|
49
119
|
return value;
|
|
50
120
|
}
|
|
121
|
+
if (typeof value === 'bigint') {
|
|
122
|
+
return `${value.toString()}n`;
|
|
123
|
+
}
|
|
124
|
+
if (typeof value === 'symbol') {
|
|
125
|
+
return sanitizeString(value.toString());
|
|
126
|
+
}
|
|
127
|
+
if (typeof value === 'function') {
|
|
128
|
+
return '[Function]';
|
|
129
|
+
}
|
|
130
|
+
if (value instanceof Date) {
|
|
131
|
+
return isNaN(value.getTime()) ? 'Invalid Date' : value.toISOString();
|
|
132
|
+
}
|
|
133
|
+
if (value instanceof RegExp) {
|
|
134
|
+
return sanitizeString(value.toString());
|
|
135
|
+
}
|
|
136
|
+
if (value instanceof Error) {
|
|
137
|
+
const sanitizedError = {
|
|
138
|
+
name: typeof value.name === 'string'
|
|
139
|
+
? sanitize(value.name, depth + 1)
|
|
140
|
+
: sanitizeString(String(value.name)),
|
|
141
|
+
message: sanitize(value.message, depth + 1),
|
|
142
|
+
};
|
|
143
|
+
if (value.stack) {
|
|
144
|
+
sanitizedError.stack = sanitize(value.stack, depth + 1);
|
|
145
|
+
}
|
|
146
|
+
if ('cause' in value && value.cause !== undefined) {
|
|
147
|
+
sanitizedError.cause = sanitize(value.cause, depth + 1);
|
|
148
|
+
}
|
|
149
|
+
for (const [key, val] of Object.entries(value)) {
|
|
150
|
+
if (key === 'name' || key === 'message' || key === 'stack' || key === 'cause' || key === '__proto__') {
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
const sanitizedKey = sanitizeKey(key);
|
|
154
|
+
if (isSensitiveKey(key)) {
|
|
155
|
+
sanitizedError[sanitizedKey] = '[REDACTED]';
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
sanitizedError[sanitizedKey] = sanitize(val, depth + 1);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
return sanitizedError;
|
|
162
|
+
}
|
|
163
|
+
if (value instanceof Set) {
|
|
164
|
+
return Array.from(value).map((item) => sanitize(item, depth + 1));
|
|
165
|
+
}
|
|
166
|
+
if (value instanceof Map) {
|
|
167
|
+
const mapObj = {};
|
|
168
|
+
for (const [k, v] of value.entries()) {
|
|
169
|
+
const stringKey = typeof k === 'string' ? k : String(k);
|
|
170
|
+
if (stringKey === '__proto__') {
|
|
171
|
+
continue;
|
|
172
|
+
}
|
|
173
|
+
const sanitizedKey = sanitizeKey(stringKey);
|
|
174
|
+
if (isSensitiveKey(stringKey)) {
|
|
175
|
+
mapObj[sanitizedKey] = '[REDACTED]';
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
mapObj[sanitizedKey] = sanitize(v, depth + 1);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
return mapObj;
|
|
182
|
+
}
|
|
51
183
|
if (Array.isArray(value)) {
|
|
52
184
|
return value.map((item) => sanitize(item, depth + 1));
|
|
53
185
|
}
|
|
54
186
|
if (typeof value === 'object' && value !== null) {
|
|
55
187
|
const sanitized = {};
|
|
56
188
|
for (const [key, val] of Object.entries(value)) {
|
|
189
|
+
if (key === '__proto__') {
|
|
190
|
+
continue;
|
|
191
|
+
}
|
|
192
|
+
const sanitizedKey = sanitizeKey(key);
|
|
57
193
|
if (isSensitiveKey(key)) {
|
|
58
|
-
sanitized[
|
|
194
|
+
sanitized[sanitizedKey] = '[REDACTED]';
|
|
59
195
|
}
|
|
60
196
|
else {
|
|
61
|
-
sanitized[
|
|
197
|
+
sanitized[sanitizedKey] = sanitize(val, depth + 1);
|
|
62
198
|
}
|
|
63
199
|
}
|
|
64
200
|
return sanitized;
|
|
@@ -72,9 +208,9 @@ export function sanitizeForLogging(data) {
|
|
|
72
208
|
try {
|
|
73
209
|
return sanitize(data);
|
|
74
210
|
}
|
|
75
|
-
catch
|
|
76
|
-
// Log
|
|
77
|
-
console.error('Sanitization error occurred
|
|
211
|
+
catch {
|
|
212
|
+
// Log safe static marker to stderr without exposing dynamic error.message (preventing throwing getter bypasses)
|
|
213
|
+
console.error('Sanitization error occurred');
|
|
78
214
|
return '[SANITIZATION_ERROR]';
|
|
79
215
|
}
|
|
80
216
|
}
|
|
@@ -83,7 +219,7 @@ export function sanitizeForLogging(data) {
|
|
|
83
219
|
*/
|
|
84
220
|
function createLoggerMethod(level) {
|
|
85
221
|
return (message, data) => {
|
|
86
|
-
const sanitizedMessage =
|
|
222
|
+
const sanitizedMessage = sanitizeForLogging(message);
|
|
87
223
|
const sanitizedMessageStr = typeof sanitizedMessage === 'string' ? sanitizedMessage : String(sanitizedMessage);
|
|
88
224
|
if (data !== undefined) {
|
|
89
225
|
// Type-safe assertion that the logger method exists and is callable
|
|
@@ -113,14 +249,15 @@ export function sanitizeOAuthServerList(servers) {
|
|
|
113
249
|
return servers.map((server) => {
|
|
114
250
|
// Only show server name without any sensitive configuration
|
|
115
251
|
const serverName = server.split('|')[0] || server; // Extract just the name part
|
|
116
|
-
|
|
252
|
+
const redacted = serverName.replace(/[?&](client_id|client_secret|token|code)=[^&]*/gi, '[OAUTH_REDACTED]');
|
|
253
|
+
return escapeControlChars(redacted);
|
|
117
254
|
});
|
|
118
255
|
}
|
|
119
256
|
/**
|
|
120
257
|
* Utility function to create safe error messages that don't expose sensitive data
|
|
121
258
|
*/
|
|
122
259
|
export function createSafeErrorMessage(error) {
|
|
123
|
-
const sanitizedError =
|
|
260
|
+
const sanitizedError = sanitizeForLogging(error);
|
|
124
261
|
const errorString = typeof sanitizedError === 'string' ? sanitizedError : String(sanitizedError);
|
|
125
262
|
return errorString
|
|
126
263
|
.replace(/HTTP \d+.*$/gi, 'HTTP [STATUS_CODE]') // Remove potentially sensitive HTTP response details
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secureLogger.js","sourceRoot":"","sources":["../../src/logger/secureLogger.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC;;GAEG;AACH,MAAM,
|
|
1
|
+
{"version":3,"file":"secureLogger.js","sourceRoot":"","sources":["../../src/logger/secureLogger.ts"],"names":[],"mappings":"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"}
|
package/build/server.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { ContextData } from './types/context.js';
|
|
|
2
2
|
import { AsyncLoadingOrchestrator } from './core/capabilities/asyncLoadingOrchestrator.js';
|
|
3
3
|
import { LazyLoadingOrchestrator } from './core/capabilities/lazyLoadingOrchestrator.js';
|
|
4
4
|
import { InstructionAggregator } from './core/instructions/instructionAggregator.js';
|
|
5
|
+
import { type BackendLoadingPolicy } from './core/loading/backendLoadingPolicy.js';
|
|
5
6
|
import { McpLoadingManager } from './core/loading/mcpLoadingManager.js';
|
|
6
7
|
import { ServerManager } from './core/server/serverManager.js';
|
|
7
8
|
/**
|
|
@@ -25,7 +26,7 @@ export interface ServerSetupResult {
|
|
|
25
26
|
* Main function to set up the MCP server
|
|
26
27
|
* Conditionally uses async or legacy loading based on configuration
|
|
27
28
|
*/
|
|
28
|
-
declare function setupServer(configFilePath?: string, context?: ContextData): Promise<ServerSetupResult>;
|
|
29
|
+
declare function setupServer(configFilePath?: string, context?: ContextData, backendLoadingPolicy?: BackendLoadingPolicy): Promise<ServerSetupResult>;
|
|
29
30
|
/**
|
|
30
31
|
* Legacy function for backward compatibility
|
|
31
32
|
* @deprecated Use setupServer() which returns ServerSetupResult
|
package/build/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAE3F,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AAEzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAK/D;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,8CAA8C;IAC9C,aAAa,EAAE,aAAa,CAAC;IAC7B,0DAA0D;IAC1D,cAAc,EAAE,iBAAiB,CAAC;IAClC,gEAAgE;IAChE,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,8DAA8D;IAC9D,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;IAC7C,4EAA4E;IAC5E,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,+DAA+D;IAC/D,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C;AAED;;;GAGG;AACH,iBAAe,WAAW,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAE3F,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AAEzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAK/D;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,8CAA8C;IAC9C,aAAa,EAAE,aAAa,CAAC;IAC7B,0DAA0D;IAC1D,cAAc,EAAE,iBAAiB,CAAC;IAClC,gEAAgE;IAChE,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,8DAA8D;IAC9D,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;IAC7C,4EAA4E;IAC5E,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,+DAA+D;IAC/D,qBAAqB,EAAE,qBAAqB,CAAC;CAC9C;AAED;;;GAGG;AACH,iBAAe,WAAW,CACxB,cAAc,CAAC,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,WAAW,EACrB,oBAAoB,GAAE,oBAAqD,GAC1E,OAAO,CAAC,iBAAiB,CAAC,CAwD5B;AAqLD;;;GAGG;AACH,iBAAe,iBAAiB,IAAI,OAAO,CAAC,aAAa,CAAC,CAKzD;AAED,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC"}
|
package/build/server.js
CHANGED
|
@@ -10,6 +10,7 @@ import { InternalCapabilitiesProvider } from './core/capabilities/internalCapabi
|
|
|
10
10
|
import { LazyLoadingOrchestrator } from './core/capabilities/lazyLoadingOrchestrator.js';
|
|
11
11
|
import { ClientManager } from './core/client/clientManager.js';
|
|
12
12
|
import { InstructionAggregator } from './core/instructions/instructionAggregator.js';
|
|
13
|
+
import { DEFAULT_BACKEND_LOADING_POLICY, } from './core/loading/backendLoadingPolicy.js';
|
|
13
14
|
import { McpLoadingManager } from './core/loading/mcpLoadingManager.js';
|
|
14
15
|
import { ServerManager } from './core/server/serverManager.js';
|
|
15
16
|
import { PresetManager } from './domains/preset/manager/presetManager.js';
|
|
@@ -19,7 +20,7 @@ import { createTransports } from './transport/transportFactory.js';
|
|
|
19
20
|
* Main function to set up the MCP server
|
|
20
21
|
* Conditionally uses async or legacy loading based on configuration
|
|
21
22
|
*/
|
|
22
|
-
async function setupServer(configFilePath, context) {
|
|
23
|
+
async function setupServer(configFilePath, context, backendLoadingPolicy = DEFAULT_BACKEND_LOADING_POLICY) {
|
|
23
24
|
try {
|
|
24
25
|
// Initialize the new unified config management system
|
|
25
26
|
const configManager = ConfigManager.getInstance(configFilePath);
|
|
@@ -45,8 +46,8 @@ async function setupServer(configFilePath, context) {
|
|
|
45
46
|
const transports = createTransports(mcpConfig);
|
|
46
47
|
logger.info(`Created ${Object.keys(transports).length} static transports (template servers will be created per-client)`);
|
|
47
48
|
const setupResult = asyncLoadingEnabled
|
|
48
|
-
? await setupServerAsync(transports, context)
|
|
49
|
-
: await setupServerSync(transports, context);
|
|
49
|
+
? await setupServerAsync(transports, context, backendLoadingPolicy)
|
|
50
|
+
: await setupServerSync(transports, context, backendLoadingPolicy);
|
|
50
51
|
const { templateServers, errors } = configManager.loadDeclaredServerConfigs();
|
|
51
52
|
if (errors.length === 0) {
|
|
52
53
|
setupResult.serverManager.getTemplateServerManager().rebuildTemplateIndex({ mcpTemplates: templateServers });
|
|
@@ -72,7 +73,7 @@ async function setupServer(configFilePath, context) {
|
|
|
72
73
|
* Set up server with async loading (new mode)
|
|
73
74
|
* HTTP server starts immediately, MCP servers load in background
|
|
74
75
|
*/
|
|
75
|
-
async function setupServerAsync(transports, _context) {
|
|
76
|
+
async function setupServerAsync(transports, _context, backendLoadingPolicy) {
|
|
76
77
|
// Get agent config for feature flags
|
|
77
78
|
const agentConfig = AgentConfigManager.getInstance();
|
|
78
79
|
// Initialize instruction aggregator
|
|
@@ -88,7 +89,7 @@ async function setupServerAsync(transports, _context) {
|
|
|
88
89
|
serverManager.setInstructionAggregator(instructionAggregator);
|
|
89
90
|
// Config reload is now handled by ConfigManager and ConfigChangeHandler initialized in setupServer
|
|
90
91
|
// Create loading manager for async MCP server initialization
|
|
91
|
-
const loadingManager = new McpLoadingManager(clientManager);
|
|
92
|
+
const loadingManager = new McpLoadingManager(clientManager, backendLoadingPolicy);
|
|
92
93
|
// Create async loading orchestrator for capability tracking and notifications
|
|
93
94
|
const asyncOrchestrator = new AsyncLoadingOrchestrator(clients, serverManager, loadingManager);
|
|
94
95
|
await asyncOrchestrator.initialize();
|
|
@@ -134,7 +135,7 @@ async function setupServerAsync(transports, _context) {
|
|
|
134
135
|
* Set up server with legacy synchronous loading
|
|
135
136
|
* Waits for all MCP servers to load before returning
|
|
136
137
|
*/
|
|
137
|
-
async function setupServerSync(transports, _context) {
|
|
138
|
+
async function setupServerSync(transports, _context, backendLoadingPolicy) {
|
|
138
139
|
// Get agent config for feature flags
|
|
139
140
|
const agentConfig = AgentConfigManager.getInstance();
|
|
140
141
|
// Initialize instruction aggregator
|
|
@@ -163,7 +164,7 @@ async function setupServerSync(transports, _context) {
|
|
|
163
164
|
logger.info('Lazy loading orchestrator initialized');
|
|
164
165
|
}
|
|
165
166
|
// Create a dummy loading manager for compatibility
|
|
166
|
-
const loadingManager = new McpLoadingManager(clientManager);
|
|
167
|
+
const loadingManager = new McpLoadingManager(clientManager, backendLoadingPolicy);
|
|
167
168
|
const loadingPromise = Promise.resolve(); // Already loaded
|
|
168
169
|
clientManager.setBackendAvailabilityHandler(() => serverManager.notifyBackendCapabilityListsChanged());
|
|
169
170
|
logger.info('Synchronous server setup completed - all MCP servers connected');
|
package/build/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2CAA2C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,OAAO,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iDAAiD,CAAC;AAC3F,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AACnG,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,wDAAwD,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAoBnE;;;GAGG;AACH,KAAK,UAAU,WAAW,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,12 @@ export declare function securityHeaders(req: Request, res: Response, next: NextF
|
|
|
6
6
|
/**
|
|
7
7
|
* Rate limiter for sensitive operations (stricter than general OAuth)
|
|
8
8
|
*/
|
|
9
|
+
export interface SensitiveOperationRateLimitPolicy {
|
|
10
|
+
windowMs: number;
|
|
11
|
+
maxRequests: number;
|
|
12
|
+
}
|
|
13
|
+
export declare const DEFAULT_SENSITIVE_OPERATION_RATE_LIMIT_POLICY: SensitiveOperationRateLimitPolicy;
|
|
14
|
+
export declare function createSensitiveOperationLimiter(policy?: SensitiveOperationRateLimitPolicy): import("express-rate-limit").RateLimitRequestHandler;
|
|
9
15
|
export declare const sensitiveOperationLimiter: import("express-rate-limit").RateLimitRequestHandler;
|
|
10
16
|
/**
|
|
11
17
|
* Enhanced input validation middleware
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"securityMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/middlewares/securityMiddleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAyBrF;AAED;;GAEG;AACH,eAAO,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"securityMiddleware.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/middlewares/securityMiddleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAyBrF;AAED;;GAEG;AACH,MAAM,WAAW,iCAAiC;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,6CAA6C,EAAE,iCAG3D,CAAC;AAEF,wBAAgB,+BAA+B,CAC7C,MAAM,GAAE,iCAAiF,wDA+B1F;AAID,eAAO,MAAM,yBAAyB,sDAAoC,CAAC;AAE3E;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAkErF;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAarF;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CA8CzF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAwB5F;AAED;;GAEG;AACH,wBAAgB,uBAAuB,+BAEtC"}
|
|
@@ -20,37 +20,43 @@ export function securityHeaders(req, res, next) {
|
|
|
20
20
|
res.removeHeader('X-Powered-By');
|
|
21
21
|
next();
|
|
22
22
|
}
|
|
23
|
-
|
|
24
|
-
*
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
},
|
|
35
|
-
skip: (req) => {
|
|
36
|
-
// Skip rate limiting for health checks or non-sensitive endpoints
|
|
37
|
-
return req.path === '/health' || req.path === '/';
|
|
38
|
-
},
|
|
39
|
-
handler: (req, res) => {
|
|
40
|
-
const logData = {
|
|
41
|
-
ip: req.ip,
|
|
42
|
-
userAgent: req.get('User-Agent'),
|
|
43
|
-
path: req.path,
|
|
44
|
-
method: req.method,
|
|
45
|
-
timestamp: new Date().toISOString(),
|
|
46
|
-
};
|
|
47
|
-
logger.warn(`Rate limit exceeded for sensitive operation`, logData);
|
|
48
|
-
res.status(429).json({
|
|
23
|
+
export const DEFAULT_SENSITIVE_OPERATION_RATE_LIMIT_POLICY = {
|
|
24
|
+
windowMs: 15 * 60 * 1000,
|
|
25
|
+
maxRequests: 10,
|
|
26
|
+
};
|
|
27
|
+
export function createSensitiveOperationLimiter(policy = DEFAULT_SENSITIVE_OPERATION_RATE_LIMIT_POLICY) {
|
|
28
|
+
return rateLimit({
|
|
29
|
+
windowMs: policy.windowMs,
|
|
30
|
+
max: policy.maxRequests,
|
|
31
|
+
standardHeaders: true,
|
|
32
|
+
legacyHeaders: false,
|
|
33
|
+
message: {
|
|
49
34
|
error: 'rate_limit_exceeded',
|
|
50
35
|
error_description: 'Too many sensitive operations. Please try again later.',
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
|
|
36
|
+
},
|
|
37
|
+
skip: (req) => {
|
|
38
|
+
// Skip rate limiting for health checks or non-sensitive endpoints.
|
|
39
|
+
return req.path === '/health' || req.path === '/';
|
|
40
|
+
},
|
|
41
|
+
handler: (req, res) => {
|
|
42
|
+
const logData = {
|
|
43
|
+
ip: req.ip,
|
|
44
|
+
userAgent: req.get('User-Agent'),
|
|
45
|
+
path: req.path,
|
|
46
|
+
method: req.method,
|
|
47
|
+
timestamp: new Date().toISOString(),
|
|
48
|
+
};
|
|
49
|
+
logger.warn(`Rate limit exceeded for sensitive operation`, logData);
|
|
50
|
+
res.status(429).json({
|
|
51
|
+
error: 'rate_limit_exceeded',
|
|
52
|
+
error_description: 'Too many sensitive operations. Please try again later.',
|
|
53
|
+
});
|
|
54
|
+
},
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
// OAuth consent retains its fixed policy. Admin routes construct a separate,
|
|
58
|
+
// startup-captured limiter so the two surfaces never share process-local state.
|
|
59
|
+
export const sensitiveOperationLimiter = createSensitiveOperationLimiter();
|
|
54
60
|
/**
|
|
55
61
|
* Enhanced input validation middleware
|
|
56
62
|
*/
|