Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(control-api): remove unsafe mock map writes

Alfredo Lopez540d3edf06a8
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index a08b64823..57623924d 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.499",
+ "version": "0.1.500",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.499",
+ "version": "0.1.500",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/image-policy": "file:../packages/image-policy",
diff --git a/control-api/package.json b/control-api/package.json
index 842aace95..8c4e58254 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.499",
+ "version": "0.1.500",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/src/routes/admin/registry.ts b/control-api/src/routes/admin/registry.ts
index 4f3f5fe0f..573c05430 100644
--- a/control-api/src/routes/admin/registry.ts
+++ b/control-api/src/routes/admin/registry.ts
@@ -2117,7 +2117,6 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
// ── Step 4: Create McpServer CRD (rollback by UID on failure) ────
let createdMcpServerSnapshot: RegistryResourceSnapshot | null = null
- let createdMcpServerIdentityProven = false
const desiredMcpServerMutation = {
spec: mcpServerSpec,
metadata: { labels: registryLabels, annotations: registryAnnotations },
@@ -2147,7 +2146,6 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
) {
throw new RegistryInstallRollbackError()
}
- createdMcpServerIdentityProven = true
} catch (err) {
const k8sErr = extractK8sError(err)
const ambiguousCreate =
@@ -2313,10 +2311,7 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
return
}
if (associationOutcome !== 'committed') {
- if (
- !createdMcpServerIdentityProven ||
- (createdSecretSnapshot && !createdSecretIdentityProven)
- ) {
+ if (createdSecretSnapshot && !createdSecretIdentityProven) {
res.status(503).json({
error: 'registry_install_outcome_ambiguous',
outcome: 'repair_required',
@@ -2324,17 +2319,15 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
return
}
let resourceRollbackFailed = false
- if (createdMcpServerSnapshot) {
- try {
- await rollbackCreatedResource(
- gateway,
- 'mcpservers',
- createdMcpServerSnapshot,
- `McpServer/${serverName}`
- )
- } catch {
- resourceRollbackFailed = true
- }
+ try {
+ await rollbackCreatedResource(
+ gateway,
+ 'mcpservers',
+ createdMcpServerSnapshot!,
+ `McpServer/${serverName}`
+ )
+ } catch {
+ resourceRollbackFailed = true
}
if (resourceRollbackFailed) {
res.status(500).json({
@@ -2920,7 +2913,6 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
registryAnnotations[REGISTRY_SPEC_DIGEST_ANNOTATION] = registrySpecDigest(hookSpec)
let createdHookSnapshot: RegistryResourceSnapshot | null = null
- let createdHookIdentityProven = false
const desiredHookMutation = {
spec: hookSpec,
metadata: { labels: registryLabels, annotations: registryAnnotations },
@@ -2939,7 +2931,6 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
if (!createdHookSnapshot.metadata?.uid || !createdHookSnapshot.metadata.resourceVersion) {
throw new RegistryInstallRollbackError()
}
- createdHookIdentityProven = true
} catch (err) {
const k8sErr = extractK8sError(err)
const ambiguousCreate =
@@ -3098,10 +3089,7 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
return
}
if (associationOutcome !== 'committed') {
- if (
- !createdHookIdentityProven ||
- (secretCreated && createdSecretSnapshot && !createdSecretIdentityProven)
- ) {
+ if (secretCreated && createdSecretSnapshot && !createdSecretIdentityProven) {
res.status(503).json({
error: 'registry_install_outcome_ambiguous',
outcome: 'repair_required',
@@ -3109,17 +3097,15 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
return
}
let resourceRollbackFailed = false
- if (createdHookSnapshot) {
- try {
- await rollbackCreatedResource(
- gateway,
- 'llmhooks',
- createdHookSnapshot,
- `LlmHook/${crName}`
- )
- } catch {
- resourceRollbackFailed = true
- }
+ try {
+ await rollbackCreatedResource(
+ gateway,
+ 'llmhooks',
+ createdHookSnapshot!,
+ `LlmHook/${crName}`
+ )
+ } catch {
+ resourceRollbackFailed = true
}
if (resourceRollbackFailed) {
res.status(500).json({
diff --git a/control-api/test/mockGateway.ts b/control-api/test/mockGateway.ts
index 0e47a8daa..b448a6ed7 100644
--- a/control-api/test/mockGateway.ts
+++ b/control-api/test/mockGateway.ts
@@ -66,24 +66,19 @@ function mergePatchMap(
patch: Record<string, unknown> | undefined
): Record<string, string> | undefined {
if (patch === undefined) return existing
- const merged: Record<string, string> = { ...(existing ?? {}) }
- for (const [key, value] of Object.entries(patch)) {
- if (value === null) {
- delete merged[key]
- } else if (typeof value === 'string') {
- // Define a data property explicitly so a Kubernetes annotation/label key
- // such as `__proto__` cannot invoke an inherited setter while the mock
- // models RFC 7396. Production validation still owns which keys are valid;
- // this boundary must also model arbitrary server-returned map members safely.
- Object.defineProperty(merged, key, {
- configurable: true,
- enumerable: true,
- value,
- writable: true,
- })
- }
- }
- return merged
+ // Build the result from entries instead of assigning/deleting through a
+ // caller-controlled property name. Object.fromEntries creates own data
+ // properties, so a Kubernetes map key such as `__proto__` remains data and
+ // cannot invoke an inherited setter while the mock models RFC 7396.
+ const appliedEntries = Object.entries(patch).filter(
+ ([, value]) => value === null || typeof value === 'string'
+ )
+ const appliedKeys = new Set(appliedEntries.map(([key]) => key))
+ const retainedEntries = Object.entries(existing ?? {}).filter(([key]) => !appliedKeys.has(key))
+ const replacementEntries = appliedEntries.filter(
+ ([, value]): value is string => typeof value === 'string'
+ )
+ return Object.fromEntries([...retainedEntries, ...replacementEntries])
}
export type MockGatewaySecretWriteFault = (input: {