@samanhappy/mcphub 1.1.13 → 1.1.15
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.fr.md +1 -1
- package/README.md +1 -1
- package/README.zh.md +1 -1
- package/dist/betterAuth.js +3 -3
- package/dist/betterAuth.js.map +1 -1
- package/dist/cli/commands/keys.js +22 -3
- package/dist/cli/commands/keys.js.map +1 -1
- package/dist/clients/mcpSdkClient.js +2667 -1448
- package/dist/clients/mcpSdkClient.js.map +4 -4
- package/dist/config/index.js +1 -1
- package/dist/config/index.js.map +1 -1
- package/dist/controllers/bearerKeyController.js +49 -3
- package/dist/controllers/bearerKeyController.js.map +1 -1
- package/dist/controllers/configController.js +1 -0
- package/dist/controllers/configController.js.map +1 -1
- package/dist/controllers/credentialBindingController.js +36 -12
- package/dist/controllers/credentialBindingController.js.map +1 -1
- package/dist/controllers/groupController.js +12 -5
- package/dist/controllers/groupController.js.map +1 -1
- package/dist/controllers/oauthRelayController.js +65 -0
- package/dist/controllers/oauthRelayController.js.map +1 -0
- package/dist/controllers/personalOAuthController.js +10 -1
- package/dist/controllers/personalOAuthController.js.map +1 -1
- package/dist/controllers/serverController.js +52 -18
- package/dist/controllers/serverController.js.map +1 -1
- package/dist/controllers/userController.js +11 -1
- package/dist/controllers/userController.js.map +1 -1
- package/dist/dao/ActivityDao.js +2 -0
- package/dist/dao/ActivityDao.js.map +1 -1
- package/dist/dao/BearerKeyDao.js +10 -5
- package/dist/dao/BearerKeyDao.js.map +1 -1
- package/dist/dao/BearerKeyDaoDbImpl.js +16 -5
- package/dist/dao/BearerKeyDaoDbImpl.js.map +1 -1
- package/dist/dao/GroupDao.js +24 -0
- package/dist/dao/GroupDao.js.map +1 -1
- package/dist/dao/GroupDaoDbImpl.js +34 -0
- package/dist/dao/GroupDaoDbImpl.js.map +1 -1
- package/dist/dao/ServerDao.js +10 -1
- package/dist/dao/ServerDao.js.map +1 -1
- package/dist/dao/ServerDaoDbImpl.js +4 -0
- package/dist/dao/ServerDaoDbImpl.js.map +1 -1
- package/dist/dao/SystemConfigDao.js +5 -2
- package/dist/dao/SystemConfigDao.js.map +1 -1
- package/dist/dao/SystemConfigDaoDbImpl.js +11 -0
- package/dist/dao/SystemConfigDaoDbImpl.js.map +1 -1
- package/dist/dao/UserDaoDbImpl.js +4 -0
- package/dist/dao/UserDaoDbImpl.js.map +1 -1
- package/dist/dao/base/JsonFileBaseDao.js +17 -2
- package/dist/dao/base/JsonFileBaseDao.js.map +1 -1
- package/dist/db/entities/Activity.js +4 -0
- package/dist/db/entities/Activity.js.map +1 -1
- package/dist/db/entities/BearerKey.js +8 -0
- package/dist/db/entities/BearerKey.js.map +1 -1
- package/dist/db/entities/Group.js +4 -0
- package/dist/db/entities/Group.js.map +1 -1
- package/dist/db/entities/Server.js +4 -0
- package/dist/db/entities/Server.js.map +1 -1
- package/dist/db/entities/SystemConfig.js +8 -0
- package/dist/db/entities/SystemConfig.js.map +1 -1
- package/dist/db/entities/User.js +4 -0
- package/dist/db/entities/User.js.map +1 -1
- package/dist/db/repositories/GroupRepository.js +36 -0
- package/dist/db/repositories/GroupRepository.js.map +1 -1
- package/dist/db/repositories/ServerRepository.js +1 -0
- package/dist/db/repositories/ServerRepository.js.map +1 -1
- package/dist/db/repositories/VectorEmbeddingRepository.js +11 -1
- package/dist/db/repositories/VectorEmbeddingRepository.js.map +1 -1
- package/dist/middlewares/auth.js +7 -1
- package/dist/middlewares/auth.js.map +1 -1
- package/dist/routes/index.js +6 -1
- package/dist/routes/index.js.map +1 -1
- package/dist/server.js +2 -0
- package/dist/server.js.map +1 -1
- package/dist/services/activityLoggingService.js +1 -0
- package/dist/services/activityLoggingService.js.map +1 -1
- package/dist/services/authorizationService.js.map +1 -1
- package/dist/services/capabilitySnapshotService.js +2 -1
- package/dist/services/capabilitySnapshotService.js.map +1 -1
- package/dist/services/contextCostService.js +2 -2
- package/dist/services/contextCostService.js.map +1 -1
- package/dist/services/credentialBindingService.js +9 -1
- package/dist/services/credentialBindingService.js.map +1 -1
- package/dist/services/dataService.js +4 -2
- package/dist/services/dataService.js.map +1 -1
- package/dist/services/groupService.js +21 -8
- package/dist/services/groupService.js.map +1 -1
- package/dist/services/mcpEventBus.js +6 -0
- package/dist/services/mcpEventBus.js.map +1 -0
- package/dist/services/mcpService.js +153 -6
- package/dist/services/mcpService.js.map +1 -1
- package/dist/services/personalOAuthService.js +2 -0
- package/dist/services/personalOAuthService.js.map +1 -1
- package/dist/services/principalRuntimeService.js +19 -0
- package/dist/services/principalRuntimeService.js.map +1 -1
- package/dist/services/requestContextService.js +15 -0
- package/dist/services/requestContextService.js.map +1 -1
- package/dist/services/serverConfigEnvironment.js +2 -1
- package/dist/services/serverConfigEnvironment.js.map +1 -1
- package/dist/services/smartRoutingService.js +20 -2
- package/dist/services/smartRoutingService.js.map +1 -1
- package/dist/services/sseService.js +58 -6
- package/dist/services/sseService.js.map +1 -1
- package/dist/services/templateService.js +11 -5
- package/dist/services/templateService.js.map +1 -1
- package/dist/services/toolPolicyDiagnostics.js +27 -0
- package/dist/services/toolPolicyDiagnostics.js.map +1 -0
- package/dist/services/toolPolicyService.js +41 -0
- package/dist/services/toolPolicyService.js.map +1 -0
- package/dist/services/userService.js +5 -1
- package/dist/services/userService.js.map +1 -1
- package/dist/services/vectorSearchService.js +4 -2
- package/dist/services/vectorSearchService.js.map +1 -1
- package/dist/types/toolPolicy.js +2 -0
- package/dist/types/toolPolicy.js.map +1 -0
- package/dist/utils/groupAccess.js +6 -4
- package/dist/utils/groupAccess.js.map +1 -1
- package/dist/utils/groupKeyScope.js +34 -0
- package/dist/utils/groupKeyScope.js.map +1 -0
- package/dist/utils/migration.js +10 -1
- package/dist/utils/migration.js.map +1 -1
- package/dist/utils/oauthBearer.js +1 -0
- package/dist/utils/oauthBearer.js.map +1 -1
- package/dist/utils/oauthServerMetadata.js +21 -0
- package/dist/utils/oauthServerMetadata.js.map +1 -1
- package/dist/utils/serverConfigPersistence.js +16 -1
- package/dist/utils/serverConfigPersistence.js.map +1 -1
- package/dist/utils/serverConfigValidation.js +1 -0
- package/dist/utils/serverConfigValidation.js.map +1 -1
- package/dist/utils/serverIdentity.js +7 -0
- package/dist/utils/serverIdentity.js.map +1 -0
- package/dist/utils/settingsSync.js +14 -1
- package/dist/utils/settingsSync.js.map +1 -1
- package/dist/utils/systemConfigCache.js +1 -1
- package/dist/utils/systemConfigCache.js.map +1 -1
- package/dist/utils/tokenCost.js +35 -3
- package/dist/utils/tokenCost.js.map +1 -1
- package/dist/utils/toolPolicy.js +42 -0
- package/dist/utils/toolPolicy.js.map +1 -0
- package/frontend/dist/assets/{ActivityPage-C68nRD4J.js → ActivityPage-Bi-TjKez.js} +2 -2
- package/frontend/dist/assets/{ActivityPage-C68nRD4J.js.map → ActivityPage-Bi-TjKez.js.map} +1 -1
- package/frontend/dist/assets/{ConfirmDialog-BYdfb115.js → ConfirmDialog-BJpzQmMw.js} +2 -2
- package/frontend/dist/assets/{ConfirmDialog-BYdfb115.js.map → ConfirmDialog-BJpzQmMw.js.map} +1 -1
- package/frontend/dist/assets/CredentialsPage-C4Ucer3d.js +2 -0
- package/frontend/dist/assets/CredentialsPage-C4Ucer3d.js.map +1 -0
- package/frontend/dist/assets/{Dashboard-CyTt5-52.js → Dashboard-C_2KkuoD.js} +2 -2
- package/frontend/dist/assets/{Dashboard-CyTt5-52.js.map → Dashboard-C_2KkuoD.js.map} +1 -1
- package/frontend/dist/assets/{DeleteDialog-BaCsEkJA.js → DeleteDialog-BoMYLx3J.js} +2 -2
- package/frontend/dist/assets/{DeleteDialog-BaCsEkJA.js.map → DeleteDialog-BoMYLx3J.js.map} +1 -1
- package/frontend/dist/assets/EndpointCopy-DITVC2YQ.js +2 -0
- package/frontend/dist/assets/{EndpointCopy-DxCJY8u6.js.map → EndpointCopy-DITVC2YQ.js.map} +1 -1
- package/frontend/dist/assets/GroupsPage-sE6YJyuK.js +33 -0
- package/frontend/dist/assets/GroupsPage-sE6YJyuK.js.map +1 -0
- package/frontend/dist/assets/LoginPage-CFsd_nY-.js +2 -0
- package/frontend/dist/assets/LoginPage-CFsd_nY-.js.map +1 -0
- package/frontend/dist/assets/{LogsPage-D3CAJzpq.js → LogsPage-BxZuGDuc.js} +2 -2
- package/frontend/dist/assets/LogsPage-BxZuGDuc.js.map +1 -0
- package/frontend/dist/assets/MarketPage-CDBs4vMb.js +2 -0
- package/frontend/dist/assets/{MarketPage-DsyVFNai.js.map → MarketPage-CDBs4vMb.js.map} +1 -1
- package/frontend/dist/assets/{OAuthConsentPage-go6iV2rX.js → OAuthConsentPage-BN_ucViM.js} +2 -2
- package/frontend/dist/assets/{OAuthConsentPage-go6iV2rX.js.map → OAuthConsentPage-BN_ucViM.js.map} +1 -1
- package/frontend/dist/assets/Pagination-S-7lzy59.js +2 -0
- package/frontend/dist/assets/Pagination-S-7lzy59.js.map +1 -0
- package/frontend/dist/assets/{PromptsPage-TJYCppKD.js → PromptsPage-Bl3ySXGK.js} +2 -2
- package/frontend/dist/assets/{PromptsPage-TJYCppKD.js.map → PromptsPage-Bl3ySXGK.js.map} +1 -1
- package/frontend/dist/assets/{ResourcesPage-B9ucLCSU.js → ResourcesPage-BOzQkQ92.js} +2 -2
- package/frontend/dist/assets/{ResourcesPage-B9ucLCSU.js.map → ResourcesPage-BOzQkQ92.js.map} +1 -1
- package/frontend/dist/assets/ServersPage-DHYwQ5AM.js +39 -0
- package/frontend/dist/assets/ServersPage-DHYwQ5AM.js.map +1 -0
- package/frontend/dist/assets/SettingsPage-CSJ35jlM.js +14 -0
- package/frontend/dist/assets/SettingsPage-CSJ35jlM.js.map +1 -0
- package/frontend/dist/assets/{StatusDot-hrwd7ElQ.js → StatusDot-NSjojGCy.js} +2 -2
- package/frontend/dist/assets/{StatusDot-hrwd7ElQ.js.map → StatusDot-NSjojGCy.js.map} +1 -1
- package/frontend/dist/assets/{ToggleGroup-BXCGM08S.js → ToggleGroup-BIZWpNzm.js} +2 -2
- package/frontend/dist/assets/{ToggleGroup-BXCGM08S.js.map → ToggleGroup-BIZWpNzm.js.map} +1 -1
- package/frontend/dist/assets/UserGroupSelection-CN0weGXJ.js +2 -0
- package/frontend/dist/assets/UserGroupSelection-CN0weGXJ.js.map +1 -0
- package/frontend/dist/assets/UsersPage-DC51v2b8.js +2 -0
- package/frontend/dist/assets/UsersPage-DC51v2b8.js.map +1 -0
- package/frontend/dist/assets/clipboard-ik5YV95M.js +2 -0
- package/frontend/dist/assets/{clipboard-CoLstiwP.js.map → clipboard-ik5YV95M.js.map} +1 -1
- package/frontend/dist/assets/{CopyClientConfigDialog-Clr8hk1S.js → costRevision-Bxov9_vH.js} +4 -4
- package/frontend/dist/assets/costRevision-Bxov9_vH.js.map +1 -0
- package/frontend/dist/assets/framework-vendor-D0S_ys6r.js +61 -0
- package/frontend/dist/assets/framework-vendor-D0S_ys6r.js.map +1 -0
- package/frontend/dist/assets/{i18n-vendor-DVmjrzgW.js → i18n-vendor-COTriSc6.js} +2 -2
- package/frontend/dist/assets/{i18n-vendor-DVmjrzgW.js.map → i18n-vendor-COTriSc6.js.map} +1 -1
- package/frontend/dist/assets/{icons-vendor-CkcU1LMA.js → icons-vendor-DZjjGrOu.js} +3 -3
- package/frontend/dist/assets/{icons-vendor-CkcU1LMA.js.map → icons-vendor-DZjjGrOu.js.map} +1 -1
- package/frontend/dist/assets/index-6AyPtx0A.js +3 -0
- package/frontend/dist/assets/index-6AyPtx0A.js.map +1 -0
- package/frontend/dist/assets/index-DrHctFvx.css +1 -0
- package/frontend/dist/assets/{resourceService-DXuM3elu.js → resourceService-DMzCAZ0B.js} +2 -2
- package/frontend/dist/assets/{resourceService-DXuM3elu.js.map → resourceService-DMzCAZ0B.js.map} +1 -1
- package/frontend/dist/assets/useCostData-CcFSYViI.js +2 -0
- package/frontend/dist/assets/useCostData-CcFSYViI.js.map +1 -0
- package/frontend/dist/assets/variableDetection-CbYSa1ka.js +80 -0
- package/frontend/dist/assets/variableDetection-CbYSa1ka.js.map +1 -0
- package/frontend/dist/index.html +5 -5
- package/mcp_settings.json +2 -0
- package/package.json +2 -2
- package/frontend/dist/assets/CopyClientConfigDialog-Clr8hk1S.js.map +0 -1
- package/frontend/dist/assets/CredentialsPage-WxYmPkS2.js +0 -2
- package/frontend/dist/assets/CredentialsPage-WxYmPkS2.js.map +0 -1
- package/frontend/dist/assets/EndpointCopy-DxCJY8u6.js +0 -2
- package/frontend/dist/assets/GroupsPage-C9uf7qRF.js +0 -33
- package/frontend/dist/assets/GroupsPage-C9uf7qRF.js.map +0 -1
- package/frontend/dist/assets/LoginPage-CfljHYdH.js +0 -2
- package/frontend/dist/assets/LoginPage-CfljHYdH.js.map +0 -1
- package/frontend/dist/assets/LogsPage-D3CAJzpq.js.map +0 -1
- package/frontend/dist/assets/MarketPage-DsyVFNai.js +0 -2
- package/frontend/dist/assets/Pagination-BRqqU5Ct.js +0 -2
- package/frontend/dist/assets/Pagination-BRqqU5Ct.js.map +0 -1
- package/frontend/dist/assets/ServersPage-BO1e0GJ4.js +0 -39
- package/frontend/dist/assets/ServersPage-BO1e0GJ4.js.map +0 -1
- package/frontend/dist/assets/SettingsPage-_LJt6T_U.js +0 -14
- package/frontend/dist/assets/SettingsPage-_LJt6T_U.js.map +0 -1
- package/frontend/dist/assets/UsersPage-CLPsZo0-.js +0 -2
- package/frontend/dist/assets/UsersPage-CLPsZo0-.js.map +0 -1
- package/frontend/dist/assets/clipboard-CoLstiwP.js +0 -2
- package/frontend/dist/assets/framework-vendor-CQFm9vKd.js +0 -61
- package/frontend/dist/assets/framework-vendor-CQFm9vKd.js.map +0 -1
- package/frontend/dist/assets/index-BE6bm3KN.css +0 -1
- package/frontend/dist/assets/index-CKByfAIo.js +0 -3
- package/frontend/dist/assets/index-CKByfAIo.js.map +0 -1
- package/frontend/dist/assets/useCostData-Br7dI3R9.js +0 -2
- package/frontend/dist/assets/useCostData-Br7dI3R9.js.map +0 -1
- package/frontend/dist/assets/variableDetection-Civ1fQ-c.js +0 -18
- package/frontend/dist/assets/variableDetection-Civ1fQ-c.js.map +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { validateAuthorizationRelay } from '../utils/oauthServerMetadata.js';
|
|
1
2
|
import { expandServerConfig } from './serverConfigEnvironment.js';
|
|
2
3
|
import { getCredentialBindingDao, getServerDao, getUserDao } from '../dao/DaoFactory.js';
|
|
3
4
|
import { credentialBindingEvents, encryptCredentialValues, decryptCredentialValues, } from './credentialBindingService.js';
|
|
@@ -111,6 +112,7 @@ export class PersonalOAuthContext {
|
|
|
111
112
|
}
|
|
112
113
|
context.revision = binding.encryptedValues;
|
|
113
114
|
}
|
|
115
|
+
validateAuthorizationRelay(context.config.oauth);
|
|
114
116
|
personalOAuthContexts.set(context.config, context);
|
|
115
117
|
return context;
|
|
116
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"personalOAuthService.js","sourceRoot":"","sources":["../../src/services/personalOAuthService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"personalOAuthService.js","sourceRoot":"","sources":["../../src/services/personalOAuthService.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,14 +6,28 @@ import { CredentialBindingError, hasPersonalAuthentication } from '../utils/cred
|
|
|
6
6
|
import { expandServerConfig } from './serverConfigEnvironment.js';
|
|
7
7
|
/** Reuses children across MCP sessions, but never across authenticated principals. */
|
|
8
8
|
export class PrincipalRuntimeService {
|
|
9
|
+
peekTools(serverName, username) {
|
|
10
|
+
const entry = this.entries.get(JSON.stringify([serverName, username]));
|
|
11
|
+
return entry?.valid && entry.info
|
|
12
|
+
? entry.info.tools
|
|
13
|
+
: this.toolCatalogs.get(JSON.stringify([serverName, username]))?.tools;
|
|
14
|
+
}
|
|
9
15
|
constructor(connect, close, restoreTools) {
|
|
10
16
|
this.connect = connect;
|
|
11
17
|
this.close = close;
|
|
12
18
|
this.restoreTools = restoreTools;
|
|
13
19
|
this.entries = new Map();
|
|
20
|
+
this.toolCatalogs = new Map();
|
|
14
21
|
credentialBindingEvents.on('invalidate', (filter) => this.invalidate(filter));
|
|
15
22
|
}
|
|
16
23
|
invalidate(filter = {}) {
|
|
24
|
+
for (const [key, catalog] of this.toolCatalogs) {
|
|
25
|
+
if (filter.serverName !== undefined && catalog.serverName !== filter.serverName)
|
|
26
|
+
continue;
|
|
27
|
+
if (filter.username !== undefined && catalog.username !== filter.username)
|
|
28
|
+
continue;
|
|
29
|
+
this.toolCatalogs.delete(key);
|
|
30
|
+
}
|
|
17
31
|
for (const [key, entry] of this.entries) {
|
|
18
32
|
if (filter.serverName !== undefined && entry.serverName !== filter.serverName)
|
|
19
33
|
continue;
|
|
@@ -55,6 +69,11 @@ export class PrincipalRuntimeService {
|
|
|
55
69
|
const current = await getServerDao().findById(serverName);
|
|
56
70
|
if (latest.revision !== resolved.revision || JSON.stringify(current) !== definitionSnapshot)
|
|
57
71
|
throw new CredentialBindingError('Personal credentials or server configuration changed; retry the request');
|
|
72
|
+
this.toolCatalogs.set(JSON.stringify([serverName, principal.username]), {
|
|
73
|
+
serverName,
|
|
74
|
+
username: principal.username,
|
|
75
|
+
tools: cached.tools,
|
|
76
|
+
});
|
|
58
77
|
return { info: cached, release: () => { } };
|
|
59
78
|
}
|
|
60
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"principalRuntimeService.js","sourceRoot":"","sources":["../../src/services/principalRuntimeService.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,oBAAoB,EAAyB,MAAM,2BAA2B,CAAC;AACxF,OAAO,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AACnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAelE,sFAAsF;AACtF,MAAM,OAAO,uBAAuB;
|
|
1
|
+
{"version":3,"file":"principalRuntimeService.js","sourceRoot":"","sources":["../../src/services/principalRuntimeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -158,6 +158,21 @@ export class RequestContextService {
|
|
|
158
158
|
requestContext.keyKind = keyKind;
|
|
159
159
|
}
|
|
160
160
|
}
|
|
161
|
+
/**
|
|
162
|
+
* Set the upstream servers hidden by an 'exclude'-scoped bearer key.
|
|
163
|
+
*/
|
|
164
|
+
setBearerKeyExclusions(excludedServers) {
|
|
165
|
+
const requestContext = this.getRequestContext();
|
|
166
|
+
if (requestContext) {
|
|
167
|
+
requestContext.excludedServers = excludedServers;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
/**
|
|
171
|
+
* Get the upstream servers hidden by the current bearer key, if any.
|
|
172
|
+
*/
|
|
173
|
+
getBearerKeyExclusions() {
|
|
174
|
+
return this.getRequestContext()?.excludedServers;
|
|
175
|
+
}
|
|
161
176
|
/**
|
|
162
177
|
* Get bearer key context
|
|
163
178
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestContextService.js","sourceRoot":"","sources":["../../src/services/requestContextService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,MAAM,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"requestContextService.js","sourceRoot":"","sources":["../../src/services/requestContextService.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,13 +11,14 @@ export const getServerEnvironment = async (config) => {
|
|
|
11
11
|
};
|
|
12
12
|
};
|
|
13
13
|
export const expandServerConfig = async (config) => {
|
|
14
|
-
const { owner, visibility, sharedWithUsers, ...transportConfig } = config;
|
|
14
|
+
const { owner, visibility, sharedWithUsers, sharedWithUserGroups, ...transportConfig } = config;
|
|
15
15
|
// Authorization metadata is literal and must never be controlled by expansion values.
|
|
16
16
|
return {
|
|
17
17
|
...replaceEnvVars(transportConfig, await getServerEnvironment(config)),
|
|
18
18
|
owner,
|
|
19
19
|
visibility,
|
|
20
20
|
sharedWithUsers,
|
|
21
|
+
sharedWithUserGroups,
|
|
21
22
|
};
|
|
22
23
|
};
|
|
23
24
|
//# sourceMappingURL=serverConfigEnvironment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverConfigEnvironment.js","sourceRoot":"","sources":["../../src/services/serverConfigEnvironment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,+EAA+E;AAC/E,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,MAAoB,EACa,EAAE;IACnC,MAAM,OAAO,GACX,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,UAAU,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACvF,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1C,OAAO;QACL,GAAI,MAAiC;QACrC,GAAG,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;KAC3F,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAA0B,MAAS,EAAc,EAAE;IACxF,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,eAAe,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"serverConfigEnvironment.js","sourceRoot":"","sources":["../../src/services/serverConfigEnvironment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAGvE,+EAA+E;AAC/E,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,MAAoB,EACa,EAAE;IACnC,MAAM,OAAO,GACX,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,UAAU,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IACvF,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1C,OAAO;QACL,GAAI,MAAiC;QACrC,GAAG,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;KAC3F,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAA0B,MAAS,EAAc,EAAE;IACxF,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,oBAAoB,EAAE,GAAG,eAAe,EAAE,GAAG,MAAM,CAAC;IAChG,sFAAsF;IACtF,OAAO;QACL,GAAG,cAAc,CAAC,eAAe,EAAE,MAAM,oBAAoB,CAAC,MAAM,CAAC,CAAC;QACtE,KAAK;QACL,UAAU;QACV,eAAe;QACf,oBAAoB;KAChB,CAAC;AACT,CAAC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getToolPolicy } from './toolPolicyService.js';
|
|
1
2
|
/**
|
|
2
3
|
* Smart Routing Service
|
|
3
4
|
*
|
|
@@ -284,7 +285,10 @@ Available servers: ${serversList}`,
|
|
|
284
285
|
* available.
|
|
285
286
|
*/
|
|
286
287
|
const getAvailableServers = async (targetGroup) => {
|
|
287
|
-
const
|
|
288
|
+
const policy = await getToolPolicy(targetGroup);
|
|
289
|
+
const servers = getServerInfos()
|
|
290
|
+
.filter(canServeToolRequests)
|
|
291
|
+
.filter((server) => policy.authorize(server.name, undefined, true).decision === 'allow');
|
|
288
292
|
if (!targetGroup) {
|
|
289
293
|
return servers;
|
|
290
294
|
}
|
|
@@ -380,7 +384,21 @@ export const handleSearchToolsRequest = async (query, limit, sessionId, requestG
|
|
|
380
384
|
? `Filtering search to servers in group "${targetGroup}": ${servers.join(', ')}`
|
|
381
385
|
: `Group "${targetGroup}" has no servers, search will return no results`);
|
|
382
386
|
}
|
|
383
|
-
const
|
|
387
|
+
const policy = await getToolPolicy(group);
|
|
388
|
+
let allowedToolIds;
|
|
389
|
+
if (policy.active) {
|
|
390
|
+
allowedToolIds = [];
|
|
391
|
+
for (const server of availableServers) {
|
|
392
|
+
const configured = await filterToolsByConfigFn(server.name, server.tools.filter((tool) => !isAppOnlyTool(tool)));
|
|
393
|
+
const selected = await filterToolsByGroupFn(targetGroup, server.name, configured);
|
|
394
|
+
allowedToolIds.push(...policy.filterTools(server.name, selected).map((tool) => `${server.name}:${tool.name}`));
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
const searchResults = servers.length === 0 || allowedToolIds?.length === 0
|
|
398
|
+
? []
|
|
399
|
+
: allowedToolIds
|
|
400
|
+
? await searchToolsByVector(query, limitNum, thresholdNum, servers, allowedToolIds)
|
|
401
|
+
: await searchToolsByVector(query, limitNum, thresholdNum, servers);
|
|
384
402
|
logger.log(`Search results: ${JSON.stringify(searchResults)}`);
|
|
385
403
|
// Find actual tool information from serverInfos by serverName and toolName
|
|
386
404
|
const resolvedTools = await Promise.all(searchResults.map(async (result) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smartRoutingService.js","sourceRoot":"","sources":["../../src/services/smartRoutingService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"smartRoutingService.js","sourceRoot":"","sources":["../../src/services/smartRoutingService.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { NodeStreamableHTTPServerTransport, toNodeHandler, toWebRequest, } from
|
|
|
4
4
|
import { SSEServerTransport } from '@modelcontextprotocol/server-legacy/sse';
|
|
5
5
|
import { createMcpHandler, isInitializeRequest, isLegacyRequest, } from '@modelcontextprotocol/server';
|
|
6
6
|
import { deleteMcpServer, getMcpServer } from './mcpService.js';
|
|
7
|
+
import { mcpEventBus } from './mcpEventBus.js';
|
|
7
8
|
import config from '../config/index.js';
|
|
8
9
|
import { getBearerKeyDao, getGroupDao, getServerDao, getSystemConfigDao, getUserDao, } from '../dao/index.js';
|
|
9
10
|
import { UserContextService } from './userContextService.js';
|
|
@@ -40,6 +41,7 @@ const getModernMcpNodeHandler = () => {
|
|
|
40
41
|
return getMcpServer(undefined, requestContextService.getGroupContext());
|
|
41
42
|
}, {
|
|
42
43
|
legacy: 'reject',
|
|
44
|
+
bus: mcpEventBus,
|
|
43
45
|
onerror: (error) => {
|
|
44
46
|
logger.error('[MCP 2026] Modern handler error:', error);
|
|
45
47
|
},
|
|
@@ -150,6 +152,28 @@ const groupRouteReferencesMatch = async (requestedGroup, sessionGroup) => {
|
|
|
150
152
|
]);
|
|
151
153
|
return Boolean(requested && session && requested.id === session.id);
|
|
152
154
|
};
|
|
155
|
+
const getGroupServerNames = (servers) => {
|
|
156
|
+
if (!Array.isArray(servers))
|
|
157
|
+
return [];
|
|
158
|
+
return servers.map((server) => typeof server === 'string' ? server : server?.name).filter((name) => typeof name === 'string' && name.length > 0);
|
|
159
|
+
};
|
|
160
|
+
// 'exclude'-scoped keys deny named servers plus every member of a named group.
|
|
161
|
+
// Stale references fail safe: they only deny something that no longer exists.
|
|
162
|
+
const resolveExcludedServerNames = async (key) => {
|
|
163
|
+
const excluded = new Set(key.excludedServers ?? []);
|
|
164
|
+
const excludedGroups = key.excludedGroups ?? [];
|
|
165
|
+
if (excludedGroups.length === 0)
|
|
166
|
+
return [...excluded];
|
|
167
|
+
const groupDao = getGroupDao();
|
|
168
|
+
for (const reference of excludedGroups) {
|
|
169
|
+
const group = (await groupDao.findByName(reference)) ||
|
|
170
|
+
(isValidUUID(reference) ? await groupDao.findById(reference) : null);
|
|
171
|
+
for (const name of getGroupServerNames(group?.servers)) {
|
|
172
|
+
excluded.add(name);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
return [...excluded];
|
|
176
|
+
};
|
|
153
177
|
const isBearerKeyAllowedForRequest = async (req, key) => {
|
|
154
178
|
if (key.kind === 'user') {
|
|
155
179
|
return true;
|
|
@@ -159,14 +183,17 @@ const isBearerKeyAllowedForRequest = async (req, key) => {
|
|
|
159
183
|
if (key.accessType === 'all') {
|
|
160
184
|
return true;
|
|
161
185
|
}
|
|
162
|
-
// No parameter value means global route
|
|
186
|
+
// No parameter value means global route. 'exclude' keys may use it; the
|
|
187
|
+
// per-server exclusions are applied to the listings and calls themselves.
|
|
163
188
|
if (!paramValue) {
|
|
164
|
-
|
|
165
|
-
return false;
|
|
189
|
+
return key.accessType === 'exclude';
|
|
166
190
|
}
|
|
167
191
|
try {
|
|
168
192
|
const groupDao = getGroupDao();
|
|
169
193
|
const serverDao = getServerDao();
|
|
194
|
+
const isExcludeScope = key.accessType === 'exclude';
|
|
195
|
+
const excludedGroups = isExcludeScope ? (key.excludedGroups ?? []) : [];
|
|
196
|
+
const excludedServers = isExcludeScope ? new Set(await resolveExcludedServerNames(key)) : null;
|
|
170
197
|
// Step 1: Try to match as a group (by name or id), since group has higher priority
|
|
171
198
|
let matchedGroup = await groupDao.findByName(paramValue);
|
|
172
199
|
if (!matchedGroup && isValidUUID(paramValue)) {
|
|
@@ -175,6 +202,18 @@ const isBearerKeyAllowedForRequest = async (req, key) => {
|
|
|
175
202
|
}
|
|
176
203
|
if (matchedGroup) {
|
|
177
204
|
// Matched as a group
|
|
205
|
+
if (isExcludeScope) {
|
|
206
|
+
if (excludedGroups.includes(matchedGroup.name) || excludedGroups.includes(matchedGroup.id)) {
|
|
207
|
+
return false;
|
|
208
|
+
}
|
|
209
|
+
const groupServerNames = getGroupServerNames(matchedGroup.servers);
|
|
210
|
+
// Reject when nothing would remain, rather than exposing an empty catalog.
|
|
211
|
+
if (groupServerNames.length > 0 &&
|
|
212
|
+
groupServerNames.every((name) => excludedServers.has(name))) {
|
|
213
|
+
return false;
|
|
214
|
+
}
|
|
215
|
+
return true;
|
|
216
|
+
}
|
|
178
217
|
if (key.accessType === 'groups') {
|
|
179
218
|
// For group-scoped keys, check if the matched group is in allowedGroups
|
|
180
219
|
const allowedGroups = key.allowedGroups || [];
|
|
@@ -225,6 +264,9 @@ const isBearerKeyAllowedForRequest = async (req, key) => {
|
|
|
225
264
|
const matchedServer = await serverDao.findById(paramValue);
|
|
226
265
|
if (matchedServer) {
|
|
227
266
|
// Matched as a server
|
|
267
|
+
if (isExcludeScope) {
|
|
268
|
+
return !excludedServers.has(matchedServer.name);
|
|
269
|
+
}
|
|
228
270
|
if (key.accessType === 'groups') {
|
|
229
271
|
// For group-scoped keys, server access is not allowed
|
|
230
272
|
return false;
|
|
@@ -246,6 +288,12 @@ const isBearerKeyAllowedForRequest = async (req, key) => {
|
|
|
246
288
|
return false;
|
|
247
289
|
}
|
|
248
290
|
};
|
|
291
|
+
const attachExcludedServerNames = async (key, result) => {
|
|
292
|
+
if (key.kind === 'user' || key.accessType !== 'exclude') {
|
|
293
|
+
return result;
|
|
294
|
+
}
|
|
295
|
+
return { ...result, excludedServerNames: await resolveExcludedServerNames(key) };
|
|
296
|
+
};
|
|
249
297
|
const resolveUserLevelKeyUser = async (req, key) => {
|
|
250
298
|
if (key.kind !== 'user') {
|
|
251
299
|
return { valid: true, keyId: key.id, keyName: key.name, kind: key.kind || 'system' };
|
|
@@ -340,7 +388,7 @@ const validateBearerAuth = async (req) => {
|
|
|
340
388
|
const allowed = await isBearerKeyAllowedForRequest(req, matchingKey);
|
|
341
389
|
if (allowed) {
|
|
342
390
|
logger.log(`Bearer key recognized (auth disabled): id=${matchingKey.id}, name=${matchingKey.name}, accessType=${matchingKey.accessType}`);
|
|
343
|
-
return userKeyResult;
|
|
391
|
+
return attachExcludedServerNames(matchingKey, userKeyResult);
|
|
344
392
|
}
|
|
345
393
|
logger.warn(`Bearer key matched but rejected due to scope restrictions (auth disabled): id=${matchingKey.id}, name=${matchingKey.name}, accessType=${matchingKey.accessType}`);
|
|
346
394
|
return { valid: true };
|
|
@@ -380,7 +428,7 @@ const validateBearerAuth = async (req) => {
|
|
|
380
428
|
return { valid: false, reason: 'invalid' };
|
|
381
429
|
}
|
|
382
430
|
logger.log(`Bearer key authenticated: id=${matchingKey.id}, name=${matchingKey.name}, accessType=${matchingKey.accessType}`);
|
|
383
|
-
return userKeyResult;
|
|
431
|
+
return attachExcludedServerNames(matchingKey, userKeyResult);
|
|
384
432
|
}
|
|
385
433
|
const oauthUser = await resolveOAuthUserFromToken(token);
|
|
386
434
|
if (oauthUser) {
|
|
@@ -516,6 +564,7 @@ export const handleSseConnection = async (req, res) => {
|
|
|
516
564
|
group: group,
|
|
517
565
|
keyId: bearerAuthResult.keyId,
|
|
518
566
|
keyName: bearerAuthResult.keyName,
|
|
567
|
+
excludedServerNames: bearerAuthResult.excludedServerNames,
|
|
519
568
|
hostedAuth: bearerAuthResult.hostedAuth,
|
|
520
569
|
};
|
|
521
570
|
res.on('close', () => {
|
|
@@ -562,7 +611,7 @@ export const handleSseMessage = async (req, res) => {
|
|
|
562
611
|
res.status(404).send('No transport found for sessionId');
|
|
563
612
|
return;
|
|
564
613
|
}
|
|
565
|
-
const { transport, group, keyId, keyName } = transportData;
|
|
614
|
+
const { transport, group, keyId, keyName, excludedServerNames } = transportData;
|
|
566
615
|
req.params.group = group;
|
|
567
616
|
req.query.group = group;
|
|
568
617
|
logger.log(`Received message for sessionId: ${sessionId} in group: ${group}${username ? ` for user: ${username}` : ''}`);
|
|
@@ -577,6 +626,7 @@ export const handleSseMessage = async (req, res) => {
|
|
|
577
626
|
requestContextService.setUsernameContext(username);
|
|
578
627
|
requestContextService.setHostedAuthContext(currentHostedAuth);
|
|
579
628
|
requestContextService.setKeyKindContext(bearerAuthResult.kind);
|
|
629
|
+
requestContextService.setBearerKeyExclusions(bearerAuthResult.excludedServerNames ?? excludedServerNames);
|
|
580
630
|
await transport.handlePostMessage(req, res);
|
|
581
631
|
});
|
|
582
632
|
};
|
|
@@ -683,6 +733,7 @@ export const handleMcpPostRequest = async (req, res) => {
|
|
|
683
733
|
requestContextService.setGroupContext(group);
|
|
684
734
|
requestContextService.setUsernameContext(username);
|
|
685
735
|
requestContextService.setKeyKindContext(bearerAuthResult.kind);
|
|
736
|
+
requestContextService.setBearerKeyExclusions(bearerAuthResult.excludedServerNames);
|
|
686
737
|
requestContextService.setHostedAuthContext(bearerAuthResult.hostedAuth);
|
|
687
738
|
const context = requestContextService.getRequestContext();
|
|
688
739
|
context.stateless = true;
|
|
@@ -789,6 +840,7 @@ export const handleMcpPostRequest = async (req, res) => {
|
|
|
789
840
|
requestContextService.setGroupContext(group);
|
|
790
841
|
requestContextService.setUsernameContext(username);
|
|
791
842
|
requestContextService.setKeyKindContext(bearerAuthResult.kind);
|
|
843
|
+
requestContextService.setBearerKeyExclusions(bearerAuthResult.excludedServerNames ?? transportInfo?.excludedServerNames);
|
|
792
844
|
requestContextService.setHostedAuthContext(bearerAuthResult.hostedAuth || transportInfo?.hostedAuth);
|
|
793
845
|
try {
|
|
794
846
|
await transport.handleRequest(req, res, req.body);
|