★ wanayoo — archive 1999 https://github.com/nodejs/node/pull/12507Nouvelle recherche | Portail wanayoo
Skip to content

/ node Public

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(v7.x backport) url: updates to the WHATWG URL parser #12507

Merged
merged 21 commits into from Apr 25, 2017
Merged

(v7.x backport) url: updates to the WHATWG URL parser #12507

merged 21 commits into from Apr 25, 2017

Conversation

@TimothyGu
Copy link
Member

@TimothyGu TimothyGu commented Apr 19, 2017 •
edited

This pull request brings the WHATWG URL implementation in v7.x up to speed with master, including the code itself, the docs, and the tests.

Note: #12042 is not backported since #11956 (which it depends on) has not been backported yet.

Backports of (in the order they were landed to master):

  • #11060 url: extend URLSearchParams constructor
  • #11436 url: enforce valid UTF-8 in WHATWG parser
  • #11737 url: call toString before valueOf when stringifying
  • #11626 url: spec-compliant URLSearchParams serializer
  • #11859 src: remove explicit UTF-8 validity check in url
  • #11858 url: spec-compliant URLSearchParams parser
  • #11930 lib: use Object.create(null) directly (only the part that adds an explicit class for url[context])
  • #12056 url: add ToObject method to native URL class
  • #11917 src, url: WHATWG URL C++ parser cleanup
  • #12058 url: change path parsing for non-special URLs
  • #12134 url: stricter domainTo*() argument checking
  • #11690 url: avoid instanceof for WHATWG URL
  • #12203 url: trim leading slashes of file URL paths
  • #12331 url: remove javascript URL special case
  • #12315 url: disallow invalid IPv4 in IPv6 parser
  • #12252 url: clean up WHATWG URL origin generation
  • #12253 url: improve WHATWG URL inspection
  • #12251 src: clean up WHATWG URL parser, round 2
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

url
@TimothyGu TimothyGu requested a review from italoacasas Apr 19, 2017
@TimothyGu TimothyGu mentioned this pull request Apr 19, 2017
Closed
4 tasks
@TimothyGu
Copy link
Member Author

@TimothyGu TimothyGu commented Apr 19, 2017

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

jasnell
jasnell approved these changes Apr 19, 2017
View changes
Copy link
Member

@jasnell jasnell left a comment

rubber stamp LGTM

TimothyGu and others added 18 commits Apr 25, 2017
@TimothyGu
url: extend URLSearchParams constructor
71d3f94 
PR-URL: nodejs#12507
Fixes: nodejs#10635
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu
doc: document URLSearchParams constructor
c40a45f 
PR-URL: nodejs#12507
Ref: whatwg/url#175
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu
url: enforce valid UTF-8 in WHATWG parser
b0fecbe 
This commit implements the Web IDL USVString conversion, which mandates
all unpaired Unicode surrogates be turned into U+FFFD REPLACEMENT
CHARACTER. It also disallows Symbols to be used as USVString per spec.

Certain functions call into C++ methods in the binding that use the
Utf8Value class to access string arguments. Utf8Value already does the
normalization using V8's String::Write, so in those cases, instead of
doing the full USVString normalization, only a symbol check is done
(`'' + val`, which uses ES's ToString, versus `String()` which has
special provisions for symbols).

PR-URL: nodejs#12507
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu
url: prioritize toString when stringifying
c3366a5 
The ES addition operator calls the ToPrimitive() abstract operation
without hint String, leading a subsequent OrdinaryToPrimitive() to call
valueOf() first on an object rather than the desired toString().

Instead, use template literals which directly call ToString() abstract
operation, per Web IDL spec.

PR-URL: nodejs#12507
Fixes: b610a4d "url: enforce valid UTF-8 in WHATWG parser"
Refs: nodejs@b610a4d#commitcomment-21200056
Refs: https://tc39.github.io/ecma262/#sec-addition-operator-plus-runtime-semantics-evaluation
Refs: https://tc39.github.io/ecma262/#sec-template-literals-runtime-semantics-evaluation
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu
url: spec-compliant URLSearchParams serializer
6b2cb6d 
PR-URL: nodejs#12507
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu
src: remove explicit UTF-8 validity check in url
7e7fd66 
This step was never part of the URL Standard's host parser algorithm,
and is rendered unnecessary after IDNA errors are no longer ignored.

PR-URL: nodejs#12507
Refs: c2a302c "src: do not ignore IDNA conversion error"
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu
querystring: move isHexTable to internal
4a94c2d 
PR-URL: nodejs#12507
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu
url: spec-compliant URLSearchParams parser
d86f0d7 
The entire `URLSearchParams` class is now fully spec-compliant.

