Fix multibyte decoding in content_disposition.js #9773
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
I made some mistakes when trying to make the content_disposition.js compatible with non-modern browsers (IE/Edge). Notably, text decoding was usually skipped because of the inverted logical check at the top of `textdecode`. I verified that this new version works as expected, as follows: 1. Visit https://github.com/Rob--W/open-in-browser/tree/55c71eb44e0ad71a3bb443457666fd48421612ac/test/ and get test-content-disposition.js also get test-content-disposition.node.js if using Node.js, or get test-content-disposition.html if you use a browser. 2. Modify `test-content-disposition.node.js` (or the HTML file) and change `../extension/content-disposition.js` to `PDFJS-content_disposition.js` 3. Copy the `getFilenameFromContentDispositionHeader` function from `content_disposition.js` (i.e. the file without the trailing exports) and save it as `PDFJS-content_disposition.js`. 4. Run the tests (`node test-content-disposition.node.js` or by opening `test-content-disposition.html` in a browser). 5. Confirm that there are no failures: "Finished all tests (0 failures)" The code has a best-efforts fallback for Microsoft Edge, which lacks the TextDecoder API. The fallback only supports the common UTF-8 encoding. To simulate this in a test, modify `PDFJS-content_disposition.js` and deliberately throw an error before `new TextDecoder`. There will be two failures because we don't want to include too much code to support text decoding for non-UTF-8 encodings in Edge ``` test-content-disposition.js:265 Assertion failed: Input: attachment; filename*=ISO-8859-1''%c3%a4 Expected: "ä" Actual : "ä" test-content-disposition.js:268 Assertion failed: Input: attachment; filename*=ISO-8859-1''%e2%82%ac Expected: "€" Actual : "€" ```
Updates content_disposition.js to include Rob--W/open-in-browser@9b789d9
|
/botio test |
From: Bot.io (Linux m4)ReceivedCommand cmd_test from @timvandermeij received. Current queue size: 0 Live output at: http://54.67.70.0:8877/d743fc2234bfc68/output.txt |
From: Bot.io (Windows)ReceivedCommand cmd_test from @timvandermeij received. Current queue size: 0 Live output at: http://54.215.176.217:8877/666ffa940f71225/output.txt |
From: Bot.io (Linux m4)SuccessFull output at http://54.67.70.0:8877/d743fc2234bfc68/output.txt Total script time: 18.87 mins
|
From: Bot.io (Windows)FailedFull output at http://54.215.176.217:8877/666ffa940f71225/output.txt Total script time: 24.34 mins
Image differences available at: http://54.215.176.217:8877/666ffa940f71225/reftest-analyzer.html#web=eq.log |
|
/botio-linux preview |
From: Bot.io (Linux m4)ReceivedCommand cmd_preview from @timvandermeij received. Current queue size: 0 Live output at: http://54.67.70.0:8877/318b452eb7bc2b9/output.txt |
From: Bot.io (Linux m4)SuccessFull output at http://54.67.70.0:8877/318b452eb7bc2b9/output.txt Total script time: 2.98 mins Published |
timvandermeij
approved these changes
Jun 3, 2018
|
Looks good to me. Thank you for fixing this! |
movsb
pushed a commit
to movsb/pdf.js
that referenced
this pull request
Jul 14, 2018
…ecode-utf8 Fix multibyte decoding in content_disposition.js
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.
I made some mistakes when trying to make the content_disposition.js compatible with non-modern browsers (IE/Edge). As a result text decoding was mostly broken (the original at https://github.com/Rob--W/open-in-browser/blob/55c71eb44e0ad71a3bb443457666fd48421612ac/extension/content-disposition.js works as expected).
I fixed and verified that it works as expected (see the commit description).
The tests in
test-content-disposition.jscontain multiple UTF-8 decoding tests, but just to make sure that #9616 is really fixed, I inserted the following too:Fixes #9616