[Bugfix]: 'forbidden_chars' - the condition added for uploading via D…

…rop or UploadPicker. #43495

Signed-off-by: Andrii Rublov <[email protected]>

apps/files/src/services/DropService.ts

@@ -29,9 +29,12 @@ import { getUploader } from '@nextcloud/upload'
 import { joinPaths } from '@nextcloud/paths'
 import { showError } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
+import { loadState } from '@nextcloud/initial-state'
 
 import logger from '../logger.js'
 
+const forbiddenCharacters = loadState('files', 'forbiddenCharacters', '') as string
+
 export const handleDrop = async (data: DataTransfer): Promise<Upload[]> => {
 	// TODO: Maybe handle `getAsFileSystemHandle()` in the future
 
@@ -67,11 +70,18 @@ export const handleDrop = async (data: DataTransfer): Promise<Upload[]> => {
 const handleFileUpload = async (file: File, path: string = '') => {
 	const uploader = getUploader()
 
-	try {
-		return await uploader.upload(`${path}${file.name}`, file)
-	} catch (e) {
-		showError(t('files', 'Uploading "{filename}" failed', { filename: file.name }))
-		throw e
+	const forbidden = forbiddenCharacters.split('')
+	let forbiddenChar
+
+	if(forbiddenChar = forbidden.find(char => file.name.includes(char))){
+		showError(t('files', `"${forbiddenChar}" is not allowed inside a file name.`));
+	}else{
+		try {
+			return await uploader.upload(`${path}${file.name}`, file)
+		} catch (e) {
+			showError(t('files', 'Uploading "{filename}" failed', { filename: file.name }))
+			throw e
+		}
 	}
 }
 

apps/files/src/views/FilesList.vue

@@ -56,6 +56,7 @@
 					<UploadPicker v-else-if="currentFolder"
 						:content="dirContents"
 						:destination="currentFolder"
+						:forbiddenCharacters="forbiddenCharacters"
 						:multiple="true"
 						class="files-list__header-upload-button"
 						@failed="onUploadFail"
@@ -161,6 +162,7 @@ import logger from '../logger.js'
 import DragAndDropNotice from '../components/DragAndDropNotice.vue'
 
 const isSharingEnabled = (getCapabilities() as { files_sharing?: boolean })?.files_sharing !== undefined
+const forbiddenCharacters = loadState('files', 'forbiddenCharacters', '') as string
 
 export default defineComponent({
 	name: 'FilesList',
@@ -402,6 +404,10 @@ export default defineComponent({
 			return isSharingEnabled
 				&& this.currentFolder && (this.currentFolder.permissions & Permission.SHARE) !== 0
 		},
+
+		forbiddenCharacters(): string {
+			return forbiddenCharacters
+		},
 	},
 
 	watch: {