PR-URL: nodejs#12507
Fixes: nodejs#10821
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu
url: use a class for WHATWG url[context]
a2a3d6c 
The object is used as a structure, not as a map, which `StorageObject`
was designed for.

PR-URL: nodejs#12507
Reviewed-By: James M Snell <jasnell@gmail.com>
@jasnell @TimothyGu
url: add ToObject method to native URL class
75ef213 
Provides a factory method to convert a native URL class
into a JS URL object.

```c++
Environment* env = ...

URL url("http://example.org/a/b/c?query#fragment");

MaybeLocal<Value> val = url.ToObject(env);
```

PR-URL: nodejs#12507
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu
src: WHATWG URL C++ parser cleanup
5b7b775 
- Clarify port state
- Remove scheme flag
- Clarify URL_FLAG_TERMINATED

PR-URL: nodejs#12507
Reviewed-By: James M Snell <jasnell@gmail.com>
@watilde @TimothyGu
url: change path parsing for non-special URLs
d912e28 
This changes to the way path parsing for non-special URLs.
It allows paths to be empty for non-special URLs and also
takes that into account when serializing.

PR-URL: nodejs#12507
Fixes: nodejs#11962
Refs: whatwg/url#213
Reviewed-By: James M Snell <jasnell@gmail.com>
@watilde @TimothyGu
test: synchronize WPT url test data
dceb12e 
PR-URL: nodejs#12507
Refs: web-platform-tests/wpt#4586
Refs: nodejs#11887
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu
url: error when domainTo*() is called w/o argument
43faf56 
PR-URL: nodejs#12507
Reviewed-By: James M Snell <jasnell@gmail.com>
@mscdex @TimothyGu
url: avoid instanceof for WHATWG URL
dafa600 
PR-URL: nodejs#12507
Reviewed-By: James M Snell <jasnell@gmail.com>
@watilde @TimothyGu
url: trim leading slashes of file URL paths
68cf850 
It should trim the slashes after the colon into three for file URL.

PR-URL: nodejs#12507
Refs: web-platform-tests/wpt#5195
Fixes: nodejs#11188
Reviewed-By: James M Snell <jasnell@gmail.com>
@watilde @TimothyGu
url: remove javascript URL special case
752097c 
PR-URL: nodejs#12507
Fixes: nodejs#11485
Reviewed-By: James M Snell <jasnell@gmail.com>
@watilde @TimothyGu
url: disallow invalid IPv4 in IPv6 parser
f484cfd 
PR-URL: nodejs#12507
Fixes: nodejs#10655
Reviewed-By: James M Snell <jasnell@gmail.com>
@evanlucas evanlucas mentioned this pull request May 1, 2017
Merged
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
url: extend URLSearchParams constructor
b4052e6 
PR-URL: #12507
Fixes: #10635
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
doc: document URLSearchParams constructor
e48e00b 
PR-URL: #12507
Ref: whatwg/url#175
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
url: enforce valid UTF-8 in WHATWG parser
7c9ca0f 
This commit implements the Web IDL USVString conversion, which mandates
all unpaired Unicode surrogates be turned into U+FFFD REPLACEMENT
CHARACTER. It also disallows Symbols to be used as USVString per spec.

Certain functions call into C++ methods in the binding that use the
Utf8Value class to access string arguments. Utf8Value already does the
normalization using V8's String::Write, so in those cases, instead of
doing the full USVString normalization, only a symbol check is done
(`'' + val`, which uses ES's ToString, versus `String()` which has
special provisions for symbols).

PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
url: prioritize toString when stringifying
d6fe916 
The ES addition operator calls the ToPrimitive() abstract operation
without hint String, leading a subsequent OrdinaryToPrimitive() to call
valueOf() first on an object rather than the desired toString().

Instead, use template literals which directly call ToString() abstract
operation, per Web IDL spec.

PR-URL: #12507
Fixes: b610a4d "url: enforce valid UTF-8 in WHATWG parser"
Refs: b610a4d#commitcomment-21200056
Refs: https://tc39.github.io/ecma262/#sec-addition-operator-plus-runtime-semantics-evaluation
Refs: https://tc39.github.io/ecma262/#sec-template-literals-runtime-semantics-evaluation
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
url: spec-compliant URLSearchParams serializer
b8ff2c9 
PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
src: remove explicit UTF-8 validity check in url
72a3cac 
This step was never part of the URL Standard's host parser algorithm,
and is rendered unnecessary after IDNA errors are no longer ignored.

