fix(uploader): encode destination

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>

lib/upload.ts

@@ -1,5 +1,5 @@
-import { getMaxChunksSize } from './utils/config.js'
 import type { AxiosResponse } from 'axios'
+import { getMaxChunksSize } from './utils/config.js'
 
 export enum Status {
 	INITIALIZED = 0,

lib/uploader.ts

@@ -2,6 +2,7 @@ import { CanceledError, type AxiosError, type AxiosResponse } from 'axios'
 import { generateRemoteUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
 import { Folder, Permission } from '@nextcloud/files'
+import { encodePath } from '@nextcloud/paths'
 import axios from '@nextcloud/axios'
 import PCancelable from 'p-cancelable'
 import PQueue from 'p-queue'
@@ -166,7 +167,11 @@ export class Uploader {
 	upload(destinationPath: string, file: File): PCancelable<Upload> {
 		const destinationFile = `${this.root}/${destinationPath.replace(/^\//, '')}`
 
-		logger.debug(`Uploading ${file.name} to ${destinationFile}`)
+		// Get the encoded source url to this object for requests purposes
+		const { origin } = new URL(destinationFile)
+		const encodedDestinationFile = origin + encodePath(destinationFile.slice(origin.length))
+
+		logger.debug(`Uploading ${file.name} to ${encodedDestinationFile}`)
 
 		// If manually disabled or if the file is too small
 		// TODO: support chunk uploading in public pages
@@ -188,7 +193,7 @@ export class Uploader {
 				logger.debug('Initializing chunked upload', { file, upload })
 
 				// Let's initialize a chunk upload
-				const tempUrl = await initChunkWorkspace(destinationFile)
+				const tempUrl = await initChunkWorkspace(encodedDestinationFile)
 				const chunksQueue: Array<Promise<any>> = []
 
 				// Generate chunks array
@@ -206,7 +211,7 @@ export class Uploader {
 							blob,
 							upload.signal,
 							() => this.updateStats(),
-							destinationFile,
+							encodedDestinationFile,
 							{
 								'X-OC-Mtime': file.lastModified / 1000,
 								'OC-Total-Length': file.size,
@@ -234,7 +239,7 @@ export class Uploader {
 						method: 'MOVE',
 						url: `${tempUrl}/.file`,
 						headers: {
-							Destination: destinationFile,
+							Destination: encodedDestinationFile,
 						},
 					})
 
@@ -272,7 +277,7 @@ export class Uploader {
 				const request = async () => {
 					try {
 						upload.response = await uploadData(
-							destinationFile,
+							encodedDestinationFile,
 							blob,
 							upload.signal,
 							() => this.updateStats(),

package.json

@@ -78,6 +78,7 @@
     "@nextcloud/files": "^3.0.0",
     "@nextcloud/l10n": "^2.2.0",
     "@nextcloud/logger": "^2.7.0",
+    "@nextcloud/paths": "^2.1.0",
     "@nextcloud/router": "^2.2.0",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0",