From 19400c363180d19f8e6c66504286a724249f5b75 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Sun, 17 Mar 2024 18:25:13 +0800 Subject: [PATCH 1/2] crash if trying to set path to / fixes #4271 --- packages/@uppy/companion/src/config/companion.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/@uppy/companion/src/config/companion.js b/packages/@uppy/companion/src/config/companion.js index 4ad236f76a..5cc6546b7d 100644 --- a/packages/@uppy/companion/src/config/companion.js +++ b/packages/@uppy/companion/src/config/companion.js @@ -86,7 +86,12 @@ const validateConfig = (companionOptions) => { ) } - const { providerOptions, periodicPingUrls } = companionOptions + const { providerOptions, periodicPingUrls, server } = companionOptions + + if (server && server.path) { + // see https://github.com/transloadit/uppy/issues/4271 + if (server.path === '/') throw new Error('server.path cannot be set to /') + } if (providerOptions) { const deprecatedOptions = { microsoft: 'providerOptions.onedrive', google: 'providerOptions.drive', s3: 's3' } From e41a1d8099573a372c0c798592b3ed5d888fa1e8 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Tue, 19 Mar 2024 17:52:45 +0800 Subject: [PATCH 2/2] Update packages/@uppy/companion/src/config/companion.js --- packages/@uppy/companion/src/config/companion.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@uppy/companion/src/config/companion.js b/packages/@uppy/companion/src/config/companion.js index 5cc6546b7d..d5dafcc77e 100644 --- a/packages/@uppy/companion/src/config/companion.js +++ b/packages/@uppy/companion/src/config/companion.js @@ -90,6 +90,7 @@ const validateConfig = (companionOptions) => { if (server && server.path) { // see https://github.com/transloadit/uppy/issues/4271 + // todo fix the code so we can allow `/` if (server.path === '/') throw new Error('server.path cannot be set to /') }