Skip to content

[stable28] fix(files): Correctly validate new node name #47035

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

Merged
susnux merged 2 commits into from
Aug 27, 2024
Merged

[stable28] fix(files): Correctly validate new node name #47035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df2baa4
fix(files): Correctly validate new node name
susnux Jul 25, 2024
adbffd6
chore: Compile assets
susnux Aug 21, 2024
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
46 changes: 27 additions & 19 deletions apps/files/src/components/FileEntry/FileEntryName.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
class="files-list__row-name-link"
data-cy-files-list-row-name-link
v-bind="linkTo.params">
<!-- File name -->
<!-- Filename -->
<span class="files-list__row-name-text">
<!-- Keep the filename stuck to the extension to avoid whitespace rendering issues-->
<span class="files-list__row-name-" v-text="basename" />
Expand All @@ -60,7 +60,7 @@ import type { PropType } from 'vue'
import axios from '@nextcloud/axios'
import { showError, showSuccess } from '@nextcloud/dialogs'
import { emit } from '@nextcloud/event-bus'
import { FileType, NodeStatus } from '@nextcloud/files'
import { FileType, InvalidFilenameError, InvalidFilenameErrorReason, NodeStatus, validateFilename } from '@nextcloud/files'
import { loadState } from '@nextcloud/initial-state'
import { translate as t } from '@nextcloud/l10n'
import { isAxiosError} from 'axios'
Expand Down Expand Up @@ -149,7 +149,7 @@ export default Vue.extend({

renameLabel() {
const matchLabel: Record<FileType, string> = {
[FileType.File]: t('files', 'File name'),
[FileType.File]: t('files', 'Filename'),
[FileType.Folder]: t('files', 'Folder name'),
}
return matchLabel[this.source.type]
Expand Down Expand Up @@ -187,7 +187,7 @@ export default Vue.extend({

watch: {
/**
* If renaming starts, select the file name
* If renaming starts, select the filename
* in the input, without the extension.
* @param renaming
*/
Expand Down Expand Up @@ -222,27 +222,35 @@ export default Vue.extend({
input.reportValidity()
}
},
isFileNameValid(name) {
const trimmedName = name.trim()
const char = trimmedName.indexOf('/') !== -1
? '/'
: forbiddenCharacters.find((char) => trimmedName.includes(char))

if (trimmedName === '.' || trimmedName === '..') {
throw new Error(t('files', '"{name}" is an invalid file name.', { name }))
} else if (trimmedName.length === 0) {
isFileNameValid(name: string) {
if (name.trim() === '') {
throw new Error(t('files', 'File name cannot be empty.'))
} else if (char) {
throw new Error(t('files', '"{char}" is not allowed inside a file name.', { char }))
} else if (trimmedName.match(OC.config.blacklist_files_regex)) {
throw new Error(t('files', '"{name}" is not an allowed filetype.', { name }))
} else if (this.checkIfNodeExists(name)) {
throw new Error(t('files', '{newName} already exists.', { newName: name }))
}

return true
try {
validateFilename(name)
} catch (error) {
if (!(error instanceof InvalidFilenameError)) {
logger.error(error as Error)
return
}
switch (error.reason) {
case InvalidFilenameErrorReason.Character:
throw new Error(t('files', '"{segment}" is not allowed inside a filename.', { segment: error.segment }))
case InvalidFilenameErrorReason.ReservedName:
throw new Error(t('files', '"{segment}" is a forbidden file or folder name.', { segment: error.segment }))
case InvalidFilenameErrorReason.Extension:
if (error.segment.startsWith('.')) {
throw new Error(t('files', '"{segment}" is not an allowed filetype.', { segment: error.segment }))
} else {
throw new Error(t('files', 'Filenames must not end with "{segment}".', { segment: error.segment }))
}
}
}
},
checkIfNodeExists(name) {
checkIfNodeExists(name: string) {
return this.nodes.find(node => node.basename === name && node !== this.source)
},

Expand Down
Loading