Skip to content

security: remove unsafe html rendering in notice and metadata views #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lhy8888 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

security: remove unsafe html rendering in notice and metadata views #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 3 additions & 15 deletions cmdb-ui/src/modules/cmdb/views/ci/modules/MetadataDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,13 @@
{ label: $t('no'), value: false },
]
"
type="html"
>
<template #default="{ row }">
<span v-if="column.field !== 'name' && column.field !== 'alias' && column.field !== 'value_type'">
<a-icon :style="{ color: '#1fb51f' }" type="check" v-if="row[column.field]" />
</span>
<span v-else-if="column.field === 'value_type'" v-html="valueTypeMap[row.value_type]"> </span>
<span v-else v-html="row[column.field]"> </span>
<span v-else-if="column.field === 'value_type'">{{ valueTypeMap[row.value_type] }}</span>
<span v-else>{{ row[column.field] }}</span>
</template>
</vxe-column>
</vxe-table>
Expand Down Expand Up @@ -196,26 +195,15 @@ export default {
.trim()
.toLowerCase()
if (filterName) {
const filterRE = new RegExp(filterName, 'gi')
const searchProps = ['name', 'alias', 'value_type']
const rest = this.tableData.filter((item) =>
this.list = this.tableData.filter((item) =>
searchProps.some(
(key) =>
XEUtils.toValueString(item[key])
.toLowerCase()
.indexOf(filterName) > -1
)
)
this.list = rest.map((row) => {
const item = Object.assign({}, row)
searchProps.forEach((key) => {
item[key] = XEUtils.toValueString(item[key]).replace(
filterRE,
(match) => `<span style='background: yellow'>${match}</span>`
)
})
return item
})
} else {
this.list = this.tableData
}
Expand Down
2 changes: 1 addition & 1 deletion cmdb-ui/src/views/noticeCenter/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<vxe-column type="checkbox" width="60px"></vxe-column>
<vxe-column field="content" title="标题内容">
<template #default="{row}">
<span v-html="row.content"></span>
<span>{{ row.content }}</span>
</template>
</vxe-column>
<vxe-column field="created_at" title="提交时间" width="150px">
Expand Down