Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix(control-ui): contain context OAuth connector access
Miguelon Peluchon0091b1e43342
diff --git a/control-ui/app/mcp-servers/page.tsx b/control-ui/app/mcp-servers/page.tsxindex b0bf380eb..1de79e6d5 100644--- a/control-ui/app/mcp-servers/page.tsx+++ b/control-ui/app/mcp-servers/page.tsx@@ -26,6 +26,7 @@ import {} from '../../lib/api'import type { ContextResource, ContextSpec, HostResource, McpServerResource } from '../../lib/api'import { mergeAccessSummaries, sortAccessPrincipals } from '../../lib/connectorAccess'+import { connectorContextAssignmentError } from '../../lib/connectorOAuthAccess'import { buildContextUpdatePayload, contextMutationError } from '../../lib/contextMutation'function resourceName(resource: { metadata?: { name?: string } }): string {@@ -302,6 +303,12 @@ export default function McpServersPage() {) {const key = `${server.namespace}/${server.name}`const contextRefs = [...new Set(agents.map(agent => agent.contextRef))]+ const connector = mcpServers.find(item => connectorKey(item) === key)+ const oauthScopeError = connectorContextAssignmentError(connector?.spec, contextRefs)+ if (oauthScopeError) {+ setError(oauthScopeError)+ return+ }const targets = contexts.filter(context => contextRefs.includes(contextName(context)))if (targets.length !== contextRefs.length) {setError('One or more selected agents could not be resolved. Please refresh and try again.')diff --git a/control-ui/components/CreateMcpServerForm/index.tsx b/control-ui/components/CreateMcpServerForm/index.tsxindex 5714c4136..efe43004c 100644--- a/control-ui/components/CreateMcpServerForm/index.tsx+++ b/control-ui/components/CreateMcpServerForm/index.tsx@@ -20,6 +20,7 @@ import {updateContext,} from '@/lib/api'import type { EgressBinding, EnvSecretKeyMapping, EnvVar, HostResource, OrgImage } from '@/lib/api'+import { connectorContextAssignmentError } from '@/lib/connectorOAuthAccess'import { buildContextUpdatePayload } from '@/lib/contextMutation'import type { EgressEditorStatus } from '@/lib/egressModel'import { createPrivateContext } from '@/lib/privateContext'@@ -588,11 +589,20 @@ export function CreateMcpServerForm({secretCreated = true}- await createMcpServer({+ const createdServer = await createMcpServer({metadata: { name },spec,})+ const oauthScopeError = connectorContextAssignmentError(+ createdServer.spec,+ selectedContextRefs+ )+ if (oauthScopeError) {+ setError(oauthScopeError)+ return+ }+// Give the selected agents access. Each agent's private scope gets an// additive write with its own loaded resourceVersion; failures are// collected so the operator knows the connector itself was created.diff --git a/control-ui/components/McpServerTable.tsx b/control-ui/components/McpServerTable.tsxindex e2031a94c..05236db0e 100644--- a/control-ui/components/McpServerTable.tsx+++ b/control-ui/components/McpServerTable.tsx@@ -2,6 +2,7 @@import React, { Fragment, useMemo, useState } from 'react'import { copyTextToClipboard } from '../lib/clipboard'+import { canAssignConnectorToContext } from '../lib/connectorOAuthAccess'import type {ConnectorAccessSummary,ConnectorAgentBinding,@@ -640,7 +641,11 @@ export function McpServerTable({))const agentOptions = agentTargets- .filter(target => !boundAgentNames.has(target.name))+ .filter(+ target =>+ !boundAgentNames.has(target.name) &&+ canAssignConnectorToContext(row.item.spec, target.contextRef)+ ).map(target => ({value: target.name,label: target.label,diff --git a/control-ui/components/McpServerTable.types.ts b/control-ui/components/McpServerTable.types.tsindex 02a016560..2cfa81679 100644--- a/control-ui/components/McpServerTable.types.ts+++ b/control-ui/components/McpServerTable.types.ts@@ -38,8 +38,9 @@ export type McpServerSpec = {port?: number}auth?: {- type?: 'none' | 'bearer' | 'basic' | 'apiKey'+ type?: 'none' | 'bearer' | 'basic' | 'apiKey' | 'oauth'}+ oauth?: { grantScope?: 'user' | 'context' }}export type McpServerItem = {diff --git a/control-ui/components/__tests__/CreateMcpServerForm.test.tsx b/control-ui/components/__tests__/CreateMcpServerForm.test.tsxindex 0146ad5ee..64ba8ddd9 100644--- a/control-ui/components/__tests__/CreateMcpServerForm.test.tsx+++ b/control-ui/components/__tests__/CreateMcpServerForm.test.tsx@@ -375,6 +375,36 @@ describe('CreateMcpServerForm — submit', () => {await waitFor(() => expect(onCreated).toHaveBeenCalledTimes(1), { timeout: 1500 })})+ it('does not grant a returned context-scoped OAuth connector across Agent scopes', async () => {+ vi.mocked(api.getHosts).mockResolvedValueOnce({+ items: [+ { metadata: { name: 'agent-alpha' }, spec: { contextRef: 'ctx-alpha' } },+ { metadata: { name: 'agent-beta' }, spec: { contextRef: 'ctx-beta' } },+ ],+ })+ vi.mocked(api.createMcpServer).mockResolvedValueOnce({+ metadata: { name: 'shared-drive' },+ spec: {+ contextRef: 'ctx-alpha',+ oauth: { grantScope: 'context' },+ },+ })+ render(<CreateMcpServerForm onCancel={vi.fn()} onCreated={vi.fn()} />)+ await fillIdentity('shared-drive')+ goToAccessStep()+ await selectAgents('agent-alpha', 'agent-beta')+ continueToSecretsStep()+ chooseNoCredentials()++ fireEvent.click(screen.getByRole('button', { name: 'Create connector' }))++ expect(+ await screen.findByText(/shared OAuth identity.*original access scope/i)+ ).toBeInTheDocument()+ expect(api.getContext).not.toHaveBeenCalled()+ expect(api.updateContext).not.toHaveBeenCalled()+ })+it('creates a private access scope when no agents are selected', async () => {const onCreated = vi.fn()render(<CreateMcpServerForm onCancel={vi.fn()} onCreated={onCreated} />)diff --git a/control-ui/components/__tests__/McpServerTable.test.tsx b/control-ui/components/__tests__/McpServerTable.test.tsxindex 816acfb48..e678e96b3 100644--- a/control-ui/components/__tests__/McpServerTable.test.tsx+++ b/control-ui/components/__tests__/McpServerTable.test.tsx@@ -23,6 +23,7 @@ function makeItem(overrides: {description?: stringtransportType?: 'sse' | 'streamableHttp' | 'stdio'enabled?: boolean+ oauthGrantScope?: 'user' | 'context'conditions?: McpServerCondition[] | undefinedhasStatus?: boolean}) {@@ -34,6 +35,7 @@ function makeItem(overrides: {description?: stringenabled?: booleantransport: { type: 'sse' | 'streamableHttp' | 'stdio'; url: string }+ oauth?: { grantScope: 'user' | 'context' }}status?: { conditions?: McpServerCondition[] }} = {@@ -50,6 +52,7 @@ function makeItem(overrides: {type: overrides.transportType ?? 'streamableHttp',url: 'http://brave-search.mcp-server.svc.cluster.local:3000/mcp',},+ ...(overrides.oauthGrantScope ? { oauth: { grantScope: overrides.oauthGrantScope } } : {}),},}if (overrides.hasStatus !== false) {@@ -536,6 +539,31 @@ describe('McpServerTable — agent membership', () => {))})++ it('offers a context-scoped OAuth connector only to Agents in its authoritative scope', () => {+ render(+ <McpServerTable+ items={[+ makeItem({+ name: 'shared-drive',+ contextRef: 'ctx-authoritative',+ oauthGrantScope: 'context',+ }),+ ]}+ agentTargets={[+ { name: 'agent-alpha', label: 'Alpha', contextRef: 'ctx-authoritative' },+ { name: 'agent-beta', label: 'Beta', contextRef: 'ctx-foreign' },+ ]}+ onAddToAgents={vi.fn().mockResolvedValue(undefined)}+ />+ )++ fireEvent.click(screen.getByRole('button', { name: 'Expand connector shared-drive' }))+ fireEvent.click(screen.getByRole('button', { name: 'Add agents' }))++ expect(screen.getByRole('option', { name: 'Alpha' })).toBeInTheDocument()+ expect(screen.queryByRole('option', { name: 'Beta' })).not.toBeInTheDocument()+ })})// ─────────────────────────────────────────────────────────────────────────────diff --git a/control-ui/lib/__tests__/connectorOAuthAccess.test.ts b/control-ui/lib/__tests__/connectorOAuthAccess.test.tsnew file mode 100644index 000000000..eba2e81fb--- /dev/null+++ b/control-ui/lib/__tests__/connectorOAuthAccess.test.ts@@ -0,0 +1,34 @@+import { describe, expect, it } from 'vitest'+import {+ CONTEXT_OAUTH_SCOPE_ERROR,+ canAssignConnectorToContext,+ connectorContextAssignmentError,+} from '../connectorOAuthAccess'++describe('context-scoped OAuth connector access', () => {+ const contextOAuthSpec = {+ contextRef: 'ctx-alpha',+ oauth: { grantScope: 'context' },+ }++ it('allows multiple Agents that share the authoritative Context', () => {+ expect(connectorContextAssignmentError(contextOAuthSpec, ['ctx-alpha', 'ctx-alpha'])).toBe(+ undefined+ )+ })++ it('fails closed when a selected Agent belongs to another Context', () => {+ expect(canAssignConnectorToContext(contextOAuthSpec, 'ctx-beta')).toBe(false)+ expect(connectorContextAssignmentError(contextOAuthSpec, ['ctx-alpha', 'ctx-beta'])).toBe(+ CONTEXT_OAUTH_SCOPE_ERROR+ )+ })++ it('does not constrain non-context OAuth connectors', () => {+ expect(+ connectorContextAssignmentError({ contextRef: 'ctx-alpha', oauth: { grantScope: 'user' } }, [+ 'ctx-beta',+ ])+ ).toBeUndefined()+ })+})diff --git a/control-ui/lib/connectorOAuthAccess.ts b/control-ui/lib/connectorOAuthAccess.tsnew file mode 100644index 000000000..b180a6d1e--- /dev/null+++ b/control-ui/lib/connectorOAuthAccess.ts@@ -0,0 +1,33 @@+export type ConnectorOAuthAccessSpec = {+ contextRef?: unknown+ oauth?: unknown+}++export const CONTEXT_OAUTH_SCOPE_ERROR =+ 'This connector uses a shared OAuth identity and can only be assigned to agents in its original access scope.'++export function isContextScopedOAuthConnector(spec: ConnectorOAuthAccessSpec | undefined): boolean {+ return (+ Boolean(spec?.oauth) &&+ typeof spec?.oauth === 'object' &&+ (spec.oauth as { grantScope?: unknown }).grantScope === 'context'+ )+}++export function canAssignConnectorToContext(+ spec: ConnectorOAuthAccessSpec | undefined,+ targetContextRef: string+): boolean {+ if (!isContextScopedOAuthConnector(spec)) return true+ const authoritativeContextRef = String(spec?.contextRef ?? '').trim()+ return Boolean(authoritativeContextRef) && targetContextRef === authoritativeContextRef+}++export function connectorContextAssignmentError(+ spec: ConnectorOAuthAccessSpec | undefined,+ targetContextRefs: readonly string[]+): string | undefined {+ return targetContextRefs.every(contextRef => canAssignConnectorToContext(spec, contextRef))+ ? undefined+ : CONTEXT_OAUTH_SCOPE_ERROR+}diff --git a/control-ui/package-lock.json b/control-ui/package-lock.jsonindex f8484046b..0f5975610 100644--- a/control-ui/package-lock.json+++ b/control-ui/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-ui",- "version": "0.1.490",+ "version": "0.1.491","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-ui",- "version": "0.1.490",+ "version": "0.1.491","dependencies": {"@clerum/display-field": "file:../packages/display-field","@clerum/llm-providers": "file:../packages/llm-providers",diff --git a/control-ui/package.json b/control-ui/package.jsonindex 8ec8bbf01..80651e901 100644--- a/control-ui/package.json+++ b/control-ui/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-ui",- "version": "0.1.490",+ "version": "0.1.491","private": true,"scripts": {"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",