230173 2021-09-10 15:32:22 -0700 Web Inspector: Network: "Lock" icon next to domain name in table view should show security information 2021-11-03 10:34:57 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All NEW InRadar P2 Normal --- 1 pangle webkit-unassigned ews-watchlist hi inspector-bugzilla-changes joepeck richardju97 webkit-bug-importer oldest_to_newest 1792560 0 pangle 2021-09-10 15:32:22 -0700 Clicking the lock icon should take you to that resource/request's Security sub-tab to view details about the certificate for the resource/request. 1792561 1 webkit-bug-importer 2021-09-10 15:32:32 -0700 <rdar://problem/82992637> 1796750 2 richardju97 2021-09-23 19:21:11 -0700 Currently working on this - would it not be preferable for the click to bring up the certificate directly (similar to clicking on the lock in the URL area) instead of the Security sub-tab? 1796760 3 joepeck 2021-09-23 20:10:39 -0700 Cool idea! Might be good to start out with a Context Menu for each action, and then see which feels better / more useful and make that a default click action. 1809945 4 442778 richardju97 2021-10-28 20:46:19 -0700 Created attachment 442778 Patch 1809948 5 442778 richardju97 2021-10-28 20:50:21 -0700 Comment on attachment 442778 Patch Various test cases failed when running run-webkit-tests, however, these seem to happen even when I stash my changes. Additionally I didn't write a test case for this as per the wiki page below Web Inspector UI changes don't require it. https://trac.webkit.org/wiki/WebInspectorTests 1810188 6 442778 pangle 2021-10-29 12:41:20 -0700 Comment on attachment 442778 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442778&action=review Thanks for the patch! This is going to be really handy for quickly getting to certificate info. I've left a few comments, but overall this feels like a good approach. > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js:719 > + let security = entry.resource.security; > + if (isEmptyObject(security)) { > + cell.append(domain || emDash); > + return; > + } > + > + let certificate = security.certificate; > + if (isEmptyObject(certificate) || Object.values(certificate).every((value) => !value)) { > + cell.append(domain || emDash); > + return; > + } > + > + lockIconElement.addEventListener("click", (event) => { > + > + if (WI.NetworkManager.supportsShowCertificate()) { > + entry.resource.showCertificate() > + .catch((error) => { > + console.error(error); > + }); > + } > + }); While this works, it would be great to not duplicate the `cell.append(domain || emDash)` in multiple places. Instead of early returns here, we could instead do something along the lines of... ``` let certificate = entry.resource.security?.certificate if (WI.NetworkManager.supportsShowCertificate() && certificate && Object.values(certificate).some((value) => value)) { lockIconElement.addEventListener("click", (event) => { // Do nothing with thrown exceptions since `showCertificate` will log any thrown exception. entry.resource.showCertificate().catch((error) => {}); }); } ``` Other considerations here are that we should make sure that an appropriate accessibility label is added to the clickable element (see usage of WI.UIString for examples of how we construct localizable strings like this with three parameters: the text, a key, and details for localizers), and we also probably want to add a bit of styling for the cursor to change to a pointer (on macOS it's the hand with index finger extended cursor) for the element similar to how it changes when you hover over the resource name to the left to indicate that clicking will perform an action. > WebKit.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings:-6 > - <key>BuildSystemType</key> > - <string>Original</string> Probably unintentional; please remove this change from the patch. 1811402 7 443177 richardju97 2021-11-03 00:15:12 -0700 Created attachment 443177 Patch 1811405 8 443180 richardju97 2021-11-03 00:42:31 -0700 Created attachment 443180 Patch 1811407 9 richardju97 2021-11-03 00:51:49 -0700 Had some issues with trying to edit the change log but the new patch incorporates Patrick's changes: 1. Reduce cell.append function calls 2. Adjust CSS to change cursor when hovering 3. Integrate (existing) localized UI string to cell.title Some other things I noticed: the lock icon in the URL bar in safari is labeled as "Show certificate", but the button (and now this icon) in the network details tab use "Show full certificate". Additionally I noticed that the icons' css aren't differentiated by whether or not the certificate exists, so in certain circumstances the cursor would transform even though the button event doesn't exist (in these cases if you go into the details tab you won't see the "Show full certificate" button either). The only case I've seen this is on the initial webkit.org website in Minibrowser though, so not sure how likely this will show up in production? 1811515 10 443180 hi 2021-11-03 10:34:57 -0700 Comment on attachment 443180 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=443180&action=review Nice patch! Some minor comments and then I think we're good to go :) > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.css:124 > + cursor: pointer; We don't normally make clickable icons into a pointer. Is there a reason why we should in this case? > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js:699 > + let security = entry.resource.security; I'm not sure we can assume that `entry.resource` is valid, so you may need to `entry.resource?.security || {}` instead. > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js:703 > + if (!isEmptyObject(security) > + && !isEmptyObject(security.certificate) > + && !Object.values(security.certificate).every((value) => !value)) { I think you can simplify this ``` if (WI.NetworkManager.supportsShowCertificate() && Object.values(security?.certificate || {}).some((value) => value)) ``` > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js:704 > + Style: unnecessary whitespace > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js:706 > + ditto (:704) > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js:707 > + if (WI.NetworkManager.supportsShowCertificate()) { please move this to the outer `if` (see comment above) as we don't event want to add the `"click"` event listener if we can't do something with it > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js:711 > + entry.resource.showCertificate() > + .catch((error) => { > + console.error(error); > + }); you can simplify this to just be `entry.resource.showCertificate().catch(WI.reportInternalError) 442778 2021-10-28 20:46:19 -0700 2021-11-03 00:15:10 -0700 Patch bug-230173-20211028204619.patch text/plain 3788 richardju97 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA5 NDM5NjMwYTMyMTgxMjcwZWU2OTQzZGI5NWU2MzFmZmFhMGVmZTUzLi45ZWQ2Mjc0YzM1YmI3N2Q2 NTI4MmU3YTMxYzY5NmI5YzNlOThkMzQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAyMS0xMC0yOCAgUmljaGFyZCBKdSAgPHJpY2hhcmRqdTk3QGdtYWlsLmNv bT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXR3b3JrOiAiTG9jayIgaWNvbiBuZXh0IHRv IGRvbWFpbiBuYW1lIGluIHRhYmxlIHZpZXcgc2hvdWxkIHNob3cgc2VjdXJpdHkgaW5mb3JtYXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDE3 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJ Lk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcG9wdWxhdGVEb21haW5DZWxsLmNy ZWF0ZUljb25BbmRUZXh0KToKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnBy b3RvdHlwZS5fcG9wdWxhdGVEb21haW5DZWxsKToKKwogMjAyMS0xMC0yNyAgQkogQnVyZyAgPGJi dXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBleHRlbnNpb24gaWZyYW1l cyBsZWFrIHdoZW4gZGlzYWJsaW5nIGFuIGV4dGVuc2lvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFi bGVDb250ZW50Vmlldy5qcwppbmRleCA2NTdkYjE4MTI2MWJiNmM2MTk3OWU0ZWE4ZmIxODI2ODI5 YTU0NjE2Li44ZDkwNDlmNTUwNmU3ZmZlZGYyNTg0MjY2MTM2YzBmMjEyZDk3NjY1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFi bGVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwpAQCAtNjk1LDYgKzY5NSwyOCBAQCBX SS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3 IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgICAgICAgICAgaWYgKHNlY3VyZSkgewogICAgICAg ICAgICAgICAgIGxldCBsb2NrSWNvbkVsZW1lbnQgPSBjZWxsLmFwcGVuZENoaWxkKGRvY3VtZW50 LmNyZWF0ZUVsZW1lbnQoImltZyIpKTsKICAgICAgICAgICAgICAgICBsb2NrSWNvbkVsZW1lbnQu Y2xhc3NOYW1lID0gImxvY2siOworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIGxl dCBzZWN1cml0eSA9IGVudHJ5LnJlc291cmNlLnNlY3VyaXR5OworICAgICAgICAgICAgICAgIGlm IChpc0VtcHR5T2JqZWN0KHNlY3VyaXR5KSkgeworICAgICAgICAgICAgICAgICAgICBjZWxsLmFw cGVuZChkb21haW4gfHwgZW1EYXNoKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIGxldCBjZXJ0aWZpY2F0ZSA9IHNlY3Vy aXR5LmNlcnRpZmljYXRlOworICAgICAgICAgICAgICAgIGlmIChpc0VtcHR5T2JqZWN0KGNlcnRp ZmljYXRlKSB8fCBPYmplY3QudmFsdWVzKGNlcnRpZmljYXRlKS5ldmVyeSgodmFsdWUpID0+ICF2 YWx1ZSkpIHsKKyAgICAgICAgICAgICAgICAgICAgY2VsbC5hcHBlbmQoZG9tYWluIHx8IGVtRGFz aCk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9CisKKyAg ICAgICAgICAgICAgICBsb2NrSWNvbkVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCAo ZXZlbnQpID0+IHsKKworICAgICAgICAgICAgICAgICAgICBpZiAoV0kuTmV0d29ya01hbmFnZXIu c3VwcG9ydHNTaG93Q2VydGlmaWNhdGUoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgZW50 cnkucmVzb3VyY2Uuc2hvd0NlcnRpZmljYXRlKCkKKyAgICAgICAgICAgICAgICAgICAgICAgIC5j YXRjaCgoZXJyb3IpID0+IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmVy cm9yKGVycm9yKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg IGNlbGwuYXBwZW5kKGRvbWFpbiB8fCBlbURhc2gpOwpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIv Q2hhbmdlTG9nCmluZGV4IGYyNTRiYTc4OTg0OWI0ZWE3ZDgxZWU1MmY4ZTI2MDU0ZmY0NmM4NDAu LjNmNTdhMjU4ODgxN2Q3ZjlhYzUwOTRhMjg1MGE1NDFjMTAzM2UxYWQgMTAwNjQ0Ci0tLSBhL0No YW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0xMC0yOCAgUmlj aGFyZCBKdSAgPHJpY2hhcmRqdTk3QGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBOZXR3b3JrOiAiTG9jayIgaWNvbiBuZXh0IHRvIGRvbWFpbiBuYW1lIGluIHRhYmxlIHZpZXcg c2hvdWxkIHNob3cgc2VjdXJpdHkgaW5mb3JtYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDE3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0Lnhjd29ya3NwYWNlL3hjc2hhcmVkZGF0 YS9Xb3Jrc3BhY2VTZXR0aW5ncy54Y3NldHRpbmdzOgorCiAyMDIxLTEwLTI3ICBSb3kgUmVhcG9y ICA8cnJlYXBvckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHJyZWFwb3IncyBHaXRIdWIgdXNl cm5hbWUgdG8gY29udHJpYnV0b3JzLmpzb24uCmRpZmYgLS1naXQgYS9XZWJLaXQueGN3b3Jrc3Bh Y2UveGNzaGFyZWRkYXRhL1dvcmtzcGFjZVNldHRpbmdzLnhjc2V0dGluZ3MgYi9XZWJLaXQueGN3 b3Jrc3BhY2UveGNzaGFyZWRkYXRhL1dvcmtzcGFjZVNldHRpbmdzLnhjc2V0dGluZ3MKaW5kZXgg N2NhMmRlNDU0N2FhMjkzMGQ3MGVhMzNiYTBkODEwZDdhZTc2M2I5Zi4uZmYyM2ViYzgxNzdmZTVk ZjRmMzQwZGY2OGY4YzdhYjViMDIwOWUyOCAxMDA2NDQKLS0tIGEvV2ViS2l0Lnhjd29ya3NwYWNl L3hjc2hhcmVkZGF0YS9Xb3Jrc3BhY2VTZXR0aW5ncy54Y3NldHRpbmdzCisrKyBiL1dlYktpdC54 Y3dvcmtzcGFjZS94Y3NoYXJlZGRhdGEvV29ya3NwYWNlU2V0dGluZ3MueGNzZXR0aW5ncwpAQCAt Miw4ICsyLDYgQEAKIDwhRE9DVFlQRSBwbGlzdCBQVUJMSUMgIi0vL0FwcGxlLy9EVEQgUExJU1Qg MS4wLy9FTiIgImh0dHA6Ly93d3cuYXBwbGUuY29tL0RURHMvUHJvcGVydHlMaXN0LTEuMC5kdGQi PgogPHBsaXN0IHZlcnNpb249IjEuMCI+CiA8ZGljdD4KLQk8a2V5PkJ1aWxkU3lzdGVtVHlwZTwv a2V5PgotCTxzdHJpbmc+T3JpZ2luYWw8L3N0cmluZz4KIAk8a2V5PklERVdvcmtzcGFjZVNoYXJl ZFNldHRpbmdzX0F1dG9jcmVhdGVDb250ZXh0c0lmTmVlZGVkPC9rZXk+CiAJPGZhbHNlLz4KIAk8 a2V5PlByZXZpZXdzRW5hYmxlZDwva2V5Pgo= 443177 2021-11-03 00:15:12 -0700 2021-11-03 00:42:29 -0700 Patch bug-230173-20211103001511.patch text/plain 5220 richardju97 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA5 NDM5NjMwYTMyMTgxMjcwZWU2OTQzZGI5NWU2MzFmZmFhMGVmZTUzLi4wNmRmMzc2YTVhMjY4YjA3 ZDg5OWZmZDQzNTI0OGZmNzNmNTAxZDgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0MCBAQAorMjAyMS0xMS0wMyAgUmljaGFyZCBKdSAgPHJpY2hhcmRqdTk3QGdtYWlsLmNv bT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXR3b3JrOiAiTG9jayIgaWNvbiBuZXh0IHRv IGRvbWFpbiBuYW1lIGluIHRhYmxlIHZpZXcgc2hvdWxkIHNob3cgc2VjdXJpdHkgaW5mb3JtYXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDE3 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3M6CisgICAgICAgICgu bmV0d29yay10YWJsZSA+IC50YWJsZSAuY2VsbC5kb21haW4gPiAubG9jayk6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAg KFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcG9wdWxhdGVEb21haW5DZWxs LmNyZWF0ZUljb25BbmRUZXh0KToKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3 LnByb3RvdHlwZS5fcG9wdWxhdGVEb21haW5DZWxsKToKKworMjAyMS0xMS0wMyAgUmljaGFyZCBK dSAgPHJpY2hhcmRqdTk3QGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXR3 b3JrOiAiTG9jayIgaWNvbiBuZXh0IHRvIGRvbWFpbiBuYW1lIGluIHRhYmxlIHZpZXcgc2hvdWxk IHNob3cgc2VjdXJpdHkgaW5mb3JtYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzMDE3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250 ZW50Vmlldy5jc3M6CisgICAgICAgICgubmV0d29yay10YWJsZSA+IC50YWJsZSAuY2VsbC5kb21h aW4gPiAubG9jayk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVD b250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3Rv dHlwZS5fcG9wdWxhdGVEb21haW5DZWxsLmNyZWF0ZUljb25BbmRUZXh0KToKKyAgICAgICAgKFdJ Lk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcG9wdWxhdGVEb21haW5DZWxsKToK KworMjAyMS0xMC0yOCAgUmljaGFyZCBKdSAgPHJpY2hhcmRqdTk3QGdtYWlsLmNvbT4KKworICAg ICAgICBXZWIgSW5zcGVjdG9yOiBOZXR3b3JrOiAiTG9jayIgaWNvbiBuZXh0IHRvIGRvbWFpbiBu YW1lIGluIHRhYmxlIHZpZXcgc2hvdWxkIHNob3cgc2VjdXJpdHkgaW5mb3JtYXRpb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDE3MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtU YWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcG9wdWxhdGVEb21haW5DZWxsLmNyZWF0ZUljb25B bmRUZXh0KToKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5f cG9wdWxhdGVEb21haW5DZWxsKToKKwogMjAyMS0xMC0yNyAgQkogQnVyZyAgPGJidXJnQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBleHRlbnNpb24gaWZyYW1lcyBsZWFrIHdo ZW4gZGlzYWJsaW5nIGFuIGV4dGVuc2lvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuY3NzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVu dFZpZXcuY3NzCmluZGV4IDYxYWNmNGVkODJmYmQ4YTFlMGMxMTVlZDA0YmI0ZjQwNTEyMzQ0Yjku LmVlYzQ0NGI1Yjc0MTA4ZmI0NjNjZTNhMmY3MzA5NzYwYjg2Y2NlNTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRl bnRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3MKQEAgLTEyMSw2ICsxMjEsNyBAQCBib2R5W2Rp cj1ydGxdIC5uZXR3b3JrLXRhYmxlID4gLnRhYmxlIC5jZWxsLmRvbS1ub2RlLm5hbWUgLmRpc2Ns b3N1cmUgewogICAgIGhlaWdodDogMTBweDsKICAgICBjb250ZW50OiB1cmwoLi4vSW1hZ2VzL0xv Y2tlZC5zdmcpOwogICAgIG1hcmdpbi1pbmxpbmUtZW5kOiA1cHg7CisgICAgY3Vyc29yOiBwb2lu dGVyOwogfQogCiAubmV0d29yay10YWJsZSA+IC50YWJsZSBsaS5zZWxlY3RlZCAuY2VsbC5kb21h aW4gPiAubG9jayB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCmluZGV4 IDY1N2RiMTgxMjYxYmI2YzYxOTc5ZTRlYThmYjE4MjY4MjlhNTQ2MTYuLmVjNTJlYTM0YjNiYmIy OTJjZWExMjgwNGI3NDkwODAyZmRlMWRjMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNv bnRlbnRWaWV3LmpzCkBAIC02OTUsNiArNjk1LDI0IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRW aWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50Vmll CiAgICAgICAgICAgICBpZiAoc2VjdXJlKSB7CiAgICAgICAgICAgICAgICAgbGV0IGxvY2tJY29u RWxlbWVudCA9IGNlbGwuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW1nIikp OwogICAgICAgICAgICAgICAgIGxvY2tJY29uRWxlbWVudC5jbGFzc05hbWUgPSAibG9jayI7Cisg ICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgbGV0IHNlY3VyaXR5ID0gZW50cnkucmVz b3VyY2Uuc2VjdXJpdHk7CisKKyAgICAgICAgICAgICAgICBpZiAoIWlzRW1wdHlPYmplY3Qoc2Vj dXJpdHkpCisgICAgICAgICAgICAgICAgICAgICYmICFpc0VtcHR5T2JqZWN0KHNlY3VyaXR5LmNl cnRpZmljYXRlKQorICAgICAgICAgICAgICAgICAgICAmJiAhT2JqZWN0LnZhbHVlcyhzZWN1cml0 eS5jZXJ0aWZpY2F0ZSkuZXZlcnkoKHZhbHVlKSA9PiAhdmFsdWUpKSB7CisKKyAgICAgICAgICAg ICAgICAgICAgbG9ja0ljb25FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgKGV2ZW50 KSA9PiB7CisKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChXSS5OZXR3b3JrTWFuYWdlci5z dXBwb3J0c1Nob3dDZXJ0aWZpY2F0ZSgpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZW50cnkucmVzb3VyY2Uuc2hvd0NlcnRpZmljYXRlKCkKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAuY2F0Y2goKGVycm9yKSA9PiB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnNvbGUuZXJyb3IoZXJyb3IpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0pOwor ICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICB9KTsKKyAgICAg ICAgICAgICAgICAgICAgY2VsbC50aXRsZSA9IFdJLlVJU3RyaW5nKCJTaG93IGZ1bGwgY2VydGlm aWNhdGUiKTsKKyAgICAgICAgICAgICAgICB9ICAgICAgICAgICAgCiAgICAgICAgICAgICB9CiAK ICAgICAgICAgICAgIGNlbGwuYXBwZW5kKGRvbWFpbiB8fCBlbURhc2gpOwpkaWZmIC0tZ2l0IGEv Q2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IGYyNTRiYTc4OTg0OWI0ZWE3ZDgxZWU1MmY4ZTI2 MDU0ZmY0NmM4NDAuLmQwM2NiY2U3YmZiYzBiNzhkNzhlNWU5MzEwZGMzNGFlNjQ1OGEwMzEgMTAw NjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAy MS0xMS0wMyAgUmljaGFyZCBKdSAgPHJpY2hhcmRqdTk3QGdtYWlsLmNvbT4KKworICAgICAgICBX ZWIgSW5zcGVjdG9yOiBOZXR3b3JrOiAiTG9jayIgaWNvbiBuZXh0IHRvIGRvbWFpbiBuYW1lIGlu IHRhYmxlIHZpZXcgc2hvdWxkIHNob3cgc2VjdXJpdHkgaW5mb3JtYXRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDE3MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0Lnhjd29ya3NwYWNl L3hjc2hhcmVkZGF0YS9Xb3Jrc3BhY2VTZXR0aW5ncy54Y3NldHRpbmdzOgorCisyMDIxLTEwLTI4 ICBSaWNoYXJkIEp1ICA8cmljaGFyZGp1OTdAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IE5ldHdvcms6ICJMb2NrIiBpY29uIG5leHQgdG8gZG9tYWluIG5hbWUgaW4gdGFibGUg dmlldyBzaG91bGQgc2hvdyBzZWN1cml0eSBpbmZvcm1hdGlvbgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwMTczCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXQueGN3b3Jrc3BhY2UveGNzaGFy ZWRkYXRhL1dvcmtzcGFjZVNldHRpbmdzLnhjc2V0dGluZ3M6CisKIDIwMjEtMTAtMjcgIFJveSBS ZWFwb3IgIDxycmVhcG9yQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgcnJlYXBvcidzIEdpdEh1 YiB1c2VybmFtZSB0byBjb250cmlidXRvcnMuanNvbi4K 443180 2021-11-03 00:42:31 -0700 2021-11-03 00:42:31 -0700 Patch bug-230173-20211103004230.patch text/plain 3191 richardju97 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA5 NDM5NjMwYTMyMTgxMjcwZWU2OTQzZGI5NWU2MzFmZmFhMGVmZTUzLi41ZDBiNzRjZjI5YTBkNzcy NTM3NDQ2YzdmNTVkZmQ3MGQ5YjhmNzlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAyMS0xMS0wMyAgUmljaGFyZCBKdSAgPHJpY2hhcmRqdTk3QGdtYWlsLmNv bT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBOZXR3b3JrOiAiTG9jayIgaWNvbiBuZXh0IHRv IGRvbWFpbiBuYW1lIGluIHRhYmxlIHZpZXcgc2hvdWxkIHNob3cgc2VjdXJpdHkgaW5mb3JtYXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDE3 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3M6CisgICAgICAgICgu bmV0d29yay10YWJsZSA+IC50YWJsZSAuY2VsbC5kb21haW4gPiAubG9jayk6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qczoKKyAgICAgICAg KFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcG9wdWxhdGVEb21haW5DZWxs LmNyZWF0ZUljb25BbmRUZXh0KToKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3 LnByb3RvdHlwZS5fcG9wdWxhdGVEb21haW5DZWxsKToKKwogMjAyMS0xMC0yNyAgQkogQnVyZyAg PGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBleHRlbnNpb24gaWZy YW1lcyBsZWFrIHdoZW4gZGlzYWJsaW5nIGFuIGV4dGVuc2lvbgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZp ZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29y a1RhYmxlQ29udGVudFZpZXcuY3NzCmluZGV4IDYxYWNmNGVkODJmYmQ4YTFlMGMxMTVlZDA0YmI0 ZjQwNTEyMzQ0YjkuLmVlYzQ0NGI1Yjc0MTA4ZmI0NjNjZTNhMmY3MzA5NzYwYjg2Y2NlNTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdv cmtUYWJsZUNvbnRlbnRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3MKQEAgLTEyMSw2ICsxMjEs NyBAQCBib2R5W2Rpcj1ydGxdIC5uZXR3b3JrLXRhYmxlID4gLnRhYmxlIC5jZWxsLmRvbS1ub2Rl Lm5hbWUgLmRpc2Nsb3N1cmUgewogICAgIGhlaWdodDogMTBweDsKICAgICBjb250ZW50OiB1cmwo Li4vSW1hZ2VzL0xvY2tlZC5zdmcpOwogICAgIG1hcmdpbi1pbmxpbmUtZW5kOiA1cHg7CisgICAg Y3Vyc29yOiBwb2ludGVyOwogfQogCiAubmV0d29yay10YWJsZSA+IC50YWJsZSBsaS5zZWxlY3Rl ZCAuY2VsbC5kb21haW4gPiAubG9jayB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRW aWV3LmpzCmluZGV4IDY1N2RiMTgxMjYxYmI2YzYxOTc5ZTRlYThmYjE4MjY4MjlhNTQ2MTYuLmVj NTJlYTM0YjNiYmIyOTJjZWExMjgwNGI3NDkwODAyZmRlMWRjMjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRW aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05l dHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzCkBAIC02OTUsNiArNjk1LDI0IEBAIFdJLk5ldHdvcmtU YWJsZUNvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBX SS5Db250ZW50VmllCiAgICAgICAgICAgICBpZiAoc2VjdXJlKSB7CiAgICAgICAgICAgICAgICAg bGV0IGxvY2tJY29uRWxlbWVudCA9IGNlbGwuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiaW1nIikpOwogICAgICAgICAgICAgICAgIGxvY2tJY29uRWxlbWVudC5jbGFzc05hbWUg PSAibG9jayI7CisgICAgICAgICAgICAgICAgCisgICAgICAgICAgICAgICAgbGV0IHNlY3VyaXR5 ID0gZW50cnkucmVzb3VyY2Uuc2VjdXJpdHk7CisKKyAgICAgICAgICAgICAgICBpZiAoIWlzRW1w dHlPYmplY3Qoc2VjdXJpdHkpCisgICAgICAgICAgICAgICAgICAgICYmICFpc0VtcHR5T2JqZWN0 KHNlY3VyaXR5LmNlcnRpZmljYXRlKQorICAgICAgICAgICAgICAgICAgICAmJiAhT2JqZWN0LnZh bHVlcyhzZWN1cml0eS5jZXJ0aWZpY2F0ZSkuZXZlcnkoKHZhbHVlKSA9PiAhdmFsdWUpKSB7CisK KyAgICAgICAgICAgICAgICAgICAgbG9ja0ljb25FbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImNs aWNrIiwgKGV2ZW50KSA9PiB7CisKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChXSS5OZXR3 b3JrTWFuYWdlci5zdXBwb3J0c1Nob3dDZXJ0aWZpY2F0ZSgpKSB7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZW50cnkucmVzb3VyY2Uuc2hvd0NlcnRpZmljYXRlKCkKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAuY2F0Y2goKGVycm9yKSA9PiB7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoZXJyb3IpOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgIH0pOworICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAg ICB9KTsKKyAgICAgICAgICAgICAgICAgICAgY2VsbC50aXRsZSA9IFdJLlVJU3RyaW5nKCJTaG93 IGZ1bGwgY2VydGlmaWNhdGUiKTsKKyAgICAgICAgICAgICAgICB9ICAgICAgICAgICAgCiAgICAg ICAgICAgICB9CiAKICAgICAgICAgICAgIGNlbGwuYXBwZW5kKGRvbWFpbiB8fCBlbURhc2gpOwo=