PR-URL: #12507
Refs: c2a302c "src: do not ignore IDNA conversion error"
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
querystring: move isHexTable to internal
0cc37c7 
PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
url: spec-compliant URLSearchParams parser
01b8839 
The entire `URLSearchParams` class is now fully spec-compliant.

PR-URL: #12507
Fixes: #10821
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
url: use a class for WHATWG url[context]
4b6097d 
The object is used as a structure, not as a map, which `StorageObject`
was designed for.

PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@jasnell @evanlucas
url: add ToObject method to native URL class
c7de98a 
Provides a factory method to convert a native URL class
into a JS URL object.

```c++
Environment* env = ...

URL url("http://example.org/a/b/c?query#fragment");

MaybeLocal<Value> val = url.ToObject(env);
```

PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
src: WHATWG URL C++ parser cleanup
078316c 
- Clarify port state
- Remove scheme flag
- Clarify URL_FLAG_TERMINATED

PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@watilde @evanlucas
url: change path parsing for non-special URLs
b8d1a45 
This changes to the way path parsing for non-special URLs.
It allows paths to be empty for non-special URLs and also
takes that into account when serializing.

PR-URL: #12507
Fixes: #11962
Refs: whatwg/url#213
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@watilde @evanlucas
test: synchronize WPT url test data
1adb08e 
PR-URL: #12507
Refs: web-platform-tests/wpt#4586
Refs: #11887
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
url: error when domainTo*() is called w/o argument
b9b93f2 
PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@mscdex @evanlucas
url: avoid instanceof for WHATWG URL
b50a84a 
PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@watilde @evanlucas
url: trim leading slashes of file URL paths
5a27f63 
It should trim the slashes after the colon into three for file URL.

PR-URL: #12507
Refs: web-platform-tests/wpt#5195
Fixes: #11188
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@watilde @evanlucas
url: remove javascript URL special case
ffb2ef4 
PR-URL: #12507
Fixes: #11485
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@watilde @evanlucas
url: disallow invalid IPv4 in IPv6 parser
29531d2 
PR-URL: #12507
Fixes: #10655
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
url: clean up WHATWG URL origin generation
b2a9e60 
- Use ordinary properties instead of symbols/getter redirection for
  internal object
- Use template string literals
- Remove unneeded custom inspection for internal objects
- Remove unneeded OpaqueOrigin class
- Remove unneeded type checks

PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
url: improve WHATWG URL inspection
dfc8017 
PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
evanlucas added a commit that referenced this issue May 1, 2017
@TimothyGu @evanlucas
src: clean up WHATWG WG parser
513fc62 
* reduce indentation
* refactor URL inlined methods
* prefer templates over macros
* do not export ARG_* flags in url binding

PR-URL: #12507
Reviewed-By: James M Snell <jasnell@gmail.com>
@TimothyGu TimothyGu mentioned this pull request May 2, 2017
Closed
evanlucas added a commit that referenced this issue May 2, 2017
@evanlucas
2017-05-02, Version 7.10.0 (Current)
e0dd758 
Notable changes:

* **crypto**:
  - add randomFill and randomFillSync (Evan Lucas)
    #10209
* **meta**: Added new collaborators
  - add lucamaraschi to collaborators (Luca Maraschi)
    #12538
  - add DavidCai1993 to collaborators (David Cai)
    #12435
  - add jkrems to collaborators (Jan Krems)
    #12427
  - add AnnaMag to collaborators (AnnaMag)
    #12414
* **process**:
  - fix crash when Promise rejection is a Symbol (Cameron Little)
    #11640
* **url**:
  - make WHATWG URL more spec compliant (Timothy Gu)
    #12507
* **v8**:
  - fix stack overflow in recursive method (Ben Noordhuis)
    #12460
  - fix build errors with g++ 7 (Ben Noordhuis)
    #12392

PR-URL: #12775
evanlucas added a commit that referenced this issue May 2, 2017
@evanlucas
2017-05-02, Version 7.10.0 (Current)
84ed5f8 
Notable changes:

* **crypto**:
  - add randomFill and randomFillSync (Evan Lucas)
    #10209
* **meta**: Added new collaborators
  - add lucamaraschi to collaborators (Luca Maraschi)
    #12538
  - add DavidCai1993 to collaborators (David Cai)
    #12435
  - add jkrems to collaborators (Jan Krems)
    #12427
  - add AnnaMag to collaborators (AnnaMag)
    #12414
* **process**:
  - fix crash when Promise rejection is a Symbol (Cameron Little)
    #11640
* **url**:
  - make WHATWG URL more spec compliant (Timothy Gu)
    #12507
