Skip to content

lib: fix regular expression to detect / and \#40325

Closed
fasttime wants to merge 1 commit intonodejs:masterfrom
fasttime:fix-40305
Closed

lib: fix regular expression to detect / and \#40325
fasttime wants to merge 1 commit intonodejs:masterfrom
fasttime:fix-40305

Conversation

@fasttime
Copy link
Contributor

@fasttime fasttime commented Oct 5, 2021 •
edited
Loading

Allow importing from file URLs with encoded commas. Forbid encoded backslashes. Fixes #40305.

@nodejs-github-bot nodejs-github-bot added esm Issues and PRs related to the ECMAScript Modules implementation. needs-ci PRs that need a full CI run. labels Oct 5, 2021
@fasttime fasttime marked this pull request as ready for review October 5, 2021 05:43
@targos
Copy link
Member

targos commented Oct 5, 2021

@nodejs/modules

@targos targos added the request-ci Add this label to start a Jenkins CI on a PR. label Oct 5, 2021
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 5, 2021
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Oct 5, 2021

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

guybedford
guybedford approved these changes Oct 5, 2021
View reviewed changes
Copy link
Contributor

@guybedford guybedford left a comment

Choose a reason for hiding this comment

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

Many thanks, and apologies for the slip!

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Oct 5, 2021

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

@bmeck
Copy link
Member

bmeck commented Oct 5, 2021

Since , is significant for data: we should add a test for that as well even if this codepath doesn't cover data: normally I could foresee a refactor accidentally mixing the 2.

@guybedford
Copy link
Contributor

guybedford commented Oct 5, 2021

@bmeck this code path does apply to data URLs, in that data URLs that contain a percent encoded comma will no longer throw, even if that percent encoding is in the body of the data URL. On the other hand, percent encoded / and \\ in any position of a data URL, including the body, will always throw. One option here could be to separately special case data URLs in opting out of these validations for the body of the data URL. I think that should be a separate PR though.

@bmeck
Copy link
Member

bmeck commented Oct 5, 2021

@guybedford my main concern is how:

import(`data:text/javascript;x="${encodeURIComponent(',')}",export default 123`);

is interpreted and ensuring it works, otherwise we could just leave the , in the regexp in this PR rather than removing it if we just want to fix the slashes. I'd prefer we have a test for the data: impact if we change its behavior.

@guybedford
Copy link
Contributor

guybedford commented Oct 5, 2021

@bmeck I believe right now your example would fail across all versions, where this PR fixes that.

@guybedford
Copy link
Contributor

guybedford commented Oct 5, 2021

Ah, I see data: URLs have an early exit higher up in the resolver so don't hit this path. We should codify that into the spec as well, will post a PR.

@guybedford
Copy link
Contributor

guybedford commented Oct 5, 2021

@bmeck since data URLs definitely never hit this path at all, I don't think there's any test coverage to apply here, are you ok with landing as is to get this fix in? I am working on a PR to clarify the data URL distinction in the spec as well as some other encoding cases.

@bmeck
Copy link
Member

bmeck commented Oct 5, 2021

@guybedford yea that is fine, though also note that Blob is up and coming

This was referenced Oct 6, 2021
Open
Open
This was referenced Oct 8, 2021
Open
Open
Open
Open
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Oct 20, 2021

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

@aduh95 aduh95 mentioned this pull request Oct 22, 2021
Closed
aduh95 pushed a commit to aduh95/node that referenced this pull request Oct 22, 2021
@fasttime @aduh95
lib: fix regular expression to detect / and \
d134dd4 
PR-URL: nodejs#40325
Fixes: nodejs#40305
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Zeyu Yang <himself65@outlook.com>
aduh95 pushed a commit to aduh95/node that referenced this pull request Oct 22, 2021
@fasttime @aduh95
lib: fix regular expression to detect / and \
a33a1a3 
PR-URL: nodejs#40325
Fixes: nodejs#40305
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Zeyu Yang <himself65@outlook.com>
@github-actions github-actions bot mentioned this pull request Oct 23, 2021
Open
31 tasks
targos pushed a commit that referenced this pull request Oct 23, 2021
@fasttime @targos
lib: fix regular expression to detect / and \
81cd7f3 
Fixes #40305

PR-URL: #40325
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Zeyu Yang <himself65@outlook.com>
@github-actions github-actions bot mentioned this pull request Oct 24, 2021
Open
31 tasks
@targos targos mentioned this pull request Nov 8, 2021
Merged
BethGriggs pushed a commit that referenced this pull request Nov 23, 2021
@fasttime @BethGriggs
lib: fix regular expression to detect / and \
881dd7b 
Fixes #40305

