Skip to content

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

TypeScript

fix(control-api): reject a malformed credentials payload on install-hook (m6)

Andy Pavia22eb19b005cf
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index d6708a2cb..3054c5c6b 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.461",
+ "version": "0.1.462",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.461",
+ "version": "0.1.462",
"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 0a440c422..d9d67f0a0 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.461",
+ "version": "0.1.462",
"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/__tests__/credentialPayloadGuard.test.ts b/control-api/src/routes/admin/__tests__/credentialPayloadGuard.test.ts
new file mode 100644
index 000000000..92b26354c
--- /dev/null
+++ b/control-api/src/routes/admin/__tests__/credentialPayloadGuard.test.ts
@@ -0,0 +1,34 @@
+import { describe, expect, it } from 'vitest'
+import { isMalformedCredentialPayload } from '../registry.js'
+
+/**
+ * Both install paths (McpServer + install-hook) gate on this so they agree on what
+ * a credentials payload is. The string case is the one that actually bit:
+ * `Object.keys('abc')` enumerates character indices, so an unchecked string reads
+ * as three credential names — a spurious unknown_credential_keys 400, or a
+ * malformed Secret built from index keys.
+ */
+describe('isMalformedCredentialPayload', () => {
+ it.each([
+ ['a string', 'ghp_secret'],
+ ['a number', 42],
+ ['a boolean', true],
+ ['an array', ['ghp_secret']],
+ ])('rejects %s', (_label, payload) => {
+ expect(isMalformedCredentialPayload(payload)).toBe(true)
+ })
+
+ it('accepts a key→value object', () => {
+ expect(isMalformedCredentialPayload({ GITHUB_TOKEN: 'ghp_secret' })).toBe(false)
+ })
+
+ it('accepts an empty object — "no credentials supplied" is not malformed', () => {
+ expect(isMalformedCredentialPayload({})).toBe(false)
+ })
+
+ // null is object-typed, so it passes this predicate by design: both call sites
+ // treat null/undefined as "none supplied" BEFORE reaching here.
+ it('leaves null to the callers null/undefined check', () => {
+ expect(isMalformedCredentialPayload(null)).toBe(false)
+ })
+})
diff --git a/control-api/src/routes/admin/registry.ts b/control-api/src/routes/admin/registry.ts
index ce6d42c50..dc8307c20 100644
--- a/control-api/src/routes/admin/registry.ts
+++ b/control-api/src/routes/admin/registry.ts
@@ -350,6 +350,17 @@ function looksLikeCredentialPlaceholder(value: string): boolean {
]).has(normalized)
}
+/**
+ * Is a supplied credentials payload something other than a key→value object?
+ * A string passes `typeof x === 'object'`? No — but it DOES survive
+ * `Object.keys()`, which enumerates its character indices, so an unchecked
+ * `credentials: "abc"` reads as three credential names. Both install paths gate
+ * on this so they agree on what a payload is.
+ */
+export function isMalformedCredentialPayload(credentials: unknown): boolean {
+ return typeof credentials !== 'object' || Array.isArray(credentials)
+}
+
function validateProvidedCredentialPayload(
schema: RegistryCredentialSchema,
credentials: RegistryInstallRequest['credentials']
@@ -357,7 +368,7 @@ function validateProvidedCredentialPayload(
const requiredKeys = schema.keys?.map(k => k.name) ?? []
if (!schema.required || requiredKeys.length === 0) return { ok: true, secretData: {} }
if (credentials === undefined || credentials === null) return { ok: true, secretData: {} }
- if (typeof credentials !== 'object' || Array.isArray(credentials)) {
+ if (isMalformedCredentialPayload(credentials)) {
return {
ok: false,
body: {
@@ -1934,6 +1945,19 @@ export function createAdminRegistryRouter(gateway?: K8sGateway): Router {
body.registryEntryVersion
).catch(() => null)) as RegistryCredentialSchema | null
const credRequired = !!credSchema?.required
+ // Reject a non-object payload before Object.keys() enumerates it. Unlike the
+ // McpServer path this cannot lean on validateProvidedCredentialPayload: that
+ // returns early when the schema is not `required`, so a malformed payload
+ // would reach createSecret as stringData. Same error shape as that path.
+ if (body.credentials !== undefined && body.credentials !== null) {
+ if (isMalformedCredentialPayload(body.credentials)) {
+ res.status(400).json({
+ error: 'credential.invalidPayload',
+ message: 'Credentials must be an object keyed by credential name.',
+ })
+ return
+ }
+ }
const credentials = body.credentials ?? {}
const secretName = `${crName}-creds`
let secretCreated = false