Skip to content
Open
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
5 changes: 5 additions & 0 deletions .changeset/fix-access-control-silent-error.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@keystone-6/core": patch
---

Fixed an issue where database errors (connection timeouts, malformed queries, etc.) were swallowed in unique item exists checks at the access control layer.
5 changes: 5 additions & 0 deletions .changeset/fix-validation-feedback-loss.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@keystone-6/core": patch
---

Fixed an issue where field-level validation messages were lost if a list-level validation hook threw an exception. Field validation messages are now prioritized and preserved in list-level hook crashes.
11 changes: 10 additions & 1 deletion packages/core/src/lib/core/access-control.ts
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ export async function enforceListLevelAccessControl(
listKey: list.listKey,
context,
item,
inputData,
})
}
} catch (error: any) {
Expand Down Expand Up @@ -428,7 +429,15 @@ export async function checkUniqueItemExists(
try {
const item = await context.db[foreignList.listKey].findOne({ where: uniqueInput })
if (item !== null) return uniqueWhere
} catch (err) {}
} catch (err: any) {
// If it's an access denied error from context.db, we swallow it and throw our own
// to keep the error message consistent with "item may not exist".
// But if it's a real database error (e.g. connection, timeout, malformed query),
// we MUST rethrow it so the developer knows what happened.
if (err?.extensions?.code !== 'KS_ACCESS_DENIED') {
throw err
}
}

throw accessDeniedError(cannotForItem(operation, foreignList))
}
29 changes: 15 additions & 14 deletions packages/core/src/lib/core/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import { extensionError, validationFailureError } from './graphql-errors'
import { type InitialisedList } from './initialise-lists'
import type { InitialisedList } from './initialise-lists'

export async function validate({
async function validate({
list,
hookArgs,
}: {
list: InitialisedList
hookArgs: Omit<
Parameters<InitialisedList['hooks']['validate']['create' | 'update' | 'delete']>[0],
'addValidationError'
>
hookArgs: any
}) {
const messages: string[] = []
const fieldsErrors: { error: Error; tag: string }[] = []
Expand All @@ -32,38 +29,40 @@ export async function validate({
resolvedFieldData: hookArgs.resolvedData?.[fieldKey],
} as never) // TODO: FIXME
} catch (error: any) {
fieldsErrors.push({ error, tag: `${list.listKey}.${fieldKey}.hooks.validateInput` })
fieldsErrors.push({ error, tag: `${list.listKey}.${fieldKey}.hooks.validate` })
}
})
)

if (fieldsErrors.length) {
throw extensionError('validateInput', fieldsErrors)
throw extensionError('validate', fieldsErrors)
}

// list validation hooks
{
const addValidationError = (msg: string) => void messages.push(`${list.listKey}: ${msg}`)
const hook = list.hooks.validate[operation]

let listHookError: any
try {
await hook({ ...hookArgs, addValidationError } as never) // TODO: FIXME
} catch (error: any) {
throw extensionError('validateInput', [{ error, tag: `${list.listKey}.hooks.validateInput` }])
listHookError = error
}

if (messages.length) {
throw validationFailureError(messages)
}

if (listHookError) {
throw extensionError('validate', [{ error: listHookError, tag: `${list.listKey}.hooks.validate` }])
}
}
}

export async function runSideEffectOnlyHook<
async function runSideEffectOnlyHook<
HookName extends 'beforeOperation' | 'afterOperation',
Args extends Parameters<
NonNullable<InitialisedList['hooks'][HookName]['create' | 'update' | 'delete']>
>[0],
>(list: InitialisedList, hookName: HookName, args: Args) {
>(list: InitialisedList, hookName: HookName, args: any) {
const { operation } = args

let shouldRunFieldLevelHook: (fieldKey: string) => boolean
Expand Down Expand Up @@ -109,3 +108,5 @@ export async function runSideEffectOnlyHook<
throw extensionError(hookName, [{ error, tag: `${list.listKey}.hooks.${hookName}` }])
}
}

export { validate, runSideEffectOnlyHook }
4 changes: 2 additions & 2 deletions packages/core/src/types/config/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export type ListHooks<ListTypeInfo extends BaseListTypeInfo> = {
}

/**
* Used to **cause side effects** before a create, update, or delete operation once all validateInput hooks have resolved
* Used to **cause side effects** before a create, update, or delete operation once all validate hooks have resolved
*/
beforeOperation?:
| BeforeOperationListHook<ListTypeInfo, 'create' | 'update' | 'delete'>
Expand Down Expand Up @@ -135,7 +135,7 @@ export type FieldHooks<
}

/**
* Used to **cause side effects** before a create, update, or delete operation once all validateInput hooks have resolved
* Used to **cause side effects** before a create, update, or delete operation once all validate hooks have resolved
*/
beforeOperation?:
| BeforeOperationFieldHook<ListTypeInfo, 'create' | 'update' | 'delete', FieldTypeInfo>
Expand Down
Loading