opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-29 04:26:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

add var name check for webhook node

Browse Source
This commit is contained in:
hjlarry 2025-10-16 16:59:46 +08:00
parent 1089c5bf04
commit 548db29a47
1 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
web/app/components/workflow/nodes/trigger-webhook/use-config.ts
View File

@ -10,7 +10,7 @@ import { fetchWebhookUrl } from '@/service/apps'
import type { Variable } from '@/app/components/workflow/types' import type { Variable } from '@/app/components/workflow/types'
import { VarType } from '@/app/components/workflow/types' import { VarType } from '@/app/components/workflow/types'
import Toast from '@/app/components/base/toast' import Toast from '@/app/components/base/toast'
import { hasDuplicateStr } from '@/utils/var' import { checkKeys, hasDuplicateStr } from '@/utils/var'
import { WEBHOOK_RAW_VARIABLE_NAME, ensureWebhookRawVariable } from './utils/raw-variable' import { WEBHOOK_RAW_VARIABLE_NAME, ensureWebhookRawVariable } from './utils/raw-variable'
const useConfig = (id: string, payload: WebhookTriggerNodeType) => { const useConfig = (id: string, payload: WebhookTriggerNodeType) => {
@ -70,6 +70,34 @@ const useConfig = (id: string, payload: WebhookTriggerNodeType) => {
if (!draft.variables) if (!draft.variables)
draft.variables = [] draft.variables = []
const hasReservedConflict = newData.some(item => item.name === WEBHOOK_RAW_VARIABLE_NAME)
if (hasReservedConflict) {
Toast.notify({
type: 'error',
message: t('appDebug.varKeyError.keyAlreadyExists', {
key: t('appDebug.variableConfig.varName'),
}),
})
return false
}
const existingOtherVarNames = new Set(
draft.variables
.filter(v => v.label !== sourceType && v.variable !== WEBHOOK_RAW_VARIABLE_NAME)
.map(v => v.variable),
)
const crossScopeConflict = newData.find(item => existingOtherVarNames.has(item.name))
if (crossScopeConflict) {
Toast.notify({
type: 'error',
message: t('appDebug.varKeyError.keyAlreadyExists', {
key: crossScopeConflict.name,
}),
})
return false
}
if(hasDuplicateStr(newData.map(item => item.name))) { if(hasDuplicateStr(newData.map(item => item.name))) {
Toast.notify({ Toast.notify({
type: 'error', type: 'error',
@ -80,6 +108,19 @@ const useConfig = (id: string, payload: WebhookTriggerNodeType) => {
return false return false
} }
for (const item of newData) {
const { isValid, errorMessageKey } = checkKeys([item.name], false)
if (!isValid) {
Toast.notify({
type: 'error',
message: t(`appDebug.varKeyError.${errorMessageKey}`, {
key: t('appDebug.variableConfig.varName'),
}),
})
return false
}
}
// Create set of new variable names for this source // Create set of new variable names for this source
const newVarNames = new Set(newData.map(item => item.name)) const newVarNames = new Set(newData.map(item => item.name))