lib: fix MIME overmatch in data URLs #49104

andremralves · 2023-08-11T05:08:02Z

This commit adds the delimiters ^ and $ to the regex that matches the MIME types for "data:URLs".
Fixes: #48957

I also added a new test case that expects an ERR_UNKNOWN_MODULE_FORMAT message for MIME types like this: data:WRONGtext/javascriptFORMAT.

This is my first time contributing to node. Let me know if I did everything right 😄.

nodejs-github-bot · 2023-08-11T05:08:06Z

Review requested:

@nodejs/loaders
@nodejs/modules

GeoffreyBooth

Thank you for your contribution! Looks good, just some questions.

GeoffreyBooth · 2023-08-11T06:29:40Z

lib/internal/modules/esm/formats.js

@@ -26,7 +26,7 @@ if (experimentalWasmModules) {
 function mimeToFormat(mime) {
  if (
    RegExpPrototypeExec(
-      /\s*(text|application)\/javascript\s*(;\s*charset=utf-?8\s*)?/i,
+      /^\s*(text|application)\/javascript\s*(;\s*charset=utf-?8\s*)?$/i,


Could there be any other extra “query params,” so to speak, besides charset=utf-8? If so, then we can’t add the $.

This is another issue, but is utf-8 / utf8 the only permitted charset?

Suggested change

/^\s*(text|application)\/javascript\s*(;\s*charset=utf-?8\s*)?$/i,

/^\s*(text|application)\/javascript\s*(;|$)/i,

Could there be any other extra “query params,” so to speak, besides charset=utf-8? If so, then we can’t add the $.

I read the MDN article about "Common MIME types" and found a link to the RFC of text/javascript MIME type. They don't mention any other param other than the charset parameter and say that it's optional.

Also, I found out that the first implementation of this code was only matching text/javascript and then someone refactored it to inclued the support for the optional charset parameter.

This is another issue, but is utf-8 / utf8 the only permitted charset?

According to that RFC: "Module goal sources MUST always be processed as UTF-8.", so I think we should be good using just utf-8.

Thanks for the feedback 🚀

aduh95 · 2023-08-11T07:44:49Z

This is another issue, but is utf-8 / utf8 the only permitted charset?

I'd say it's not related to this PR, but defaultLoad is ignoring all the params (including charset) except for base64.

aduh95 · 2023-08-11T14:11:39Z

Can you fix the test failure please?

andremralves · 2023-08-11T16:28:37Z

Can you fix the test failure please?

Oh, I know what happened. I fixed the linting and the error message ended up being wrong. I will fix.

andremralves · 2023-08-11T16:38:29Z

@aduh95 I fixed the test failure.

andremralves · 2023-08-11T20:38:05Z

I believe the failure now is not related to this PR. There are other PRs with the same failure.

This commit adds the delimiters ^ and $ to the regex that matches the MIME types for "data:URLs". Fixes: nodejs#48957

nodejs-github-bot · 2023-08-13T09:16:36Z

CI: https://ci.nodejs.org/job/node-test-pull-request/53267/

nodejs-github-bot · 2023-08-13T10:11:59Z

CI: https://ci.nodejs.org/job/node-test-pull-request/53269/

nodejs-github-bot · 2023-08-13T14:30:36Z

CI: https://ci.nodejs.org/job/node-test-pull-request/53279/

nodejs-github-bot · 2023-08-13T17:48:39Z

CI: https://ci.nodejs.org/job/node-test-pull-request/53284/

nodejs-github-bot · 2023-08-13T21:12:06Z

Commit Queue failed

- Loading data for nodejs/node/pull/49104
✔  Done loading data for nodejs/node/pull/49104
----------------------------------- PR info ------------------------------------
Title      lib: fix MIME overmatch in data URLs (#49104)
   ⚠  Could not retrieve the email or name of the PR author's from user's GitHub profile!
Branch     andremralves:fix-mime -> nodejs:main
Labels     esm, author ready, needs-ci
Commits    1
 - lib: fix MIME overmatch in data URLs
Committers 1
 - Antoine du Hamel 
PR-URL: https://github.com/nodejs/node/pull/49104
Fixes: https://github.com/nodejs/node/issues/48957
Reviewed-By: Geoffrey Booth 
Reviewed-By: Antoine du Hamel 
------------------------------ Generated metadata ------------------------------
PR-URL: https://github.com/nodejs/node/pull/49104
Fixes: https://github.com/nodejs/node/issues/48957
Reviewed-By: Geoffrey Booth 
Reviewed-By: Antoine du Hamel 
--------------------------------------------------------------------------------
   ℹ  This PR was created on Fri, 11 Aug 2023 05:08:02 GMT
   ✔  Approvals: 2
   ✔  - Geoffrey Booth (@GeoffreyBooth) (TSC): https://github.com/nodejs/node/pull/49104#pullrequestreview-1573705440
   ✔  - Antoine du Hamel (@aduh95) (TSC): https://github.com/nodejs/node/pull/49104#pullrequestreview-1575747202
   ✔  Last GitHub CI successful
   ℹ  Last Full PR CI on 2023-08-13T17:48:39Z: https://ci.nodejs.org/job/node-test-pull-request/53284/
- Querying data for job/node-test-pull-request/53284/
   ✔  Last Jenkins CI successful
--------------------------------------------------------------------------------
   ✔  No git cherry-pick in progress
   ✔  No git am in progress
   ✔  No git rebase in progress
--------------------------------------------------------------------------------
- Bringing origin/main up to date...
From https://github.com/nodejs/node
 * branch                  main       -> FETCH_HEAD
✔  origin/main is now up-to-date
- Downloading patch for 49104
From https://github.com/nodejs/node
 * branch                  refs/pull/49104/merge -> FETCH_HEAD
✔  Fetched commits as b5da2f4dad72..00dbd9454ae8
--------------------------------------------------------------------------------
[main a344cdb5e6] lib: fix MIME overmatch in data URLs
 Author: Andre Alves 
 Date: Fri Aug 11 01:47:22 2023 -0300
 2 files changed, 4 insertions(+), 1 deletion(-)
   ✔  Patches applied
--------------------------------------------------------------------------------
   ✘  Git found no trailers in the original commit message, but 'Fixes: https://github.com/nodejs/node/issues/48957' is present and should be a trailer.

https://github.com/nodejs/node/actions/runs/5849556424

aduh95 · 2023-08-13T21:24:49Z

Landed in 7139198, thanks for the contribution 🎉

This commit adds the delimiters ^ and $ to the regex that matches the MIME types for `data:` URLs. PR-URL: nodejs#49104 Fixes: nodejs#48957 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

This commit adds the delimiters ^ and $ to the regex that matches the MIME types for `data:` URLs. PR-URL: #49104 Fixes: #48957 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

This commit adds the delimiters ^ and $ to the regex that matches the MIME types for `data:` URLs. PR-URL: nodejs#49104 Fixes: nodejs#48957 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

This commit adds the delimiters ^ and $ to the regex that matches the MIME types for `data:` URLs. PR-URL: #49104 Fixes: #48957 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

This commit adds the delimiters ^ and $ to the regex that matches the MIME types for `data:` URLs. PR-URL: nodejs/node#49104 Fixes: nodejs/node#48957 Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

nodejs-github-bot added esm Issues and PRs related to the ECMAScript Modules implementation. needs-ci PRs that need a full CI run. labels Aug 11, 2023

GeoffreyBooth reviewed Aug 11, 2023

View reviewed changes

GeoffreyBooth approved these changes Aug 11, 2023

View reviewed changes

andremralves force-pushed the fix-mime branch from 5c8af6c to fc3b4dc Compare August 11, 2023 16:29

andremralves requested a review from aduh95 August 11, 2023 16:32

aduh95 force-pushed the fix-mime branch from fc3b4dc to b244935 Compare August 13, 2023 09:08

lib: fix MIME overmatch in data URLs

00dbd94

This commit adds the delimiters ^ and $ to the regex that matches the MIME types for "data:URLs". Fixes: nodejs#48957

aduh95 force-pushed the fix-mime branch from b244935 to 00dbd94 Compare August 13, 2023 09:10

aduh95 approved these changes Aug 13, 2023

View reviewed changes

aduh95 added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. request-ci Add this label to start a Jenkins CI on a PR. labels Aug 13, 2023

github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Aug 13, 2023

aduh95 added the commit-queue Add this label to land a pull request using GitHub Actions. label Aug 13, 2023

nodejs-github-bot added commit-queue-failed An error occurred while landing this pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Aug 13, 2023

aduh95 merged commit 7139198 into nodejs:main Aug 13, 2023
33 checks passed

github-actions bot mentioned this pull request Aug 14, 2023

CI Reliability 2023-08-14 nodejs/reliability#636

Open

25 tasks

github-actions bot mentioned this pull request Aug 15, 2023

CI Reliability 2023-08-15 nodejs/reliability#637

Open

22 tasks

UlisesGascon mentioned this pull request Aug 15, 2023

v20.6.0 proposal #49185

Merged

github-actions bot mentioned this pull request Aug 16, 2023

CI Reliability 2023-08-16 nodejs/reliability#638

Open

24 tasks

andremralves deleted the fix-mime branch August 16, 2023 05:02

joyeecheung mentioned this pull request Aug 16, 2023

test: make test-perf-hooks more robust and work with workers #49197

Merged

targos mentioned this pull request Nov 28, 2023

v18.19.0 release proposal #50953

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

lib: fix MIME overmatch in data URLs #49104

lib: fix MIME overmatch in data URLs #49104

andremralves commented Aug 11, 2023

nodejs-github-bot commented Aug 11, 2023

GeoffreyBooth left a comment

GeoffreyBooth Aug 11, 2023

aduh95 Aug 11, 2023

andremralves Aug 11, 2023

aduh95 commented Aug 11, 2023

aduh95 commented Aug 11, 2023

andremralves commented Aug 11, 2023

andremralves commented Aug 11, 2023 •

edited

Loading

andremralves commented Aug 11, 2023

nodejs-github-bot commented Aug 13, 2023

nodejs-github-bot commented Aug 13, 2023

nodejs-github-bot commented Aug 13, 2023

nodejs-github-bot commented Aug 13, 2023

nodejs-github-bot commented Aug 13, 2023

aduh95 commented Aug 13, 2023

	/^\s(text\|application)\/javascript\s(;\scharset=utf-?8\s)?$/i,
	/^\s(text\|application)\/javascript\s(;\|$)/i,

lib: fix MIME overmatch in data URLs #49104

lib: fix MIME overmatch in data URLs #49104

Conversation

andremralves commented Aug 11, 2023

nodejs-github-bot commented Aug 11, 2023

GeoffreyBooth left a comment

Choose a reason for hiding this comment

GeoffreyBooth Aug 11, 2023

Choose a reason for hiding this comment

aduh95 Aug 11, 2023

Choose a reason for hiding this comment

andremralves Aug 11, 2023

Choose a reason for hiding this comment

aduh95 commented Aug 11, 2023

aduh95 commented Aug 11, 2023

andremralves commented Aug 11, 2023

andremralves commented Aug 11, 2023 • edited Loading

andremralves commented Aug 11, 2023

nodejs-github-bot commented Aug 13, 2023

nodejs-github-bot commented Aug 13, 2023

nodejs-github-bot commented Aug 13, 2023

nodejs-github-bot commented Aug 13, 2023

nodejs-github-bot commented Aug 13, 2023

aduh95 commented Aug 13, 2023

andremralves commented Aug 11, 2023 •

edited

Loading