Skip to content

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

TypeScript

test(hcc): pin NP fixture merge, UDP, and M1 409 against skip veto (#460)

Alfredo Lopezb0db53d2f4dd
diff --git a/host-context-controller/package-lock.json b/host-context-controller/package-lock.json
index 34470dffc..1cd5126c3 100644
--- a/host-context-controller/package-lock.json
+++ b/host-context-controller/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-host-context-controller",
- "version": "0.1.245",
+ "version": "0.1.246",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-host-context-controller",
- "version": "0.1.245",
+ "version": "0.1.246",
"license": "SEE LICENSE IN LICENSE",
"dependencies": {
"@clerum/image-policy": "file:../packages/image-policy",
diff --git a/host-context-controller/package.json b/host-context-controller/package.json
index 56dc92a70..b813d7c9f 100644
--- a/host-context-controller/package.json
+++ b/host-context-controller/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-host-context-controller",
- "version": "0.1.245",
+ "version": "0.1.246",
"description": "Host Context Controller - provides McpServer CRDs to mcp-host via REST API",
"main": "dist/main.js",
"engines": {
diff --git a/host-context-controller/src/__tests__/applyNetworkPolicyNoopGate.test.ts b/host-context-controller/src/__tests__/applyNetworkPolicyNoopGate.test.ts
index be11e37b6..6af71edcf 100644
--- a/host-context-controller/src/__tests__/applyNetworkPolicyNoopGate.test.ts
+++ b/host-context-controller/src/__tests__/applyNetworkPolicyNoopGate.test.ts
@@ -1,6 +1,6 @@
import { describe, expect, it, vi } from 'vitest'
import type * as k8s from '@kubernetes/client-node'
-import { applyNetworkPolicy } from '../utils'
+import { applyNetworkPolicy, networkPolicyMatchesDesired } from '../utils'
import { asApiserverNetworkPolicy, updatedPolicyLogs } from './asApiserverNetworkPolicy'
function desiredPolicy(): k8s.V1NetworkPolicy {
@@ -100,11 +100,11 @@ describe('applyNetworkPolicy no-op gate', () => {
it('GATE-NP-1: mutationAllowed false after create-409 skips replace on drift', async () => {
const desired = desiredPolicy()
+ const drifted = asApiserverNetworkPolicy(desired, { port: 9090 })
+ expect(networkPolicyMatchesDesired(desired, drifted)).toBe(false)
const api = fakeNetworkingApi()
api.createNamespacedNetworkPolicy.mockRejectedValue({ code: 409 })
- api.readNamespacedNetworkPolicy.mockResolvedValue(
- asApiserverNetworkPolicy(desired, { port: 9090 })
- )
+ api.readNamespacedNetworkPolicy.mockResolvedValue(drifted)
const mutationAllowed = vi.fn().mockReturnValueOnce(true).mockReturnValueOnce(false)
await applyNetworkPolicy(
@@ -116,6 +116,7 @@ describe('applyNetworkPolicy no-op gate', () => {
mutationAllowed
)
+ expect(mutationAllowed).toHaveBeenCalledTimes(2)
expect(api.replaceNamespacedNetworkPolicy).not.toHaveBeenCalled()
})
})
diff --git a/host-context-controller/src/__tests__/asApiserverNetworkPolicy.ts b/host-context-controller/src/__tests__/asApiserverNetworkPolicy.ts
index be19b9a65..cced0c850 100644
--- a/host-context-controller/src/__tests__/asApiserverNetworkPolicy.ts
+++ b/host-context-controller/src/__tests__/asApiserverNetworkPolicy.ts
@@ -5,9 +5,17 @@ import type * as k8s from '@kubernetes/client-node'
* Recorded kube-apiserver GET of a NetworkPolicy after client-node decode
* (`from` → `_from`), not a field list copied from the comparator.
* Stamp controller-owned name/labels/podSelector/rules via
- * `asApiserverNetworkPolicy`. When a newer apiserver default-fills a field,
- * refresh this blob so the suite goes red until the comparator learns it.
+ * `asApiserverNetworkPolicy`. Nested port defaults are merged from this blob
+ * (and `RECORDED_DEFAULT_PORT`) onto desired ports so a newer apiserver
+ * default-fill goes red until the comparator learns it. Do not reconstruct
+ * ports from desired alone.
*/
+
+/** Recorded apiserver default-fill on a port that omits protocol. */
+const RECORDED_DEFAULT_PORT: k8s.V1NetworkPolicyPort = { protocol: 'TCP' }
+
+/** Recorded apiserver policyTypes when the live object has egress rules. */
+const RECORDED_EGRESS_POLICY_TYPES: string[] = ['Ingress', 'Egress']
export const RECORDED_NETWORKPOLICY: k8s.V1NetworkPolicy = {
apiVersion: 'networking.k8s.io/v1',
kind: 'NetworkPolicy',
@@ -47,18 +55,27 @@ export const RECORDED_NETWORKPOLICY: k8s.V1NetworkPolicy = {
function stampPorts(
rules: k8s.V1NetworkPolicyIngressRule[] | k8s.V1NetworkPolicyEgressRule[] | undefined,
+ recordedRules: typeof rules,
driftPort?: number
): typeof rules {
if (!rules) return rules
return rules.map((rule, ruleIndex) => {
- if (!rule.ports) return { ...rule }
+ const recordedRule = recordedRules?.[ruleIndex]
+ if (!rule.ports) return { ...recordedRule, ...rule, ports: undefined }
return {
+ ...recordedRule,
...rule,
- ports: rule.ports.map((port, portIndex) => ({
- ...port,
- protocol: port.protocol ?? 'TCP',
- port: ruleIndex === 0 && portIndex === 0 && driftPort !== undefined ? driftPort : port.port,
- })),
+ ports: rule.ports.map((port, portIndex) => {
+ const recordedPort = recordedRule?.ports?.[portIndex]
+ return {
+ ...RECORDED_DEFAULT_PORT,
+ ...recordedPort,
+ ...port,
+ protocol: port.protocol ?? recordedPort?.protocol ?? RECORDED_DEFAULT_PORT.protocol,
+ port:
+ ruleIndex === 0 && portIndex === 0 && driftPort !== undefined ? driftPort : port.port,
+ }
+ }),
}
})
}
@@ -74,8 +91,8 @@ export function asApiserverNetworkPolicy(
explicitTypes && explicitTypes.length > 0
? explicitTypes
: hasEgress
- ? ['Ingress', 'Egress']
- : ['Ingress']
+ ? [...RECORDED_EGRESS_POLICY_TYPES]
+ : [...(recorded.spec?.policyTypes ?? ['Ingress'])]
return {
...recorded,
metadata: {
@@ -93,8 +110,12 @@ export function asApiserverNetworkPolicy(
...recorded.spec,
podSelector: desired.spec?.podSelector ?? {},
policyTypes,
- ingress: stampPorts(desired.spec?.ingress, drift?.port),
- egress: stampPorts(desired.spec?.egress, desired.spec?.ingress ? undefined : drift?.port),
+ ingress: stampPorts(desired.spec?.ingress, recorded.spec?.ingress, drift?.port),
+ egress: stampPorts(
+ desired.spec?.egress,
+ recorded.spec?.egress,
+ desired.spec?.ingress ? undefined : drift?.port
+ ),
},
}
}
diff --git a/host-context-controller/src/__tests__/networkPolicyMatchesDesired.test.ts b/host-context-controller/src/__tests__/networkPolicyMatchesDesired.test.ts
index 7423a265c..9f8de91cf 100644
--- a/host-context-controller/src/__tests__/networkPolicyMatchesDesired.test.ts
+++ b/host-context-controller/src/__tests__/networkPolicyMatchesDesired.test.ts
@@ -1,7 +1,7 @@
import { describe, expect, it } from 'vitest'
import type * as k8s from '@kubernetes/client-node'
import { networkPolicyMatchesDesired } from '../utils'
-import { asApiserverNetworkPolicy } from './asApiserverNetworkPolicy'
+import { RECORDED_NETWORKPOLICY, asApiserverNetworkPolicy } from './asApiserverNetworkPolicy'
function desiredPolicy(overrides: Partial<k8s.V1NetworkPolicy> = {}): k8s.V1NetworkPolicy {
return {
@@ -177,4 +177,47 @@ describe('networkPolicyMatchesDesired', () => {
expect(existing.spec?.ingress?.[0]?.ports).toBeUndefined()
expect(networkPolicyMatchesDesired(desired, existing)).toBe(true)
})
+
+ it('CMP-NP-11: UDP is not stripped; UDP vs TCP is not equivalent', () => {
+ const desired: k8s.V1NetworkPolicy = {
+ apiVersion: 'networking.k8s.io/v1',
+ kind: 'NetworkPolicy',
+ metadata: { name: 'np', namespace: 'ns', labels: { app: 'np' } },
+ spec: {
+ podSelector: { matchLabels: { app: 'np' } },
+ egress: [{ ports: [{ port: 53, protocol: 'UDP' }] }],
+ },
+ }
+ const existing = asApiserverNetworkPolicy(desired)
+ expect(existing.spec?.egress?.[0]?.ports?.[0]?.protocol).toBe('UDP')
+ expect(networkPolicyMatchesDesired(desired, existing)).toBe(true)
+
+ const tcpLive = asApiserverNetworkPolicy(desired)
+ const tcpPort = tcpLive.spec?.egress?.[0]?.ports?.[0]
+ expect(tcpPort).toBeDefined()
+ tcpPort!.protocol = 'TCP'
+ expect(networkPolicyMatchesDesired(desired, tcpLive)).toBe(false)
+ })
+
+ it('CMP-NP-12: recorded nested port fields survive the overlay', () => {
+ const desired = desiredPolicy()
+ const existing = asApiserverNetworkPolicy(desired)
+ const recordedPort = RECORDED_NETWORKPOLICY.spec?.ingress?.[0]?.ports?.[0]
+ const livePort = existing.spec?.ingress?.[0]?.ports?.[0] as Record<string, unknown> | undefined
+ expect(recordedPort).toBeDefined()
+ expect(livePort).toBeDefined()
+ for (const key of Object.keys(recordedPort as object)) {
+ if (key === 'port') continue
+ expect(livePort![key]).toEqual((recordedPort as Record<string, unknown>)[key])
+ }
+ })
+
+ it('CMP-NP-13: empty egress array vs omitted fails open to write', () => {
+ const omitted = desiredPolicy()
+ const emptyEgress: k8s.V1NetworkPolicy = {
+ ...omitted,
+ spec: { ...omitted.spec, egress: [] },
+ }
+ expect(networkPolicyMatchesDesired(emptyEgress, asApiserverNetworkPolicy(omitted))).toBe(false)
+ })
})
diff --git a/host-context-controller/src/networkPolicyReconciler.test.ts b/host-context-controller/src/networkPolicyReconciler.test.ts
index 203db6304..bb393858f 100644
--- a/host-context-controller/src/networkPolicyReconciler.test.ts
+++ b/host-context-controller/src/networkPolicyReconciler.test.ts
@@ -2046,6 +2046,64 @@ describe('NetworkPolicyReconciler', () => {
expect(wrote).toBeGreaterThan(0)
})
+ it('WRITES through create-409 when renewalDue so the inner no-op gate cannot veto M1', async () => {
+ const server: McpServerCRD = {
+ name: 'renew-409-mcp',
+ namespace: 'mcp-server',
+ spec: {
+ contextRef: 'dev',
+ image: 'renew:latest',
+ transport: { type: 'streamableHttp', url: 'http://renew:3000', port: 3000 },
+ egressBindings: [{ dns: 'api.example.com', port: 443 }],
+ },
+ }
+ await reconciler.reconcileExternalEgress(server, { isCurrent: () => true })
+ const written = (
+ mockApi.createNamespacedNetworkPolicy.mock.calls[0][0] as { body: k8s.V1NetworkPolicy }
+ ).body
+
+ const annotations = { ...(written.metadata?.annotations ?? {}) }
+ const state = JSON.parse(annotations['clerum.io/egress-fqdn-state']) as Array<{
+ expiresAt: number
+ }>
+ for (const e of state) e.expiresAt = Date.now() + 1000
+ annotations['clerum.io/egress-fqdn-state'] = JSON.stringify(state)
+
+ mockApi.listNamespacedNetworkPolicy.mockResolvedValue({
+ items: [
+ {
+ metadata: {
+ name: written.metadata?.name,
+ labels: written.metadata?.labels,
+ annotations,
+ },
+ spec: written.spec,
+ },
+ ],
+ })
+ mockApi.createNamespacedNetworkPolicy.mockRejectedValue(
+ Object.assign(new Error('already exists'), { code: 409 })
+ )
+ mockApi.readNamespacedNetworkPolicy.mockResolvedValue({
+ apiVersion: 'networking.k8s.io/v1',
+ kind: 'NetworkPolicy',
+ metadata: {
+ name: written.metadata?.name,
+ namespace: written.metadata?.namespace,
+ labels: written.metadata?.labels,
+ annotations,
+ resourceVersion: '9',
+ },
+ spec: written.spec,
+ })
+ mockApi.createNamespacedNetworkPolicy.mockClear()
+ mockApi.replaceNamespacedNetworkPolicy.mockClear()
+
+ await reconciler.reconcileExternalEgress(server, { isCurrent: () => true })
+ expect(mockApi.readNamespacedNetworkPolicy).toHaveBeenCalled()
+ expect(mockApi.replaceNamespacedNetworkPolicy).toHaveBeenCalled()
+ })
+
it('DROPS a blocked/private IP rehydrated from a tampered annotation (issue #299 M3 defense-in-depth)', async () => {
const server: McpServerCRD = {
name: 'tamper-mcp',
@@ -5631,12 +5689,14 @@ describe('NetworkPolicyReconciler', () => {
) => k8s.V1NetworkPolicy
}
).buildExactHostEgressPolicy(server, desiredName, binding, ['104.18.0.0/16'])
- mockApi.createNamespacedNetworkPolicy.mockRejectedValueOnce(
+ mockApi.createNamespacedNetworkPolicy.mockRejectedValue(
Object.assign(new Error('already exists'), { code: 409 })
)
- mockApi.readNamespacedNetworkPolicy.mockResolvedValueOnce(asApiserverNetworkPolicy(desired))
+ mockApi.readNamespacedNetworkPolicy.mockResolvedValue(asApiserverNetworkPolicy(desired))
expect(await reconcileExternalEgressSafety()).toBe(true)
+ expect(mockApi.createNamespacedNetworkPolicy).toHaveBeenCalled()
+ expect(mockApi.readNamespacedNetworkPolicy).toHaveBeenCalled()
expect(mockApi.replaceNamespacedNetworkPolicy).not.toHaveBeenCalled()
})
diff --git a/host-context-controller/src/utils.ts b/host-context-controller/src/utils.ts
index 11c242ee3..200437a89 100644
--- a/host-context-controller/src/utils.ts
+++ b/host-context-controller/src/utils.ts
@@ -254,7 +254,9 @@ function isServiceObject(value: unknown): value is Record<string, unknown> {
* replace would be a no-op. Canonicalize first: the apiserver default-fills
* policyTypes and ports[].protocol=TCP, and key order is not stable (#307).
* Arrays stay in author order (#214). Doubt or a malformed object returns
- * false (fail-open-to-write).
+ * false (fail-open-to-write). Distinct from `sameNetworkPolicySpec` (spec-only
+ * safety-inventory filter, no default-fill) and `egressSignature` (#299
+ * no-churn fingerprint). Do not unify those predicates here (#473).
*/
export function networkPolicyMatchesDesired(
desired: k8s.V1NetworkPolicy | undefined,