@samanhappy/mcphub 1.2.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -0
- package/dist/controllers/configController.js +2 -0
- package/dist/controllers/configController.js.map +1 -1
- package/dist/controllers/serverController.js +64 -26
- package/dist/controllers/serverController.js.map +1 -1
- package/dist/db/entities/SystemConfig.js.map +1 -1
- package/dist/services/mcpService.js +3 -3
- package/dist/services/mcpService.js.map +1 -1
- package/dist/services/openApiGeneratorService.js +10 -3
- package/dist/services/openApiGeneratorService.js.map +1 -1
- package/dist/types/network.js +2 -0
- package/dist/types/network.js.map +1 -0
- package/dist/utils/openApiSchema.js +148 -0
- package/dist/utils/openApiSchema.js.map +1 -0
- package/dist/utils/parameterConversion.js +38 -5
- package/dist/utils/parameterConversion.js.map +1 -1
- package/dist/utils/passthroughHeaders.js +7 -3
- package/dist/utils/passthroughHeaders.js.map +1 -1
- package/dist/utils/ssrf.js +46 -12
- package/dist/utils/ssrf.js.map +1 -1
- package/frontend/dist/assets/{ActivityPage-CSXEpl6y.js → ActivityPage-DZFLY-Um.js} +2 -2
- package/frontend/dist/assets/{ActivityPage-CSXEpl6y.js.map → ActivityPage-DZFLY-Um.js.map} +1 -1
- package/frontend/dist/assets/{ConfirmDialog-BJpzQmMw.js → ConfirmDialog-ByWCtrIw.js} +2 -2
- package/frontend/dist/assets/{ConfirmDialog-BJpzQmMw.js.map → ConfirmDialog-ByWCtrIw.js.map} +1 -1
- package/frontend/dist/assets/{CredentialsPage-CPxOHQUZ.js → CredentialsPage-BqEsnkMx.js} +2 -2
- package/frontend/dist/assets/{CredentialsPage-CPxOHQUZ.js.map → CredentialsPage-BqEsnkMx.js.map} +1 -1
- package/frontend/dist/assets/{Dashboard-Da-YT_l_.js → Dashboard-BRU2Gk9z.js} +2 -2
- package/frontend/dist/assets/{Dashboard-Da-YT_l_.js.map → Dashboard-BRU2Gk9z.js.map} +1 -1
- package/frontend/dist/assets/{DeleteDialog-BoMYLx3J.js → DeleteDialog-BkEKW9LB.js} +2 -2
- package/frontend/dist/assets/{DeleteDialog-BoMYLx3J.js.map → DeleteDialog-BkEKW9LB.js.map} +1 -1
- package/frontend/dist/assets/{EndpointCopy-CZOjiFAH.js → EndpointCopy-3f1Uw-gu.js} +2 -2
- package/frontend/dist/assets/{EndpointCopy-CZOjiFAH.js.map → EndpointCopy-3f1Uw-gu.js.map} +1 -1
- package/frontend/dist/assets/{GroupsPage-CSA5G9_H.js → GroupsPage-D_E7QL_o.js} +2 -2
- package/frontend/dist/assets/{GroupsPage-CSA5G9_H.js.map → GroupsPage-D_E7QL_o.js.map} +1 -1
- package/frontend/dist/assets/{LoginPage-7RswUPtG.js → LoginPage-Bsfdp4yD.js} +2 -2
- package/frontend/dist/assets/{LoginPage-7RswUPtG.js.map → LoginPage-Bsfdp4yD.js.map} +1 -1
- package/frontend/dist/assets/{LogsPage-Dbef_68F.js → LogsPage-CCHmA5cZ.js} +2 -2
- package/frontend/dist/assets/{LogsPage-Dbef_68F.js.map → LogsPage-CCHmA5cZ.js.map} +1 -1
- package/frontend/dist/assets/{MarketPage-rSBdHZxo.js → MarketPage-DrQQT14y.js} +2 -2
- package/frontend/dist/assets/{MarketPage-rSBdHZxo.js.map → MarketPage-DrQQT14y.js.map} +1 -1
- package/frontend/dist/assets/{OAuthConsentPage-BH9O7bk3.js → OAuthConsentPage-934ieVvL.js} +2 -2
- package/frontend/dist/assets/{OAuthConsentPage-BH9O7bk3.js.map → OAuthConsentPage-934ieVvL.js.map} +1 -1
- package/frontend/dist/assets/{Pagination-S-7lzy59.js → Pagination-B2WW4qn_.js} +2 -2
- package/frontend/dist/assets/{Pagination-S-7lzy59.js.map → Pagination-B2WW4qn_.js.map} +1 -1
- package/frontend/dist/assets/{PromptsPage-B558MhVU.js → PromptsPage-QAI8kF63.js} +2 -2
- package/frontend/dist/assets/{PromptsPage-B558MhVU.js.map → PromptsPage-QAI8kF63.js.map} +1 -1
- package/frontend/dist/assets/{ResourcesPage-DQpy8B9L.js → ResourcesPage-TclV1l2q.js} +2 -2
- package/frontend/dist/assets/{ResourcesPage-DQpy8B9L.js.map → ResourcesPage-TclV1l2q.js.map} +1 -1
- package/frontend/dist/assets/{ServersPage-DBcC8pG2.js → ServersPage-Bc0tS2uo.js} +4 -4
- package/frontend/dist/assets/{ServersPage-DBcC8pG2.js.map → ServersPage-Bc0tS2uo.js.map} +1 -1
- package/frontend/dist/assets/SettingsPage-Dfhl51E1.js +14 -0
- package/frontend/dist/assets/SettingsPage-Dfhl51E1.js.map +1 -0
- package/frontend/dist/assets/{StatusDot-CLxRrJ5l.js → StatusDot-C_UTW6B7.js} +2 -2
- package/frontend/dist/assets/{StatusDot-CLxRrJ5l.js.map → StatusDot-C_UTW6B7.js.map} +1 -1
- package/frontend/dist/assets/{ToggleGroup-DuWJZU41.js → ToggleGroup-CUUsTJDm.js} +2 -2
- package/frontend/dist/assets/{ToggleGroup-DuWJZU41.js.map → ToggleGroup-CUUsTJDm.js.map} +1 -1
- package/frontend/dist/assets/{UserGroupSelection-CN0weGXJ.js → UserGroupSelection-DionUENR.js} +2 -2
- package/frontend/dist/assets/{UserGroupSelection-CN0weGXJ.js.map → UserGroupSelection-DionUENR.js.map} +1 -1
- package/frontend/dist/assets/{UsersPage-B158Bofs.js → UsersPage-MpTb3xJ-.js} +2 -2
- package/frontend/dist/assets/{UsersPage-B158Bofs.js.map → UsersPage-MpTb3xJ-.js.map} +1 -1
- package/frontend/dist/assets/{clipboard-BLr_gbf8.js → clipboard-DVbqnePj.js} +2 -2
- package/frontend/dist/assets/{clipboard-BLr_gbf8.js.map → clipboard-DVbqnePj.js.map} +1 -1
- package/frontend/dist/assets/{costRevision-Dzec2k_b.js → costRevision-DXEYAFUy.js} +2 -2
- package/frontend/dist/assets/{costRevision-Dzec2k_b.js.map → costRevision-DXEYAFUy.js.map} +1 -1
- package/frontend/dist/assets/{i18n-vendor-COTriSc6.js → i18n-vendor-CPneThYa.js} +3 -3
- package/frontend/dist/assets/{i18n-vendor-COTriSc6.js.map → i18n-vendor-CPneThYa.js.map} +1 -1
- package/frontend/dist/assets/index-BNm-68Gn.js +3 -0
- package/frontend/dist/assets/index-BNm-68Gn.js.map +1 -0
- package/frontend/dist/assets/{index-DrHctFvx.css → index-C33aH9Y7.css} +1 -1
- package/frontend/dist/assets/{resourceService-BNH7uNar.js → resourceService-DPjgql8Z.js} +2 -2
- package/frontend/dist/assets/{resourceService-BNH7uNar.js.map → resourceService-DPjgql8Z.js.map} +1 -1
- package/frontend/dist/assets/{useCostData-B2d2eLCD.js → useCostData-CDNXYHZf.js} +2 -2
- package/frontend/dist/assets/{useCostData-B2d2eLCD.js.map → useCostData-CDNXYHZf.js.map} +1 -1
- package/frontend/dist/assets/{variableDetection-DRdE941j.js → variableDetection-DGr_LErx.js} +2 -2
- package/frontend/dist/assets/{variableDetection-DRdE941j.js.map → variableDetection-DGr_LErx.js.map} +1 -1
- package/frontend/dist/index.html +3 -3
- package/package.json +4 -4
- package/frontend/dist/assets/SettingsPage-BcpeHFR3.js +0 -14
- package/frontend/dist/assets/SettingsPage-BcpeHFR3.js.map +0 -1
- package/frontend/dist/assets/index-CGRjM_NC.js +0 -3
- package/frontend/dist/assets/index-CGRjM_NC.js.map +0 -1
|
@@ -4,6 +4,7 @@ import { getSystemConfigDao } from '../dao/index.js';
|
|
|
4
4
|
import { resolveInstallBaseUrl } from '../utils/installBaseUrl.js';
|
|
5
5
|
import { filterModelVisibleTools } from '../utils/mcpApps.js';
|
|
6
6
|
import { applyHiddenParams } from '../utils/toolConfig.js';
|
|
7
|
+
import { collectDefinitions, toOpenApiSchema } from '../utils/openApiSchema.js';
|
|
7
8
|
/**
|
|
8
9
|
* Convert MCP tool input schema to OpenAPI parameter or request body schema
|
|
9
10
|
*/
|
|
@@ -17,7 +18,11 @@ function convertToolSchemaToOpenAPI(tool) {
|
|
|
17
18
|
const properties = schema.properties;
|
|
18
19
|
const required = Array.isArray(schema.required) ? schema.required : [];
|
|
19
20
|
// For simple tools with only primitive parameters, use query parameters
|
|
20
|
-
const hasComplexTypes = Object.values(properties).some((prop) => prop.type === 'object' ||
|
|
21
|
+
const hasComplexTypes = Object.values(properties).some((prop) => prop.type === 'object' ||
|
|
22
|
+
prop.type === 'array' ||
|
|
23
|
+
prop.type === 'string' ||
|
|
24
|
+
Array.isArray(prop.type) ||
|
|
25
|
+
['anyOf', 'oneOf', 'allOf', '$ref'].some((keyword) => prop[keyword] !== undefined));
|
|
21
26
|
if (!hasComplexTypes && Object.keys(properties).length <= 10) {
|
|
22
27
|
// Use query parameters for simple tools
|
|
23
28
|
const parameters = Object.entries(properties).map(([name, prop]) => ({
|
|
@@ -35,14 +40,16 @@ function convertToolSchemaToOpenAPI(tool) {
|
|
|
35
40
|
return { parameters };
|
|
36
41
|
}
|
|
37
42
|
else {
|
|
38
|
-
// Use request body for complex tools
|
|
43
|
+
// Use request body for complex tools. The generated document is OpenAPI 3.0, so the
|
|
44
|
+
// JSON Schema property definitions are converted to their 3.0 form first
|
|
45
|
+
const definitions = collectDefinitions(schema);
|
|
39
46
|
const requestBody = {
|
|
40
47
|
required: required.length > 0,
|
|
41
48
|
content: {
|
|
42
49
|
'application/json': {
|
|
43
50
|
schema: {
|
|
44
51
|
type: 'object',
|
|
45
|
-
properties,
|
|
52
|
+
properties: toOpenApiSchema({ type: 'object', properties }, definitions).properties,
|
|
46
53
|
...(required.length > 0 && { required }),
|
|
47
54
|
},
|
|
48
55
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openApiGeneratorService.js","sourceRoot":"","sources":["../../src/services/openApiGeneratorService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,MAAM,EAAE,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"openApiGeneratorService.js","sourceRoot":"","sources":["../../src/services/openApiGeneratorService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/types/network.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Convert JSON Schema fragments from MCP tool input schemas into schemas that are valid
|
|
3
|
+
* under OpenAPI 3.0.x (which the generated documents declare).
|
|
4
|
+
*/
|
|
5
|
+
const DEFINITION_PREFIXES = ['#/$defs/', '#/definitions/'];
|
|
6
|
+
function definitionName(ref) {
|
|
7
|
+
const prefix = DEFINITION_PREFIXES.find((candidate) => ref.startsWith(candidate));
|
|
8
|
+
return prefix ? ref.slice(prefix.length) : undefined;
|
|
9
|
+
}
|
|
10
|
+
function isNullSchema(member) {
|
|
11
|
+
return !!member && typeof member === 'object' && member.type === 'null';
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Collect the local definitions of a tool input schema, keyed by name.
|
|
15
|
+
*/
|
|
16
|
+
export function collectDefinitions(rootSchema) {
|
|
17
|
+
return { ...rootSchema.definitions, ...rootSchema.$defs };
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Rewrite a schema for OpenAPI 3.0:
|
|
21
|
+
* - `type: [..., 'null']` and `anyOf`/`oneOf` members of `{ type: 'null' }` become `nullable: true`
|
|
22
|
+
* - other `type` lists become an `anyOf`
|
|
23
|
+
* - `const` becomes a single-value `enum`
|
|
24
|
+
* - local `$ref`s to `$defs`/`definitions` are inlined, since the root definitions are not part
|
|
25
|
+
* of the generated document. A reference to a definition that is already being inlined
|
|
26
|
+
* (a recursive schema) becomes an empty schema, which accepts any value.
|
|
27
|
+
*/
|
|
28
|
+
export function toOpenApiSchema(schema, definitions = {}, resolving = []) {
|
|
29
|
+
if (Array.isArray(schema)) {
|
|
30
|
+
return schema.map((item) => toOpenApiSchema(item, definitions, resolving));
|
|
31
|
+
}
|
|
32
|
+
if (!schema || typeof schema !== 'object') {
|
|
33
|
+
return schema;
|
|
34
|
+
}
|
|
35
|
+
const { $ref, $defs: _defs, definitions: _definitions, ...rest } = schema;
|
|
36
|
+
const node = convertChildren(rest, definitions, resolving);
|
|
37
|
+
if (typeof $ref === 'string') {
|
|
38
|
+
const name = definitionName($ref);
|
|
39
|
+
if (name !== undefined && Object.prototype.hasOwnProperty.call(definitions, name)) {
|
|
40
|
+
const target = resolving.includes(name)
|
|
41
|
+
? {}
|
|
42
|
+
: toOpenApiSchema(definitions[name], definitions, [...resolving, name]);
|
|
43
|
+
return normalizeNullability({ ...target, ...node });
|
|
44
|
+
}
|
|
45
|
+
// Not a reference this converter can resolve; keep it as written
|
|
46
|
+
return { $ref, ...node };
|
|
47
|
+
}
|
|
48
|
+
return normalizeNullability(node);
|
|
49
|
+
}
|
|
50
|
+
function convertChildren(node, definitions, resolving) {
|
|
51
|
+
const converted = {};
|
|
52
|
+
for (const [key, value] of Object.entries(node)) {
|
|
53
|
+
if (key === 'properties' && value && typeof value === 'object' && !Array.isArray(value)) {
|
|
54
|
+
converted.properties = Object.fromEntries(Object.entries(value).map(([name, property]) => [
|
|
55
|
+
name,
|
|
56
|
+
toOpenApiSchema(property, definitions, resolving),
|
|
57
|
+
]));
|
|
58
|
+
}
|
|
59
|
+
else if (['items', 'additionalProperties', 'not'].includes(key)) {
|
|
60
|
+
converted[key] = toOpenApiSchema(value, definitions, resolving);
|
|
61
|
+
}
|
|
62
|
+
else if (['allOf', 'anyOf', 'oneOf'].includes(key) && Array.isArray(value)) {
|
|
63
|
+
converted[key] = toOpenApiSchema(value, definitions, resolving);
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
converted[key] = value;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return converted;
|
|
70
|
+
}
|
|
71
|
+
function normalizeNullability(node) {
|
|
72
|
+
const result = { ...node };
|
|
73
|
+
let nullable = false;
|
|
74
|
+
if (result.const !== undefined && result.enum === undefined) {
|
|
75
|
+
result.enum = [result.const];
|
|
76
|
+
delete result.const;
|
|
77
|
+
}
|
|
78
|
+
if (Array.isArray(result.type)) {
|
|
79
|
+
const types = result.type.filter((type) => type !== 'null');
|
|
80
|
+
const acceptsNull = types.length !== result.type.length;
|
|
81
|
+
if (types.length === 0) {
|
|
82
|
+
delete result.type;
|
|
83
|
+
}
|
|
84
|
+
else if (types.length === 1) {
|
|
85
|
+
result.type = types[0];
|
|
86
|
+
if (acceptsNull) {
|
|
87
|
+
result.nullable = true;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
delete result.type;
|
|
92
|
+
const members = types.map((type) => ({ type }));
|
|
93
|
+
if (acceptsNull) {
|
|
94
|
+
members[0] = markNullable(members[0], false);
|
|
95
|
+
}
|
|
96
|
+
if (result.anyOf === undefined) {
|
|
97
|
+
result.anyOf = members;
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
result.allOf = [...(result.allOf ?? []), { anyOf: members }];
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
for (const key of ['anyOf', 'oneOf']) {
|
|
105
|
+
if (!Array.isArray(result[key]) || !result[key].some(isNullSchema))
|
|
106
|
+
continue;
|
|
107
|
+
const members = result[key].filter((member) => !isNullSchema(member));
|
|
108
|
+
delete result[key];
|
|
109
|
+
if (members.length === 1) {
|
|
110
|
+
// The node's own keywords (description, default, ...) take priority over the member's
|
|
111
|
+
Object.assign(result, { ...members[0], ...result });
|
|
112
|
+
nullable = true;
|
|
113
|
+
}
|
|
114
|
+
else if (members.length > 1) {
|
|
115
|
+
// `nullable` must sit next to a `type`, so it goes on the first member that has one. One
|
|
116
|
+
// member is enough for anyOf, and for oneOf null has to match exactly one member
|
|
117
|
+
const typed = members.findIndex((member) => !!member && typeof member.type === 'string');
|
|
118
|
+
if (typed >= 0) {
|
|
119
|
+
members[typed] = markNullable(members[typed]);
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
nullable = true;
|
|
123
|
+
}
|
|
124
|
+
result[key] = members;
|
|
125
|
+
}
|
|
126
|
+
else {
|
|
127
|
+
nullable = true;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
return nullable ? markNullable(result) : result;
|
|
131
|
+
}
|
|
132
|
+
/**
|
|
133
|
+
* Make a schema accept null in OpenAPI 3.0. `nullable` only counts next to a `type`, and an
|
|
134
|
+
* `enum` accepts null only when it lists it. `extendEnum` is false when the schema's own enum
|
|
135
|
+
* is meant to keep excluding null.
|
|
136
|
+
*/
|
|
137
|
+
function markNullable(schema, extendEnum = true) {
|
|
138
|
+
const marked = { ...schema };
|
|
139
|
+
const hasEnum = Array.isArray(marked.enum);
|
|
140
|
+
if (hasEnum && extendEnum && !marked.enum.includes(null)) {
|
|
141
|
+
marked.enum = [...marked.enum, null];
|
|
142
|
+
}
|
|
143
|
+
if (typeof marked.type === 'string' || !hasEnum) {
|
|
144
|
+
marked.nullable = true;
|
|
145
|
+
}
|
|
146
|
+
return marked;
|
|
147
|
+
}
|
|
148
|
+
//# sourceMappingURL=openApiSchema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openApiSchema.js","sourceRoot":"","sources":["../../src/utils/openApiSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,30 @@ import { logger } from './logger.js';
|
|
|
2
2
|
/**
|
|
3
3
|
* Utility functions for converting parameter types based on JSON schema definitions
|
|
4
4
|
*/
|
|
5
|
+
/**
|
|
6
|
+
* Resolve the schema that decides how a value is converted. A `type` list or an
|
|
7
|
+
* `anyOf`/`oneOf` union that has exactly one non-null member (the usual encoding of a
|
|
8
|
+
* nullable parameter) is treated as that member; anything more ambiguous is left alone.
|
|
9
|
+
*/
|
|
10
|
+
function resolveEffectiveSchema(propDef) {
|
|
11
|
+
if (Array.isArray(propDef.type)) {
|
|
12
|
+
const types = propDef.type.filter((type) => type !== 'null');
|
|
13
|
+
return types.length === 1 ? { ...propDef, type: types[0] } : propDef;
|
|
14
|
+
}
|
|
15
|
+
if (propDef.type === undefined) {
|
|
16
|
+
for (const key of ['anyOf', 'oneOf']) {
|
|
17
|
+
if (!Array.isArray(propDef[key]))
|
|
18
|
+
continue;
|
|
19
|
+
const members = propDef[key].filter((member) => member && typeof member === 'object' && member.type !== 'null');
|
|
20
|
+
if (members.length === 1) {
|
|
21
|
+
const rest = { ...propDef };
|
|
22
|
+
delete rest[key];
|
|
23
|
+
return resolveEffectiveSchema({ ...rest, ...members[0] });
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return propDef;
|
|
28
|
+
}
|
|
5
29
|
/**
|
|
6
30
|
* Convert parameters to their proper types based on the tool's input schema
|
|
7
31
|
* This ensures that form-submitted string values are converted to the correct types
|
|
@@ -24,7 +48,8 @@ export function convertParametersToTypes(params, inputSchema) {
|
|
|
24
48
|
convertedParams[key] = value;
|
|
25
49
|
continue;
|
|
26
50
|
}
|
|
27
|
-
const
|
|
51
|
+
const effectiveDef = resolveEffectiveSchema(propDef);
|
|
52
|
+
const propType = effectiveDef.type;
|
|
28
53
|
try {
|
|
29
54
|
switch (propType) {
|
|
30
55
|
case 'integer':
|
|
@@ -56,12 +81,20 @@ export function convertParametersToTypes(params, inputSchema) {
|
|
|
56
81
|
break;
|
|
57
82
|
case 'array': {
|
|
58
83
|
// Handle array conversion if needed (e.g., comma-separated strings)
|
|
59
|
-
|
|
84
|
+
let items = typeof value === 'string' && value.includes(',')
|
|
60
85
|
? value.split(',').map((item) => item.trim())
|
|
61
86
|
: value;
|
|
62
|
-
if (Array.isArray(items) &&
|
|
63
|
-
|
|
64
|
-
|
|
87
|
+
if (!Array.isArray(items) &&
|
|
88
|
+
items !== '' &&
|
|
89
|
+
['string', 'number', 'boolean'].includes(typeof items)) {
|
|
90
|
+
// A single query or form value arrives as a scalar; the schema wants an array
|
|
91
|
+
items = [items];
|
|
92
|
+
}
|
|
93
|
+
const itemsDef = effectiveDef.items && typeof effectiveDef.items === 'object'
|
|
94
|
+
? resolveEffectiveSchema(effectiveDef.items)
|
|
95
|
+
: undefined;
|
|
96
|
+
if (Array.isArray(items) && ['integer', 'number', 'boolean'].includes(itemsDef?.type)) {
|
|
97
|
+
convertedParams[key] = items.map((item) => convertParametersToTypes({ item }, { properties: { item: itemsDef } }).item);
|
|
65
98
|
}
|
|
66
99
|
else {
|
|
67
100
|
convertedParams[key] = items;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameterConversion.js","sourceRoot":"","sources":["../../src/utils/parameterConversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC;;GAEG;AAEH;;;;;;;;GAQG;AACH,MAAM,UAAU,wBAAwB,CACtC,MAA2B,EAC3B,WAAgC;IAEhC,IAAI,CAAC,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAC/E,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,eAAe,GAAwB,EAAE,CAAC;IAChD,MAAM,UAAU,GAAG,WAAW,CAAC,UAAU,CAAC;IAE1C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC5C,yCAAyC;YACzC,eAAe,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC7B,SAAS;QACX,CAAC;QAED,MAAM,
|
|
1
|
+
{"version":3,"file":"parameterConversion.js","sourceRoot":"","sources":["../../src/utils/parameterConversion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isHostedModeEnabled } from '../services/hostedMode.js';
|
|
1
2
|
import { resolveBearerAuthHeaderName } from './bearerAuth.js';
|
|
2
3
|
import { getCachedSystemConfig } from './systemConfigCache.js';
|
|
3
4
|
const sensitiveHeaders = new Set([
|
|
@@ -9,9 +10,12 @@ const sensitiveHeaders = new Set([
|
|
|
9
10
|
]);
|
|
10
11
|
export const isSafePassthroughHeader = (name) => {
|
|
11
12
|
const normalized = name.trim().toLowerCase();
|
|
12
|
-
|
|
13
|
+
const systemConfig = getCachedSystemConfig();
|
|
14
|
+
// Hosted mode always accepts Authorization as a platform credential.
|
|
15
|
+
const allowAuthorization = systemConfig?.routing?.allowAuthorizationPassthrough === true && !isHostedModeEnabled();
|
|
16
|
+
// An opt-in must never forward the header used for MCPHub authentication.
|
|
13
17
|
return (Boolean(normalized) &&
|
|
14
|
-
!sensitiveHeaders.has(normalized) &&
|
|
15
|
-
normalized !== resolveBearerAuthHeaderName(
|
|
18
|
+
(!sensitiveHeaders.has(normalized) || (normalized === 'authorization' && allowAuthorization)) &&
|
|
19
|
+
normalized !== resolveBearerAuthHeaderName(systemConfig).toLowerCase());
|
|
16
20
|
};
|
|
17
21
|
//# sourceMappingURL=passthroughHeaders.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"passthroughHeaders.js","sourceRoot":"","sources":["../../src/utils/passthroughHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B,eAAe;IACf,qBAAqB;IACrB,QAAQ;IACR,cAAc;IACd,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAW,EAAE;IAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC7C,
|
|
1
|
+
{"version":3,"file":"passthroughHeaders.js","sourceRoot":"","sources":["../../src/utils/passthroughHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B,eAAe;IACf,qBAAqB;IACrB,QAAQ;IACR,cAAc;IACd,WAAW;CACZ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAW,EAAE;IAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC7C,MAAM,YAAY,GAAG,qBAAqB,EAAE,CAAC;IAC7C,qEAAqE;IACrE,MAAM,kBAAkB,GACtB,YAAY,EAAE,OAAO,EAAE,6BAA6B,KAAK,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC1F,0EAA0E;IAC1E,OAAO,CACL,OAAO,CAAC,UAAU,CAAC;QACnB,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,KAAK,eAAe,IAAI,kBAAkB,CAAC,CAAC;QAC7F,UAAU,KAAK,2BAA2B,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CACvE,CAAC;AACJ,CAAC,CAAC"}
|
package/dist/utils/ssrf.js
CHANGED
|
@@ -23,11 +23,39 @@ export function validateAllowedCidrs(value) {
|
|
|
23
23
|
Number(prefix) <= (family === 4 ? 32 : 128));
|
|
24
24
|
}));
|
|
25
25
|
}
|
|
26
|
+
export function validateFakeIpExceptions(value) {
|
|
27
|
+
return (Array.isArray(value) &&
|
|
28
|
+
value.every((rule) => {
|
|
29
|
+
if (!rule ||
|
|
30
|
+
typeof rule.serverId !== 'string' ||
|
|
31
|
+
!rule.serverId.trim() ||
|
|
32
|
+
typeof rule.hostname !== 'string')
|
|
33
|
+
return false;
|
|
34
|
+
const host = rule.hostname;
|
|
35
|
+
return (host.length <= 253 &&
|
|
36
|
+
host === host.toLowerCase() &&
|
|
37
|
+
isIP(host) === 0 &&
|
|
38
|
+
host.includes('.') &&
|
|
39
|
+
host
|
|
40
|
+
.split('.')
|
|
41
|
+
.every((label) => /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(label)));
|
|
42
|
+
}));
|
|
43
|
+
}
|
|
44
|
+
function allowsFakeIp(ip, hostname, serverId) {
|
|
45
|
+
if (!hostname || !serverId || isIP(hostname) || isIP(ip) !== 4)
|
|
46
|
+
return false;
|
|
47
|
+
const n = ipv4ToInt(ip);
|
|
48
|
+
if (n < 0xc6120000 || n > 0xc613ffff)
|
|
49
|
+
return false;
|
|
50
|
+
const rules = getCachedSystemConfig()?.network?.fakeIpExceptions;
|
|
51
|
+
return (validateFakeIpExceptions(rules) &&
|
|
52
|
+
rules.some((rule) => rule.serverId === serverId && rule.hostname === hostname.toLowerCase()));
|
|
53
|
+
}
|
|
26
54
|
// Read on each request/socket lookup so removing a range also affects existing clients.
|
|
27
|
-
function isDisallowedIp(ip, allowedCidrs) {
|
|
55
|
+
function isDisallowedIp(ip, allowedCidrs, hostname, serverId) {
|
|
28
56
|
if (!isIP(ip))
|
|
29
57
|
return true;
|
|
30
|
-
if (!isBlockedIp(ip))
|
|
58
|
+
if (!isBlockedIp(ip) || allowsFakeIp(ip, hostname, serverId))
|
|
31
59
|
return false;
|
|
32
60
|
const cidrs = allowedCidrs ?? getCachedSystemConfig()?.network?.allowedCidrs ?? [];
|
|
33
61
|
if (!validateAllowedCidrs(cidrs))
|
|
@@ -130,10 +158,11 @@ const defaultLookup = async (host) => {
|
|
|
130
158
|
return records.map((r) => r.address);
|
|
131
159
|
};
|
|
132
160
|
/** Validate the very DNS result handed to the socket, without a second resolution. */
|
|
133
|
-
export const createSafeLookup = (lookup = defaultLookup, allowedCidrs) => (hostname, options, callback) => {
|
|
161
|
+
export const createSafeLookup = (lookup = defaultLookup, allowedCidrs, serverId) => (hostname, options, callback) => {
|
|
134
162
|
void lookup(hostname)
|
|
135
163
|
.then((addresses) => {
|
|
136
|
-
if (!addresses.length ||
|
|
164
|
+
if (!addresses.length ||
|
|
165
|
+
addresses.some((ip) => isDisallowedIp(ip, allowedCidrs, hostname, serverId))) {
|
|
137
166
|
throw new UnsafeUrlError(`Blocked or empty DNS result for ${hostname}`);
|
|
138
167
|
}
|
|
139
168
|
const records = addresses
|
|
@@ -164,7 +193,7 @@ export const ssrfConnectionOptions = (allowInternal) => allowInternal
|
|
|
164
193
|
proxy: false,
|
|
165
194
|
};
|
|
166
195
|
export async function assertSafeUrl(rawUrl, opts = {}) {
|
|
167
|
-
const { allowInternal = false, lookup = defaultLookup, allowedCidrs } = opts;
|
|
196
|
+
const { allowInternal = false, lookup = defaultLookup, allowedCidrs, serverId } = opts;
|
|
168
197
|
let parsed;
|
|
169
198
|
try {
|
|
170
199
|
parsed = new URL(rawUrl);
|
|
@@ -196,7 +225,7 @@ export async function assertSafeUrl(rawUrl, opts = {}) {
|
|
|
196
225
|
throw new UnsafeUrlError(`No addresses resolved for host: ${host}`);
|
|
197
226
|
}
|
|
198
227
|
for (const addr of addresses) {
|
|
199
|
-
if (isDisallowedIp(addr, allowedCidrs)) {
|
|
228
|
+
if (isDisallowedIp(addr, allowedCidrs, host, serverId)) {
|
|
200
229
|
throw new UnsafeUrlError(`Host ${host} resolves to blocked address: ${addr}`);
|
|
201
230
|
}
|
|
202
231
|
}
|
|
@@ -207,19 +236,19 @@ export async function assertSafeUrl(rawUrl, opts = {}) {
|
|
|
207
236
|
// fetch auto-follow to an attacker-chosen internal address. Validates the
|
|
208
237
|
// resolved Location (absolute or relative) on every hop and caps the chain
|
|
209
238
|
// at maxHops to avoid redirect loops.
|
|
210
|
-
export function createRedirectValidatingFetch(baseFetch, allowInternal, lookup = defaultLookup, allowedCidrs) {
|
|
239
|
+
export function createRedirectValidatingFetch(baseFetch, allowInternal, lookup = defaultLookup, allowedCidrs, serverId) {
|
|
211
240
|
const maxHops = 5;
|
|
212
241
|
const dispatcher = allowInternal
|
|
213
242
|
? undefined
|
|
214
|
-
: lookup === defaultLookup && allowedCidrs === undefined
|
|
243
|
+
: !serverId && lookup === defaultLookup && allowedCidrs === undefined
|
|
215
244
|
? safeDispatcher
|
|
216
|
-
: lookup === defaultLookup && allowedCidrs?.length === 0
|
|
245
|
+
: !serverId && lookup === defaultLookup && allowedCidrs?.length === 0
|
|
217
246
|
? publicOnlyDispatcher
|
|
218
|
-
: new Agent({ connect: { lookup: createSafeLookup(lookup, allowedCidrs) } });
|
|
247
|
+
: new Agent({ connect: { lookup: createSafeLookup(lookup, allowedCidrs, serverId) } });
|
|
219
248
|
return async (url, init) => {
|
|
220
249
|
let currentUrl = typeof url === 'string' ? url : url.toString();
|
|
221
250
|
let hops = 0;
|
|
222
|
-
currentUrl = await assertSafeUrl(currentUrl, { allowInternal, lookup, allowedCidrs });
|
|
251
|
+
currentUrl = await assertSafeUrl(currentUrl, { allowInternal, lookup, allowedCidrs, serverId });
|
|
223
252
|
let response = await baseFetch(currentUrl, {
|
|
224
253
|
...init,
|
|
225
254
|
...(dispatcher ? { dispatcher } : {}),
|
|
@@ -234,7 +263,12 @@ export function createRedirectValidatingFetch(baseFetch, allowInternal, lookup =
|
|
|
234
263
|
return response;
|
|
235
264
|
}
|
|
236
265
|
const resolvedUrl = new URL(location, currentUrl).toString();
|
|
237
|
-
currentUrl = await assertSafeUrl(resolvedUrl, {
|
|
266
|
+
currentUrl = await assertSafeUrl(resolvedUrl, {
|
|
267
|
+
allowInternal,
|
|
268
|
+
lookup,
|
|
269
|
+
allowedCidrs,
|
|
270
|
+
serverId,
|
|
271
|
+
});
|
|
238
272
|
hops++;
|
|
239
273
|
response = await baseFetch(currentUrl, {
|
|
240
274
|
...init,
|
package/dist/utils/ssrf.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssrf.js","sourceRoot":"","sources":["../../src/utils/ssrf.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ssrf.js","sourceRoot":"","sources":["../../src/utils/ssrf.ts"],"names":[],"mappings":"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"}
|