* **v8**:
  - fix stack overflow in recursive method (Ben Noordhuis)
    #12460
  - fix build errors with g++ 7 (Ben Noordhuis)
    #12392

PR-URL: #12775
evanlucas added a commit that referenced this issue May 3, 2017
@evanlucas
2017-05-02, Version 7.10.0 (Current)
b5e70ae 
Notable changes:

* **crypto**:
  - add randomFill and randomFillSync (Evan Lucas)
    #10209
* **meta**: Added new collaborators
  - add lucamaraschi to collaborators (Luca Maraschi)
    #12538
  - add DavidCai1993 to collaborators (David Cai)
    #12435
  - add jkrems to collaborators (Jan Krems)
    #12427
  - add AnnaMag to collaborators (AnnaMag)
    #12414
* **process**:
  - fix crash when Promise rejection is a Symbol (Cameron Little)
    #11640
* **url**:
  - make WHATWG URL more spec compliant (Timothy Gu)
    #12507
* **v8**:
  - fix stack overflow in recursive method (Ben Noordhuis)
    #12460
  - fix build errors with g++ 7 (Ben Noordhuis)
    #12392

PR-URL: #12775
evanlucas added a commit that referenced this issue May 3, 2017
@evanlucas
2017-05-02, Version 7.10.0 (Current)
871fb5a 
Notable changes:

* **crypto**:
  - add randomFill and randomFillSync (Evan Lucas)
    #10209
* **meta**: Added new collaborators
  - add lucamaraschi to collaborators (Luca Maraschi)
    #12538
  - add DavidCai1993 to collaborators (David Cai)
    #12435
  - add jkrems to collaborators (Jan Krems)
    #12427
  - add AnnaMag to collaborators (AnnaMag)
    #12414
* **process**:
  - fix crash when Promise rejection is a Symbol (Cameron Little)
    #11640
* **url**:
  - make WHATWG URL more spec compliant (Timothy Gu)
    #12507
* **v8**:
  - fix stack overflow in recursive method (Ben Noordhuis)
    #12460
  - fix build errors with g++ 7 (Ben Noordhuis)
    #12392

PR-URL: #12775
imyller added a commit to imyller/meta-nodejs that referenced this issue May 4, 2017
@imyller
2017-05-02, Version 7.10.0 (Current)
eec531e 
    Notable changes:

    * **crypto**:
      - add randomFill and randomFillSync (Evan Lucas)
        nodejs/node#10209
    * **meta**: Added new collaborators
      - add lucamaraschi to collaborators (Luca Maraschi)
        nodejs/node#12538
      - add DavidCai1993 to collaborators (David Cai)
        nodejs/node#12435
      - add jkrems to collaborators (Jan Krems)
        nodejs/node#12427
      - add AnnaMag to collaborators (AnnaMag)
        nodejs/node#12414
    * **process**:
      - fix crash when Promise rejection is a Symbol (Cameron Little)
        nodejs/node#11640
    * **url**:
      - make WHATWG URL more spec compliant (Timothy Gu)
        nodejs/node#12507
    * **v8**:
      - fix stack overflow in recursive method (Ben Noordhuis)
        nodejs/node#12460
      - fix build errors with g++ 7 (Ben Noordhuis)
        nodejs/node#12392

    PR-URL: nodejs/node#12775

Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>
anchnk pushed a commit to anchnk/node that referenced this issue May 6, 2017
@evanlucas Olivier Martin
2017-05-02, Version 7.10.0 (Current)
575955f 
Notable changes:

* **crypto**:
  - add randomFill and randomFillSync (Evan Lucas)
    nodejs#10209
* **meta**: Added new collaborators
  - add lucamaraschi to collaborators (Luca Maraschi)
    nodejs#12538
  - add DavidCai1993 to collaborators (David Cai)
    nodejs#12435
  - add jkrems to collaborators (Jan Krems)
    nodejs#12427
  - add AnnaMag to collaborators (AnnaMag)
    nodejs#12414
* **process**:
  - fix crash when Promise rejection is a Symbol (Cameron Little)
    nodejs#11640
* **url**:
  - make WHATWG URL more spec compliant (Timothy Gu)
    nodejs#12507
* **v8**:
  - fix stack overflow in recursive method (Ben Noordhuis)
    nodejs#12460
  - fix build errors with g++ 7 (Ben Noordhuis)
    nodejs#12392

PR-URL: nodejs#12775
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasnell jasnell

@italoacasas italoacasas

Assignees
No one assigned
Labels
c++ querystring whatwg-url
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@TimothyGu @watilde @jasnell @nodejs-github-bot @mscdex