Skip to content

Commit

Permalink
chore: fix security situation (#3230)
Browse files Browse the repository at this point in the history
  • Loading branch information
uyarn authored Aug 15, 2023
1 parent c22ae30 commit e7d6fc4
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions src/hooks/tnode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@ import { getDefaultNode, getParams, OptionsType, JSXRenderContext, getSlotFirst

// 兼容处理插槽名称,同时支持驼峰命名和中划线命名,示例:value-display 和 valueDisplay
function handleSlots(instance: ComponentInternalInstance, name: string, params: Record<string, any>) {
// 每个 slots 需要单独的 h 函数 否则直接assign会重复把不同 slots 的 params 都注入
const finalParams = new Function('return ' + h.toString())();
if (params) {
Object.assign(finalParams, params);
}
// 2023-08 new Function 触发部分使用场景安全策略问题(Chrome插件/eletron等)
// // 每个 slots 需要单独的 h 函数 否则直接assign会重复把不同 slots 的 params 都注入
// const finalParams = new Function('return ' + h.toString())();
// if (params) {
// Object.assign(finalParams, params);
// }

// 检查是否存在 驼峰命名 的插槽(过滤注释节点)
let node = instance.slots[camelCase(name)]?.(finalParams);
let node = instance.slots[camelCase(name)]?.(params);
if (node && node.filter((t) => t.type.toString() !== 'Symbol(v-cmt)').length) return node;
// 检查是否存在 中划线命名 的插槽
node = instance.slots[kebabCase(name)]?.(finalParams);
node = instance.slots[kebabCase(name)]?.(params);
if (node && node.filter((t) => t.type.toString() !== 'Symbol(v-cmt)').length) return node;
return null;
}
Expand Down

0 comments on commit e7d6fc4

Please sign in to comment.