Skip to content

Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail#201

Merged
mrsimpson merged 1 commit intomasterfrom
hotfix/upload-special-chars
Jan 25, 2018
Merged

Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail#201
mrsimpson merged 1 commit intomasterfrom
hotfix/upload-special-chars

Conversation

@mrsimpson
Copy link
Copy Markdown
Member

This PR fixes the upload to S3 failing with special characters in filenames (such as German Umlaute, ä, ö, ü).
Cheery-picked a fix from 0.60

Adds:
  - encodeURI in AmazonS3 store to allow special chars in file name;
@ghost ghost assigned mrsimpson Jan 25, 2018
@ghost ghost added the progress:working label Jan 25, 2018
@mrsimpson mrsimpson requested a review from ThomasRoehl January 25, 2018 09:54
@mrsimpson mrsimpson changed the base branch from develop to master January 25, 2018 09:55
@mrsimpson
Copy link
Copy Markdown
Member Author

This fix has been cherry-picked from 798d626 which has already been merged by Rocket.Chat into 0.60. Thus, I consider this integration-tested

@ThomasRoehl It's a bit tricky to validate the fix without having S3-running, but still wanted to ask you to have a look at it whether there's something coming to your mind.

Copy link
Copy Markdown

@ThomasRoehl ThomasRoehl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine for me!

@mrsimpson mrsimpson merged commit b98e243 into master Jan 25, 2018
@ghost ghost removed the progress:working label Jan 25, 2018
@mrsimpson mrsimpson deleted the hotfix/upload-special-chars branch January 25, 2018 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants