Skip to content

armgit / mso

Public Imported from GitHub
0

Browser-based graphical shell and control plane for a Linux server you own — real terminal, file manager, live metrics and BYOK AI in one mobile-first workspace. Next.js 16 · React 19 · node-pty · Tailwind v4 · shadcn/ui. Public alpha, self-hosted.

fix(security): isolate PAT principals and revoke refresh replay

Abdurrahman Fakhrulef31c88dbbd2
diff --git a/lib/mcp/store-state.ts b/lib/mcp/store-state.ts
index bdd835a0..0ee54222 100644
--- a/lib/mcp/store-state.ts
+++ b/lib/mcp/store-state.ts
@@ -7,7 +7,7 @@ import type { McpStore } from "./store-types";
const STORE_PATH = expandOwnerStorePath(process.env.OS_MCP_STORE ?? path.join(os.homedir(), ".mso", "mcp.json"));
const MAX_CLIENTS = 64;
-const empty = (): McpStore => ({ clients: {}, codes: {}, tokens: {}, refreshTokens: {} });
+const empty = (): McpStore => ({ clients: {}, codes: {}, tokens: {}, refreshTokens: {}, spentRefreshTokens: {} });
export async function readMcpStore(): Promise<McpStore> {
let raw: string;
@@ -23,6 +23,7 @@ export async function readMcpStore(): Promise<McpStore> {
codes: parsed.codes ?? {},
tokens: parsed.tokens ?? {},
refreshTokens: parsed.refreshTokens ?? {},
+ spentRefreshTokens: parsed.spentRefreshTokens ?? {},
};
}
@@ -50,6 +51,9 @@ export function sweepMcpStore(store: McpStore): McpStore {
for (const [key, value] of Object.entries(store.refreshTokens)) {
if (value.expiresAt < now || value.revokedAt) delete store.refreshTokens[key];
}
+ for (const [key, value] of Object.entries(store.spentRefreshTokens)) {
+ if (value.expiresAt < now) delete store.spentRefreshTokens[key];
+ }
return store;
}
diff --git a/lib/mcp/store-token-admin.ts b/lib/mcp/store-token-admin.ts
index c58bd239..9bafb71a 100644
--- a/lib/mcp/store-token-admin.ts
+++ b/lib/mcp/store-token-admin.ts
@@ -71,7 +71,7 @@ export function mintPatToken(input: {
const ttlDays = typeof input.ttlDays === "number" && input.ttlDays > 0 ? input.ttlDays : 0;
const expiresAt = ttlDays > 0 ? now + ttlDays * 24 * 60 * 60 * 1000 : 0;
const label = input.label.trim().slice(0, 80) || "Personal Access Token";
- const tokenRec: McpToken = { label, clientId: "manual:pat", scope: input.scope, createdAt: now, expiresAt };
+ const tokenRec: McpToken = { label, clientId: "manual:pat:" + randomUUID().replaceAll("-", "").slice(0, 24), scope: input.scope, createdAt: now, expiresAt };
const hash = sha256hex(rawToken);
store.tokens[hash] = tokenRec;
await write(store);
diff --git a/lib/mcp/store-types.ts b/lib/mcp/store-types.ts
index 38850dd7..c44b7e22 100644
--- a/lib/mcp/store-types.ts
+++ b/lib/mcp/store-types.ts
@@ -52,11 +52,19 @@ export interface McpRefreshToken {
revokedAt?: number;
}
+export interface McpSpentRefreshToken {
+ grantId: string;
+ clientId: string;
+ resource: string;
+ expiresAt: number;
+}
+
export interface McpStore {
clients: Record<string, McpClient>;
codes: Record<string, McpCode>;
tokens: Record<string, McpToken>;
refreshTokens: Record<string, McpRefreshToken>;
+ spentRefreshTokens: Record<string, McpSpentRefreshToken>;
}
export interface TokenView extends McpToken {
diff --git a/lib/mcp/store.test.ts b/lib/mcp/store.test.ts
index 41a4bf2b..09cd567e 100644
--- a/lib/mcp/store.test.ts
+++ b/lib/mcp/store.test.ts
@@ -198,3 +198,57 @@ describe("OAuth refresh grants", () => {
await expect(store.rotateOAuthGrant({ oldRefreshToken: "family-refresh", accessToken: "after-revoke", refreshToken: "after-revoke-r", label: "oauth", clientId: "client-a", resource: "https://mso.example/mcp" })).resolves.toBeNull();
});
});
+
+
+describe("durable MCP credential isolation", () => {
+ it("assigns every PAT a distinct durable client principal", async () => {
+ const first = await store.mintPatToken({ label: "client one", scope: "read", ttlDays: 1 });
+ const second = await store.mintPatToken({ label: "client two", scope: "read", ttlDays: 1 });
+ const a = await store.validateToken(first.rawToken);
+ const b = await store.validateToken(second.rawToken);
+ expect(a?.clientId).toMatch(/^manual:pat:[a-f0-9]{24}$/);
+ expect(b?.clientId).toMatch(/^manual:pat:[a-f0-9]{24}$/);
+ expect(a?.clientId).not.toBe(b?.clientId);
+ });
+
+ it("treats refresh-token replay as grant-family compromise", async () => {
+ await store.storeOAuthGrant({
+ accessToken: "initial-access",
+ refreshToken: "initial-refresh",
+ label: "oauth",
+ clientId: "client-replay",
+ scope: "exec",
+ resource: "https://mso.example/mcp",
+ offlineAccess: true,
+ grantId: "grant-replay",
+ });
+ expect(await store.rotateOAuthGrant({
+ oldRefreshToken: "initial-refresh",
+ accessToken: "successor-access",
+ refreshToken: "successor-refresh",
+ label: "oauth",
+ clientId: "client-replay",
+ resource: "https://mso.example/mcp",
+ })).not.toBeNull();
+ expect(await store.validateToken("successor-access")).not.toBeNull();
+
+ expect(await store.rotateOAuthGrant({
+ oldRefreshToken: "initial-refresh",
+ accessToken: "replay-access",
+ refreshToken: "replay-refresh",
+ label: "oauth",
+ clientId: "client-replay",
+ resource: "https://mso.example/mcp",
+ })).toBeNull();
+
+ expect(await store.validateToken("successor-access")).toBeNull();
+ expect(await store.rotateOAuthGrant({
+ oldRefreshToken: "successor-refresh",
+ accessToken: "after-replay-access",
+ refreshToken: "after-replay-refresh",
+ label: "oauth",
+ clientId: "client-replay",
+ resource: "https://mso.example/mcp",
+ })).toBeNull();
+ });
+});
diff --git a/lib/mcp/store.ts b/lib/mcp/store.ts
index a197c8a9..97d4a59d 100644
--- a/lib/mcp/store.ts
+++ b/lib/mcp/store.ts
@@ -132,11 +132,30 @@ export function rotateOAuthGrant(input: {
return mutate(async () => {
const store = sweep(await read());
const oldHash = sha256hex(captured.oldRefreshToken);
+ const spent = store.spentRefreshTokens[oldHash];
+ if (spent) {
+ if (spent.clientId !== captured.clientId || spent.resource !== captured.resource) return null;
+ const now = Date.now();
+ for (const token of Object.values(store.tokens)) {
+ if (token.grantId === spent.grantId && !token.revokedAt) token.revokedAt = now;
+ }
+ for (const refresh of Object.values(store.refreshTokens)) {
+ if (refresh.grantId === spent.grantId && !refresh.revokedAt) refresh.revokedAt = now;
+ }
+ await write(store);
+ return null;
+ }
const rec = store.refreshTokens[oldHash];
if (!rec || rec.revokedAt || rec.expiresAt < Date.now() || rec.clientId !== captured.clientId || rec.resource !== captured.resource) return null;
try { await authorizeMcpTenantGrant(rec); } catch (error) { if (error instanceof TenantDenied) return null; throw error; }
const tenant = tenantCredentialFields(rec);
delete store.refreshTokens[oldHash];
+ store.spentRefreshTokens[oldHash] = {
+ grantId: rec.grantId,
+ clientId: rec.clientId,
+ resource: rec.resource,
+ expiresAt: rec.expiresAt,
+ };
const now = Date.now();
store.tokens[sha256hex(captured.accessToken)] = {
...tenant,