-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
encode uploadid #5168
Merged
Merged
encode uploadid #5168
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fixes #4649
Diff output filesdiff --git a/packages/@uppy/aws-s3/lib/index.js b/packages/@uppy/aws-s3/lib/index.js
index bcff951..1cda298 100644
--- a/packages/@uppy/aws-s3/lib/index.js
+++ b/packages/@uppy/aws-s3/lib/index.js
@@ -294,9 +294,12 @@ export default class AwsS3Multipart extends BasePlugin {
this.assertHost("listParts");
throwIfAborted(signal);
const filename = encodeURIComponent(key);
- return _classPrivateFieldLooseBase(this, _client)[_client].get(`s3/multipart/${uploadId}?key=${filename}`, {
- signal,
- }).then(assertServerError);
+ return _classPrivateFieldLooseBase(this, _client)[_client].get(
+ `s3/multipart/${encodeURIComponent(uploadId)}?key=${filename}`,
+ {
+ signal,
+ },
+ ).then(assertServerError);
}
completeMultipartUpload(file, _ref4, oldSignal) {
var _signal2;
@@ -364,7 +367,7 @@ export default class AwsS3Multipart extends BasePlugin {
}
const filename = encodeURIComponent(key);
return _classPrivateFieldLooseBase(this, _client)[_client].get(
- `s3/multipart/${uploadId}/${partNumber}?key=${filename}`,
+ `s3/multipart/${encodeURIComponent(uploadId)}/${partNumber}?key=${filename}`,
{
signal,
}, |
aduh95
approved these changes
May 17, 2024
Murderlon
added a commit
that referenced
this pull request
May 21, 2024
* 4.x: (24 commits) @uppy/companion: encode `uploadId` (#5168) @uppy/companion: bump `express-session` (#5177) @uppy/companion: remove dependency on `express-request-id` (#5176) @uppy/companion: bump prom to v15 (#5175) docs: fix linter meta: remove `nodemon` from the deps (#5172) docs: update `@uppy/aws-s3` docs (#5093) meta: update more dependencies (#5171) @uppy/companion: upgrade deps (#5119) Release: [email protected] (#5162) @uppy/companion: switch from `node-redis` to `ioredis` (#4623) Fix headings in xhr.mdx @uppy/xhr-upload: introduce hooks similar to tus (#5094) @uppy/core: close->destroy, clearUploadedFiles->clear (#5154) Use `title` consistently from locales (#5134) Release: [email protected] (#5152) Release: [email protected] (#5141) meta: run Prettier in the release workflow Release: [email protected] (#5139) Bump ejs from 3.1.9 to 3.1.10 (#5135) ...
github-actions bot
added a commit
that referenced
this pull request
May 22, 2024
| Package | Version | Package | Version | | -------------------- | ------------ | -------------------- | ------------ | | @uppy/aws-s3 | 4.0.0-beta.4 | @uppy/status-bar | 4.0.0-beta.8 | | @uppy/companion | 5.0.0-beta.7 | @uppy/svelte | 4.0.0-beta.4 | | @uppy/compressor | 2.0.0-beta.8 | @uppy/tus | 4.0.0-beta.5 | | @uppy/core | 4.0.0-beta.8 | @uppy/utils | 6.0.0-beta.7 | | @uppy/dashboard | 4.0.0-beta.8 | @uppy/vue | 2.0.0-beta.3 | | @uppy/image-editor | 3.0.0-beta.5 | @uppy/webcam | 4.0.0-beta.7 | | @uppy/provider-views | 4.0.0-beta.6 | uppy | 4.0.0-beta.8 | - @uppy/core: resolve some (breaking) TODOs (Antoine du Hamel / #4824) - @uppy/companion: encode `uploadId` (Mikael Finstad / #5168) - @uppy/companion: bump `express-session` (Antoine du Hamel / #5177) - @uppy/companion: remove dependency on `express-request-id` (Antoine du Hamel / #5176) - @uppy/companion: bump prom to v15 (Antoine du Hamel / #5175) - docs: fix linter (Antoine du Hamel) - meta: remove `nodemon` from the deps (Antoine du Hamel / #5172) - docs: update `@uppy/aws-s3` docs (Antoine du Hamel / #5093) - meta: update more dependencies (Antoine du Hamel / #5171) - @uppy/companion: upgrade deps (Antoine du Hamel / #5119)
Murderlon
added a commit
that referenced
this pull request
May 28, 2024
* 4.x: (38 commits) docs: assume tree-shaking bundler is the most common case (#5160) @uppy/core: remove `reason` (#5159) Release: [email protected] (#5194) Release: [email protected] (#5193) @uppy/companion: remove `chalk` from dependencies (#5178) @uppy/transloadit: do not cancel assembly when removing all files (#5191) @uppy/xhr-upload: fix regression for lowercase HTTP methods (#5179) meta: improve changelog generator (#5190) Release: [email protected] (#5189) examples: add SvelteKit example (#5181) @uppy/companion: fix missing `await` Release: [email protected] (#5188) @uppy/svelte: do not attempt removing plugin before it's created (#5186) Update facebook.mdx fixup! @uppy/tus: fix no headers passed to companion if argument is a function (#5182) @uppy/core: resolve some (breaking) TODOs (#4824) @uppy/tus: fix no headers passed to companion if argument is a function (#5182) @uppy/companion: fix google drive gsuite export large size (#5144) @uppy/companion: encode `uploadId` (#5168) @uppy/companion: bump `express-session` (#5177) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #4649