Skip to content

chore(custom-sounds): sanitize any usage in AddCustomSound and EditSound #39044

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
srijnabhargav wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

chore(custom-sounds): sanitize any usage in AddCustomSound and EditSound #39044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
737a9c3
refactor(custom-sounds): remove any usage and enforce strict typing i…
srijnabhargav Feb 25, 2026
a472d6f
fix(custom-sounds): validate empty MIME type values in sound file checks
srijnabhargav Feb 25, 2026
114a5fe
fix: resolve prettier formatting errors in lib.ts and EditSound.tsx
srijnabhargav Feb 27, 2026
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
8 changes: 5 additions & 3 deletions apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
const dispatchToastMessage = useToastMessageDispatch();

const [name, setName] = useState('');
const [sound, setSound] = useState<{ name: string }>();
const [sound, setSound] = useState<File>();

const uploadCustomSound = useMethod('uploadCustomSound');
const insertOrUpdateSound = useMethod('insertOrUpdateSound');
Expand All @@ -31,8 +31,7 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr
const [clickUpload] = useSingleFileInput(handleChangeFile, 'audio/mp3');

const saveAction = useCallback(
// FIXME
async (name: string, soundFile: any) => {
async (name: string, soundFile: File) => {
const soundData = createSoundData(soundFile, name);
const validation = validate(soundData, soundFile) as Array<Parameters<typeof t>[0]>;

Expand Down Expand Up @@ -73,6 +72,9 @@ const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundPr

const handleSave = useCallback(async () => {
try {
if (!sound) {
return;
}
const result = await saveAction(name, sound);
if (result) {
dispatchToastMessage({ type: 'success', message: t('Custom_Sound_Saved_Successfully') });
Expand Down
8 changes: 4 additions & 4 deletions apps/meteor/client/views/admin/customSounds/EditSound.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
const hasUnsavedChanges = useMemo(() => previousName !== name || previousSound !== sound, [name, previousName, previousSound, sound]);

const saveAction = useCallback(
// FIXME
async (sound: any) => {
const soundData = createSoundData(sound, name, { previousName, previousSound, _id, extension: sound.extension });
async (sound: { _id: string; name: string; extension?: string } | File) => {
const extension = 'extension' in sound ? (sound.extension ?? '') : '';
const soundData = createSoundData(sound, name, { previousName, previousSound, _id, extension });
const validation = validate(soundData, sound);
if (validation.length === 0) {
let soundId: string;
Expand All @@ -68,7 +68,7 @@ function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactEl
soundData._id = soundId;
soundData.random = Math.round(Math.random() * 1000);

if (sound && sound !== previousSound) {
if (sound instanceof File) {
dispatchToastMessage({ type: 'success', message: t('Uploading_file') });

const reader = new FileReader();
Expand Down
9 changes: 7 additions & 2 deletions apps/meteor/client/views/admin/customSounds/lib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { ICustomSoundData } from '../../../../app/custom-sounds/server/meth

type ICustomSoundFile = {
name: string;
type: string;
type?: string;
extension?: string;
};

Expand All @@ -20,7 +20,12 @@ export function validate(soundData: ICustomSoundData, soundFile?: ICustomSoundFi

if (soundFile) {
if (!soundData.previousSound || soundData.previousSound !== soundFile) {
if (!/audio\/mp3/.test(soundFile.type) && !/audio\/mpeg/.test(soundFile.type) && !/audio\/x-mpeg/.test(soundFile.type)) {
if (
'type' in soundFile &&
!/audio\/mp3/.test(soundFile.type ?? '') &&
!/audio\/mpeg/.test(soundFile.type ?? '') &&
!/audio\/x-mpeg/.test(soundFile.type ?? '')
) {
errors.push('FileType');
}
}
Expand Down