@openziti/ziti-mcp-server 0.4.0 → 0.6.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/dist/auth/device-auth-flow.d.ts +1 -1
- package/dist/auth/device-auth-flow.js +6 -6
- package/dist/auth/device-auth-flow.js.map +1 -1
- package/dist/commands/init.d.ts +3 -2
- package/dist/commands/init.js +18 -7
- package/dist/commands/init.js.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/utils/analytics.js +5 -4
- package/dist/utils/analytics.js.map +1 -1
- package/dist/utils/auth0-client.d.ts +4 -4
- package/dist/utils/auth0-client.js +4 -4
- package/dist/utils/tools.d.ts +1 -1
- package/dist/utils/tools.js +1 -1
- package/package.json +2 -2
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
declare function requestAuthorization(selectedScopes?: string[]): Promise<void>;
|
|
1
|
+
declare function requestAuthorization(selectedScopes?: string[], idpDomain?: string, idpClientId?: string, idpAudience?: string): Promise<void>;
|
|
2
2
|
export declare function refreshAccessToken(selectedScopes?: string[]): Promise<string | null>;
|
|
3
3
|
/**
|
|
4
4
|
* Revokes the refresh token that is previously set within keychain when offline_access is requested.
|
|
@@ -4,21 +4,21 @@ import { startSpinner, stopSpinner, getTenantFromToken, cliOutput, promptForBrow
|
|
|
4
4
|
import { log, logError } from '../utils/logger.js';
|
|
5
5
|
import { keychain } from '../utils/keychain.js';
|
|
6
6
|
import { DEFAULT_SCOPES } from '../utils/scopes.js';
|
|
7
|
-
function getConfig(selectedScopes) {
|
|
7
|
+
function getConfig(selectedScopes, idpDomain, idpClientId, idpAudience) {
|
|
8
8
|
// If selectedScopes is provided, use those scopes
|
|
9
9
|
// If not provided or empty, use DEFAULT_SCOPES (which is now empty by default)
|
|
10
10
|
const scopes = selectedScopes && selectedScopes.length > 0
|
|
11
11
|
? selectedScopes.join(' ')
|
|
12
12
|
: DEFAULT_SCOPES.join(' ');
|
|
13
13
|
return {
|
|
14
|
-
tenant: 'auth0.auth0.com',
|
|
15
|
-
clientId: '
|
|
16
|
-
audience: '
|
|
14
|
+
tenant: idpDomain || 'auth0.auth0.com',
|
|
15
|
+
clientId: idpClientId || '12345678`90abcdef1234', // Placeholder client ID for device auth flow
|
|
16
|
+
audience: idpAudience || 'foo-api', // Placeholder audience for device auth flow
|
|
17
17
|
scopes,
|
|
18
18
|
};
|
|
19
19
|
}
|
|
20
|
-
async function requestAuthorization(selectedScopes) {
|
|
21
|
-
const config = getConfig(selectedScopes);
|
|
20
|
+
async function requestAuthorization(selectedScopes, idpDomain, idpClientId, idpAudience) {
|
|
21
|
+
const config = getConfig(selectedScopes, idpDomain, idpClientId, idpAudience);
|
|
22
22
|
const body = {
|
|
23
23
|
client_id: config.clientId,
|
|
24
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device-auth-flow.js","sourceRoot":"","sources":["../../src/auth/device-auth-flow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EACL,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,SAAS,EACT,0BAA0B,GAC3B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,SAAS,SAAS,
|
|
1
|
+
{"version":3,"file":"device-auth-flow.js","sourceRoot":"","sources":["../../src/auth/device-auth-flow.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/init.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ export interface InitOptions {
|
|
|
11
11
|
idpDomain?: string;
|
|
12
12
|
idpClientId?: string;
|
|
13
13
|
idpClientSecret?: string;
|
|
14
|
+
idpAudience?: string;
|
|
14
15
|
}
|
|
15
16
|
/**
|
|
16
17
|
* Initializes the OpenZiti MCP server with the specified client, tools and scopes.
|
|
@@ -23,7 +24,7 @@ export interface InitOptions {
|
|
|
23
24
|
* @param {InitOptions} options - Configuration options including:
|
|
24
25
|
* - client: The target client type to configure ('claude', 'windsurf', or 'cursor')
|
|
25
26
|
* - scopes: Optional scope patterns for authorization (will prompt if omitted)
|
|
26
|
-
* - tools: Tool patterns to enable (e.g., ['
|
|
27
|
+
* - tools: Tool patterns to enable (e.g., ['list*'])
|
|
27
28
|
*
|
|
28
29
|
* @returns {Promise<void>} A promise that resolves when initialization is complete
|
|
29
30
|
*
|
|
@@ -37,7 +38,7 @@ export interface InitOptions {
|
|
|
37
38
|
* // Initialize with Windsurf client and specific tools
|
|
38
39
|
* await init({
|
|
39
40
|
* client: 'windsurf',
|
|
40
|
-
* tools: ['
|
|
41
|
+
* tools: ['list*'],
|
|
41
42
|
* scopes: ['read:*']
|
|
42
43
|
* });
|
|
43
44
|
*/
|
package/dist/commands/init.js
CHANGED
|
@@ -82,7 +82,7 @@ async function configureClient(clientType, options) {
|
|
|
82
82
|
* @param {InitOptions} options - Configuration options including:
|
|
83
83
|
* - client: The target client type to configure ('claude', 'windsurf', or 'cursor')
|
|
84
84
|
* - scopes: Optional scope patterns for authorization (will prompt if omitted)
|
|
85
|
-
* - tools: Tool patterns to enable (e.g., ['
|
|
85
|
+
* - tools: Tool patterns to enable (e.g., ['list*'])
|
|
86
86
|
*
|
|
87
87
|
* @returns {Promise<void>} A promise that resolves when initialization is complete
|
|
88
88
|
*
|
|
@@ -96,7 +96,7 @@ async function configureClient(clientType, options) {
|
|
|
96
96
|
* // Initialize with Windsurf client and specific tools
|
|
97
97
|
* await init({
|
|
98
98
|
* client: 'windsurf',
|
|
99
|
-
* tools: ['
|
|
99
|
+
* tools: ['list*'],
|
|
100
100
|
* scopes: ['read:*']
|
|
101
101
|
* });
|
|
102
102
|
*/
|
|
@@ -108,9 +108,9 @@ const init = async (options) => {
|
|
|
108
108
|
}
|
|
109
109
|
trackEvent.trackInit(options.client);
|
|
110
110
|
// Check if client credentials parameters are provided for Private Cloud authentication
|
|
111
|
-
const { zitiControllerHost, idpDomain, idpClientId, idpClientSecret } = options;
|
|
111
|
+
const { zitiControllerHost, idpDomain, idpClientId, idpClientSecret, idpAudience, client } = options;
|
|
112
112
|
if (zitiControllerHost && idpDomain && idpClientId && idpClientSecret) {
|
|
113
|
-
// Client credentials flow
|
|
113
|
+
// Client credentials flow with provided IdP details
|
|
114
114
|
log('Using client credentials flow for authentication');
|
|
115
115
|
await requestClientCredentialsAuthorization({
|
|
116
116
|
zitiControllerHost: zitiControllerHost,
|
|
@@ -119,12 +119,23 @@ const init = async (options) => {
|
|
|
119
119
|
idpClientSecret: idpClientSecret,
|
|
120
120
|
});
|
|
121
121
|
}
|
|
122
|
-
else {
|
|
123
|
-
// Device authorization flow
|
|
122
|
+
else if (zitiControllerHost && idpDomain && idpClientId && idpAudience) {
|
|
123
|
+
// Device authorization flow with provided IdP details
|
|
124
124
|
log('Using device authorization flow for authentication');
|
|
125
125
|
// Handle scope resolution
|
|
126
126
|
const selectedScopes = await resolveScopes(options.scopes);
|
|
127
|
-
await requestAuthorization(selectedScopes);
|
|
127
|
+
await requestAuthorization(selectedScopes, idpDomain, idpClientId, idpAudience);
|
|
128
|
+
}
|
|
129
|
+
else if (client && !zitiControllerHost && !idpDomain && !idpClientId && !idpAudience) {
|
|
130
|
+
// probably running the automated tests
|
|
131
|
+
const selectedScopes = await resolveScopes(options.scopes);
|
|
132
|
+
await requestAuthorization(selectedScopes, idpDomain, idpClientId, idpAudience);
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
log('Using unknown flow for authentication');
|
|
136
|
+
throw new Error('Insufficient authentication parameters provided. Please provide either:\n' +
|
|
137
|
+
'1. --ziti-controller-host, --idp-domain, --idp-client-id, and --idp-client-secret for client credentials flow\n' +
|
|
138
|
+
'2. --ziti-controller-host, --idp-domain, --idp-client-id, and --idp-audience for device authorization flow');
|
|
128
139
|
}
|
|
129
140
|
// Configure the requested client
|
|
130
141
|
await configureClient(options.client, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,qCAAqC,EAAE,MAAM,oCAAoC,CAAC;AAC3F,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,UAAU,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -53,11 +53,11 @@ with Claude Desktop, enabling AI-assisted management of your OpenZiti network.`)
|
|
|
53
53
|
.addHelpText('after', `
|
|
54
54
|
Examples:
|
|
55
55
|
npx ${packageName} init
|
|
56
|
-
npx ${packageName} init --tools '
|
|
56
|
+
npx ${packageName} init --tools 'list*' --client claude
|
|
57
57
|
npx ${packageName} init --read-only --client claude
|
|
58
|
-
npx ${packageName} init --tools '
|
|
59
|
-
npx ${packageName} init --tools 'ziti_list_*,ziti_get_*' --client cursor
|
|
58
|
+
npx ${packageName} init --tools '*Identities' --client windsurf
|
|
60
59
|
npx ${packageName} init --ziti-controller <ziti-controller> --idp-domain <idp-domain> --idp-client-id <idp-client-id> --idp-client-secret <idp-client-secret>
|
|
60
|
+
npx ${packageName} init --ziti-controller <ziti-controller> --idp-domain <idp-domain> --idp-client-id <idp-client-id>
|
|
61
61
|
npx ${packageName} run
|
|
62
62
|
npx ${packageName} run --read-only
|
|
63
63
|
npx ${packageName} session
|
|
@@ -72,6 +72,7 @@ program
|
|
|
72
72
|
.option('--ziti-controller-host <ziti controller host>', 'Ziti controller (required for Ziti network authentication)')
|
|
73
73
|
.option('--idp-domain <idp domain>', 'IdP domain (required for Private Cloud authentication)')
|
|
74
74
|
.option('--idp-client-id <idp ClientId>', 'Client ID (required for Private Cloud authentication)')
|
|
75
|
+
.option('--idp-audience <idp Audience>', 'IdP audience (required for Private Cloud authentication)')
|
|
75
76
|
.option('--idp-client-secret <idp Client Secret>', 'Client secret (required for Private Cloud authentication)')
|
|
76
77
|
.option('--scopes <scopes>', 'Comma-separated list of API scopes', (text) => text
|
|
77
78
|
.split(',')
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEjE,oBAAoB;AACpB,OAAO,CAAC,KAAK,GAAG,WAAW,CAAC;AAE5B,wBAAwB;AACxB,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;IAC5D,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QAC1B,QAAQ,CAAC,GAAG,KAAK,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH;;;;;;;;;;GAUG;AACH,SAAS,iBAAiB,CAAC,KAAa;IACtC,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAEzB,MAAM,QAAQ,GAAG,KAAK;SACnB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnB,gDAAgD;IAChD,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAElC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,gBAAgB;AAChB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;KAC1B,IAAI,CAAC,iBAAiB,CAAC;KACvB,WAAW,CACV,4FAA4F,CAC7F;KACA,OAAO,CAAC,cAAc,CAAC;KACvB,WAAW,CACV,QAAQ,EACR;EACF,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC;;;+EAG4C,CAC5E;KACA,WAAW,CACV,OAAO,EACP;;QAEI,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;;2EAEwD,CACxE,CAAC;AAEJ,eAAe;AACf,OAAO;KACJ,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,oDAAoD,CAAC;KACjE,MAAM,CACL,mBAAmB,EACnB,iEAAiE,EACjE,QAAQ,CACT;KACA,MAAM,CACL,+CAA+C,EAC/C,4DAA4D,CAC7D;KACA,MAAM,CAAC,2BAA2B,EAAE,wDAAwD,CAAC;KAC7F,MAAM,CAAC,gCAAgC,EAAE,uDAAuD,CAAC;KACjG,MAAM,CACL,yCAAyC,EACzC,2DAA2D,CAC5D;KACA,MAAM,CAAC,mBAAmB,EAAE,oCAAoC,EAAE,CAAC,IAAI,EAAE,EAAE,CAC1E,IAAI;KACD,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;KAC5B,MAAM,CAAC,OAAO,CAAC,CACnB;KACA,MAAM,CACL,iBAAiB,EACjB,4FAA4F,EAC5F,iBAAiB,EACjB,CAAC,GAAG,CAAC,CACN;KACA,MAAM,CAAC,aAAa,EAAE,uDAAuD,EAAE,KAAK,CAAC;KACrF,MAAM,CAAC,IAAI,CAAC,CAAC;AAEhB,cAAc;AACd,OAAO;KACJ,OAAO,CAAC,KAAK,CAAC;KACd,WAAW,CAAC,sBAAsB,CAAC;KACnC,MAAM,CACL,iBAAiB,EACjB,4FAA4F,EAC5F,iBAAiB,EACjB,CAAC,GAAG,CAAC,CACN;KACA,MAAM,CAAC,aAAa,EAAE,uDAAuD,EAAE,KAAK,CAAC;KACrF,MAAM,CAAC,GAAG,CAAC,CAAC;AAEf,iBAAiB;AACjB,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,uDAAuD,CAAC;KACpE,MAAM,CAAC,MAAM,CAAC,CAAC;AAElB,kBAAkB;AAClB,OAAO;KACJ,OAAO,CAAC,SAAS,CAAC;KAClB,WAAW,CAAC,oDAAoD,CAAC;KACjE,MAAM,CAAC,OAAO,CAAC,CAAC;AAEnB,8CAA8C;AAC9C,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACnC,QAAQ,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;IAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEjE,oBAAoB;AACpB,OAAO,CAAC,KAAK,GAAG,WAAW,CAAC;AAE5B,wBAAwB;AACxB,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;IAC5D,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE;QAC1B,QAAQ,CAAC,GAAG,KAAK,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH;;;;;;;;;;GAUG;AACH,SAAS,iBAAiB,CAAC,KAAa;IACtC,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAEzB,MAAM,QAAQ,GAAG,KAAK;SACnB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,MAAM,CAAC,OAAO,CAAC,CAAC;IAEnB,gDAAgD;IAChD,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAElC,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,gBAAgB;AAChB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE;KAC1B,IAAI,CAAC,iBAAiB,CAAC;KACvB,WAAW,CACV,4FAA4F,CAC7F;KACA,OAAO,CAAC,cAAc,CAAC;KACvB,WAAW,CACV,QAAQ,EACR;EACF,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC;;;+EAG4C,CAC5E;KACA,WAAW,CACV,OAAO,EACP;;QAEI,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;QACX,WAAW;;2EAEwD,CACxE,CAAC;AAEJ,eAAe;AACf,OAAO;KACJ,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,oDAAoD,CAAC;KACjE,MAAM,CACL,mBAAmB,EACnB,iEAAiE,EACjE,QAAQ,CACT;KACA,MAAM,CACL,+CAA+C,EAC/C,4DAA4D,CAC7D;KACA,MAAM,CAAC,2BAA2B,EAAE,wDAAwD,CAAC;KAC7F,MAAM,CAAC,gCAAgC,EAAE,uDAAuD,CAAC;KACjG,MAAM,CACL,+BAA+B,EAC/B,0DAA0D,CAC3D;KACA,MAAM,CACL,yCAAyC,EACzC,2DAA2D,CAC5D;KACA,MAAM,CAAC,mBAAmB,EAAE,oCAAoC,EAAE,CAAC,IAAI,EAAE,EAAE,CAC1E,IAAI;KACD,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;KAC5B,MAAM,CAAC,OAAO,CAAC,CACnB;KACA,MAAM,CACL,iBAAiB,EACjB,4FAA4F,EAC5F,iBAAiB,EACjB,CAAC,GAAG,CAAC,CACN;KACA,MAAM,CAAC,aAAa,EAAE,uDAAuD,EAAE,KAAK,CAAC;KACrF,MAAM,CAAC,IAAI,CAAC,CAAC;AAEhB,cAAc;AACd,OAAO;KACJ,OAAO,CAAC,KAAK,CAAC;KACd,WAAW,CAAC,sBAAsB,CAAC;KACnC,MAAM,CACL,iBAAiB,EACjB,4FAA4F,EAC5F,iBAAiB,EACjB,CAAC,GAAG,CAAC,CACN;KACA,MAAM,CAAC,aAAa,EAAE,uDAAuD,EAAE,KAAK,CAAC;KACrF,MAAM,CAAC,GAAG,CAAC,CAAC;AAEf,iBAAiB;AACjB,OAAO;KACJ,OAAO,CAAC,QAAQ,CAAC;KACjB,WAAW,CAAC,uDAAuD,CAAC;KACpE,MAAM,CAAC,MAAM,CAAC,CAAC;AAElB,kBAAkB;AAClB,OAAO;KACJ,OAAO,CAAC,SAAS,CAAC;KAClB,WAAW,CAAC,oDAAoD,CAAC;KACjE,MAAM,CAAC,OAAO,CAAC,CAAC;AAEnB,8CAA8C;AAC9C,OAAO,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACnC,QAAQ,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;IAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
|
package/dist/utils/analytics.js
CHANGED
|
@@ -69,8 +69,9 @@ export class TrackEvent {
|
|
|
69
69
|
* @param success - Whether the tool execution was successful
|
|
70
70
|
*/
|
|
71
71
|
trackTool(toolName, success = true) {
|
|
72
|
-
const eventName = `${EVENT_NAME_PREFIX}-tool
|
|
72
|
+
const eventName = `${EVENT_NAME_PREFIX}-tool-invoked`;
|
|
73
73
|
const properties = {
|
|
74
|
+
tool: toolName,
|
|
74
75
|
success,
|
|
75
76
|
...this.getCommonProperties(),
|
|
76
77
|
};
|
|
@@ -87,6 +88,7 @@ export class TrackEvent {
|
|
|
87
88
|
return;
|
|
88
89
|
}
|
|
89
90
|
const event = this.createEvent(eventName, customProperties);
|
|
91
|
+
log(`analytics.track: event: ${JSON.stringify(event)}`);
|
|
90
92
|
this.sendEvent(event).catch((err) => {
|
|
91
93
|
// Silently handle errors in tracking
|
|
92
94
|
log('Analytics tracking error:', err?.message);
|
|
@@ -172,8 +174,7 @@ export class TrackEvent {
|
|
|
172
174
|
* Determine if tracking should be enabled
|
|
173
175
|
*/
|
|
174
176
|
shouldTrack() {
|
|
175
|
-
return false;
|
|
176
|
-
return process.env.OPENZITI_MCP_ANALYTICS !== 'false';
|
|
177
|
+
return process.env.ZITI_MCP_ANALYTICS !== 'false';
|
|
177
178
|
}
|
|
178
179
|
/**
|
|
179
180
|
* Get current timestamp in milliseconds
|
|
@@ -183,7 +184,7 @@ export class TrackEvent {
|
|
|
183
184
|
}
|
|
184
185
|
}
|
|
185
186
|
const HEAP_CONFIG = {
|
|
186
|
-
appId: '
|
|
187
|
+
appId: '1165125554',
|
|
187
188
|
endpoint: 'https://heapanalytics.com/api/track',
|
|
188
189
|
};
|
|
189
190
|
const trackEvent = new TrackEvent(HEAP_CONFIG.appId, HEAP_CONFIG.endpoint);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../src/utils/analytics.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAElD,8BAA8B;AAC9B,MAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC;AAE3C,YAAY;AACZ,MAAM,iBAAiB,GAAG,iBAAiB,CAAC;AAE5C,uBAAuB;AACvB,MAAM,WAAW,GAAG,SAAS,CAAC;AAC9B,MAAM,MAAM,GAAG,IAAI,CAAC;AACpB,MAAM,QAAQ,GAAG,MAAM,CAAC;AACxB,MAAM,YAAY,GAAG,cAAc,CAAC;AACpC,MAAM,QAAQ,GAAG,UAAU,CAAC;AAU5B;;GAEG;AACH,MAAM,OAAO,UAAU;IACb,KAAK,CAAS;IACd,QAAQ,CAAS;IACzB;;;;;OAKG;IACH,YAAY,KAAa,EAAE,QAAgB;QACzC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IACD;;;;OAIG;IACH,eAAe,CAAC,OAAe;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACH,SAAS,CAAC,UAAmB;QAC3B,MAAM,SAAS,GAAG,GAAG,iBAAiB,OAAO,CAAC;QAC9C,MAAM,UAAU,GAAG;YACjB,UAAU,EAAE,UAAU,IAAI,SAAS;YACnC,GAAG,IAAI,CAAC,mBAAmB,EAAE;SAC9B,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,cAAc;QACZ,MAAM,SAAS,GAAG,GAAG,iBAAiB,MAAM,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACxB,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,QAAgB,EAAE,UAAmB,IAAI;QACjD,MAAM,SAAS,GAAG,GAAG,iBAAiB,
|
|
1
|
+
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../src/utils/analytics.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,18 +10,18 @@ import { ZitiConfig } from './config.js';
|
|
|
10
10
|
*
|
|
11
11
|
* @param {ZitiConfig} config - Configuration object containing:
|
|
12
12
|
* - host: The OpenZiti Controller host
|
|
13
|
-
* - domain: The
|
|
13
|
+
* - domain: The IdP domain name (e.g., 'your-tenant.idp.com')
|
|
14
14
|
* - token: A valid OpenZiti Controller Management API access token with appropriate scopes
|
|
15
15
|
* @returns {Promise<ManagementClient>} A configured OpenZiti Controller Management API client
|
|
16
16
|
* ready to make authenticated requests to the OpenZiti Controller Management API.
|
|
17
17
|
*/
|
|
18
18
|
export declare const getManagementClient: (config: ZitiConfig) => Promise<ManagementClient>;
|
|
19
19
|
/**
|
|
20
|
-
* Creates and configures an
|
|
20
|
+
* Creates and configures an IdP Authentication API client.
|
|
21
21
|
*
|
|
22
|
-
* @param {string} domain - The
|
|
22
|
+
* @param {string} domain - The IdP domain (e.g., 'your-tenant.idp.com')
|
|
23
23
|
* @param {string} [clientId] - Optional client ID for authentication operations
|
|
24
24
|
* @param {string} [clientSecret] - Optional client secret for server-to-server operations
|
|
25
|
-
* @returns {Promise<AuthenticationClient>} Configured
|
|
25
|
+
* @returns {Promise<AuthenticationClient>} Configured IdP Authentication API client
|
|
26
26
|
*/
|
|
27
27
|
export declare const getAuthenticationClient: (domain: string, clientId: string, clientSecret: string) => Promise<AuthenticationClient>;
|
|
@@ -30,7 +30,7 @@ function getUserAgent() {
|
|
|
30
30
|
*
|
|
31
31
|
* @param {ZitiConfig} config - Configuration object containing:
|
|
32
32
|
* - host: The OpenZiti Controller host
|
|
33
|
-
* - domain: The
|
|
33
|
+
* - domain: The IdP domain name (e.g., 'your-tenant.idp.com')
|
|
34
34
|
* - token: A valid OpenZiti Controller Management API access token with appropriate scopes
|
|
35
35
|
* @returns {Promise<ManagementClient>} A configured OpenZiti Controller Management API client
|
|
36
36
|
* ready to make authenticated requests to the OpenZiti Controller Management API.
|
|
@@ -47,12 +47,12 @@ export const getManagementClient = async (config) => {
|
|
|
47
47
|
});
|
|
48
48
|
};
|
|
49
49
|
/**
|
|
50
|
-
* Creates and configures an
|
|
50
|
+
* Creates and configures an IdP Authentication API client.
|
|
51
51
|
*
|
|
52
|
-
* @param {string} domain - The
|
|
52
|
+
* @param {string} domain - The IdP domain (e.g., 'your-tenant.idp.com')
|
|
53
53
|
* @param {string} [clientId] - Optional client ID for authentication operations
|
|
54
54
|
* @param {string} [clientSecret] - Optional client secret for server-to-server operations
|
|
55
|
-
* @returns {Promise<AuthenticationClient>} Configured
|
|
55
|
+
* @returns {Promise<AuthenticationClient>} Configured IdP Authentication API client
|
|
56
56
|
*/
|
|
57
57
|
export const getAuthenticationClient = async (domain, clientId, clientSecret) => {
|
|
58
58
|
return new AuthenticationClient({
|
package/dist/utils/tools.d.ts
CHANGED
|
@@ -32,7 +32,7 @@ import { Tool } from './types.js';
|
|
|
32
32
|
* // Return only read-only tools that match the pattern
|
|
33
33
|
* // Note: --read-only takes priority, so even if the pattern matches non-read-only tools,
|
|
34
34
|
* // only the read-only ones will be returned
|
|
35
|
-
* const readOnlyAuthTools = getAvailableTools(tools, ['
|
|
35
|
+
* const readOnlyAuthTools = getAvailableTools(tools, ['*Identities'], true);
|
|
36
36
|
*/
|
|
37
37
|
export declare function getAvailableTools(allTools: Tool[], patterns?: string[], readOnly?: boolean): Tool[];
|
|
38
38
|
/**
|
package/dist/utils/tools.js
CHANGED
|
@@ -33,7 +33,7 @@ import { Glob } from './glob.js';
|
|
|
33
33
|
* // Return only read-only tools that match the pattern
|
|
34
34
|
* // Note: --read-only takes priority, so even if the pattern matches non-read-only tools,
|
|
35
35
|
* // only the read-only ones will be returned
|
|
36
|
-
* const readOnlyAuthTools = getAvailableTools(tools, ['
|
|
36
|
+
* const readOnlyAuthTools = getAvailableTools(tools, ['*Identities'], true);
|
|
37
37
|
*/
|
|
38
38
|
export function getAvailableTools(allTools, patterns, readOnly) {
|
|
39
39
|
// Start with all tools
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openziti/ziti-mcp-server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.6.0",
|
|
4
4
|
"description": "OpenZiti Model Context Protocol (MCP) Server — A secure implementation of an MCP server that provides AI assistants with controlled access to the OpenZiti Controller's Management API through natural language. It enables AI-assisted Ziti Network management while enforcing best practices around security, least-privilege access, and zero-trust.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"author": "NetFoundry",
|
|
49
49
|
"license": "Apache-2.0",
|
|
50
50
|
"dependencies": {
|
|
51
|
-
"@modelcontextprotocol/sdk": "^1.
|
|
51
|
+
"@modelcontextprotocol/sdk": "^1.26.0",
|
|
52
52
|
"auth0": "^4.21.0",
|
|
53
53
|
"chalk": "^5.4.1",
|
|
54
54
|
"commander": "^13.1.0",
|