Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/server/node/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { Settings } from './settings.ts'

const maxRequestBytes = 4 * 1024
const encoder = new TextEncoder()
const decoder = new TextDecoder('utf-8', { fatal: true, ignoreBOM: false })

export function createConfigApp(settings: Settings, authenticate: (request: Request) => Promise<string>, changed: () => void = () => {}): Hono {
const app = new Hono()
Expand Down Expand Up @@ -140,7 +141,7 @@ async function objectRequest(request: Request): Promise<Record<string, unknown>
}
let value: unknown
try {
value = JSON.parse(new TextDecoder().decode(bytes)) as unknown
value = JSON.parse(decoder.decode(bytes)) as unknown
} catch {
return
}
Expand Down
3 changes: 2 additions & 1 deletion apps/server/node/control.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const maxPageSize = 100
const defaultPageSize = 50
const runStatusSet: ReadonlySet<string> = new Set(runStatuses)
const encoder = new TextEncoder()
const controlDecoder = new TextDecoder('utf-8', { fatal: true, ignoreBOM: false })

export function createControlApp(service: ControlService, resolveActor?: ResolveControlActor): Hono<Environment> {
const app = new Hono<Environment>()
Expand Down Expand Up @@ -382,7 +383,7 @@ async function requestObject(request: Request, code: InvalidCode): Promise<Recor
bytes.set(chunk, offset)
offset += chunk.byteLength
}
return record(JSON.parse(new TextDecoder().decode(bytes)) as unknown, code)
return record(JSON.parse(controlDecoder.decode(bytes)) as unknown, code)
} catch {
return invalid(code, 'Request body must be valid JSON.')
}
Expand Down
26 changes: 26 additions & 0 deletions apps/server/test/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,29 @@ it('authenticates configuration requests, hides tokens, and rejects stale or env
await closeService(service)
}
})

it('rejects malformed UTF-8 in configuration JSON bodies', async () => {
const file = await databaseFile()
const service = await openService(file)
const configured = settings(file)
const app = createServerApp(service, { resolveControlActor: () => 'operator', settings: configured })
try {
const prefix = new TextEncoder().encode('{"expectedRevision":1,"origin":"https://models.example.com","token":"')
const suffix = new TextEncoder().encode('","version":1}')
const malformed = new Uint8Array(prefix.length + 2 + suffix.length)
malformed.set(prefix)
malformed.set([0xc3, 0x28], prefix.length)
malformed.set(suffix, prefix.length + 2)

const response = await app.request('/config/llm', {
body: malformed,
headers: { 'content-type': 'application/json' },
method: 'PUT',
})

expect(response.status).toBe(400)
expect(configured.status().llm.configured).toBe(false)
} finally {
await closeService(service)
}
})