PR-URL: #40325
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Zeyu Yang <himself65@outlook.com>
@BethGriggs BethGriggs mentioned this pull request Nov 26, 2021
Merged
1 task
richardlau pushed a commit that referenced this pull request Nov 26, 2021
@fasttime @richardlau
lib: fix regular expression to detect / and \
b5b66ef 
PR-URL: #40325
Backport-PR-URL: #40564
Fixes: #40305
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Zeyu Yang <himself65@outlook.com>
richardlau pushed a commit that referenced this pull request Nov 26, 2021
@fasttime @richardlau
lib: fix regular expression to detect / and \
8894bdd 
PR-URL: #40325
Backport-PR-URL: #40564
Fixes: #40305
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Zeyu Yang <himself65@outlook.com>
@richardlau richardlau mentioned this pull request Nov 26, 2021
Merged
BethGriggs added a commit that referenced this pull request Nov 30, 2021
@BethGriggs
2021-11-30, Version 16.13.1 'Gallium' (LTS)
88cfa36 
Notable changes:

- **deps**: upgrade npm to 8.1.2 (npm team)
  [#40643](#40643)
- **deps**: update c-ares to 1.18.1 (Richard Lau)
  [#40660](#40660)
- **doc**: add VoltrexMaster to collaborators (voltrexmaster)
  [#40566](#40566)
- **lib**: fix regular expression to detect \`/\` and \`\\\`
  (Francesco Trotta) [#40325](#40325)

PR-URL: #40974
BethGriggs added a commit that referenced this pull request Dec 1, 2021
@BethGriggs
2021-12-01, Version 16.13.1 'Gallium' (LTS)
12029ce 
Notable changes:

- **deps**: upgrade npm to 8.1.2 (npm team)
  [#40643](#40643)
- **deps**: update c-ares to 1.18.1 (Richard Lau)
  [#40660](#40660)
- **doc**: add VoltrexMaster to collaborators (voltrexmaster)
  [#40566](#40566)
- **lib**: fix regular expression to detect \`/\` and \`\\\`
  (Francesco Trotta) [#40325](#40325)

PR-URL: #40974
BethGriggs added a commit that referenced this pull request Dec 1, 2021
@BethGriggs
2021-12-01, Version 16.13.1 'Gallium' (LTS)
6f74010 
Notable changes:

- **deps**: upgrade npm to 8.1.2 (npm team)
  [#40643](#40643)
- **deps**: update c-ares to 1.18.1 (Richard Lau)
  [#40660](#40660)
- **doc**: add VoltrexMaster to collaborators (voltrexmaster)
  [#40566](#40566)
- **lib**: fix regular expression to detect \`/\` and \`\\\`
  (Francesco Trotta) [#40325](#40325)

PR-URL: #40974
richardlau pushed a commit that referenced this pull request Dec 14, 2021
@fasttime @richardlau
lib: fix regular expression to detect / and \
243b2fb 
PR-URL: #40325
Backport-PR-URL: #40565
Fixes: #40305
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Zeyu Yang <himself65@outlook.com>
@richardlau richardlau mentioned this pull request Dec 15, 2021
Merged
Linkgoron pushed a commit to Linkgoron/node that referenced this pull request Jan 31, 2022
@BethGriggs @Linkgoron
2021-12-01, Version 16.13.1 'Gallium' (LTS)
5fd35c5 
Notable changes:

- **deps**: upgrade npm to 8.1.2 (npm team)
  [nodejs#40643](nodejs#40643)
- **deps**: update c-ares to 1.18.1 (Richard Lau)
  [nodejs#40660](nodejs#40660)
- **doc**: add VoltrexMaster to collaborators (voltrexmaster)
  [nodejs#40566](nodejs#40566)
- **lib**: fix regular expression to detect \`/\` and \`\\\`
  (Francesco Trotta) [nodejs#40325](nodejs#40325)

PR-URL: nodejs#40974
abhishekumar-tyagi pushed a commit to abhishekumar-tyagi/node that referenced this pull request May 5, 2024
@fasttime @aduh95
lib: fix regular expression to detect / and \
55dfacd 
PR-URL: nodejs/node#40325
Fixes: nodejs/node#40305
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Guy Bedford <guybedford@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Zeyu Yang <himself65@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jasnell jasnell jasnell approved these changes

@guybedford guybedford guybedford approved these changes

@targos targos targos approved these changes

@himself65 himself65 himself65 approved these changes

@aduh95 aduh95 aduh95 approved these changes

Assignees

No one assigned

Labels

author ready PRs that have at least one approval, no pending requests for changes, and a CI started. esm Issues and PRs related to the ECMAScript Modules implementation. needs-ci PRs that need a full CI run.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Error importing ES module with an encoded comma in the URL

10 participants

@fasttime @targos @nodejs-github-bot @bmeck @guybedford @Ayase-252 @jasnell @himself65 @aduh95 @richardlau