Decouple bundled UI from runtime API and add remote instance tooling (#1228)
Add a packaged-client runtime boundary so the shared UI can talk to local, desktop, remote, and VS Code runtimes through the right transport instead of assuming one same-origin web server. Centralize OpenChamber-owned API access behind RuntimeAPIs, runtimeFetch, and runtime URL helpers, while keeping official OpenCode traffic on the SDK path. Support runtime switching, remote host selection, desktop client credentials, and headless connection links for pairing packaged clients with remote OpenChamber servers. Harden the new auth model by moving long-lived client tokens out of browser URLs, introducing short-lived scoped URL tokens for browser-owned transports, restricting URL-token access to explicit readable/realtime routes, and making client-token management session-scoped or self-scoped as appropriate. Update browser-owned assets and preview proxy flows to work with the split runtime model, including authenticated project icons, preview token propagation, CSP-safe preview bridge injection, and preview proxy auth that survives short-lived URL-token expiry. Tighten Electron security boundaries for packaged clients by gating privileged preload state to trusted origins and requiring explicit confirmation before connect deep-links import or switch remote runtimes. Also refresh agent guidance and project skills so future runtime/API, auth, preview, UI, CLI, settings, locale, and drag-to-reorder work follows the new architecture.
This commit is contained in:
Bohdan Triapitsyn
committed by
GitHub
GitHub
parent
a4314c189b
commit
2031e3b4a8
@@ -83,4 +83,190 @@ describe('core-routes', () => {
|
||||
globalThis.fetch = originalFetch;
|
||||
}
|
||||
});
|
||||
|
||||
it('should let preview proxy credentials reach preview proxy validation', async () => {
|
||||
const app = express();
|
||||
const requireAuth = vi.fn((_req, res) => res.status(401).type('text/plain').send('Authentication required'));
|
||||
|
||||
registerAuthAndAccessRoutes(app, {
|
||||
express,
|
||||
tunnelAuthController: {
|
||||
classifyRequestScope: () => 'local',
|
||||
requireTunnelSession: vi.fn(),
|
||||
getTunnelSessionFromRequest: vi.fn(),
|
||||
clearTunnelSessionCookie: vi.fn(),
|
||||
exchangeBootstrapToken: vi.fn(),
|
||||
},
|
||||
uiAuthController: {
|
||||
requireAuth,
|
||||
handleSessionStatus: vi.fn(),
|
||||
handleSessionCreate: vi.fn(),
|
||||
handlePasskeyStatus: vi.fn(),
|
||||
handlePasskeyAuthenticationOptions: vi.fn(),
|
||||
handlePasskeyAuthenticationVerify: vi.fn(),
|
||||
handlePasskeyRegistrationOptions: vi.fn(),
|
||||
handlePasskeyRegistrationVerify: vi.fn(),
|
||||
handlePasskeyList: vi.fn(),
|
||||
handlePasskeyRevoke: vi.fn(),
|
||||
handleResetAuth: vi.fn(),
|
||||
},
|
||||
readSettingsFromDiskMigrated: vi.fn(async () => ({})),
|
||||
normalizeTunnelSessionTtlMs: vi.fn(),
|
||||
});
|
||||
|
||||
app.use('/api/preview/proxy', (_req, res) => res.json({ reached: true }));
|
||||
|
||||
await request(app)
|
||||
.get('/api/preview/proxy/abc123/?oc_preview_token=preview-secret')
|
||||
.expect(200, { reached: true });
|
||||
|
||||
await request(app)
|
||||
.get('/api/preview/proxy/abc123/')
|
||||
.set('Cookie', 'oc_preview_token=preview-secret')
|
||||
.expect(200, { reached: true });
|
||||
|
||||
await request(app)
|
||||
.get('/api/preview/proxy/abc123/')
|
||||
.expect(401, 'Authentication required');
|
||||
|
||||
expect(requireAuth).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
|
||||
describe('client auth routes', () => {
|
||||
const createDependencies = (options = {}) => {
|
||||
const clients = [];
|
||||
const requireAuth = vi.fn((_req, _res, next) => next());
|
||||
const requireSessionAuth = vi.fn((_req, _res, next) => next());
|
||||
const resolveAuthContext = vi.fn(options.resolveAuthContext || (async () => ({ type: 'session' })));
|
||||
return {
|
||||
express,
|
||||
tunnelAuthController: {
|
||||
classifyRequestScope: () => 'local',
|
||||
getTunnelSessionFromRequest: () => null,
|
||||
clearTunnelSessionCookie: () => {},
|
||||
requireTunnelSession: (_req, _res, next) => next(),
|
||||
},
|
||||
uiAuthController: {
|
||||
handleSessionStatus: (_req, res) => res.json({ authenticated: true }),
|
||||
handleSessionCreate: (_req, res) => res.json({ authenticated: true }),
|
||||
handlePasskeyStatus: (_req, res) => res.json({ enabled: false }),
|
||||
handlePasskeyAuthenticationOptions: (_req, res) => res.json({}),
|
||||
handlePasskeyAuthenticationVerify: (_req, res) => res.json({ authenticated: true }),
|
||||
requireAuth,
|
||||
requireSessionAuth,
|
||||
resolveAuthContext,
|
||||
handlePasskeyRegistrationOptions: (_req, res) => res.json({}),
|
||||
handlePasskeyRegistrationVerify: (_req, res) => res.json({}),
|
||||
handlePasskeyList: (_req, res) => res.json({ passkeys: [] }),
|
||||
handlePasskeyRevoke: (_req, res) => res.json({ revoked: true }),
|
||||
handleResetAuth: (_req, res) => res.json({ cleared: true }),
|
||||
},
|
||||
remoteClientAuthRuntime: {
|
||||
listClients: async () => clients,
|
||||
createClient: async ({ label, clientKind }) => {
|
||||
const client = {
|
||||
id: `client-${clients.length + 1}`,
|
||||
label: label || 'Remote client',
|
||||
createdAt: 'now',
|
||||
lastUsedAt: null,
|
||||
revokedAt: null,
|
||||
clientKind: clientKind || null,
|
||||
};
|
||||
clients.push(client);
|
||||
return { client, token: 'oc_client_secret' };
|
||||
},
|
||||
revokeClient: async (id) => {
|
||||
const client = clients.find((entry) => entry.id === id);
|
||||
if (!client) return { revoked: false };
|
||||
client.revokedAt = 'revoked';
|
||||
return { revoked: true, client };
|
||||
},
|
||||
purgeRevokedClients: async () => {
|
||||
const before = clients.length;
|
||||
for (let index = clients.length - 1; index >= 0; index -= 1) {
|
||||
if (clients[index].revokedAt) clients.splice(index, 1);
|
||||
}
|
||||
return { purged: before - clients.length };
|
||||
},
|
||||
},
|
||||
readSettingsFromDiskMigrated: async () => ({}),
|
||||
normalizeTunnelSessionTtlMs: () => 1000,
|
||||
testHooks: { clients, requireAuth, requireSessionAuth, resolveAuthContext },
|
||||
};
|
||||
};
|
||||
|
||||
it('creates, lists, and revokes remote client tokens', async () => {
|
||||
const app = express();
|
||||
const dependencies = createDependencies();
|
||||
registerAuthAndAccessRoutes(app, dependencies);
|
||||
|
||||
const created = await request(app)
|
||||
.post('/api/client-auth/clients')
|
||||
.send({ label: 'Laptop' });
|
||||
expect(created.status).toBe(201);
|
||||
expect(created.body.token).toBe('oc_client_secret');
|
||||
expect(created.headers['cache-control']).toBe('no-store');
|
||||
|
||||
const listed = await request(app).get('/api/client-auth/clients');
|
||||
expect(listed.status).toBe(200);
|
||||
expect(listed.body.clients).toHaveLength(1);
|
||||
expect(listed.body.clients[0]).not.toHaveProperty('token');
|
||||
|
||||
const revoked = await request(app).delete('/api/client-auth/clients/client-1');
|
||||
expect(revoked.status).toBe(200);
|
||||
expect(revoked.body.revoked).toBe(true);
|
||||
|
||||
const purged = await request(app).delete('/api/client-auth/clients');
|
||||
expect(purged.status).toBe(200);
|
||||
expect(purged.body.purged).toBe(1);
|
||||
|
||||
const listedAfterPurge = await request(app).get('/api/client-auth/clients');
|
||||
expect(listedAfterPurge.body.clients).toHaveLength(0);
|
||||
expect(dependencies.testHooks.requireSessionAuth).toHaveBeenCalled();
|
||||
expect(dependencies.testHooks.requireAuth).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('allows client credentials to list and revoke only the authenticated client', async () => {
|
||||
const app = express();
|
||||
let authContext = { type: 'session' };
|
||||
const dependencies = createDependencies({
|
||||
resolveAuthContext: async () => authContext,
|
||||
});
|
||||
registerAuthAndAccessRoutes(app, dependencies);
|
||||
|
||||
const current = await request(app)
|
||||
.post('/api/client-auth/clients')
|
||||
.send({ label: 'OpenChamber Desktop', clientKind: 'desktop-local' });
|
||||
const other = await request(app)
|
||||
.post('/api/client-auth/clients')
|
||||
.send({ label: 'Other device' });
|
||||
|
||||
authContext = { type: 'client', clientId: current.body.client.id, client: current.body.client };
|
||||
|
||||
const listed = await request(app).get('/api/client-auth/clients');
|
||||
expect(listed.status).toBe(200);
|
||||
expect(listed.body.clients).toEqual([current.body.client]);
|
||||
|
||||
const denied = await request(app).delete(`/api/client-auth/clients/${other.body.client.id}`);
|
||||
expect(denied.status).toBe(403);
|
||||
expect(denied.body.revoked).toBe(false);
|
||||
|
||||
const revoked = await request(app).delete(`/api/client-auth/clients/${current.body.client.id}`);
|
||||
expect(revoked.status).toBe(200);
|
||||
expect(revoked.body.revoked).toBe(true);
|
||||
expect(revoked.body.client.id).toBe(current.body.client.id);
|
||||
});
|
||||
|
||||
it('requires UI-session auth for passkey registration management routes', async () => {
|
||||
const app = express();
|
||||
const dependencies = createDependencies();
|
||||
registerAuthAndAccessRoutes(app, dependencies);
|
||||
|
||||
await request(app).post('/auth/passkey/register/options').expect(200);
|
||||
await request(app).post('/auth/passkey/register/verify').expect(200);
|
||||
|
||||
expect(dependencies.testHooks.requireSessionAuth).toHaveBeenCalledTimes(2);
|
||||
expect(dependencies.testHooks.requireAuth).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user