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
13 changes: 11 additions & 2 deletions packages/renderless/src/file-upload/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,18 @@ const onBeforeIsPromise = ({
}

const isAcceptType = (acceptArray, file, constants, fileType) => {
// MIME 通配符(image/*、video/*、audio/*)需按扩展名白名单校验,
// 否则 type 里的 * 会被当作正则量词,导致 video/*、audio/* 无法匹配到对应文件
const mimeWildcardMap = {
[constants.IMAGE_TYPE]: constants.FILE_TYPE.PICTURE,
'video/*': constants.FILE_TYPE.VIDEO,
'audio/*': constants.FILE_TYPE.AUDIO
}

return acceptArray.some((type) => {
if (type.toLowerCase() === constants.IMAGE_TYPE) {
return constants.FILE_TYPE.PICTURE.split('/').includes(fileType)
const whitelist = mimeWildcardMap[type.trim().toLowerCase()]
if (whitelist) {
return whitelist.split('/').includes(fileType)
}
return new RegExp(`(${type.trim()})$`, 'i').test(file.name)
})
Expand Down
87 changes: 87 additions & 0 deletions packages/vue/src/file-upload/__tests__/accept-type.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
import { describe, expect, test, vi } from 'vitest'
import { beforeUpload } from '@opentiny/vue-renderless/file-upload'
import { $constants as constants } from '../src/index'

/**
* accept 使用 MIME 通配符(image/*、video/*、audio/*)时的校验。
* 修复 #4237:此前仅 image/* 走扩展名白名单,video/*、audio/* 会落入正则分支,
* 通配符 * 被当作正则量词,导致 mp4、mp3 等合法文件被误拦截。
*/

const t = (_key: string, params?: { format?: string }) =>
params?.format ? `格式(.${params.format})暂不支持` : '暂不支持'

type BeforeUploadOptions = Parameters<typeof beforeUpload>[0]

const createUploadFn = (accept: string, modalMessage = vi.fn()) =>
beforeUpload({
props: { accept },
api: { handleRemove: vi.fn() },
Modal: { message: modalMessage },
constants,
t,
state: { isEdm: false, triggerClickType: '' }
// 单测仅构造 accept 校验所需的最小依赖,props/api/state 为部分 mock
} as BeforeUploadOptions)

const makeFile = (name: string, type: string) => ({
name,
raw: new File([], name, { type })
})

describe('file-upload accept 通配符校验', () => {
test('accept=video/* 时 mp4 应通过校验并上传', () => {
const modalMessage = vi.fn()
const doUpload = vi.fn()

createUploadFn('video/*', modalMessage)(makeFile('测试.mp4', 'video/mp4'), false, doUpload)

expect(modalMessage).not.toHaveBeenCalled()
expect(doUpload).toHaveBeenCalled()
})

test('accept=video/* 时非视频文件仍应被拦截', () => {
const modalMessage = vi.fn()
const doUpload = vi.fn()

createUploadFn('video/*', modalMessage)(makeFile('测试.txt', 'text/plain'), false, doUpload)

expect(modalMessage).toHaveBeenCalledWith(
expect.objectContaining({
message: '格式(.txt)暂不支持',
status: 'warning'
})
)
expect(doUpload).not.toHaveBeenCalled()
})

test('accept=audio/* 时 mp3 应通过校验并上传', () => {
const modalMessage = vi.fn()
const doUpload = vi.fn()

createUploadFn('audio/*', modalMessage)(makeFile('测试.mp3', 'audio/mpeg'), false, doUpload)

expect(modalMessage).not.toHaveBeenCalled()
expect(doUpload).toHaveBeenCalled()
})

test('对照:accept=image/* 时 jpg 可通过校验', () => {
const modalMessage = vi.fn()
const doUpload = vi.fn()

createUploadFn('image/*', modalMessage)(makeFile('测试.jpg', 'image/jpeg'), false, doUpload)

expect(modalMessage).not.toHaveBeenCalled()
expect(doUpload).toHaveBeenCalled()
})

test('对照:accept=.mp4 精确扩展名仍可通过校验', () => {
const modalMessage = vi.fn()
const doUpload = vi.fn()

createUploadFn('.mp4', modalMessage)(makeFile('测试.mp4', 'video/mp4'), false, doUpload)

expect(modalMessage).not.toHaveBeenCalled()
expect(doUpload).toHaveBeenCalled()
})
})
Loading