Skip to content

fix(files): honour the escape flag in every filename validity message #64374

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
torvalstrom wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −7
Open

fix(files): honour the escape flag in every filename validity message #64374

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
12 changes: 10 additions & 2 deletions apps/files/src/utils/filenameValidity.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ vi.mock('@nextcloud/capabilities', () => ({
getCapabilities: () => ({
files: {
forbidden_filename_characters: ['/', '\\', '>'],
forbidden_filenames: ['.htaccess'],
forbidden_filenames: ['.htaccess', 'a&b'],
forbidden_filename_basenames: ['con'],
forbidden_filename_extensions: ['.exe', '.~'],
forbidden_filename_extensions: ['.exe', '.~', '.a&b'],
},
}),
}))
Expand Down Expand Up @@ -87,6 +87,14 @@ describe('getFilenameValidity', () => {
it('does not escape the matched character by default', () => {
expect(getFilenameValidity('inva>lid')).toBe('">" is not allowed inside a filename.')
})

it('escapes a reserved name when requested', () => {
expect(getFilenameValidity('a&b', true)).toBe('"a&b" is a reserved name and not allowed for filenames.')
})

it('escapes a forbidden extension when requested', () => {
expect(getFilenameValidity('file.a&b', true)).toBe('".a&b" is not an allowed filetype.')
})
})

it('rethrows errors that are not InvalidFilenameError', async () => {
Expand Down
10 changes: 5 additions & 5 deletions apps/files/src/utils/filenameValidity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ export function getFilenameValidity(name: string, escape = false, isFolder = fal
return t('files', '"{char}" is not allowed inside a filename.', { char: error.segment }, { escape })
case InvalidFilenameErrorReason.ReservedName:
if (isFolder) {
return t('files', '"{segment}" is a reserved name and not allowed for folder names.', { segment: error.segment }, { escape: false })
return t('files', '"{segment}" is a reserved name and not allowed for folder names.', { segment: error.segment }, { escape })
}
return t('files', '"{segment}" is a reserved name and not allowed for filenames.', { segment: error.segment }, { escape: false })
return t('files', '"{segment}" is a reserved name and not allowed for filenames.', { segment: error.segment }, { escape })
case InvalidFilenameErrorReason.Extension:
if (!isFolder && error.segment.match(/\.[a-z]/i)) {
return t('files', '"{extension}" is not an allowed filetype.', { extension: error.segment }, { escape: false })
return t('files', '"{extension}" is not an allowed filetype.', { extension: error.segment }, { escape })
}
if (isFolder) {
return t('files', 'Folder names must not end with "{extension}".', { extension: error.segment }, { escape: false })
return t('files', 'Folder names must not end with "{extension}".', { extension: error.segment }, { escape })
}
return t('files', 'Filenames must not end with "{extension}".', { extension: error.segment }, { escape: false })
return t('files', 'Filenames must not end with "{extension}".', { extension: error.segment }, { escape })
default:
if (isFolder) {
return t('files', 'Invalid folder name.')
Expand Down