@kya-os/mcp-i-cloudflare 1.6.19 → 1.6.20-canary.clientinfo.20251126125404
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/__tests__/e2e/test-config.d.ts +37 -0
- package/dist/__tests__/e2e/test-config.d.ts.map +1 -0
- package/dist/__tests__/e2e/test-config.js +62 -0
- package/dist/__tests__/e2e/test-config.js.map +1 -0
- package/dist/adapter.d.ts.map +1 -1
- package/dist/adapter.js +20 -86
- package/dist/adapter.js.map +1 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/agent.js +100 -24
- package/dist/agent.js.map +1 -1
- package/dist/runtime/oauth-handler.d.ts.map +1 -1
- package/dist/runtime/oauth-handler.js.map +1 -1
- package/dist/services/kta-client-lookup.d.ts +5 -3
- package/dist/services/kta-client-lookup.d.ts.map +1 -1
- package/dist/services/kta-client-lookup.js +10 -34
- package/dist/services/kta-client-lookup.js.map +1 -1
- package/dist/utils/client-info.d.ts +69 -0
- package/dist/utils/client-info.d.ts.map +1 -0
- package/dist/utils/client-info.js +178 -0
- package/dist/utils/client-info.js.map +1 -0
- package/dist/utils/error-formatter.d.ts +103 -0
- package/dist/utils/error-formatter.d.ts.map +1 -0
- package/dist/utils/error-formatter.js +245 -0
- package/dist/utils/error-formatter.js.map +1 -0
- package/dist/utils/initialize-context.d.ts +91 -0
- package/dist/utils/initialize-context.d.ts.map +1 -0
- package/dist/utils/initialize-context.js +169 -0
- package/dist/utils/initialize-context.js.map +1 -0
- package/dist/utils/known-clients.d.ts +14 -6
- package/dist/utils/known-clients.d.ts.map +1 -1
- package/dist/utils/known-clients.js +30 -11
- package/dist/utils/known-clients.js.map +1 -1
- package/dist/utils/oauth-identity.d.ts +58 -0
- package/dist/utils/oauth-identity.d.ts.map +1 -0
- package/dist/utils/oauth-identity.js +215 -0
- package/dist/utils/oauth-identity.js.map +1 -0
- package/package.json +2 -2
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Known MCP Clients Registry
|
|
3
3
|
*
|
|
4
4
|
* Maps known MCP client names to their official Know That AI (KTA) DIDs.
|
|
5
|
-
*
|
|
5
|
+
* All known clients get a did:web DID, with ktaRegistered indicating actual KTA registration.
|
|
6
6
|
*/
|
|
7
7
|
/**
|
|
8
8
|
* Registry of known MCP clients
|
|
@@ -10,6 +10,8 @@
|
|
|
10
10
|
* Each entry maps a canonical client ID to its configuration.
|
|
11
11
|
* The `names` array contains possible variations of the client name
|
|
12
12
|
* that might appear in the MCP initialize message's clientInfo.name field.
|
|
13
|
+
*
|
|
14
|
+
* All known clients get a did:web DID. ktaRegistered indicates if actually on KTA.
|
|
13
15
|
*/
|
|
14
16
|
export const KNOWN_MCP_CLIENTS = {
|
|
15
17
|
// ============================================================
|
|
@@ -27,7 +29,8 @@ export const KNOWN_MCP_CLIENTS = {
|
|
|
27
29
|
"Claude Code", // CLI/code client
|
|
28
30
|
"claude-code",
|
|
29
31
|
],
|
|
30
|
-
ktaDid: "did:web:knowthat.ai:agents:claude",
|
|
32
|
+
ktaDid: "did:web:knowthat.ai:agents:claude",
|
|
33
|
+
ktaRegistered: true, // https://knowthat.ai/agents/claude
|
|
31
34
|
displayName: "Claude",
|
|
32
35
|
vendor: "Anthropic",
|
|
33
36
|
},
|
|
@@ -39,8 +42,11 @@ export const KNOWN_MCP_CLIENTS = {
|
|
|
39
42
|
"ChatGPT App",
|
|
40
43
|
"OpenAI ChatGPT",
|
|
41
44
|
"OpenAI",
|
|
45
|
+
"OpenAI-MCP", // ChatGPT MCP client name
|
|
46
|
+
"openai-mcp",
|
|
42
47
|
],
|
|
43
|
-
ktaDid: "did:web:knowthat.ai:agents:chatgpt",
|
|
48
|
+
ktaDid: "did:web:knowthat.ai:agents:chatgpt",
|
|
49
|
+
ktaRegistered: true, // https://knowthat.ai/agents/chatgpt
|
|
44
50
|
displayName: "ChatGPT",
|
|
45
51
|
vendor: "OpenAI",
|
|
46
52
|
},
|
|
@@ -52,12 +58,13 @@ export const KNOWN_MCP_CLIENTS = {
|
|
|
52
58
|
"perplexity-ai",
|
|
53
59
|
"Perplexity App",
|
|
54
60
|
],
|
|
55
|
-
ktaDid: "did:web:knowthat.ai:agents:perplexity",
|
|
61
|
+
ktaDid: "did:web:knowthat.ai:agents:perplexity",
|
|
62
|
+
ktaRegistered: true, // https://knowthat.ai/agents/perplexity
|
|
56
63
|
displayName: "Perplexity",
|
|
57
64
|
vendor: "Perplexity AI",
|
|
58
65
|
},
|
|
59
66
|
// ============================================================
|
|
60
|
-
// UNREGISTERED CLIENTS (
|
|
67
|
+
// KNOWN BUT UNREGISTERED CLIENTS (have did:web but not yet on KTA)
|
|
61
68
|
// ============================================================
|
|
62
69
|
"mcp-inspector": {
|
|
63
70
|
names: [
|
|
@@ -68,31 +75,36 @@ export const KNOWN_MCP_CLIENTS = {
|
|
|
68
75
|
"Inspector",
|
|
69
76
|
"inspector-client", // Name sent by inspector CLI
|
|
70
77
|
],
|
|
71
|
-
ktaDid:
|
|
78
|
+
ktaDid: "did:web:knowthat.ai:agents:mcp-inspector",
|
|
79
|
+
ktaRegistered: false, // Pending registration on knowthat.ai
|
|
72
80
|
displayName: "MCP Inspector",
|
|
73
81
|
vendor: "Anthropic",
|
|
74
82
|
},
|
|
75
83
|
"cursor": {
|
|
76
84
|
names: ["Cursor", "cursor", "cursor-ai", "Cursor AI", "Cursor IDE"],
|
|
77
|
-
ktaDid:
|
|
85
|
+
ktaDid: "did:web:knowthat.ai:agents:cursor",
|
|
86
|
+
ktaRegistered: false, // Pending registration on knowthat.ai
|
|
78
87
|
displayName: "Cursor",
|
|
79
88
|
vendor: "Cursor Inc",
|
|
80
89
|
},
|
|
81
90
|
"windsurf": {
|
|
82
91
|
names: ["Windsurf", "windsurf", "Codeium Windsurf"],
|
|
83
|
-
ktaDid:
|
|
92
|
+
ktaDid: "did:web:knowthat.ai:agents:windsurf",
|
|
93
|
+
ktaRegistered: false, // Pending registration on knowthat.ai
|
|
84
94
|
displayName: "Windsurf",
|
|
85
95
|
vendor: "Codeium",
|
|
86
96
|
},
|
|
87
97
|
"cline": {
|
|
88
98
|
names: ["Cline", "cline", "VS Code Cline", "vscode-cline"],
|
|
89
|
-
ktaDid:
|
|
99
|
+
ktaDid: "did:web:knowthat.ai:agents:cline",
|
|
100
|
+
ktaRegistered: false, // Pending registration on knowthat.ai
|
|
90
101
|
displayName: "Cline",
|
|
91
102
|
vendor: "Cline",
|
|
92
103
|
},
|
|
93
104
|
"zed": {
|
|
94
105
|
names: ["Zed", "zed", "Zed Editor", "zed-editor"],
|
|
95
|
-
ktaDid:
|
|
106
|
+
ktaDid: "did:web:knowthat.ai:agents:zed",
|
|
107
|
+
ktaRegistered: false, // Pending registration on knowthat.ai
|
|
96
108
|
displayName: "Zed",
|
|
97
109
|
vendor: "Zed Industries",
|
|
98
110
|
},
|
|
@@ -123,12 +135,19 @@ export function isKnownClient(clientName) {
|
|
|
123
135
|
return findKnownClient(clientName) !== undefined;
|
|
124
136
|
}
|
|
125
137
|
/**
|
|
126
|
-
* Get the DID for a known client
|
|
138
|
+
* Get the DID for a known client
|
|
127
139
|
*/
|
|
128
140
|
export function getKnownClientDid(clientName) {
|
|
129
141
|
const known = findKnownClient(clientName);
|
|
130
142
|
return known?.ktaDid ?? null;
|
|
131
143
|
}
|
|
144
|
+
/**
|
|
145
|
+
* Check if a known client is registered on KTA
|
|
146
|
+
*/
|
|
147
|
+
export function isKnownClientRegistered(clientName) {
|
|
148
|
+
const known = findKnownClient(clientName);
|
|
149
|
+
return known?.ktaRegistered ?? false;
|
|
150
|
+
}
|
|
132
151
|
/**
|
|
133
152
|
* Get all known client IDs
|
|
134
153
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"known-clients.js","sourceRoot":"","sources":["../../src/utils/known-clients.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"known-clients.js","sourceRoot":"","sources":["../../src/utils/known-clients.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* OAuth Identity Utilities
|
|
3
|
+
*
|
|
4
|
+
* Handles OAuth identity extraction and validation from HTTP requests.
|
|
5
|
+
* This module consolidates OAuth-related logic that was previously in the adapter.
|
|
6
|
+
*/
|
|
7
|
+
import type { OAuthIdentity } from "@kya-os/contracts/consent";
|
|
8
|
+
/**
|
|
9
|
+
* OAuth identity validation result
|
|
10
|
+
*/
|
|
11
|
+
export interface OAuthValidationResult {
|
|
12
|
+
valid: boolean;
|
|
13
|
+
reason?: string;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Extract OAuth identity from request cookies
|
|
17
|
+
*
|
|
18
|
+
* @param request - HTTP Request object
|
|
19
|
+
* @returns OAuthIdentity or null if not found/invalid
|
|
20
|
+
*/
|
|
21
|
+
export declare function extractOAuthIdentityFromRequest(request: Request): OAuthIdentity | null;
|
|
22
|
+
/**
|
|
23
|
+
* Validate OAuth identity format and content
|
|
24
|
+
*
|
|
25
|
+
* Ensures:
|
|
26
|
+
* - Provider is non-empty string (1-50 chars)
|
|
27
|
+
* - Subject is non-empty string (1-255 chars)
|
|
28
|
+
* - Provider matches expected format (alphanumeric, hyphens, underscores)
|
|
29
|
+
* - Subject matches expected format (non-empty, reasonable length)
|
|
30
|
+
*
|
|
31
|
+
* @param identity - Parsed OAuth identity object
|
|
32
|
+
* @returns Validation result
|
|
33
|
+
*/
|
|
34
|
+
export declare function validateOAuthIdentity(identity: unknown): OAuthValidationResult;
|
|
35
|
+
/**
|
|
36
|
+
* Lookup User DID from OAuth identity mapping
|
|
37
|
+
*
|
|
38
|
+
* @param oauthIdentity OAuth identity to lookup
|
|
39
|
+
* @param delegationStorage KV namespace for storage
|
|
40
|
+
* @returns User DID or null if not found
|
|
41
|
+
*/
|
|
42
|
+
export declare function lookupUserDidFromOAuth(oauthIdentity: OAuthIdentity, delegationStorage: any): Promise<string | null>;
|
|
43
|
+
/**
|
|
44
|
+
* Create a redacted OAuth identity for storage (PII protection)
|
|
45
|
+
*
|
|
46
|
+
* @param oauthIdentity Original OAuth identity
|
|
47
|
+
* @returns Redacted identity safe for storage
|
|
48
|
+
*/
|
|
49
|
+
export declare function redactOAuthIdentityForStorage(oauthIdentity: OAuthIdentity | null): any;
|
|
50
|
+
/**
|
|
51
|
+
* Test if an OAuth cookie value is valid
|
|
52
|
+
* Helper function for testing and debugging
|
|
53
|
+
*
|
|
54
|
+
* @param cookieValue Encoded cookie value
|
|
55
|
+
* @returns true if valid OAuth identity, false otherwise
|
|
56
|
+
*/
|
|
57
|
+
export declare function isValidOAuthCookie(cookieValue: string): boolean;
|
|
58
|
+
//# sourceMappingURL=oauth-identity.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-identity.d.ts","sourceRoot":"","sources":["../../src/utils/oauth-identity.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,GAAG,IAAI,CAoCtF;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,OAAO,GAAG,qBAAqB,CAkH9E;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,aAAa,EAAE,aAAa,EAC5B,iBAAiB,EAAE,GAAG,GACrB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA+BxB;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI,GAAG,GAAG,CAUtF;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAQ/D"}
|
|
@@ -0,0 +1,215 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* OAuth Identity Utilities
|
|
3
|
+
*
|
|
4
|
+
* Handles OAuth identity extraction and validation from HTTP requests.
|
|
5
|
+
* This module consolidates OAuth-related logic that was previously in the adapter.
|
|
6
|
+
*/
|
|
7
|
+
/**
|
|
8
|
+
* Extract OAuth identity from request cookies
|
|
9
|
+
*
|
|
10
|
+
* @param request - HTTP Request object
|
|
11
|
+
* @returns OAuthIdentity or null if not found/invalid
|
|
12
|
+
*/
|
|
13
|
+
export function extractOAuthIdentityFromRequest(request) {
|
|
14
|
+
try {
|
|
15
|
+
const cookieHeader = request.headers.get("Cookie");
|
|
16
|
+
if (!cookieHeader)
|
|
17
|
+
return null;
|
|
18
|
+
const cookies = cookieHeader.split("; ").map((c) => c.trim());
|
|
19
|
+
const oauthCookie = cookies.find((c) => c.startsWith("oauth_identity="));
|
|
20
|
+
if (!oauthCookie)
|
|
21
|
+
return null;
|
|
22
|
+
// Extract cookie value properly handling cases where value contains '='
|
|
23
|
+
// Find the first '=' which separates key from value, then take everything after it
|
|
24
|
+
const equalsIndex = oauthCookie.indexOf("=");
|
|
25
|
+
if (equalsIndex === -1)
|
|
26
|
+
return null;
|
|
27
|
+
const cookieValue = oauthCookie.substring(equalsIndex + 1);
|
|
28
|
+
const parsed = JSON.parse(decodeURIComponent(cookieValue));
|
|
29
|
+
// ✅ SECURITY: Validate OAuth identity format and content
|
|
30
|
+
const validationResult = validateOAuthIdentity(parsed);
|
|
31
|
+
if (!validationResult.valid) {
|
|
32
|
+
console.warn("[OAuth] ⚠️ OAuth identity validation failed:", validationResult.reason, { parsed });
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
return parsed;
|
|
36
|
+
}
|
|
37
|
+
catch (error) {
|
|
38
|
+
console.warn("[OAuth] Failed to extract OAuth identity from cookies:", error);
|
|
39
|
+
}
|
|
40
|
+
return null;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Validate OAuth identity format and content
|
|
44
|
+
*
|
|
45
|
+
* Ensures:
|
|
46
|
+
* - Provider is non-empty string (1-50 chars)
|
|
47
|
+
* - Subject is non-empty string (1-255 chars)
|
|
48
|
+
* - Provider matches expected format (alphanumeric, hyphens, underscores)
|
|
49
|
+
* - Subject matches expected format (non-empty, reasonable length)
|
|
50
|
+
*
|
|
51
|
+
* @param identity - Parsed OAuth identity object
|
|
52
|
+
* @returns Validation result
|
|
53
|
+
*/
|
|
54
|
+
export function validateOAuthIdentity(identity) {
|
|
55
|
+
// Check if identity is an object
|
|
56
|
+
if (!identity || typeof identity !== "object") {
|
|
57
|
+
return { valid: false, reason: "OAuth identity must be an object" };
|
|
58
|
+
}
|
|
59
|
+
const oauth = identity;
|
|
60
|
+
// Validate provider
|
|
61
|
+
if (!oauth.provider || typeof oauth.provider !== "string") {
|
|
62
|
+
return {
|
|
63
|
+
valid: false,
|
|
64
|
+
reason: "OAuth provider is required and must be a string",
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
const provider = oauth.provider.trim();
|
|
68
|
+
if (provider.length === 0) {
|
|
69
|
+
return { valid: false, reason: "OAuth provider cannot be empty" };
|
|
70
|
+
}
|
|
71
|
+
if (provider.length > 50) {
|
|
72
|
+
return {
|
|
73
|
+
valid: false,
|
|
74
|
+
reason: "OAuth provider must be 50 characters or less",
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
// Provider format: alphanumeric, hyphens, underscores, dots (e.g., "google", "microsoft", "github", "custom-provider")
|
|
78
|
+
const providerPattern = /^[a-zA-Z0-9._-]+$/;
|
|
79
|
+
if (!providerPattern.test(provider)) {
|
|
80
|
+
return {
|
|
81
|
+
valid: false,
|
|
82
|
+
reason: `OAuth provider must match pattern [a-zA-Z0-9._-]: "${provider}"`,
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
// Validate subject
|
|
86
|
+
if (!oauth.subject || typeof oauth.subject !== "string") {
|
|
87
|
+
return {
|
|
88
|
+
valid: false,
|
|
89
|
+
reason: "OAuth subject is required and must be a string",
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
const subject = oauth.subject.trim();
|
|
93
|
+
if (subject.length === 0) {
|
|
94
|
+
return { valid: false, reason: "OAuth subject cannot be empty" };
|
|
95
|
+
}
|
|
96
|
+
if (subject.length > 255) {
|
|
97
|
+
return {
|
|
98
|
+
valid: false,
|
|
99
|
+
reason: "OAuth subject must be 255 characters or less",
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
// Subject format: non-empty, reasonable characters (allows most Unicode, but prevents control chars)
|
|
103
|
+
// OAuth subjects can be numeric IDs, email-like strings, or other identifiers
|
|
104
|
+
const subjectPattern = /^[\S]+$/; // At least one non-whitespace character
|
|
105
|
+
if (!subjectPattern.test(subject)) {
|
|
106
|
+
return {
|
|
107
|
+
valid: false,
|
|
108
|
+
reason: `OAuth subject contains invalid characters: "${subject.substring(0, 20)}..."`,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
// Validate optional email if present
|
|
112
|
+
if (oauth.email !== undefined) {
|
|
113
|
+
if (typeof oauth.email !== "string") {
|
|
114
|
+
return {
|
|
115
|
+
valid: false,
|
|
116
|
+
reason: "OAuth email must be a string if provided",
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
const email = oauth.email.trim();
|
|
120
|
+
if (email.length > 0) {
|
|
121
|
+
// Basic email format validation
|
|
122
|
+
const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
|
123
|
+
if (!emailPattern.test(email)) {
|
|
124
|
+
return {
|
|
125
|
+
valid: false,
|
|
126
|
+
reason: `OAuth email format invalid: "${email}"`,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
if (email.length > 255) {
|
|
130
|
+
return {
|
|
131
|
+
valid: false,
|
|
132
|
+
reason: "OAuth email must be 255 characters or less",
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
// Validate optional name if present
|
|
138
|
+
if (oauth.name !== undefined) {
|
|
139
|
+
if (typeof oauth.name !== "string") {
|
|
140
|
+
return {
|
|
141
|
+
valid: false,
|
|
142
|
+
reason: "OAuth name must be a string if provided",
|
|
143
|
+
};
|
|
144
|
+
}
|
|
145
|
+
if (oauth.name.length > 255) {
|
|
146
|
+
return {
|
|
147
|
+
valid: false,
|
|
148
|
+
reason: "OAuth name must be 255 characters or less",
|
|
149
|
+
};
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
return { valid: true };
|
|
153
|
+
}
|
|
154
|
+
/**
|
|
155
|
+
* Lookup User DID from OAuth identity mapping
|
|
156
|
+
*
|
|
157
|
+
* @param oauthIdentity OAuth identity to lookup
|
|
158
|
+
* @param delegationStorage KV namespace for storage
|
|
159
|
+
* @returns User DID or null if not found
|
|
160
|
+
*/
|
|
161
|
+
export async function lookupUserDidFromOAuth(oauthIdentity, delegationStorage) {
|
|
162
|
+
if (!delegationStorage || !oauthIdentity?.provider || !oauthIdentity?.subject) {
|
|
163
|
+
return null;
|
|
164
|
+
}
|
|
165
|
+
try {
|
|
166
|
+
const { STORAGE_KEYS } = await import("../constants/storage-keys");
|
|
167
|
+
const oauthKey = STORAGE_KEYS.oauthIdentity(oauthIdentity.provider, oauthIdentity.subject);
|
|
168
|
+
const userDid = await delegationStorage.get(oauthKey, "text");
|
|
169
|
+
if (userDid) {
|
|
170
|
+
console.log("[OAuth] ✅ Retrieved persistent userDid from OAuth mapping:", {
|
|
171
|
+
provider: oauthIdentity.provider,
|
|
172
|
+
userDid: userDid.slice(0, 20) + "...",
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
return userDid;
|
|
176
|
+
}
|
|
177
|
+
catch (error) {
|
|
178
|
+
console.warn("[OAuth] Failed to lookup userDid from OAuth mapping:", error);
|
|
179
|
+
return null;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
/**
|
|
183
|
+
* Create a redacted OAuth identity for storage (PII protection)
|
|
184
|
+
*
|
|
185
|
+
* @param oauthIdentity Original OAuth identity
|
|
186
|
+
* @returns Redacted identity safe for storage
|
|
187
|
+
*/
|
|
188
|
+
export function redactOAuthIdentityForStorage(oauthIdentity) {
|
|
189
|
+
if (!oauthIdentity) {
|
|
190
|
+
return undefined;
|
|
191
|
+
}
|
|
192
|
+
return {
|
|
193
|
+
provider: oauthIdentity.provider,
|
|
194
|
+
subjectHash: oauthIdentity.subject.substring(0, 8), // Redact full subject
|
|
195
|
+
// Don't store email, name, or full subject for PII protection
|
|
196
|
+
};
|
|
197
|
+
}
|
|
198
|
+
/**
|
|
199
|
+
* Test if an OAuth cookie value is valid
|
|
200
|
+
* Helper function for testing and debugging
|
|
201
|
+
*
|
|
202
|
+
* @param cookieValue Encoded cookie value
|
|
203
|
+
* @returns true if valid OAuth identity, false otherwise
|
|
204
|
+
*/
|
|
205
|
+
export function isValidOAuthCookie(cookieValue) {
|
|
206
|
+
try {
|
|
207
|
+
const parsed = JSON.parse(decodeURIComponent(cookieValue));
|
|
208
|
+
const result = validateOAuthIdentity(parsed);
|
|
209
|
+
return result.valid;
|
|
210
|
+
}
|
|
211
|
+
catch {
|
|
212
|
+
return false;
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
//# sourceMappingURL=oauth-identity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-identity.js","sourceRoot":"","sources":["../../src/utils/oauth-identity.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kya-os/mcp-i-cloudflare",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.20-canary.clientinfo.20251126125404",
|
|
4
4
|
"description": "Cloudflare Workers adapter for MCP-I framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@kya-os/contracts": "^1.6.1",
|
|
21
|
-
"@kya-os/mcp-i-core": "
|
|
21
|
+
"@kya-os/mcp-i-core": "canary-clientinfo",
|
|
22
22
|
"@modelcontextprotocol/sdk": "^1.19.1",
|
|
23
23
|
"agents": "^0.2.21",
|
|
24
24
|
"base-x": "^5.0.0",
|