tiny-http-mcp-server 0.1.26 → 0.1.27
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/composition.json +1 -1
- package/node_modules/auth-store/README.md +16 -0
- package/node_modules/auth-store/dist/encrypted-file-store.d.ts +3 -0
- package/node_modules/auth-store/dist/encrypted-file-store.js +7 -0
- package/node_modules/auth-store/dist/index.d.ts +1 -0
- package/node_modules/auth-store/dist/keychain-store.d.ts +8 -0
- package/node_modules/auth-store/dist/keychain-store.js +13 -0
- package/node_modules/auth-store/dist/transaction-lock.d.ts +24 -0
- package/node_modules/auth-store/dist/transaction-lock.js +152 -0
- package/node_modules/auth-store/dist/types.d.ts +2 -0
- package/node_modules/mcp-oauth/README.md +6 -1
- package/node_modules/mcp-oauth/dist/client/auth-store-session-store.js +6 -0
- package/node_modules/tiny-mcp-client/dist/index.d.ts +24 -0
- package/node_modules/tiny-mcp-client/dist/index.js +234 -61
- package/package.json +1 -1
package/dist/composition.json
CHANGED
|
@@ -25,6 +25,22 @@ const value = await store.get(); // "secret-value"
|
|
|
25
25
|
await store.delete();
|
|
26
26
|
```
|
|
27
27
|
|
|
28
|
+
Both built-in backends expose `store.withLock(operation, { signal, timeoutMs })`
|
|
29
|
+
for transactions spanning a read, external operation and write. Independent
|
|
30
|
+
instances and processes serialize the same encrypted file or Keychain
|
|
31
|
+
service/account; unrelated identities proceed independently. The default
|
|
32
|
+
acquisition timeout is 30 seconds. Cancellation during acquisition does not
|
|
33
|
+
release the active owner's lock. Individual `get`, `set` and `delete` calls do
|
|
34
|
+
not implicitly acquire it.
|
|
35
|
+
|
|
36
|
+
Locks use private filesystem claim directories, containing PID/random names
|
|
37
|
+
and numeric tickets without credentials. Dead-owner claims are recovered;
|
|
38
|
+
live claims are never stolen because of age. Empty directories remain so an
|
|
39
|
+
arriving contender cannot race directory removal. Keychain lock storage defaults
|
|
40
|
+
to `~/.auth-store/keychain-locks`; `keychainStore.lock` can select another
|
|
41
|
+
directory or filesystem adapter. Injected encrypted-file adapters need
|
|
42
|
+
`readdir` support when using transactions.
|
|
43
|
+
|
|
28
44
|
## Backends
|
|
29
45
|
|
|
30
46
|
| `backendEnvVar` value | Platform | Backend |
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { SecretStore } from "./types.js";
|
|
2
|
+
import { type SecretStoreLockOptions } from "./transaction-lock.js";
|
|
2
3
|
export interface MachineIdentity {
|
|
3
4
|
hostname: string;
|
|
4
5
|
username: string;
|
|
5
6
|
}
|
|
6
7
|
export interface EncryptedFileStoreFileSystem {
|
|
8
|
+
readdir?(path: string): Promise<string[]>;
|
|
7
9
|
readFile(path: string, encoding: BufferEncoding): Promise<string>;
|
|
8
10
|
writeFile(path: string, data: string | NodeJS.ArrayBufferView, options?: {
|
|
9
11
|
encoding?: BufferEncoding;
|
|
@@ -40,6 +42,7 @@ export declare class EncryptedFileStore implements SecretStore {
|
|
|
40
42
|
private keyPromise;
|
|
41
43
|
constructor(input: EncryptedFileStoreInput);
|
|
42
44
|
get(): Promise<string | null>;
|
|
45
|
+
withLock<T>(operation: () => Promise<T>, options?: SecretStoreLockOptions): Promise<T>;
|
|
43
46
|
set(value: string): Promise<void>;
|
|
44
47
|
delete(): Promise<void>;
|
|
45
48
|
private assertCredentialPathHasNoSymbolicLinks;
|
|
@@ -3,6 +3,7 @@ import { promises as fs } from "node:fs";
|
|
|
3
3
|
import { homedir, hostname, userInfo } from "node:os";
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
import { hasOwnErrorCode } from "./error-codes.js";
|
|
6
|
+
import { withSecretStoreFileLock } from "./transaction-lock.js";
|
|
6
7
|
const derivedKeyCache = new Map();
|
|
7
8
|
const ENCRYPTION_ALGORITHM = "aes-256-gcm";
|
|
8
9
|
const ENCRYPTION_VERSION = 1;
|
|
@@ -71,6 +72,12 @@ export class EncryptedFileStore {
|
|
|
71
72
|
return null;
|
|
72
73
|
}
|
|
73
74
|
}
|
|
75
|
+
async withLock(operation, options = {}) {
|
|
76
|
+
await this.assertCredentialPathHasNoSymbolicLinks(`${this.filePath}.lock`);
|
|
77
|
+
if (this.fs.readdir === undefined)
|
|
78
|
+
throw new Error("Secret-store transaction locks require filesystem readdir support");
|
|
79
|
+
return withSecretStoreFileLock(this.fs, `${this.filePath}.lock`, operation, options);
|
|
80
|
+
}
|
|
74
81
|
async set(value) {
|
|
75
82
|
await this.assertCredentialPathHasNoSymbolicLinks(this.filePath);
|
|
76
83
|
const key = await this.getEncryptionKey();
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export { createSecretStore } from "./create-secret-store.js";
|
|
2
2
|
export { EncryptedFileStore } from "./encrypted-file-store.js";
|
|
3
3
|
export { KeychainStore } from "./keychain-store.js";
|
|
4
|
+
export type { SecretStoreLockOptions, SecretStoreLockFileSystem } from "./transaction-lock.js";
|
|
4
5
|
export { key, MigratingSecretStore } from "./provider-store.js";
|
|
5
6
|
export type { SecretStore, StoreBackend, CreateSecretStoreInput, CreateSecretStoreResult } from "./types.js";
|
|
6
7
|
export type { MachineIdentity, EncryptedFileStoreInput, EncryptedFileStoreFileSystem } from "./encrypted-file-store.js";
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { SecretStore } from "./types.js";
|
|
2
|
+
import { type SecretStoreLockFileSystem, type SecretStoreLockOptions } from "./transaction-lock.js";
|
|
2
3
|
export interface KeychainCommandResult {
|
|
3
4
|
stdout: string;
|
|
4
5
|
stderr: string;
|
|
@@ -12,13 +13,20 @@ export interface KeychainStoreInput {
|
|
|
12
13
|
runCommand?: KeychainCommandRunner;
|
|
13
14
|
service: string;
|
|
14
15
|
account: string;
|
|
16
|
+
lock?: {
|
|
17
|
+
fs?: SecretStoreLockFileSystem;
|
|
18
|
+
directory?: string;
|
|
19
|
+
};
|
|
15
20
|
}
|
|
16
21
|
export declare class KeychainStore implements SecretStore {
|
|
17
22
|
private readonly runCommand;
|
|
18
23
|
private readonly service;
|
|
19
24
|
private readonly account;
|
|
25
|
+
private readonly lockFs;
|
|
26
|
+
private readonly lockDirectory;
|
|
20
27
|
constructor(input: KeychainStoreInput);
|
|
21
28
|
get(): Promise<string | null>;
|
|
29
|
+
withLock<T>(operation: () => Promise<T>, options?: SecretStoreLockOptions): Promise<T>;
|
|
22
30
|
set(value: string): Promise<void>;
|
|
23
31
|
delete(): Promise<void>;
|
|
24
32
|
private executeSecurityCommand;
|
|
@@ -1,14 +1,23 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
|
+
import { createHash } from "node:crypto";
|
|
3
|
+
import { promises as nodeFs } from "node:fs";
|
|
4
|
+
import { homedir } from "node:os";
|
|
5
|
+
import path from "node:path";
|
|
6
|
+
import { withSecretStoreFileLock } from "./transaction-lock.js";
|
|
2
7
|
const SECURITY_CLI = "security";
|
|
3
8
|
const KEYCHAIN_ITEM_NOT_FOUND_EXIT_CODE = 44;
|
|
4
9
|
export class KeychainStore {
|
|
5
10
|
runCommand;
|
|
6
11
|
service;
|
|
7
12
|
account;
|
|
13
|
+
lockFs;
|
|
14
|
+
lockDirectory;
|
|
8
15
|
constructor(input) {
|
|
9
16
|
this.runCommand = input.runCommand ?? runSecurityCommand;
|
|
10
17
|
this.service = input.service.trim();
|
|
11
18
|
this.account = input.account.trim();
|
|
19
|
+
this.lockFs = input.lock?.fs ?? nodeFs;
|
|
20
|
+
this.lockDirectory = input.lock?.directory ?? path.join(homedir(), ".auth-store", "keychain-locks");
|
|
12
21
|
if (this.service.length === 0) {
|
|
13
22
|
throw new Error("Keychain service must not be empty");
|
|
14
23
|
}
|
|
@@ -26,6 +35,10 @@ export class KeychainStore {
|
|
|
26
35
|
}
|
|
27
36
|
throw createSecurityCliFailure("read secret from macOS Keychain", result);
|
|
28
37
|
}
|
|
38
|
+
async withLock(operation, options = {}) {
|
|
39
|
+
const identity = createHash("sha256").update(JSON.stringify([this.service, this.account])).digest("hex");
|
|
40
|
+
return withSecretStoreFileLock(this.lockFs, path.join(this.lockDirectory, identity), operation, options);
|
|
41
|
+
}
|
|
29
42
|
async set(value) {
|
|
30
43
|
if (value.includes("\n") || value.includes("\r")) {
|
|
31
44
|
throw new Error("Keychain secrets cannot contain line breaks");
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
export interface SecretStoreLockOptions {
|
|
2
|
+
signal?: AbortSignal;
|
|
3
|
+
timeoutMs?: number;
|
|
4
|
+
}
|
|
5
|
+
export interface SecretStoreLockFileSystem {
|
|
6
|
+
mkdir(path: string, options?: {
|
|
7
|
+
recursive?: boolean;
|
|
8
|
+
mode?: number;
|
|
9
|
+
}): Promise<unknown>;
|
|
10
|
+
readdir(path: string): Promise<string[]>;
|
|
11
|
+
readFile(path: string, encoding: BufferEncoding): Promise<string>;
|
|
12
|
+
writeFile(path: string, value: string, options: {
|
|
13
|
+
encoding: BufferEncoding;
|
|
14
|
+
flag: string;
|
|
15
|
+
mode: number;
|
|
16
|
+
}): Promise<void>;
|
|
17
|
+
rename(from: string, to: string): Promise<void>;
|
|
18
|
+
unlink(path: string): Promise<void>;
|
|
19
|
+
lstat(path: string): Promise<{
|
|
20
|
+
isSymbolicLink(): boolean;
|
|
21
|
+
}>;
|
|
22
|
+
}
|
|
23
|
+
/** Filesystem bakery lock: unique claims allow dead-owner cleanup without deleting a replacement owner's lock. */
|
|
24
|
+
export declare function withSecretStoreFileLock<T>(fs: SecretStoreLockFileSystem, lockDirectory: string, operation: () => Promise<T>, options?: SecretStoreLockOptions): Promise<T>;
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { hasOwnErrorCode } from "./error-codes.js";
|
|
4
|
+
/** Filesystem bakery lock: unique claims allow dead-owner cleanup without deleting a replacement owner's lock. */
|
|
5
|
+
export async function withSecretStoreFileLock(fs, lockDirectory, operation, options = {}) {
|
|
6
|
+
const timeoutMs = options.timeoutMs ?? 30_000;
|
|
7
|
+
if (!Number.isFinite(timeoutMs) || timeoutMs < 0 || timeoutMs > 2_147_483_647)
|
|
8
|
+
throw new Error("Invalid secret-store transaction lock timeout");
|
|
9
|
+
options.signal?.throwIfAborted();
|
|
10
|
+
const deadline = performance.now() + timeoutMs;
|
|
11
|
+
const directory = path.resolve(lockDirectory);
|
|
12
|
+
await assertLockDirectoryPath(fs, directory);
|
|
13
|
+
await fs.mkdir(directory, { recursive: true, mode: 0o700 });
|
|
14
|
+
await assertLockDirectoryPath(fs, directory);
|
|
15
|
+
const name = `${process.pid}-${randomUUID()}.claim`;
|
|
16
|
+
const claimPath = path.join(directory, name);
|
|
17
|
+
const temporaryPath = `${claimPath}.tmp`;
|
|
18
|
+
let claimed = true;
|
|
19
|
+
let temporaryCreated = false;
|
|
20
|
+
let outcome;
|
|
21
|
+
try {
|
|
22
|
+
try {
|
|
23
|
+
await fs.writeFile(claimPath, JSON.stringify({ ticket: null }), { encoding: "utf8", flag: "wx", mode: 0o600 });
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
if (hasOwnErrorCode(error, "EEXIST"))
|
|
27
|
+
claimed = false;
|
|
28
|
+
throw error;
|
|
29
|
+
}
|
|
30
|
+
const existing = await readClaims(fs, directory, name);
|
|
31
|
+
const ticket = existing.reduce((max, claim) => Math.max(max, claim.ticket ?? 0), 0) + 1;
|
|
32
|
+
if (!Number.isSafeInteger(ticket))
|
|
33
|
+
throw new Error("Secret-store transaction lock ticket overflow");
|
|
34
|
+
temporaryCreated = true;
|
|
35
|
+
try {
|
|
36
|
+
await fs.writeFile(temporaryPath, JSON.stringify({ ticket }), { encoding: "utf8", flag: "wx", mode: 0o600 });
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
if (hasOwnErrorCode(error, "EEXIST"))
|
|
40
|
+
temporaryCreated = false;
|
|
41
|
+
throw error;
|
|
42
|
+
}
|
|
43
|
+
await fs.rename(temporaryPath, claimPath);
|
|
44
|
+
temporaryCreated = false;
|
|
45
|
+
for (;;) {
|
|
46
|
+
options.signal?.throwIfAborted();
|
|
47
|
+
const peers = await readClaims(fs, directory, name);
|
|
48
|
+
if (!peers.some(peer => peer.ticket === null || peer.ticket < ticket || (peer.ticket === ticket && peer.name < name)))
|
|
49
|
+
break;
|
|
50
|
+
const remaining = deadline - performance.now();
|
|
51
|
+
if (remaining <= 0)
|
|
52
|
+
throw new Error("Timed out waiting for secret-store transaction lock");
|
|
53
|
+
await new Promise((resolve, reject) => {
|
|
54
|
+
const abort = () => { clearTimeout(timer); options.signal?.removeEventListener("abort", abort); reject(options.signal?.reason); };
|
|
55
|
+
const timer = setTimeout(() => { options.signal?.removeEventListener("abort", abort); resolve(); }, Math.min(10, remaining));
|
|
56
|
+
options.signal?.addEventListener("abort", abort, { once: true });
|
|
57
|
+
if (options.signal?.aborted)
|
|
58
|
+
abort();
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
options.signal?.throwIfAborted();
|
|
62
|
+
outcome = { result: await operation() };
|
|
63
|
+
}
|
|
64
|
+
catch (error) {
|
|
65
|
+
outcome = { error };
|
|
66
|
+
}
|
|
67
|
+
const cleanup = [];
|
|
68
|
+
for (const target of [...(temporaryCreated ? [temporaryPath] : []), ...(claimed ? [claimPath] : [])]) {
|
|
69
|
+
try {
|
|
70
|
+
await fs.unlink(target);
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
if (!hasOwnErrorCode(error, "ENOENT"))
|
|
74
|
+
cleanup.push(error);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
if (cleanup.length)
|
|
78
|
+
throw new AggregateError([...("error" in outcome ? [outcome.error] : []), ...cleanup], "Secret-store transaction lock cleanup failed");
|
|
79
|
+
if ("error" in outcome)
|
|
80
|
+
throw outcome.error;
|
|
81
|
+
return outcome.result;
|
|
82
|
+
}
|
|
83
|
+
async function assertNoSymbolicLink(fs, target) {
|
|
84
|
+
try {
|
|
85
|
+
if ((await fs.lstat(target)).isSymbolicLink())
|
|
86
|
+
throw new Error("Refusing secret-store transaction lock through symbolic link");
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
if (!hasOwnErrorCode(error, "ENOENT"))
|
|
90
|
+
throw error;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
async function assertLockDirectoryPath(fs, directory) {
|
|
94
|
+
const root = path.parse(directory).root;
|
|
95
|
+
const segments = directory.slice(root.length).split(path.sep).filter(Boolean);
|
|
96
|
+
let current = root;
|
|
97
|
+
for (const [index, segment] of segments.entries()) {
|
|
98
|
+
current = path.join(current, segment);
|
|
99
|
+
// Match encrypted credential paths: allow OS root aliases such as macOS /var.
|
|
100
|
+
if (index > 0 || segments.length === 1)
|
|
101
|
+
await assertNoSymbolicLink(fs, current);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
async function readClaims(fs, directory, ownName) {
|
|
105
|
+
const claims = [];
|
|
106
|
+
for (const name of await fs.readdir(directory)) {
|
|
107
|
+
if (name === ownName || !name.endsWith(".claim"))
|
|
108
|
+
continue;
|
|
109
|
+
const pidText = name.slice(0, name.indexOf("-"));
|
|
110
|
+
const pid = Number(pidText);
|
|
111
|
+
if (!Number.isSafeInteger(pid) || pid < 1 || String(pid) !== pidText)
|
|
112
|
+
throw new Error("Malformed secret-store transaction lock owner");
|
|
113
|
+
const target = path.join(directory, name);
|
|
114
|
+
await assertNoSymbolicLink(fs, target);
|
|
115
|
+
let alive = true;
|
|
116
|
+
try {
|
|
117
|
+
process.kill(pid, 0);
|
|
118
|
+
}
|
|
119
|
+
catch (error) {
|
|
120
|
+
alive = !hasOwnErrorCode(error, "ESRCH");
|
|
121
|
+
}
|
|
122
|
+
if (!alive) {
|
|
123
|
+
try {
|
|
124
|
+
await fs.unlink(target);
|
|
125
|
+
}
|
|
126
|
+
catch (error) {
|
|
127
|
+
if (!hasOwnErrorCode(error, "ENOENT"))
|
|
128
|
+
throw error;
|
|
129
|
+
}
|
|
130
|
+
continue;
|
|
131
|
+
}
|
|
132
|
+
let ticket = null;
|
|
133
|
+
let raw;
|
|
134
|
+
try {
|
|
135
|
+
raw = await fs.readFile(target, "utf8");
|
|
136
|
+
}
|
|
137
|
+
catch (error) {
|
|
138
|
+
if (hasOwnErrorCode(error, "ENOENT"))
|
|
139
|
+
continue;
|
|
140
|
+
throw error;
|
|
141
|
+
}
|
|
142
|
+
try {
|
|
143
|
+
const value = JSON.parse(raw);
|
|
144
|
+
if (value !== null && typeof value === "object" && "ticket" in value &&
|
|
145
|
+
typeof value.ticket === "number" && Number.isSafeInteger(value.ticket) && value.ticket > 0)
|
|
146
|
+
ticket = value.ticket;
|
|
147
|
+
}
|
|
148
|
+
catch { /* Incomplete live claims remain in the choosing phase; never steal them by age. */ }
|
|
149
|
+
claims.push({ name, ticket });
|
|
150
|
+
}
|
|
151
|
+
return claims;
|
|
152
|
+
}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import type { EncryptedFileStoreInput } from "./encrypted-file-store.js";
|
|
2
2
|
import type { KeychainStoreInput } from "./keychain-store.js";
|
|
3
|
+
import type { SecretStoreLockOptions } from "./transaction-lock.js";
|
|
3
4
|
export interface SecretStore {
|
|
4
5
|
get(options?: {
|
|
5
6
|
readOnly?: boolean;
|
|
6
7
|
}): Promise<string | null>;
|
|
7
8
|
set(value: string): Promise<void>;
|
|
8
9
|
delete(): Promise<void>;
|
|
10
|
+
withLock?<T>(operation: () => Promise<T>, options?: SecretStoreLockOptions): Promise<T>;
|
|
9
11
|
}
|
|
10
12
|
export type StoreBackend = "file" | "keychain";
|
|
11
13
|
export interface CreateSecretStoreInput {
|
|
@@ -115,7 +115,12 @@ active owner's lock. Custom stores may implement
|
|
|
115
115
|
transaction across store instances or processes. The hook must honor acquisition
|
|
116
116
|
cancellation and keep the lock until the operation settles. The timeout bounds
|
|
117
117
|
acquisition, while token and browser operations retain their own deadlines.
|
|
118
|
-
|
|
118
|
+
The native `auth-store` session adapter implements this hook for both encrypted
|
|
119
|
+
files and Keychain identities, including across independent processes. Locks
|
|
120
|
+
cover the complete read, refresh/authorization and persisted winner. Dead-owner
|
|
121
|
+
claims are recovered without stealing a live transaction. A process crash or
|
|
122
|
+
cancellation after refresh redemption but before persistence is still an
|
|
123
|
+
uncertain token outcome; recovery for that case is under development.
|
|
119
124
|
|
|
120
125
|
## Environment Variables
|
|
121
126
|
|
|
@@ -11,6 +11,12 @@ const DEFAULT_CLIENT_KEYCHAIN_SERVICE = "poe-code-mcp-oauth-clients";
|
|
|
11
11
|
const MAX_JS_DATE_MS = 8_640_000_000_000_000;
|
|
12
12
|
export function createAuthStoreSessionStore(options = {}) {
|
|
13
13
|
return {
|
|
14
|
+
async withLock(resource, operation, lockOptions) {
|
|
15
|
+
const store = createResourceSecretStore(resource, options);
|
|
16
|
+
if (store.withLock === undefined)
|
|
17
|
+
throw new Error("OAuth secret-store backend does not support transaction locks");
|
|
18
|
+
return store.withLock(operation, lockOptions);
|
|
19
|
+
},
|
|
14
20
|
async load(resource) {
|
|
15
21
|
const store = createResourceSecretStore(resource, options);
|
|
16
22
|
const value = await store.get();
|
|
@@ -20,11 +20,31 @@ interface McpSubscription {
|
|
|
20
20
|
cancel(): void;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
+
interface SecretStoreLockFileSystem {
|
|
24
|
+
mkdir(path: string, options?: {
|
|
25
|
+
recursive?: boolean;
|
|
26
|
+
mode?: number;
|
|
27
|
+
}): Promise<unknown>;
|
|
28
|
+
readdir(path: string): Promise<string[]>;
|
|
29
|
+
readFile(path: string, encoding: BufferEncoding): Promise<string>;
|
|
30
|
+
writeFile(path: string, value: string, options: {
|
|
31
|
+
encoding: BufferEncoding;
|
|
32
|
+
flag: string;
|
|
33
|
+
mode: number;
|
|
34
|
+
}): Promise<void>;
|
|
35
|
+
rename(from: string, to: string): Promise<void>;
|
|
36
|
+
unlink(path: string): Promise<void>;
|
|
37
|
+
lstat(path: string): Promise<{
|
|
38
|
+
isSymbolicLink(): boolean;
|
|
39
|
+
}>;
|
|
40
|
+
}
|
|
41
|
+
|
|
23
42
|
interface MachineIdentity {
|
|
24
43
|
hostname: string;
|
|
25
44
|
username: string;
|
|
26
45
|
}
|
|
27
46
|
interface EncryptedFileStoreFileSystem {
|
|
47
|
+
readdir?(path: string): Promise<string[]>;
|
|
28
48
|
readFile(path: string, encoding: BufferEncoding): Promise<string>;
|
|
29
49
|
writeFile(path: string, data: string | NodeJS.ArrayBufferView, options?: {
|
|
30
50
|
encoding?: BufferEncoding;
|
|
@@ -65,6 +85,10 @@ interface KeychainStoreInput {
|
|
|
65
85
|
runCommand?: KeychainCommandRunner;
|
|
66
86
|
service: string;
|
|
67
87
|
account: string;
|
|
88
|
+
lock?: {
|
|
89
|
+
fs?: SecretStoreLockFileSystem;
|
|
90
|
+
directory?: string;
|
|
91
|
+
};
|
|
68
92
|
}
|
|
69
93
|
|
|
70
94
|
type StoreBackend = "file" | "keychain";
|
|
@@ -279,8 +279,8 @@ function receivedType(value) {
|
|
|
279
279
|
}
|
|
280
280
|
return typeof value;
|
|
281
281
|
}
|
|
282
|
-
function issue(
|
|
283
|
-
return { path:
|
|
282
|
+
function issue(path5, expected, value, message, keyword = keywordFor(expected)) {
|
|
283
|
+
return { path: path5, expected, received: receivedType(value), message, keyword };
|
|
284
284
|
}
|
|
285
285
|
function keywordFor(expected) {
|
|
286
286
|
if (["null", "boolean", "object", "array", "number", "integer", "string"].includes(expected)) {
|
|
@@ -997,113 +997,113 @@ function evaluateArrayApplicators(graph, node, schema, value, context) {
|
|
|
997
997
|
}
|
|
998
998
|
return results;
|
|
999
999
|
}
|
|
1000
|
-
function evaluateValidationKeywords(node, schema, value,
|
|
1000
|
+
function evaluateValidationKeywords(node, schema, value, path5) {
|
|
1001
1001
|
const results = [];
|
|
1002
1002
|
const types = typeof schema.type === "string" ? [schema.type] : Array.isArray(schema.type) ? schema.type : [];
|
|
1003
1003
|
if (types.length > 0 && !types.some((type) => typeof type === "string" && typeMatches(type, value))) {
|
|
1004
|
-
results.push(invalidResult(issue(
|
|
1004
|
+
results.push(invalidResult(issue(path5, types.join(","), value, `must be ${types.join(",")}`)));
|
|
1005
1005
|
return results;
|
|
1006
1006
|
}
|
|
1007
1007
|
if (schema.const !== void 0 && !deepEqual(schema.const, value)) {
|
|
1008
|
-
results.push(invalidResult(issue(
|
|
1008
|
+
results.push(invalidResult(issue(path5, "const", value, "must be equal to constant")));
|
|
1009
1009
|
}
|
|
1010
1010
|
if (Array.isArray(schema.enum) && !schema.enum.some((entry) => deepEqual(entry, value))) {
|
|
1011
|
-
results.push(invalidResult(issue(
|
|
1011
|
+
results.push(invalidResult(issue(path5, "enum", value, "must be equal to one of the allowed values")));
|
|
1012
1012
|
}
|
|
1013
1013
|
if (typeof value === "number" && Number.isFinite(value)) {
|
|
1014
|
-
evaluateNumberKeywords(schema, value,
|
|
1014
|
+
evaluateNumberKeywords(schema, value, path5, results);
|
|
1015
1015
|
}
|
|
1016
1016
|
if (typeof value === "string") {
|
|
1017
|
-
evaluateStringKeywords(schema, value,
|
|
1017
|
+
evaluateStringKeywords(schema, value, path5, results);
|
|
1018
1018
|
}
|
|
1019
1019
|
if (Array.isArray(value)) {
|
|
1020
|
-
evaluateArrayKeywords(schema, value,
|
|
1020
|
+
evaluateArrayKeywords(schema, value, path5, results);
|
|
1021
1021
|
}
|
|
1022
1022
|
if (isObject(value)) {
|
|
1023
|
-
evaluateObjectKeywords(node, schema, value,
|
|
1023
|
+
evaluateObjectKeywords(node, schema, value, path5, results);
|
|
1024
1024
|
}
|
|
1025
1025
|
return results;
|
|
1026
1026
|
}
|
|
1027
|
-
function evaluateNumberKeywords(schema, value,
|
|
1027
|
+
function evaluateNumberKeywords(schema, value, path5, results) {
|
|
1028
1028
|
if (typeof schema.multipleOf === "number" && !isMultipleOf(value, schema.multipleOf)) {
|
|
1029
|
-
results.push(invalidResult(issue(
|
|
1029
|
+
results.push(invalidResult(issue(path5, `multiple of ${schema.multipleOf}`, value, `must be multiple of ${schema.multipleOf}`)));
|
|
1030
1030
|
}
|
|
1031
1031
|
if (typeof schema.maximum === "number" && value > schema.maximum) {
|
|
1032
|
-
results.push(invalidResult(issue(
|
|
1032
|
+
results.push(invalidResult(issue(path5, `<= ${schema.maximum}`, value, `must be <= ${schema.maximum}`)));
|
|
1033
1033
|
}
|
|
1034
1034
|
if (typeof schema.minimum === "number" && value < schema.minimum) {
|
|
1035
|
-
results.push(invalidResult(issue(
|
|
1035
|
+
results.push(invalidResult(issue(path5, `>= ${schema.minimum}`, value, `must be >= ${schema.minimum}`)));
|
|
1036
1036
|
}
|
|
1037
1037
|
if (typeof schema.exclusiveMaximum === "number" && value >= schema.exclusiveMaximum) {
|
|
1038
|
-
results.push(invalidResult(issue(
|
|
1038
|
+
results.push(invalidResult(issue(path5, `< ${schema.exclusiveMaximum}`, value, `must be < ${schema.exclusiveMaximum}`)));
|
|
1039
1039
|
}
|
|
1040
1040
|
if (typeof schema.exclusiveMinimum === "number" && value <= schema.exclusiveMinimum) {
|
|
1041
|
-
results.push(invalidResult(issue(
|
|
1041
|
+
results.push(invalidResult(issue(path5, `> ${schema.exclusiveMinimum}`, value, `must be > ${schema.exclusiveMinimum}`)));
|
|
1042
1042
|
}
|
|
1043
1043
|
}
|
|
1044
|
-
function evaluateStringKeywords(schema, value,
|
|
1044
|
+
function evaluateStringKeywords(schema, value, path5, results) {
|
|
1045
1045
|
const length = unicodeLength(value);
|
|
1046
1046
|
if (typeof schema.maxLength === "number" && length > schema.maxLength) {
|
|
1047
|
-
results.push(invalidResult(issue(
|
|
1047
|
+
results.push(invalidResult(issue(path5, `length <= ${schema.maxLength}`, value, `must NOT have more than ${schema.maxLength} characters`)));
|
|
1048
1048
|
}
|
|
1049
1049
|
if (typeof schema.minLength === "number" && length < schema.minLength) {
|
|
1050
|
-
results.push(invalidResult(issue(
|
|
1050
|
+
results.push(invalidResult(issue(path5, `length >= ${schema.minLength}`, value, `must NOT have fewer than ${schema.minLength} characters`)));
|
|
1051
1051
|
}
|
|
1052
1052
|
if (typeof schema.pattern === "string" && !new RegExp(schema.pattern, "u").test(value)) {
|
|
1053
|
-
results.push(invalidResult(issue(
|
|
1053
|
+
results.push(invalidResult(issue(path5, `pattern ${schema.pattern}`, value, `must match pattern ${schema.pattern}`)));
|
|
1054
1054
|
}
|
|
1055
1055
|
}
|
|
1056
|
-
function evaluateArrayKeywords(schema, value,
|
|
1056
|
+
function evaluateArrayKeywords(schema, value, path5, results) {
|
|
1057
1057
|
if (typeof schema.maxItems === "number" && value.length > schema.maxItems) {
|
|
1058
|
-
results.push(invalidResult(issue(
|
|
1058
|
+
results.push(invalidResult(issue(path5, `items <= ${schema.maxItems}`, value, `must NOT have more than ${schema.maxItems} items`)));
|
|
1059
1059
|
}
|
|
1060
1060
|
if (typeof schema.minItems === "number" && value.length < schema.minItems) {
|
|
1061
|
-
results.push(invalidResult(issue(
|
|
1061
|
+
results.push(invalidResult(issue(path5, `items >= ${schema.minItems}`, value, `must NOT have fewer than ${schema.minItems} items`)));
|
|
1062
1062
|
}
|
|
1063
1063
|
if (schema.uniqueItems === true) {
|
|
1064
1064
|
for (let left = 0; left < value.length; left += 1) {
|
|
1065
1065
|
for (let right = left + 1; right < value.length; right += 1) {
|
|
1066
1066
|
if (deepEqual(value[left], value[right])) {
|
|
1067
|
-
results.push(invalidResult(issue(
|
|
1067
|
+
results.push(invalidResult(issue(path5, "unique items", value, "must NOT have duplicate items")));
|
|
1068
1068
|
return;
|
|
1069
1069
|
}
|
|
1070
1070
|
}
|
|
1071
1071
|
}
|
|
1072
1072
|
}
|
|
1073
1073
|
}
|
|
1074
|
-
function evaluateObjectKeywords(node, schema, value,
|
|
1074
|
+
function evaluateObjectKeywords(node, schema, value, path5, results) {
|
|
1075
1075
|
const keys = Object.keys(value);
|
|
1076
1076
|
if (typeof schema.maxProperties === "number" && keys.length > schema.maxProperties) {
|
|
1077
|
-
results.push(invalidResult(issue(
|
|
1077
|
+
results.push(invalidResult(issue(path5, `properties <= ${schema.maxProperties}`, value, `must NOT have more than ${schema.maxProperties} properties`)));
|
|
1078
1078
|
}
|
|
1079
1079
|
if (typeof schema.minProperties === "number" && keys.length < schema.minProperties) {
|
|
1080
|
-
results.push(invalidResult(issue(
|
|
1080
|
+
results.push(invalidResult(issue(path5, `properties >= ${schema.minProperties}`, value, `must NOT have fewer than ${schema.minProperties} properties`)));
|
|
1081
1081
|
}
|
|
1082
1082
|
if (Array.isArray(schema.required)) {
|
|
1083
1083
|
for (const key2 of schema.required) {
|
|
1084
1084
|
if (typeof key2 === "string" && !Object.prototype.hasOwnProperty.call(value, key2)) {
|
|
1085
|
-
results.push(invalidResult(issue([...
|
|
1085
|
+
results.push(invalidResult(issue([...path5, key2], "required", void 0, `must have required property '${key2}'`)));
|
|
1086
1086
|
}
|
|
1087
1087
|
}
|
|
1088
1088
|
}
|
|
1089
1089
|
const dependentRequired = isObject(schema.dependentRequired) ? schema.dependentRequired : {};
|
|
1090
1090
|
for (const [key2, dependencies] of Object.entries(dependentRequired)) {
|
|
1091
1091
|
if (Object.prototype.hasOwnProperty.call(value, key2) && Array.isArray(dependencies)) {
|
|
1092
|
-
addMissingDependencies(value, dependencies,
|
|
1092
|
+
addMissingDependencies(value, dependencies, path5, results);
|
|
1093
1093
|
}
|
|
1094
1094
|
}
|
|
1095
1095
|
if (node.dialect === "draft7" && isObject(schema.dependencies)) {
|
|
1096
1096
|
for (const [key2, dependencies] of Object.entries(schema.dependencies)) {
|
|
1097
1097
|
if (Object.prototype.hasOwnProperty.call(value, key2) && Array.isArray(dependencies)) {
|
|
1098
|
-
addMissingDependencies(value, dependencies,
|
|
1098
|
+
addMissingDependencies(value, dependencies, path5, results);
|
|
1099
1099
|
}
|
|
1100
1100
|
}
|
|
1101
1101
|
}
|
|
1102
1102
|
}
|
|
1103
|
-
function addMissingDependencies(value, dependencies,
|
|
1103
|
+
function addMissingDependencies(value, dependencies, path5, results) {
|
|
1104
1104
|
for (const dependency of dependencies) {
|
|
1105
1105
|
if (typeof dependency === "string" && !Object.prototype.hasOwnProperty.call(value, dependency)) {
|
|
1106
|
-
results.push(invalidResult(issue([...
|
|
1106
|
+
results.push(invalidResult(issue([...path5, dependency], "dependency", void 0, `must have property '${dependency}'`)));
|
|
1107
1107
|
}
|
|
1108
1108
|
}
|
|
1109
1109
|
}
|
|
@@ -3397,19 +3397,168 @@ var SubscriptionManager = class {
|
|
|
3397
3397
|
|
|
3398
3398
|
// ../mcp-oauth/dist/client/auth-store-session-store.js
|
|
3399
3399
|
import crypto from "node:crypto";
|
|
3400
|
-
import
|
|
3400
|
+
import path4 from "node:path";
|
|
3401
3401
|
|
|
3402
3402
|
// ../auth-store/dist/encrypted-file-store.js
|
|
3403
|
-
import { createCipheriv, createDecipheriv, randomBytes, randomUUID, scrypt } from "node:crypto";
|
|
3403
|
+
import { createCipheriv, createDecipheriv, randomBytes, randomUUID as randomUUID2, scrypt } from "node:crypto";
|
|
3404
3404
|
import { promises as fs } from "node:fs";
|
|
3405
3405
|
import { homedir, hostname, userInfo } from "node:os";
|
|
3406
|
-
import
|
|
3406
|
+
import path2 from "node:path";
|
|
3407
3407
|
|
|
3408
3408
|
// ../auth-store/dist/error-codes.js
|
|
3409
3409
|
function hasOwnErrorCode(error, code) {
|
|
3410
3410
|
return error instanceof Error && Object.prototype.hasOwnProperty.call(error, "code") && error.code === code;
|
|
3411
3411
|
}
|
|
3412
3412
|
|
|
3413
|
+
// ../auth-store/dist/transaction-lock.js
|
|
3414
|
+
import { randomUUID } from "node:crypto";
|
|
3415
|
+
import path from "node:path";
|
|
3416
|
+
async function withSecretStoreFileLock(fs2, lockDirectory, operation, options = {}) {
|
|
3417
|
+
const timeoutMs = options.timeoutMs ?? 3e4;
|
|
3418
|
+
if (!Number.isFinite(timeoutMs) || timeoutMs < 0 || timeoutMs > 2147483647)
|
|
3419
|
+
throw new Error("Invalid secret-store transaction lock timeout");
|
|
3420
|
+
options.signal?.throwIfAborted();
|
|
3421
|
+
const deadline = performance.now() + timeoutMs;
|
|
3422
|
+
const directory = path.resolve(lockDirectory);
|
|
3423
|
+
await assertLockDirectoryPath(fs2, directory);
|
|
3424
|
+
await fs2.mkdir(directory, { recursive: true, mode: 448 });
|
|
3425
|
+
await assertLockDirectoryPath(fs2, directory);
|
|
3426
|
+
const name = `${process.pid}-${randomUUID()}.claim`;
|
|
3427
|
+
const claimPath = path.join(directory, name);
|
|
3428
|
+
const temporaryPath = `${claimPath}.tmp`;
|
|
3429
|
+
let claimed = true;
|
|
3430
|
+
let temporaryCreated = false;
|
|
3431
|
+
let outcome;
|
|
3432
|
+
try {
|
|
3433
|
+
try {
|
|
3434
|
+
await fs2.writeFile(claimPath, JSON.stringify({ ticket: null }), { encoding: "utf8", flag: "wx", mode: 384 });
|
|
3435
|
+
} catch (error) {
|
|
3436
|
+
if (hasOwnErrorCode(error, "EEXIST"))
|
|
3437
|
+
claimed = false;
|
|
3438
|
+
throw error;
|
|
3439
|
+
}
|
|
3440
|
+
const existing = await readClaims(fs2, directory, name);
|
|
3441
|
+
const ticket = existing.reduce((max, claim) => Math.max(max, claim.ticket ?? 0), 0) + 1;
|
|
3442
|
+
if (!Number.isSafeInteger(ticket))
|
|
3443
|
+
throw new Error("Secret-store transaction lock ticket overflow");
|
|
3444
|
+
temporaryCreated = true;
|
|
3445
|
+
try {
|
|
3446
|
+
await fs2.writeFile(temporaryPath, JSON.stringify({ ticket }), { encoding: "utf8", flag: "wx", mode: 384 });
|
|
3447
|
+
} catch (error) {
|
|
3448
|
+
if (hasOwnErrorCode(error, "EEXIST"))
|
|
3449
|
+
temporaryCreated = false;
|
|
3450
|
+
throw error;
|
|
3451
|
+
}
|
|
3452
|
+
await fs2.rename(temporaryPath, claimPath);
|
|
3453
|
+
temporaryCreated = false;
|
|
3454
|
+
for (; ; ) {
|
|
3455
|
+
options.signal?.throwIfAborted();
|
|
3456
|
+
const peers = await readClaims(fs2, directory, name);
|
|
3457
|
+
if (!peers.some((peer) => peer.ticket === null || peer.ticket < ticket || peer.ticket === ticket && peer.name < name))
|
|
3458
|
+
break;
|
|
3459
|
+
const remaining = deadline - performance.now();
|
|
3460
|
+
if (remaining <= 0)
|
|
3461
|
+
throw new Error("Timed out waiting for secret-store transaction lock");
|
|
3462
|
+
await new Promise((resolve, reject) => {
|
|
3463
|
+
const abort = () => {
|
|
3464
|
+
clearTimeout(timer);
|
|
3465
|
+
options.signal?.removeEventListener("abort", abort);
|
|
3466
|
+
reject(options.signal?.reason);
|
|
3467
|
+
};
|
|
3468
|
+
const timer = setTimeout(() => {
|
|
3469
|
+
options.signal?.removeEventListener("abort", abort);
|
|
3470
|
+
resolve();
|
|
3471
|
+
}, Math.min(10, remaining));
|
|
3472
|
+
options.signal?.addEventListener("abort", abort, { once: true });
|
|
3473
|
+
if (options.signal?.aborted)
|
|
3474
|
+
abort();
|
|
3475
|
+
});
|
|
3476
|
+
}
|
|
3477
|
+
options.signal?.throwIfAborted();
|
|
3478
|
+
outcome = { result: await operation() };
|
|
3479
|
+
} catch (error) {
|
|
3480
|
+
outcome = { error };
|
|
3481
|
+
}
|
|
3482
|
+
const cleanup = [];
|
|
3483
|
+
for (const target of [...temporaryCreated ? [temporaryPath] : [], ...claimed ? [claimPath] : []]) {
|
|
3484
|
+
try {
|
|
3485
|
+
await fs2.unlink(target);
|
|
3486
|
+
} catch (error) {
|
|
3487
|
+
if (!hasOwnErrorCode(error, "ENOENT"))
|
|
3488
|
+
cleanup.push(error);
|
|
3489
|
+
}
|
|
3490
|
+
}
|
|
3491
|
+
if (cleanup.length)
|
|
3492
|
+
throw new AggregateError([..."error" in outcome ? [outcome.error] : [], ...cleanup], "Secret-store transaction lock cleanup failed");
|
|
3493
|
+
if ("error" in outcome)
|
|
3494
|
+
throw outcome.error;
|
|
3495
|
+
return outcome.result;
|
|
3496
|
+
}
|
|
3497
|
+
async function assertNoSymbolicLink(fs2, target) {
|
|
3498
|
+
try {
|
|
3499
|
+
if ((await fs2.lstat(target)).isSymbolicLink())
|
|
3500
|
+
throw new Error("Refusing secret-store transaction lock through symbolic link");
|
|
3501
|
+
} catch (error) {
|
|
3502
|
+
if (!hasOwnErrorCode(error, "ENOENT"))
|
|
3503
|
+
throw error;
|
|
3504
|
+
}
|
|
3505
|
+
}
|
|
3506
|
+
async function assertLockDirectoryPath(fs2, directory) {
|
|
3507
|
+
const root = path.parse(directory).root;
|
|
3508
|
+
const segments = directory.slice(root.length).split(path.sep).filter(Boolean);
|
|
3509
|
+
let current = root;
|
|
3510
|
+
for (const [index, segment] of segments.entries()) {
|
|
3511
|
+
current = path.join(current, segment);
|
|
3512
|
+
if (index > 0 || segments.length === 1)
|
|
3513
|
+
await assertNoSymbolicLink(fs2, current);
|
|
3514
|
+
}
|
|
3515
|
+
}
|
|
3516
|
+
async function readClaims(fs2, directory, ownName) {
|
|
3517
|
+
const claims = [];
|
|
3518
|
+
for (const name of await fs2.readdir(directory)) {
|
|
3519
|
+
if (name === ownName || !name.endsWith(".claim"))
|
|
3520
|
+
continue;
|
|
3521
|
+
const pidText = name.slice(0, name.indexOf("-"));
|
|
3522
|
+
const pid = Number(pidText);
|
|
3523
|
+
if (!Number.isSafeInteger(pid) || pid < 1 || String(pid) !== pidText)
|
|
3524
|
+
throw new Error("Malformed secret-store transaction lock owner");
|
|
3525
|
+
const target = path.join(directory, name);
|
|
3526
|
+
await assertNoSymbolicLink(fs2, target);
|
|
3527
|
+
let alive = true;
|
|
3528
|
+
try {
|
|
3529
|
+
process.kill(pid, 0);
|
|
3530
|
+
} catch (error) {
|
|
3531
|
+
alive = !hasOwnErrorCode(error, "ESRCH");
|
|
3532
|
+
}
|
|
3533
|
+
if (!alive) {
|
|
3534
|
+
try {
|
|
3535
|
+
await fs2.unlink(target);
|
|
3536
|
+
} catch (error) {
|
|
3537
|
+
if (!hasOwnErrorCode(error, "ENOENT"))
|
|
3538
|
+
throw error;
|
|
3539
|
+
}
|
|
3540
|
+
continue;
|
|
3541
|
+
}
|
|
3542
|
+
let ticket = null;
|
|
3543
|
+
let raw;
|
|
3544
|
+
try {
|
|
3545
|
+
raw = await fs2.readFile(target, "utf8");
|
|
3546
|
+
} catch (error) {
|
|
3547
|
+
if (hasOwnErrorCode(error, "ENOENT"))
|
|
3548
|
+
continue;
|
|
3549
|
+
throw error;
|
|
3550
|
+
}
|
|
3551
|
+
try {
|
|
3552
|
+
const value = JSON.parse(raw);
|
|
3553
|
+
if (value !== null && typeof value === "object" && "ticket" in value && typeof value.ticket === "number" && Number.isSafeInteger(value.ticket) && value.ticket > 0)
|
|
3554
|
+
ticket = value.ticket;
|
|
3555
|
+
} catch {
|
|
3556
|
+
}
|
|
3557
|
+
claims.push({ name, ticket });
|
|
3558
|
+
}
|
|
3559
|
+
return claims;
|
|
3560
|
+
}
|
|
3561
|
+
|
|
3413
3562
|
// ../auth-store/dist/encrypted-file-store.js
|
|
3414
3563
|
var derivedKeyCache = /* @__PURE__ */ new Map();
|
|
3415
3564
|
var ENCRYPTION_ALGORITHM = "aes-256-gcm";
|
|
@@ -3435,7 +3584,7 @@ var EncryptedFileStore = class {
|
|
|
3435
3584
|
const defaultFileName = input.defaultFileName ?? "credentials.enc";
|
|
3436
3585
|
assertSafeDefaultDirectory(defaultDirectory);
|
|
3437
3586
|
assertSafeDefaultFileName(defaultFileName);
|
|
3438
|
-
this.filePath =
|
|
3587
|
+
this.filePath = path2.join(homeDirectory, defaultDirectory, defaultFileName);
|
|
3439
3588
|
this.symbolicLinkCheckStartPath = resolveDefaultDirectoryCheckStart(homeDirectory, defaultDirectory);
|
|
3440
3589
|
} else {
|
|
3441
3590
|
this.filePath = input.filePath;
|
|
@@ -3475,6 +3624,12 @@ var EncryptedFileStore = class {
|
|
|
3475
3624
|
return null;
|
|
3476
3625
|
}
|
|
3477
3626
|
}
|
|
3627
|
+
async withLock(operation, options = {}) {
|
|
3628
|
+
await this.assertCredentialPathHasNoSymbolicLinks(`${this.filePath}.lock`);
|
|
3629
|
+
if (this.fs.readdir === void 0)
|
|
3630
|
+
throw new Error("Secret-store transaction locks require filesystem readdir support");
|
|
3631
|
+
return withSecretStoreFileLock(this.fs, `${this.filePath}.lock`, operation, options);
|
|
3632
|
+
}
|
|
3478
3633
|
async set(value) {
|
|
3479
3634
|
await this.assertCredentialPathHasNoSymbolicLinks(this.filePath);
|
|
3480
3635
|
const key2 = await this.getEncryptionKey();
|
|
@@ -3491,9 +3646,9 @@ var EncryptedFileStore = class {
|
|
|
3491
3646
|
authTag: authTag.toString("base64"),
|
|
3492
3647
|
ciphertext: ciphertext.toString("base64")
|
|
3493
3648
|
};
|
|
3494
|
-
await this.fs.mkdir(
|
|
3649
|
+
await this.fs.mkdir(path2.dirname(this.filePath), { recursive: true });
|
|
3495
3650
|
await this.assertCredentialPathHasNoSymbolicLinks(this.filePath);
|
|
3496
|
-
const temporaryPath = `${this.filePath}.${process.pid}.${
|
|
3651
|
+
const temporaryPath = `${this.filePath}.${process.pid}.${randomUUID2()}.tmp`;
|
|
3497
3652
|
let temporaryCreated = false;
|
|
3498
3653
|
try {
|
|
3499
3654
|
await this.assertCredentialPathHasNoSymbolicLinks(temporaryPath);
|
|
@@ -3523,7 +3678,7 @@ var EncryptedFileStore = class {
|
|
|
3523
3678
|
}
|
|
3524
3679
|
}
|
|
3525
3680
|
async assertCredentialPathHasNoSymbolicLinks(targetPath) {
|
|
3526
|
-
const resolvedPath =
|
|
3681
|
+
const resolvedPath = path2.resolve(targetPath);
|
|
3527
3682
|
const protectedPaths = getProtectedCredentialPaths(resolvedPath, this.symbolicLinkCheckStartPath);
|
|
3528
3683
|
for (const currentPath of protectedPaths) {
|
|
3529
3684
|
try {
|
|
@@ -3554,26 +3709,26 @@ var EncryptedFileStore = class {
|
|
|
3554
3709
|
};
|
|
3555
3710
|
function resolveDefaultDirectoryCheckStart(homeDirectory, defaultDirectory) {
|
|
3556
3711
|
const [firstSegment] = defaultDirectory.split(/[\\/]+/).filter(Boolean);
|
|
3557
|
-
return
|
|
3712
|
+
return path2.resolve(homeDirectory, firstSegment ?? ".");
|
|
3558
3713
|
}
|
|
3559
3714
|
function getProtectedCredentialPaths(resolvedPath, symbolicLinkCheckStartPath) {
|
|
3560
3715
|
if (symbolicLinkCheckStartPath === null) {
|
|
3561
3716
|
return getExplicitProtectedCredentialPaths(resolvedPath);
|
|
3562
3717
|
}
|
|
3563
|
-
const resolvedStartPath =
|
|
3718
|
+
const resolvedStartPath = path2.resolve(symbolicLinkCheckStartPath);
|
|
3564
3719
|
if (!isPathInsideOrEqual(resolvedPath, resolvedStartPath)) {
|
|
3565
|
-
return [
|
|
3720
|
+
return [path2.dirname(resolvedPath), resolvedPath];
|
|
3566
3721
|
}
|
|
3567
3722
|
const protectedPaths = [resolvedStartPath];
|
|
3568
3723
|
let currentPath = resolvedStartPath;
|
|
3569
|
-
for (const segment of
|
|
3570
|
-
currentPath =
|
|
3724
|
+
for (const segment of path2.relative(resolvedStartPath, resolvedPath).split(path2.sep).filter(Boolean)) {
|
|
3725
|
+
currentPath = path2.join(currentPath, segment);
|
|
3571
3726
|
protectedPaths.push(currentPath);
|
|
3572
3727
|
}
|
|
3573
3728
|
return protectedPaths;
|
|
3574
3729
|
}
|
|
3575
3730
|
function assertSafeDefaultDirectory(defaultDirectory) {
|
|
3576
|
-
if (
|
|
3731
|
+
if (path2.isAbsolute(defaultDirectory) || path2.win32.isAbsolute(defaultDirectory)) {
|
|
3577
3732
|
throw new Error("defaultDirectory must be a relative path inside the home directory");
|
|
3578
3733
|
}
|
|
3579
3734
|
for (const segment of splitPathSegments(defaultDirectory)) {
|
|
@@ -3591,15 +3746,15 @@ function splitPathSegments(value) {
|
|
|
3591
3746
|
return value.split("/").flatMap((segment) => segment.split("\\")).filter((segment) => segment.length > 0);
|
|
3592
3747
|
}
|
|
3593
3748
|
function getExplicitProtectedCredentialPaths(resolvedPath) {
|
|
3594
|
-
const parsed =
|
|
3595
|
-
const segments = resolvedPath.slice(parsed.root.length).split(
|
|
3749
|
+
const parsed = path2.parse(resolvedPath);
|
|
3750
|
+
const segments = resolvedPath.slice(parsed.root.length).split(path2.sep).filter((segment) => segment.length > 0);
|
|
3596
3751
|
if (segments.length <= 1) {
|
|
3597
3752
|
return [resolvedPath];
|
|
3598
3753
|
}
|
|
3599
3754
|
const protectedPaths = [];
|
|
3600
3755
|
let currentPath = parsed.root;
|
|
3601
3756
|
for (const [index, segment] of segments.entries()) {
|
|
3602
|
-
currentPath =
|
|
3757
|
+
currentPath = path2.join(currentPath, segment);
|
|
3603
3758
|
if (index === 0) {
|
|
3604
3759
|
continue;
|
|
3605
3760
|
}
|
|
@@ -3608,8 +3763,8 @@ function getExplicitProtectedCredentialPaths(resolvedPath) {
|
|
|
3608
3763
|
return protectedPaths;
|
|
3609
3764
|
}
|
|
3610
3765
|
function isPathInsideOrEqual(childPath, parentPath) {
|
|
3611
|
-
const relativePath =
|
|
3612
|
-
return relativePath === "" || !relativePath.startsWith("..") && !
|
|
3766
|
+
const relativePath = path2.relative(parentPath, childPath);
|
|
3767
|
+
return relativePath === "" || !relativePath.startsWith("..") && !path2.isAbsolute(relativePath);
|
|
3613
3768
|
}
|
|
3614
3769
|
async function removeIfPresent(fileSystem, filePath) {
|
|
3615
3770
|
try {
|
|
@@ -3692,16 +3847,24 @@ function isAlreadyExistsError(error) {
|
|
|
3692
3847
|
|
|
3693
3848
|
// ../auth-store/dist/keychain-store.js
|
|
3694
3849
|
import { spawn } from "node:child_process";
|
|
3850
|
+
import { createHash } from "node:crypto";
|
|
3851
|
+
import { promises as nodeFs } from "node:fs";
|
|
3852
|
+
import { homedir as homedir2 } from "node:os";
|
|
3853
|
+
import path3 from "node:path";
|
|
3695
3854
|
var SECURITY_CLI = "security";
|
|
3696
3855
|
var KEYCHAIN_ITEM_NOT_FOUND_EXIT_CODE = 44;
|
|
3697
3856
|
var KeychainStore = class {
|
|
3698
3857
|
runCommand;
|
|
3699
3858
|
service;
|
|
3700
3859
|
account;
|
|
3860
|
+
lockFs;
|
|
3861
|
+
lockDirectory;
|
|
3701
3862
|
constructor(input) {
|
|
3702
3863
|
this.runCommand = input.runCommand ?? runSecurityCommand;
|
|
3703
3864
|
this.service = input.service.trim();
|
|
3704
3865
|
this.account = input.account.trim();
|
|
3866
|
+
this.lockFs = input.lock?.fs ?? nodeFs;
|
|
3867
|
+
this.lockDirectory = input.lock?.directory ?? path3.join(homedir2(), ".auth-store", "keychain-locks");
|
|
3705
3868
|
if (this.service.length === 0) {
|
|
3706
3869
|
throw new Error("Keychain service must not be empty");
|
|
3707
3870
|
}
|
|
@@ -3719,6 +3882,10 @@ var KeychainStore = class {
|
|
|
3719
3882
|
}
|
|
3720
3883
|
throw createSecurityCliFailure("read secret from macOS Keychain", result);
|
|
3721
3884
|
}
|
|
3885
|
+
async withLock(operation, options = {}) {
|
|
3886
|
+
const identity = createHash("sha256").update(JSON.stringify([this.service, this.account])).digest("hex");
|
|
3887
|
+
return withSecretStoreFileLock(this.lockFs, path3.join(this.lockDirectory, identity), operation, options);
|
|
3888
|
+
}
|
|
3722
3889
|
async set(value) {
|
|
3723
3890
|
if (value.includes("\n") || value.includes("\r")) {
|
|
3724
3891
|
throw new Error("Keychain secrets cannot contain line breaks");
|
|
@@ -3904,6 +4071,12 @@ var DEFAULT_CLIENT_KEYCHAIN_SERVICE = "poe-code-mcp-oauth-clients";
|
|
|
3904
4071
|
var MAX_JS_DATE_MS = 864e13;
|
|
3905
4072
|
function createAuthStoreSessionStore(options = {}) {
|
|
3906
4073
|
return {
|
|
4074
|
+
async withLock(resource, operation, lockOptions) {
|
|
4075
|
+
const store = createResourceSecretStore(resource, options);
|
|
4076
|
+
if (store.withLock === void 0)
|
|
4077
|
+
throw new Error("OAuth secret-store backend does not support transaction locks");
|
|
4078
|
+
return store.withLock(operation, lockOptions);
|
|
4079
|
+
},
|
|
3907
4080
|
async load(resource) {
|
|
3908
4081
|
const store = createResourceSecretStore(resource, options);
|
|
3909
4082
|
const value = await store.get();
|
|
@@ -3958,10 +4131,10 @@ function createAuthStoreClientStore(options) {
|
|
|
3958
4131
|
function createNamedSecretStore(key2, options, defaults) {
|
|
3959
4132
|
const hash = crypto.createHash("sha256").update(key2).digest("hex");
|
|
3960
4133
|
const configuredFilePath = options.fileStore?.filePath;
|
|
3961
|
-
const parsedFilePath = configuredFilePath === void 0 ? null :
|
|
4134
|
+
const parsedFilePath = configuredFilePath === void 0 ? null : path4.parse(configuredFilePath);
|
|
3962
4135
|
const fileStore = {
|
|
3963
4136
|
...options.fileStore,
|
|
3964
|
-
filePath: parsedFilePath === null ? void 0 :
|
|
4137
|
+
filePath: parsedFilePath === null ? void 0 : path4.join(parsedFilePath.dir, `${parsedFilePath.name}-${hash}${parsedFilePath.ext || ".enc"}`),
|
|
3965
4138
|
salt: options.fileStore?.salt ?? defaults.salt,
|
|
3966
4139
|
defaultDirectory: options.fileStore?.defaultDirectory || defaults.directory,
|
|
3967
4140
|
defaultFileName: parsedFilePath === null ? `${hash}.enc` : `${parsedFilePath.name}-${hash}${parsedFilePath.ext || ".enc"}`
|
|
@@ -5347,7 +5520,7 @@ function getParameterHeaders(schema) {
|
|
|
5347
5520
|
const names = /* @__PURE__ */ new Set();
|
|
5348
5521
|
const ancestors = /* @__PURE__ */ new Set();
|
|
5349
5522
|
let nodes = 0;
|
|
5350
|
-
const visit = (value,
|
|
5523
|
+
const visit = (value, path5, reachable, depth) => {
|
|
5351
5524
|
if (++nodes > 1e4 || depth > 64)
|
|
5352
5525
|
throw new Error("MCP header schema traversal limit exceeded");
|
|
5353
5526
|
if (typeof value === "boolean")
|
|
@@ -5358,7 +5531,7 @@ function getParameterHeaders(schema) {
|
|
|
5358
5531
|
try {
|
|
5359
5532
|
if (Object.prototype.hasOwnProperty.call(value, "x-mcp-header")) {
|
|
5360
5533
|
const name = value["x-mcp-header"];
|
|
5361
|
-
if (!reachable ||
|
|
5534
|
+
if (!reachable || path5.length === 0 || typeof name !== "string" || name.length === 0 || [...name].some((character) => {
|
|
5362
5535
|
const code = character.charCodeAt(0);
|
|
5363
5536
|
return !tokenPunctuation.has(character) && !(code >= 48 && code <= 57 || code >= 65 && code <= 90 || code >= 97 && code <= 122);
|
|
5364
5537
|
}))
|
|
@@ -5369,25 +5542,25 @@ function getParameterHeaders(schema) {
|
|
|
5369
5542
|
if (names.has(key2))
|
|
5370
5543
|
throw new Error("Duplicate x-mcp-header name");
|
|
5371
5544
|
names.add(key2);
|
|
5372
|
-
headers.push({ name: `Mcp-Param-${name}`, path: [...
|
|
5545
|
+
headers.push({ name: `Mcp-Param-${name}`, path: [...path5], type: value.type });
|
|
5373
5546
|
}
|
|
5374
5547
|
for (const [keyword, child] of Object.entries(value)) {
|
|
5375
5548
|
if (schemaMaps.has(keyword)) {
|
|
5376
5549
|
if (!isRecord3(child))
|
|
5377
5550
|
throw new Error("Invalid schema map");
|
|
5378
5551
|
for (const [key2, nested] of Object.entries(child))
|
|
5379
|
-
visit(nested, keyword === "properties" ? [...
|
|
5552
|
+
visit(nested, keyword === "properties" ? [...path5, key2] : path5, reachable && keyword === "properties", depth + 1);
|
|
5380
5553
|
} else if (schemaArrays.has(keyword)) {
|
|
5381
5554
|
if (!Array.isArray(child))
|
|
5382
5555
|
throw new Error("Invalid schema array");
|
|
5383
5556
|
for (const nested of child)
|
|
5384
|
-
visit(nested,
|
|
5557
|
+
visit(nested, path5, false, depth + 1);
|
|
5385
5558
|
} else if (schemaChildren.has(keyword)) {
|
|
5386
5559
|
if (Array.isArray(child))
|
|
5387
5560
|
for (const nested of child)
|
|
5388
|
-
visit(nested,
|
|
5561
|
+
visit(nested, path5, false, depth + 1);
|
|
5389
5562
|
else
|
|
5390
|
-
visit(child,
|
|
5563
|
+
visit(child, path5, false, depth + 1);
|
|
5391
5564
|
}
|
|
5392
5565
|
}
|
|
5393
5566
|
} finally {
|
|
@@ -5585,8 +5758,8 @@ function authorizationServerMetadataLocations(issuer) {
|
|
|
5585
5758
|
];
|
|
5586
5759
|
const issuerUrl = new URL(issuer);
|
|
5587
5760
|
if (issuerUrl.pathname !== "/") {
|
|
5588
|
-
const
|
|
5589
|
-
issuerUrl.pathname = `${
|
|
5761
|
+
const path5 = issuerUrl.pathname.endsWith("/") ? issuerUrl.pathname.slice(0, -1) : issuerUrl.pathname;
|
|
5762
|
+
issuerUrl.pathname = `${path5}/.well-known/openid-configuration`;
|
|
5590
5763
|
locations.push(issuerUrl.toString());
|
|
5591
5764
|
}
|
|
5592
5765
|
return locations;
|