[FIX] web: NFD UTF-8 for safari in upload file #24307
Merged
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
xmo-odoo
requested changes
Apr 19, 2018
| @@ -1069,16 +1070,23 @@ def upload_attachment(self, callback, model, id, ufile): | |||
| var win = window.top.window; | |||
| win.jQuery(win).trigger(%s, %s); | |||
| </script>""" | |||
|
|
|||
| filename = ufile.filename | |||
There was a problem hiding this comment.
Don't we need to decode that before processing it? If in P2 this is implicitly decoded in normalize it's going to blow up in P3.
There was a problem hiding this comment.
From Werkzeug 0.90 code:
# On Python 3 we want to make sure the filename is always unicode.
# This might not be if the name attribute is bytes due to the
# file being opened from the bytes API.
if not PY2 and isinstance(filename, bytes):
filename = filename.decode(sys.getfilesystemencoding(),
'replace')
| if request.httprequest.user_agent.browser == 'safari': | ||
| # Safari sends NFD UTF-8 (where é is composed by 'e' and [accent]) | ||
| # we need to send it the same stuff, otherwise it'll fail | ||
| filename = unicodedata.normalize('NFD', ufile.filename).encode('UTF-8') |
There was a problem hiding this comment.
How comes we don't get the filename in NFD when it comes from Safari?
There was a problem hiding this comment.
That I don't know but I'll bet on the combination of two things:
- default normalization of Safari to be NFD
- no headers specifying normalization, so werkzeug takes utf-8 and doesn't normalize
Before this commit, when uploading a file as attachment in Safari, The file icon kept on showing 'downloading' whereas the request was successful This was because the return from the server had a different UTF-8 norm than Safari After this commit, it works well OPW 1836545 closes odoo#24307
kebeclibre
force-pushed
the
9.0-safari-diacritics-attach-lpe
branch
from
74834b6
to
cd6150f
Compare
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.
Before this commit, when uploading a file as attachment in Safari,
The file icon kept on showing 'downloading' whereas the request was successful
This was because the return from the server had a different UTF-8 norm than Safari
After this commit, it works well
OPW 1836545
Description of the issue/feature this PR addresses:
Current behavior before PR:
Desired behavior after PR is merged:
--
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr