feat(har): record remote IP:PORT and SSL details - #6631

Merged
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl
Jun 15, 2021
Merged

feat(har): record remote IP:PORT and SSL details#6631
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl

Conversation

@rwoll

@rwollRoss Wollman (rwoll) commented May 18, 2021

Copy link
Copy Markdown
Member

Updates in the HAR capture Log Entries:

  • serverIPAddress: (string) This now gets populated.

  • _serverPort: (number) This now gets populated. There isn't an
    official field according to this w3 doc (and I didn't see
    a suitable field in a HAR download from Chromium DevTools).

    I used the field name from WK WebInspector HARBuilder.js.

  • _securityDetails: non-standard info that is helpful in making
    assertions about cert expiries.

This also introduces new APIs on network.Response exposing the
new info.

NB: At first these APIs were synchronous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.

Closes#6624.

@rwollRoss Wollman (rwoll) left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Comment threadtests/har.spec.ts Outdated
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll) marked this pull request as ready for review May 19, 2021 00:44
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I cleaned up the types (including deleting some of the awkward code dealing with the non-standard zero values.) I also added a comment to the WebKit address parsing code with some examples from my testing.

I haven't yet figured out the appropriate changes to emit the Response at the correct time after _onLoadingFinished where the IP address details are available for WebKit so I left the signal barrier in place in the HAR code. I'll remove that once we sort out dealing Response emission timing (directly or indirectly through guarding the newly added fields behind a Promise api). If we can avoid adding more external Promises to Response, I agree that would be much nicer.

Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 21c91c9 to 9ce3a01CompareMay 20, 2021 21:13
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) Here's the latest pass! Promise-based APIs because of WK. See #6631 (comment) with updated description.

@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 3 times, most recently from d2d1c15 to c7f30eeCompareMay 21, 2021 00:31
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 38e1f04 to b0342f5CompareMay 21, 2021 07:14
Comment threadsrc/server/network.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder): This should now pass on all the browser+platform variants. (Thanks platform-dependent WK networking! 😉 )

Let me know your feedback and I will make any necessary adjustments.

It's also worth skimming through #6695 to what additional information will be coming in next.

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
GNOME Infrastructure Automation Bot (gnomesysadmins) pushed a commit to GNOME/glib that referenced this pull request Jun 1, 2021
This changeset exposes
* `not-valid-before`
* `not-valid-after`
* `subject-name`
* `issuer-name`
on GTlsCertificate provided by the underlying TLS Backend.
In order to make use of these changes,
see the related [glib-networking MR][glib-networking].
This change aims to help populate more of the [`Certificate`][wk-cert]
info in the WebKit Inspector Protocol on Linux.
This changeset stems from work in Microsoft Playwright to [add more info
into its HAR capture][pw] generated from the Inspector Protocol events
and will bring feature parity across WebKit platforms.
[wk-cert]: https://github.com/WebKit/WebKit/blob/8afe31a018b11741abdf9b4d5bb973d7c1d9ff05/Source/JavaScriptCore/inspector/protocol/Security.json
[pw]: microsoft/playwright#6631
[glib-networking]: https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/156
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts
@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

requestStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.requestStart) : -1,
responseStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.responseStart) : -1,
};

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

There are a number of errant extra newlines that I'll clean up. They are an artifact of refactoring within this MR.

@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this in _requestFinished(…).

@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this [before] _requestFinished(…).

Here's what that might look like: rwoll#2. Joel Einbinder (@JoelEinbinder) Let me know which approach you think is cleaner:

  1. Everything in loading finished modulo fixing Chromium breakage of the postData test cases: e29de4c
  2. Using callbacks like WIP: feat(har): experiment with finish callbacks rwoll/playwright#2 which are invoked next to createResponse for CR/FF and then _loadingFinished for WK).

I like doing everything in request finished for simplicity/unity, but I'm not sure how to compromise between Chrome and WebKit. I don't love rwoll#2 since—while it's simple for Chrome and FF—you can accidentally hang the HAR capture in WK if the finish callbacks aren't invoked in all terminal response paths (although I've added tests to make sure we are good here).

@rwoll

Copy link
Copy Markdown
MemberAuthor

Updated with option 2 since fixing Chromium not firing loading finished is out of scope.

Comment threadsrc/server/network.ts Outdated
}

_serverIPAddressAndPortFinished(serverIPAddress?: IPAddressAndPort) {
this._serverIPAddressAndPortPromiseCallback(helper.filterEmpties(serverIPAddress));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think you need filterEmpties here and below. Everything is eventually going to be JSON.stringified into the har.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I've updated this, but we will get some empty objects for securityDetails in the HAR. (Tests updated accordingly.)

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/helper.ts Outdated

@mxschmittMax Schmitt (mxschmitt) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Awesome work! (don't forget to rebase)

Comment threadsrc/server/chromium/crNetworkManager.ts Outdated
Comment threadtests/har.spec.ts
Updates in the HAR capture Log Entries:
* `serverIPAddress`: (string) This now gets populated.
* `_serverPort`: (number) This now gets populated. There isn't an
official field according to this [w3 doc][w3] (and I didn't see
a suitable field in a HAR download from Chromium DevTools).
I used the field name from [WK WebInspector HARBuilder.js][wk].
* _securityDetails: non-standard info that is helpful in making
assertions about cert expiries.
This also introduces new APIs on `network.Response` exposing the
new info.
NB: At first these APIs were synchonous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.
Closesmicrosoft#6624.
[w3]: https://www.w3.org/community/bigdata-tools/files/2017/10/HAR_Spec_TO_HAR_Vocabulary.pdf
[wk]: https://opensource.apple.com/source/WebInspectorUI/WebInspectorUI-7608.4.9.1.3/UserInterface/Controllers/HARBuilder.js.auto.html
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 17eca1b to 2de1397CompareJune 14, 2021 18:58
@rwoll

Copy link
Copy Markdown
MemberAuthor

All feedback addressed! Thanks for the reviews Joel Einbinder (@JoelEinbinder) and Max Schmitt (@mxschmitt)!

Comment threadtests/har.spec.ts
expect(port).toBe(httpsServer.PORT);
if (browserName === 'webkit' && platform === 'win32')
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863});
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863, validTo: -1});

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure what the best approach is here…should I just mark this test as fully failing on Win32? filterEmpties used to filter out the -1's we were getting from WK.

@mxschmitt
Max Schmitt (mxschmitt) merged commit 195eab8 into microsoft:masterJun 15, 2021
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 17, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature] HAR: IP Address and SSL Info

3 participants

@rwoll@JoelEinbinder@mxschmitt
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

feat(har): record remote IP:PORT and SSL details - #6631

Merged
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl
Jun 15, 2021
Merged

feat(har): record remote IP:PORT and SSL details#6631
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl

Conversation

@rwoll

@rwollRoss Wollman (rwoll) commented May 18, 2021

Copy link
Copy Markdown
Member

Updates in the HAR capture Log Entries:

  • serverIPAddress: (string) This now gets populated.

  • _serverPort: (number) This now gets populated. There isn't an
    official field according to this w3 doc (and I didn't see
    a suitable field in a HAR download from Chromium DevTools).

    I used the field name from WK WebInspector HARBuilder.js.

  • _securityDetails: non-standard info that is helpful in making
    assertions about cert expiries.

This also introduces new APIs on network.Response exposing the
new info.

NB: At first these APIs were synchronous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.

Closes#6624.

@rwollRoss Wollman (rwoll) left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Comment threadtests/har.spec.ts Outdated
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll) marked this pull request as ready for review May 19, 2021 00:44
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I cleaned up the types (including deleting some of the awkward code dealing with the non-standard zero values.) I also added a comment to the WebKit address parsing code with some examples from my testing.

I haven't yet figured out the appropriate changes to emit the Response at the correct time after _onLoadingFinished where the IP address details are available for WebKit so I left the signal barrier in place in the HAR code. I'll remove that once we sort out dealing Response emission timing (directly or indirectly through guarding the newly added fields behind a Promise api). If we can avoid adding more external Promises to Response, I agree that would be much nicer.

Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 21c91c9 to 9ce3a01CompareMay 20, 2021 21:13
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) Here's the latest pass! Promise-based APIs because of WK. See #6631 (comment) with updated description.

@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 3 times, most recently from d2d1c15 to c7f30eeCompareMay 21, 2021 00:31
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 38e1f04 to b0342f5CompareMay 21, 2021 07:14
Comment threadsrc/server/network.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder): This should now pass on all the browser+platform variants. (Thanks platform-dependent WK networking! 😉 )

Let me know your feedback and I will make any necessary adjustments.

It's also worth skimming through #6695 to what additional information will be coming in next.

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
GNOME Infrastructure Automation Bot (gnomesysadmins) pushed a commit to GNOME/glib that referenced this pull request Jun 1, 2021
This changeset exposes
* `not-valid-before`
* `not-valid-after`
* `subject-name`
* `issuer-name`
on GTlsCertificate provided by the underlying TLS Backend.
In order to make use of these changes,
see the related [glib-networking MR][glib-networking].
This change aims to help populate more of the [`Certificate`][wk-cert]
info in the WebKit Inspector Protocol on Linux.
This changeset stems from work in Microsoft Playwright to [add more info
into its HAR capture][pw] generated from the Inspector Protocol events
and will bring feature parity across WebKit platforms.
[wk-cert]: https://github.com/WebKit/WebKit/blob/8afe31a018b11741abdf9b4d5bb973d7c1d9ff05/Source/JavaScriptCore/inspector/protocol/Security.json
[pw]: microsoft/playwright#6631
[glib-networking]: https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/156
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts
@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

requestStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.requestStart) : -1,
responseStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.responseStart) : -1,
};

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

There are a number of errant extra newlines that I'll clean up. They are an artifact of refactoring within this MR.

@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this in _requestFinished(…).

@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this [before] _requestFinished(…).

Here's what that might look like: rwoll#2. Joel Einbinder (@JoelEinbinder) Let me know which approach you think is cleaner:

  1. Everything in loading finished modulo fixing Chromium breakage of the postData test cases: e29de4c
  2. Using callbacks like WIP: feat(har): experiment with finish callbacks rwoll/playwright#2 which are invoked next to createResponse for CR/FF and then _loadingFinished for WK).

I like doing everything in request finished for simplicity/unity, but I'm not sure how to compromise between Chrome and WebKit. I don't love rwoll#2 since—while it's simple for Chrome and FF—you can accidentally hang the HAR capture in WK if the finish callbacks aren't invoked in all terminal response paths (although I've added tests to make sure we are good here).

@rwoll

Copy link
Copy Markdown
MemberAuthor

Updated with option 2 since fixing Chromium not firing loading finished is out of scope.

Comment threadsrc/server/network.ts Outdated
}

_serverIPAddressAndPortFinished(serverIPAddress?: IPAddressAndPort) {
this._serverIPAddressAndPortPromiseCallback(helper.filterEmpties(serverIPAddress));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think you need filterEmpties here and below. Everything is eventually going to be JSON.stringified into the har.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I've updated this, but we will get some empty objects for securityDetails in the HAR. (Tests updated accordingly.)

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/helper.ts Outdated

@mxschmittMax Schmitt (mxschmitt) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Awesome work! (don't forget to rebase)

Comment threadsrc/server/chromium/crNetworkManager.ts Outdated
Comment threadtests/har.spec.ts
Updates in the HAR capture Log Entries:
* `serverIPAddress`: (string) This now gets populated.
* `_serverPort`: (number) This now gets populated. There isn't an
official field according to this [w3 doc][w3] (and I didn't see
a suitable field in a HAR download from Chromium DevTools).
I used the field name from [WK WebInspector HARBuilder.js][wk].
* _securityDetails: non-standard info that is helpful in making
assertions about cert expiries.
This also introduces new APIs on `network.Response` exposing the
new info.
NB: At first these APIs were synchonous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.
Closesmicrosoft#6624.
[w3]: https://www.w3.org/community/bigdata-tools/files/2017/10/HAR_Spec_TO_HAR_Vocabulary.pdf
[wk]: https://opensource.apple.com/source/WebInspectorUI/WebInspectorUI-7608.4.9.1.3/UserInterface/Controllers/HARBuilder.js.auto.html
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 17eca1b to 2de1397CompareJune 14, 2021 18:58
@rwoll

Copy link
Copy Markdown
MemberAuthor

All feedback addressed! Thanks for the reviews Joel Einbinder (@JoelEinbinder) and Max Schmitt (@mxschmitt)!

Comment threadtests/har.spec.ts
expect(port).toBe(httpsServer.PORT);
if (browserName === 'webkit' && platform === 'win32')
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863});
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863, validTo: -1});

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure what the best approach is here…should I just mark this test as fully failing on Win32? filterEmpties used to filter out the -1's we were getting from WK.

@mxschmitt
Max Schmitt (mxschmitt) merged commit 195eab8 into microsoft:masterJun 15, 2021
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 17, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature] HAR: IP Address and SSL Info

3 participants

@rwoll@JoelEinbinder@mxschmitt
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(har): record remote IP:PORT and SSL details - #6631

Merged
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl
Jun 15, 2021
Merged

feat(har): record remote IP:PORT and SSL details#6631
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl

Conversation

@rwoll

@rwollRoss Wollman (rwoll) commented May 18, 2021

Copy link
Copy Markdown
Member

Updates in the HAR capture Log Entries:

  • serverIPAddress: (string) This now gets populated.

  • _serverPort: (number) This now gets populated. There isn't an
    official field according to this w3 doc (and I didn't see
    a suitable field in a HAR download from Chromium DevTools).

    I used the field name from WK WebInspector HARBuilder.js.

  • _securityDetails: non-standard info that is helpful in making
    assertions about cert expiries.

This also introduces new APIs on network.Response exposing the
new info.

NB: At first these APIs were synchronous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.

Closes#6624.

@rwollRoss Wollman (rwoll) left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Comment threadtests/har.spec.ts Outdated
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll) marked this pull request as ready for review May 19, 2021 00:44
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I cleaned up the types (including deleting some of the awkward code dealing with the non-standard zero values.) I also added a comment to the WebKit address parsing code with some examples from my testing.

I haven't yet figured out the appropriate changes to emit the Response at the correct time after _onLoadingFinished where the IP address details are available for WebKit so I left the signal barrier in place in the HAR code. I'll remove that once we sort out dealing Response emission timing (directly or indirectly through guarding the newly added fields behind a Promise api). If we can avoid adding more external Promises to Response, I agree that would be much nicer.

Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 21c91c9 to 9ce3a01CompareMay 20, 2021 21:13
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) Here's the latest pass! Promise-based APIs because of WK. See #6631 (comment) with updated description.

@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 3 times, most recently from d2d1c15 to c7f30eeCompareMay 21, 2021 00:31
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 38e1f04 to b0342f5CompareMay 21, 2021 07:14
Comment threadsrc/server/network.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder): This should now pass on all the browser+platform variants. (Thanks platform-dependent WK networking! 😉 )

Let me know your feedback and I will make any necessary adjustments.

It's also worth skimming through #6695 to what additional information will be coming in next.

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
GNOME Infrastructure Automation Bot (gnomesysadmins) pushed a commit to GNOME/glib that referenced this pull request Jun 1, 2021
This changeset exposes
* `not-valid-before`
* `not-valid-after`
* `subject-name`
* `issuer-name`
on GTlsCertificate provided by the underlying TLS Backend.
In order to make use of these changes,
see the related [glib-networking MR][glib-networking].
This change aims to help populate more of the [`Certificate`][wk-cert]
info in the WebKit Inspector Protocol on Linux.
This changeset stems from work in Microsoft Playwright to [add more info
into its HAR capture][pw] generated from the Inspector Protocol events
and will bring feature parity across WebKit platforms.
[wk-cert]: https://github.com/WebKit/WebKit/blob/8afe31a018b11741abdf9b4d5bb973d7c1d9ff05/Source/JavaScriptCore/inspector/protocol/Security.json
[pw]: microsoft/playwright#6631
[glib-networking]: https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/156
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts
@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

requestStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.requestStart) : -1,
responseStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.responseStart) : -1,
};

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

There are a number of errant extra newlines that I'll clean up. They are an artifact of refactoring within this MR.

@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this in _requestFinished(…).

@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this [before] _requestFinished(…).

Here's what that might look like: rwoll#2. Joel Einbinder (@JoelEinbinder) Let me know which approach you think is cleaner:

  1. Everything in loading finished modulo fixing Chromium breakage of the postData test cases: e29de4c
  2. Using callbacks like WIP: feat(har): experiment with finish callbacks rwoll/playwright#2 which are invoked next to createResponse for CR/FF and then _loadingFinished for WK).

I like doing everything in request finished for simplicity/unity, but I'm not sure how to compromise between Chrome and WebKit. I don't love rwoll#2 since—while it's simple for Chrome and FF—you can accidentally hang the HAR capture in WK if the finish callbacks aren't invoked in all terminal response paths (although I've added tests to make sure we are good here).

@rwoll

Copy link
Copy Markdown
MemberAuthor

Updated with option 2 since fixing Chromium not firing loading finished is out of scope.

Comment threadsrc/server/network.ts Outdated
}

_serverIPAddressAndPortFinished(serverIPAddress?: IPAddressAndPort) {
this._serverIPAddressAndPortPromiseCallback(helper.filterEmpties(serverIPAddress));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think you need filterEmpties here and below. Everything is eventually going to be JSON.stringified into the har.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I've updated this, but we will get some empty objects for securityDetails in the HAR. (Tests updated accordingly.)

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/helper.ts Outdated

@mxschmittMax Schmitt (mxschmitt) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Awesome work! (don't forget to rebase)

Comment threadsrc/server/chromium/crNetworkManager.ts Outdated
Comment threadtests/har.spec.ts
Updates in the HAR capture Log Entries:
* `serverIPAddress`: (string) This now gets populated.
* `_serverPort`: (number) This now gets populated. There isn't an
official field according to this [w3 doc][w3] (and I didn't see
a suitable field in a HAR download from Chromium DevTools).
I used the field name from [WK WebInspector HARBuilder.js][wk].
* _securityDetails: non-standard info that is helpful in making
assertions about cert expiries.
This also introduces new APIs on `network.Response` exposing the
new info.
NB: At first these APIs were synchonous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.
Closesmicrosoft#6624.
[w3]: https://www.w3.org/community/bigdata-tools/files/2017/10/HAR_Spec_TO_HAR_Vocabulary.pdf
[wk]: https://opensource.apple.com/source/WebInspectorUI/WebInspectorUI-7608.4.9.1.3/UserInterface/Controllers/HARBuilder.js.auto.html
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 17eca1b to 2de1397CompareJune 14, 2021 18:58
@rwoll

Copy link
Copy Markdown
MemberAuthor

All feedback addressed! Thanks for the reviews Joel Einbinder (@JoelEinbinder) and Max Schmitt (@mxschmitt)!

Comment threadtests/har.spec.ts
expect(port).toBe(httpsServer.PORT);
if (browserName === 'webkit' && platform === 'win32')
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863});
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863, validTo: -1});

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure what the best approach is here…should I just mark this test as fully failing on Win32? filterEmpties used to filter out the -1's we were getting from WK.

@mxschmitt
Max Schmitt (mxschmitt) merged commit 195eab8 into microsoft:masterJun 15, 2021
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 17, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature] HAR: IP Address and SSL Info

3 participants

@rwoll@JoelEinbinder@mxschmitt
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(har): record remote IP:PORT and SSL details - #6631

Merged
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl
Jun 15, 2021
Merged

feat(har): record remote IP:PORT and SSL details#6631
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl

Conversation

@rwoll

@rwollRoss Wollman (rwoll) commented May 18, 2021

Copy link
Copy Markdown
Member

Updates in the HAR capture Log Entries:

  • serverIPAddress: (string) This now gets populated.

  • _serverPort: (number) This now gets populated. There isn't an
    official field according to this w3 doc (and I didn't see
    a suitable field in a HAR download from Chromium DevTools).

    I used the field name from WK WebInspector HARBuilder.js.

  • _securityDetails: non-standard info that is helpful in making
    assertions about cert expiries.

This also introduces new APIs on network.Response exposing the
new info.

NB: At first these APIs were synchronous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.

Closes#6624.

@rwollRoss Wollman (rwoll) left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Comment threadtests/har.spec.ts Outdated
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll) marked this pull request as ready for review May 19, 2021 00:44
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I cleaned up the types (including deleting some of the awkward code dealing with the non-standard zero values.) I also added a comment to the WebKit address parsing code with some examples from my testing.

I haven't yet figured out the appropriate changes to emit the Response at the correct time after _onLoadingFinished where the IP address details are available for WebKit so I left the signal barrier in place in the HAR code. I'll remove that once we sort out dealing Response emission timing (directly or indirectly through guarding the newly added fields behind a Promise api). If we can avoid adding more external Promises to Response, I agree that would be much nicer.

Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 21c91c9 to 9ce3a01CompareMay 20, 2021 21:13
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) Here's the latest pass! Promise-based APIs because of WK. See #6631 (comment) with updated description.

@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 3 times, most recently from d2d1c15 to c7f30eeCompareMay 21, 2021 00:31
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 38e1f04 to b0342f5CompareMay 21, 2021 07:14
Comment threadsrc/server/network.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder): This should now pass on all the browser+platform variants. (Thanks platform-dependent WK networking! 😉 )

Let me know your feedback and I will make any necessary adjustments.

It's also worth skimming through #6695 to what additional information will be coming in next.

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
GNOME Infrastructure Automation Bot (gnomesysadmins) pushed a commit to GNOME/glib that referenced this pull request Jun 1, 2021
This changeset exposes
* `not-valid-before`
* `not-valid-after`
* `subject-name`
* `issuer-name`
on GTlsCertificate provided by the underlying TLS Backend.
In order to make use of these changes,
see the related [glib-networking MR][glib-networking].
This change aims to help populate more of the [`Certificate`][wk-cert]
info in the WebKit Inspector Protocol on Linux.
This changeset stems from work in Microsoft Playwright to [add more info
into its HAR capture][pw] generated from the Inspector Protocol events
and will bring feature parity across WebKit platforms.
[wk-cert]: https://github.com/WebKit/WebKit/blob/8afe31a018b11741abdf9b4d5bb973d7c1d9ff05/Source/JavaScriptCore/inspector/protocol/Security.json
[pw]: microsoft/playwright#6631
[glib-networking]: https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/156
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts
@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

requestStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.requestStart) : -1,
responseStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.responseStart) : -1,
};

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

There are a number of errant extra newlines that I'll clean up. They are an artifact of refactoring within this MR.

@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this in _requestFinished(…).

@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this [before] _requestFinished(…).

Here's what that might look like: rwoll#2. Joel Einbinder (@JoelEinbinder) Let me know which approach you think is cleaner:

  1. Everything in loading finished modulo fixing Chromium breakage of the postData test cases: e29de4c
  2. Using callbacks like WIP: feat(har): experiment with finish callbacks rwoll/playwright#2 which are invoked next to createResponse for CR/FF and then _loadingFinished for WK).

I like doing everything in request finished for simplicity/unity, but I'm not sure how to compromise between Chrome and WebKit. I don't love rwoll#2 since—while it's simple for Chrome and FF—you can accidentally hang the HAR capture in WK if the finish callbacks aren't invoked in all terminal response paths (although I've added tests to make sure we are good here).

@rwoll

Copy link
Copy Markdown
MemberAuthor

Updated with option 2 since fixing Chromium not firing loading finished is out of scope.

Comment threadsrc/server/network.ts Outdated
}

_serverIPAddressAndPortFinished(serverIPAddress?: IPAddressAndPort) {
this._serverIPAddressAndPortPromiseCallback(helper.filterEmpties(serverIPAddress));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think you need filterEmpties here and below. Everything is eventually going to be JSON.stringified into the har.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I've updated this, but we will get some empty objects for securityDetails in the HAR. (Tests updated accordingly.)

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/helper.ts Outdated

@mxschmittMax Schmitt (mxschmitt) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Awesome work! (don't forget to rebase)

Comment threadsrc/server/chromium/crNetworkManager.ts Outdated
Comment threadtests/har.spec.ts
Updates in the HAR capture Log Entries:
* `serverIPAddress`: (string) This now gets populated.
* `_serverPort`: (number) This now gets populated. There isn't an
official field according to this [w3 doc][w3] (and I didn't see
a suitable field in a HAR download from Chromium DevTools).
I used the field name from [WK WebInspector HARBuilder.js][wk].
* _securityDetails: non-standard info that is helpful in making
assertions about cert expiries.
This also introduces new APIs on `network.Response` exposing the
new info.
NB: At first these APIs were synchonous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.
Closesmicrosoft#6624.
[w3]: https://www.w3.org/community/bigdata-tools/files/2017/10/HAR_Spec_TO_HAR_Vocabulary.pdf
[wk]: https://opensource.apple.com/source/WebInspectorUI/WebInspectorUI-7608.4.9.1.3/UserInterface/Controllers/HARBuilder.js.auto.html
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 17eca1b to 2de1397CompareJune 14, 2021 18:58
@rwoll

Copy link
Copy Markdown
MemberAuthor

All feedback addressed! Thanks for the reviews Joel Einbinder (@JoelEinbinder) and Max Schmitt (@mxschmitt)!

Comment threadtests/har.spec.ts
expect(port).toBe(httpsServer.PORT);
if (browserName === 'webkit' && platform === 'win32')
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863});
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863, validTo: -1});

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure what the best approach is here…should I just mark this test as fully failing on Win32? filterEmpties used to filter out the -1's we were getting from WK.

@mxschmitt
Max Schmitt (mxschmitt) merged commit 195eab8 into microsoft:masterJun 15, 2021
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 17, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature] HAR: IP Address and SSL Info

3 participants

@rwoll@JoelEinbinder@mxschmitt
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

feat(har): record remote IP:PORT and SSL details - #6631

Merged
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl
Jun 15, 2021
Merged

feat(har): record remote IP:PORT and SSL details#6631
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl

Conversation

@rwoll

@rwollRoss Wollman (rwoll) commented May 18, 2021

Copy link
Copy Markdown
Member

Updates in the HAR capture Log Entries:

  • serverIPAddress: (string) This now gets populated.

  • _serverPort: (number) This now gets populated. There isn't an
    official field according to this w3 doc (and I didn't see
    a suitable field in a HAR download from Chromium DevTools).

    I used the field name from WK WebInspector HARBuilder.js.

  • _securityDetails: non-standard info that is helpful in making
    assertions about cert expiries.

This also introduces new APIs on network.Response exposing the
new info.

NB: At first these APIs were synchronous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.

Closes#6624.

@rwollRoss Wollman (rwoll) left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Comment threadtests/har.spec.ts Outdated
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll) marked this pull request as ready for review May 19, 2021 00:44
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I cleaned up the types (including deleting some of the awkward code dealing with the non-standard zero values.) I also added a comment to the WebKit address parsing code with some examples from my testing.

I haven't yet figured out the appropriate changes to emit the Response at the correct time after _onLoadingFinished where the IP address details are available for WebKit so I left the signal barrier in place in the HAR code. I'll remove that once we sort out dealing Response emission timing (directly or indirectly through guarding the newly added fields behind a Promise api). If we can avoid adding more external Promises to Response, I agree that would be much nicer.

Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 21c91c9 to 9ce3a01CompareMay 20, 2021 21:13
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) Here's the latest pass! Promise-based APIs because of WK. See #6631 (comment) with updated description.

@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 3 times, most recently from d2d1c15 to c7f30eeCompareMay 21, 2021 00:31
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 38e1f04 to b0342f5CompareMay 21, 2021 07:14
Comment threadsrc/server/network.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder): This should now pass on all the browser+platform variants. (Thanks platform-dependent WK networking! 😉 )

Let me know your feedback and I will make any necessary adjustments.

It's also worth skimming through #6695 to what additional information will be coming in next.

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
GNOME Infrastructure Automation Bot (gnomesysadmins) pushed a commit to GNOME/glib that referenced this pull request Jun 1, 2021
This changeset exposes
* `not-valid-before`
* `not-valid-after`
* `subject-name`
* `issuer-name`
on GTlsCertificate provided by the underlying TLS Backend.
In order to make use of these changes,
see the related [glib-networking MR][glib-networking].
This change aims to help populate more of the [`Certificate`][wk-cert]
info in the WebKit Inspector Protocol on Linux.
This changeset stems from work in Microsoft Playwright to [add more info
into its HAR capture][pw] generated from the Inspector Protocol events
and will bring feature parity across WebKit platforms.
[wk-cert]: https://github.com/WebKit/WebKit/blob/8afe31a018b11741abdf9b4d5bb973d7c1d9ff05/Source/JavaScriptCore/inspector/protocol/Security.json
[pw]: microsoft/playwright#6631
[glib-networking]: https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/156
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts
@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

requestStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.requestStart) : -1,
responseStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.responseStart) : -1,
};

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

There are a number of errant extra newlines that I'll clean up. They are an artifact of refactoring within this MR.

@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this in _requestFinished(…).

@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this [before] _requestFinished(…).

Here's what that might look like: rwoll#2. Joel Einbinder (@JoelEinbinder) Let me know which approach you think is cleaner:

  1. Everything in loading finished modulo fixing Chromium breakage of the postData test cases: e29de4c
  2. Using callbacks like WIP: feat(har): experiment with finish callbacks rwoll/playwright#2 which are invoked next to createResponse for CR/FF and then _loadingFinished for WK).

I like doing everything in request finished for simplicity/unity, but I'm not sure how to compromise between Chrome and WebKit. I don't love rwoll#2 since—while it's simple for Chrome and FF—you can accidentally hang the HAR capture in WK if the finish callbacks aren't invoked in all terminal response paths (although I've added tests to make sure we are good here).

@rwoll

Copy link
Copy Markdown
MemberAuthor

Updated with option 2 since fixing Chromium not firing loading finished is out of scope.

Comment threadsrc/server/network.ts Outdated
}

_serverIPAddressAndPortFinished(serverIPAddress?: IPAddressAndPort) {
this._serverIPAddressAndPortPromiseCallback(helper.filterEmpties(serverIPAddress));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think you need filterEmpties here and below. Everything is eventually going to be JSON.stringified into the har.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I've updated this, but we will get some empty objects for securityDetails in the HAR. (Tests updated accordingly.)

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/helper.ts Outdated

@mxschmittMax Schmitt (mxschmitt) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Awesome work! (don't forget to rebase)

Comment threadsrc/server/chromium/crNetworkManager.ts Outdated
Comment threadtests/har.spec.ts
Updates in the HAR capture Log Entries:
* `serverIPAddress`: (string) This now gets populated.
* `_serverPort`: (number) This now gets populated. There isn't an
official field according to this [w3 doc][w3] (and I didn't see
a suitable field in a HAR download from Chromium DevTools).
I used the field name from [WK WebInspector HARBuilder.js][wk].
* _securityDetails: non-standard info that is helpful in making
assertions about cert expiries.
This also introduces new APIs on `network.Response` exposing the
new info.
NB: At first these APIs were synchonous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.
Closesmicrosoft#6624.
[w3]: https://www.w3.org/community/bigdata-tools/files/2017/10/HAR_Spec_TO_HAR_Vocabulary.pdf
[wk]: https://opensource.apple.com/source/WebInspectorUI/WebInspectorUI-7608.4.9.1.3/UserInterface/Controllers/HARBuilder.js.auto.html
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 17eca1b to 2de1397CompareJune 14, 2021 18:58
@rwoll

Copy link
Copy Markdown
MemberAuthor

All feedback addressed! Thanks for the reviews Joel Einbinder (@JoelEinbinder) and Max Schmitt (@mxschmitt)!

Comment threadtests/har.spec.ts
expect(port).toBe(httpsServer.PORT);
if (browserName === 'webkit' && platform === 'win32')
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863});
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863, validTo: -1});

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure what the best approach is here…should I just mark this test as fully failing on Win32? filterEmpties used to filter out the -1's we were getting from WK.

@mxschmitt
Max Schmitt (mxschmitt) merged commit 195eab8 into microsoft:masterJun 15, 2021
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 17, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature] HAR: IP Address and SSL Info

3 participants

@rwoll@JoelEinbinder@mxschmitt
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(har): record remote IP:PORT and SSL details - #6631

Merged
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl
Jun 15, 2021
Merged

feat(har): record remote IP:PORT and SSL details#6631
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl

Conversation

@rwoll

@rwollRoss Wollman (rwoll) commented May 18, 2021

Copy link
Copy Markdown
Member

Updates in the HAR capture Log Entries:

  • serverIPAddress: (string) This now gets populated.

  • _serverPort: (number) This now gets populated. There isn't an
    official field according to this w3 doc (and I didn't see
    a suitable field in a HAR download from Chromium DevTools).

    I used the field name from WK WebInspector HARBuilder.js.

  • _securityDetails: non-standard info that is helpful in making
    assertions about cert expiries.

This also introduces new APIs on network.Response exposing the
new info.

NB: At first these APIs were synchronous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.

Closes#6624.

@rwollRoss Wollman (rwoll) left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Comment threadtests/har.spec.ts Outdated
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll) marked this pull request as ready for review May 19, 2021 00:44
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I cleaned up the types (including deleting some of the awkward code dealing with the non-standard zero values.) I also added a comment to the WebKit address parsing code with some examples from my testing.

I haven't yet figured out the appropriate changes to emit the Response at the correct time after _onLoadingFinished where the IP address details are available for WebKit so I left the signal barrier in place in the HAR code. I'll remove that once we sort out dealing Response emission timing (directly or indirectly through guarding the newly added fields behind a Promise api). If we can avoid adding more external Promises to Response, I agree that would be much nicer.

Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 21c91c9 to 9ce3a01CompareMay 20, 2021 21:13
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) Here's the latest pass! Promise-based APIs because of WK. See #6631 (comment) with updated description.

@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 3 times, most recently from d2d1c15 to c7f30eeCompareMay 21, 2021 00:31
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 38e1f04 to b0342f5CompareMay 21, 2021 07:14
Comment threadsrc/server/network.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder): This should now pass on all the browser+platform variants. (Thanks platform-dependent WK networking! 😉 )

Let me know your feedback and I will make any necessary adjustments.

It's also worth skimming through #6695 to what additional information will be coming in next.

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
GNOME Infrastructure Automation Bot (gnomesysadmins) pushed a commit to GNOME/glib that referenced this pull request Jun 1, 2021
This changeset exposes
* `not-valid-before`
* `not-valid-after`
* `subject-name`
* `issuer-name`
on GTlsCertificate provided by the underlying TLS Backend.
In order to make use of these changes,
see the related [glib-networking MR][glib-networking].
This change aims to help populate more of the [`Certificate`][wk-cert]
info in the WebKit Inspector Protocol on Linux.
This changeset stems from work in Microsoft Playwright to [add more info
into its HAR capture][pw] generated from the Inspector Protocol events
and will bring feature parity across WebKit platforms.
[wk-cert]: https://github.com/WebKit/WebKit/blob/8afe31a018b11741abdf9b4d5bb973d7c1d9ff05/Source/JavaScriptCore/inspector/protocol/Security.json
[pw]: microsoft/playwright#6631
[glib-networking]: https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/156
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts
@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

requestStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.requestStart) : -1,
responseStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.responseStart) : -1,
};

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

There are a number of errant extra newlines that I'll clean up. They are an artifact of refactoring within this MR.

@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this in _requestFinished(…).

@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this [before] _requestFinished(…).

Here's what that might look like: rwoll#2. Joel Einbinder (@JoelEinbinder) Let me know which approach you think is cleaner:

  1. Everything in loading finished modulo fixing Chromium breakage of the postData test cases: e29de4c
  2. Using callbacks like WIP: feat(har): experiment with finish callbacks rwoll/playwright#2 which are invoked next to createResponse for CR/FF and then _loadingFinished for WK).

I like doing everything in request finished for simplicity/unity, but I'm not sure how to compromise between Chrome and WebKit. I don't love rwoll#2 since—while it's simple for Chrome and FF—you can accidentally hang the HAR capture in WK if the finish callbacks aren't invoked in all terminal response paths (although I've added tests to make sure we are good here).

@rwoll

Copy link
Copy Markdown
MemberAuthor

Updated with option 2 since fixing Chromium not firing loading finished is out of scope.

Comment threadsrc/server/network.ts Outdated
}

_serverIPAddressAndPortFinished(serverIPAddress?: IPAddressAndPort) {
this._serverIPAddressAndPortPromiseCallback(helper.filterEmpties(serverIPAddress));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think you need filterEmpties here and below. Everything is eventually going to be JSON.stringified into the har.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I've updated this, but we will get some empty objects for securityDetails in the HAR. (Tests updated accordingly.)

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/helper.ts Outdated

@mxschmittMax Schmitt (mxschmitt) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Awesome work! (don't forget to rebase)

Comment threadsrc/server/chromium/crNetworkManager.ts Outdated
Comment threadtests/har.spec.ts
Updates in the HAR capture Log Entries:
* `serverIPAddress`: (string) This now gets populated.
* `_serverPort`: (number) This now gets populated. There isn't an
official field according to this [w3 doc][w3] (and I didn't see
a suitable field in a HAR download from Chromium DevTools).
I used the field name from [WK WebInspector HARBuilder.js][wk].
* _securityDetails: non-standard info that is helpful in making
assertions about cert expiries.
This also introduces new APIs on `network.Response` exposing the
new info.
NB: At first these APIs were synchonous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.
Closesmicrosoft#6624.
[w3]: https://www.w3.org/community/bigdata-tools/files/2017/10/HAR_Spec_TO_HAR_Vocabulary.pdf
[wk]: https://opensource.apple.com/source/WebInspectorUI/WebInspectorUI-7608.4.9.1.3/UserInterface/Controllers/HARBuilder.js.auto.html
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 17eca1b to 2de1397CompareJune 14, 2021 18:58
@rwoll

Copy link
Copy Markdown
MemberAuthor

All feedback addressed! Thanks for the reviews Joel Einbinder (@JoelEinbinder) and Max Schmitt (@mxschmitt)!

Comment threadtests/har.spec.ts
expect(port).toBe(httpsServer.PORT);
if (browserName === 'webkit' && platform === 'win32')
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863});
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863, validTo: -1});

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure what the best approach is here…should I just mark this test as fully failing on Win32? filterEmpties used to filter out the -1's we were getting from WK.

@mxschmitt
Max Schmitt (mxschmitt) merged commit 195eab8 into microsoft:masterJun 15, 2021
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 17, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature] HAR: IP Address and SSL Info

3 participants

@rwoll@JoelEinbinder@mxschmitt
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(har): record remote IP:PORT and SSL details - #6631

Merged
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl
Jun 15, 2021
Merged

feat(har): record remote IP:PORT and SSL details#6631
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl

Conversation

@rwoll

@rwollRoss Wollman (rwoll) commented May 18, 2021

Copy link
Copy Markdown
Member

Updates in the HAR capture Log Entries:

  • serverIPAddress: (string) This now gets populated.

  • _serverPort: (number) This now gets populated. There isn't an
    official field according to this w3 doc (and I didn't see
    a suitable field in a HAR download from Chromium DevTools).

    I used the field name from WK WebInspector HARBuilder.js.

  • _securityDetails: non-standard info that is helpful in making
    assertions about cert expiries.

This also introduces new APIs on network.Response exposing the
new info.

NB: At first these APIs were synchronous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.

Closes#6624.

@rwollRoss Wollman (rwoll) left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Comment threadtests/har.spec.ts Outdated
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll) marked this pull request as ready for review May 19, 2021 00:44
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I cleaned up the types (including deleting some of the awkward code dealing with the non-standard zero values.) I also added a comment to the WebKit address parsing code with some examples from my testing.

I haven't yet figured out the appropriate changes to emit the Response at the correct time after _onLoadingFinished where the IP address details are available for WebKit so I left the signal barrier in place in the HAR code. I'll remove that once we sort out dealing Response emission timing (directly or indirectly through guarding the newly added fields behind a Promise api). If we can avoid adding more external Promises to Response, I agree that would be much nicer.

Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 21c91c9 to 9ce3a01CompareMay 20, 2021 21:13
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) Here's the latest pass! Promise-based APIs because of WK. See #6631 (comment) with updated description.

@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 3 times, most recently from d2d1c15 to c7f30eeCompareMay 21, 2021 00:31
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 38e1f04 to b0342f5CompareMay 21, 2021 07:14
Comment threadsrc/server/network.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder): This should now pass on all the browser+platform variants. (Thanks platform-dependent WK networking! 😉 )

Let me know your feedback and I will make any necessary adjustments.

It's also worth skimming through #6695 to what additional information will be coming in next.

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
GNOME Infrastructure Automation Bot (gnomesysadmins) pushed a commit to GNOME/glib that referenced this pull request Jun 1, 2021
This changeset exposes
* `not-valid-before`
* `not-valid-after`
* `subject-name`
* `issuer-name`
on GTlsCertificate provided by the underlying TLS Backend.
In order to make use of these changes,
see the related [glib-networking MR][glib-networking].
This change aims to help populate more of the [`Certificate`][wk-cert]
info in the WebKit Inspector Protocol on Linux.
This changeset stems from work in Microsoft Playwright to [add more info
into its HAR capture][pw] generated from the Inspector Protocol events
and will bring feature parity across WebKit platforms.
[wk-cert]: https://github.com/WebKit/WebKit/blob/8afe31a018b11741abdf9b4d5bb973d7c1d9ff05/Source/JavaScriptCore/inspector/protocol/Security.json
[pw]: microsoft/playwright#6631
[glib-networking]: https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/156
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts
@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

requestStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.requestStart) : -1,
responseStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.responseStart) : -1,
};

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

There are a number of errant extra newlines that I'll clean up. They are an artifact of refactoring within this MR.

@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this in _requestFinished(…).

@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this [before] _requestFinished(…).

Here's what that might look like: rwoll#2. Joel Einbinder (@JoelEinbinder) Let me know which approach you think is cleaner:

  1. Everything in loading finished modulo fixing Chromium breakage of the postData test cases: e29de4c
  2. Using callbacks like WIP: feat(har): experiment with finish callbacks rwoll/playwright#2 which are invoked next to createResponse for CR/FF and then _loadingFinished for WK).

I like doing everything in request finished for simplicity/unity, but I'm not sure how to compromise between Chrome and WebKit. I don't love rwoll#2 since—while it's simple for Chrome and FF—you can accidentally hang the HAR capture in WK if the finish callbacks aren't invoked in all terminal response paths (although I've added tests to make sure we are good here).

@rwoll

Copy link
Copy Markdown
MemberAuthor

Updated with option 2 since fixing Chromium not firing loading finished is out of scope.

Comment threadsrc/server/network.ts Outdated
}

_serverIPAddressAndPortFinished(serverIPAddress?: IPAddressAndPort) {
this._serverIPAddressAndPortPromiseCallback(helper.filterEmpties(serverIPAddress));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think you need filterEmpties here and below. Everything is eventually going to be JSON.stringified into the har.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I've updated this, but we will get some empty objects for securityDetails in the HAR. (Tests updated accordingly.)

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/helper.ts Outdated

@mxschmittMax Schmitt (mxschmitt) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Awesome work! (don't forget to rebase)

Comment threadsrc/server/chromium/crNetworkManager.ts Outdated
Comment threadtests/har.spec.ts
Updates in the HAR capture Log Entries:
* `serverIPAddress`: (string) This now gets populated.
* `_serverPort`: (number) This now gets populated. There isn't an
official field according to this [w3 doc][w3] (and I didn't see
a suitable field in a HAR download from Chromium DevTools).
I used the field name from [WK WebInspector HARBuilder.js][wk].
* _securityDetails: non-standard info that is helpful in making
assertions about cert expiries.
This also introduces new APIs on `network.Response` exposing the
new info.
NB: At first these APIs were synchonous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.
Closesmicrosoft#6624.
[w3]: https://www.w3.org/community/bigdata-tools/files/2017/10/HAR_Spec_TO_HAR_Vocabulary.pdf
[wk]: https://opensource.apple.com/source/WebInspectorUI/WebInspectorUI-7608.4.9.1.3/UserInterface/Controllers/HARBuilder.js.auto.html
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 17eca1b to 2de1397CompareJune 14, 2021 18:58
@rwoll

Copy link
Copy Markdown
MemberAuthor

All feedback addressed! Thanks for the reviews Joel Einbinder (@JoelEinbinder) and Max Schmitt (@mxschmitt)!

Comment threadtests/har.spec.ts
expect(port).toBe(httpsServer.PORT);
if (browserName === 'webkit' && platform === 'win32')
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863});
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863, validTo: -1});

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure what the best approach is here…should I just mark this test as fully failing on Win32? filterEmpties used to filter out the -1's we were getting from WK.

@mxschmitt
Max Schmitt (mxschmitt) merged commit 195eab8 into microsoft:masterJun 15, 2021
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 17, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature] HAR: IP Address and SSL Info

3 participants

@rwoll@JoelEinbinder@mxschmitt
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

feat(har): record remote IP:PORT and SSL details - #6631

Merged
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl
Jun 15, 2021
Merged

feat(har): record remote IP:PORT and SSL details#6631
Max Schmitt (mxschmitt) merged 2 commits into
microsoft:masterfrom
rwoll:feature/har-ip-and-ssl

Conversation

@rwoll

@rwollRoss Wollman (rwoll) commented May 18, 2021

Copy link
Copy Markdown
Member

Updates in the HAR capture Log Entries:

  • serverIPAddress: (string) This now gets populated.

  • _serverPort: (number) This now gets populated. There isn't an
    official field according to this w3 doc (and I didn't see
    a suitable field in a HAR download from Chromium DevTools).

    I used the field name from WK WebInspector HARBuilder.js.

  • _securityDetails: non-standard info that is helpful in making
    assertions about cert expiries.

This also introduces new APIs on network.Response exposing the
new info.

NB: At first these APIs were synchronous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.

Closes#6624.

@rwollRoss Wollman (rwoll) left a comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Comment threadtests/har.spec.ts Outdated
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/webkit/wkInterceptableRequest.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll) marked this pull request as ready for review May 19, 2021 00:44
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I cleaned up the types (including deleting some of the awkward code dealing with the non-standard zero values.) I also added a comment to the WebKit address parsing code with some examples from my testing.

I haven't yet figured out the appropriate changes to emit the Response at the correct time after _onLoadingFinished where the IP address details are available for WebKit so I left the signal barrier in place in the HAR code. I'll remove that once we sort out dealing Response emission timing (directly or indirectly through guarding the newly added fields behind a Promise api). If we can avoid adding more external Promises to Response, I agree that would be much nicer.

Comment threadsrc/server/supplements/har/harTracer.ts Outdated
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 21c91c9 to 9ce3a01CompareMay 20, 2021 21:13
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) Here's the latest pass! Promise-based APIs because of WK. See #6631 (comment) with updated description.

@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 3 times, most recently from d2d1c15 to c7f30eeCompareMay 21, 2021 00:31
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 38e1f04 to b0342f5CompareMay 21, 2021 07:14
Comment threadsrc/server/network.ts Outdated
@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder): This should now pass on all the browser+platform variants. (Thanks platform-dependent WK networking! 😉 )

Let me know your feedback and I will make any necessary adjustments.

It's also worth skimming through #6695 to what additional information will be coming in next.

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadtests/har.spec.ts Outdated
GNOME Infrastructure Automation Bot (gnomesysadmins) pushed a commit to GNOME/glib that referenced this pull request Jun 1, 2021
This changeset exposes
* `not-valid-before`
* `not-valid-after`
* `subject-name`
* `issuer-name`
on GTlsCertificate provided by the underlying TLS Backend.
In order to make use of these changes,
see the related [glib-networking MR][glib-networking].
This change aims to help populate more of the [`Certificate`][wk-cert]
info in the WebKit Inspector Protocol on Linux.
This changeset stems from work in Microsoft Playwright to [add more info
into its HAR capture][pw] generated from the Inspector Protocol events
and will bring feature parity across WebKit platforms.
[wk-cert]: https://github.com/WebKit/WebKit/blob/8afe31a018b11741abdf9b4d5bb973d7c1d9ff05/Source/JavaScriptCore/inspector/protocol/Security.json
[pw]: microsoft/playwright#6631
[glib-networking]: https://gitlab.gnome.org/GNOME/glib-networking/-/merge_requests/156
Comment threadtests/har.spec.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/helper.ts Outdated
Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/network.ts
@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

requestStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.requestStart) : -1,
responseStart: timingPayload ? wkMillisToRoundishMillis(timingPayload.responseStart) : -1,
};

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

There are a number of errant extra newlines that I'll clean up. They are an artifact of refactoring within this MR.

@rwoll

Copy link
Copy Markdown
MemberAuthor

Joel Einbinder (@JoelEinbinder) I took a quick pass to refactor to defer populating the information across all browser impls in _onRequestFinished. Please let me know if the general approach looks good. (i.e. save off intermediate request data in a map until we need it later in request finished.) If all looks kosher, I will clean up (i.e. ensure we're deleting out of the map not to leak/bloat mem; additionally, we likely need to do something in some of the other terminal request handlers (i.e. loading failed)—I'll add some more test cases, too.)

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this in _requestFinished(…).

@rwoll

Ross Wollman (rwoll) commented Jun 2, 2021

Copy link
Copy Markdown
MemberAuthor

Unfortunately, this brings me back to why I ended up implementing this and then needing to change to the hybrid approach you saw in the last review: should include postData and should include binary postData now hang because we never fire request finished. Do you have tips to ensure we don't fail on these? (relates: #6631 (comment))

I suppose one approach would be to add response._connectionDetailsFinished(serverIPAddressAndPort, securityDetails) that FF and CR can call immediately after createResponse, and WK can call this [before] _requestFinished(…).

Here's what that might look like: rwoll#2. Joel Einbinder (@JoelEinbinder) Let me know which approach you think is cleaner:

  1. Everything in loading finished modulo fixing Chromium breakage of the postData test cases: e29de4c
  2. Using callbacks like WIP: feat(har): experiment with finish callbacks rwoll/playwright#2 which are invoked next to createResponse for CR/FF and then _loadingFinished for WK).

I like doing everything in request finished for simplicity/unity, but I'm not sure how to compromise between Chrome and WebKit. I don't love rwoll#2 since—while it's simple for Chrome and FF—you can accidentally hang the HAR capture in WK if the finish callbacks aren't invoked in all terminal response paths (although I've added tests to make sure we are good here).

@rwoll

Copy link
Copy Markdown
MemberAuthor

Updated with option 2 since fixing Chromium not firing loading finished is out of scope.

Comment threadsrc/server/network.ts Outdated
}

_serverIPAddressAndPortFinished(serverIPAddress?: IPAddressAndPort) {
this._serverIPAddressAndPortPromiseCallback(helper.filterEmpties(serverIPAddress));

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think you need filterEmpties here and below. Everything is eventually going to be JSON.stringified into the har.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I've updated this, but we will get some empty objects for securityDetails in the HAR. (Tests updated accordingly.)

Comment threadsrc/server/network.ts Outdated
Comment threadsrc/server/supplements/har/harTracer.ts Outdated
Comment threadsrc/server/helper.ts Outdated

@mxschmittMax Schmitt (mxschmitt) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Awesome work! (don't forget to rebase)

Comment threadsrc/server/chromium/crNetworkManager.ts Outdated
Comment threadtests/har.spec.ts
Updates in the HAR capture Log Entries:
* `serverIPAddress`: (string) This now gets populated.
* `_serverPort`: (number) This now gets populated. There isn't an
official field according to this [w3 doc][w3] (and I didn't see
a suitable field in a HAR download from Chromium DevTools).
I used the field name from [WK WebInspector HARBuilder.js][wk].
* _securityDetails: non-standard info that is helpful in making
assertions about cert expiries.
This also introduces new APIs on `network.Response` exposing the
new info.
NB: At first these APIs were synchonous and populated with info that is
readily available at the beginning of the Response creation, but WK does
not emit IP address info until _loadingFinished, so the API's were all
turned into Promise-based approaches.
Closesmicrosoft#6624.
[w3]: https://www.w3.org/community/bigdata-tools/files/2017/10/HAR_Spec_TO_HAR_Vocabulary.pdf
[wk]: https://opensource.apple.com/source/WebInspectorUI/WebInspectorUI-7608.4.9.1.3/UserInterface/Controllers/HARBuilder.js.auto.html
@rwoll
Ross Wollman (rwoll)force-pushed the feature/har-ip-and-ssl branch 2 times, most recently from 17eca1b to 2de1397CompareJune 14, 2021 18:58
@rwoll

Copy link
Copy Markdown
MemberAuthor

All feedback addressed! Thanks for the reviews Joel Einbinder (@JoelEinbinder) and Max Schmitt (@mxschmitt)!

Comment threadtests/har.spec.ts
expect(port).toBe(httpsServer.PORT);
if (browserName === 'webkit' && platform === 'win32')
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863});
expect(securityDetails).toEqual({subjectName: 'puppeteer-tests', validFrom: 1550084863, validTo: -1});

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Not sure what the best approach is here…should I just mark this test as fully failing on Win32? filterEmpties used to filter out the -1's we were getting from WK.

@mxschmitt
Max Schmitt (mxschmitt) merged commit 195eab8 into microsoft:masterJun 15, 2021
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 15, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Ross Wollman (rwoll) added a commit to rwoll/playwright that referenced this pull request Jun 17, 2021
This allows users to access the connection information outside of the
HAR file in realtime.
Closesmicrosoft#7147.
Relates microsoft#6631.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature] HAR: IP Address and SSL Info

3 participants

@rwoll@JoelEinbinder@mxschmitt