221828 2021-02-12 10:29:54 -0800 Unconditionally return information in _autofillContext SPI when a field is focused 2021-03-02 14:12:05 -0800 1 1 1 Unclassified WebKit Forms Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 222191 1 rmondello rmondello cdumez commit-queue darin rmondello sam thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1728639 0 rmondello 2021-02-12 10:29:54 -0800 Unconditionally return information in _autofillContext SPI when a field is focused 1728640 1 rmondello 2021-02-12 10:30:11 -0800 rdar://74211237 1728692 2 420155 rmondello 2021-02-12 11:27:31 -0800 Created attachment 420155 patch Looking for review, but not to land yet. 1728702 3 webkit-bug-importer 2021-02-12 11:42:00 -0800 <rdar://problem/74285044> 1728707 4 420155 wenson_hsieh 2021-02-12 11:49:10 -0800 Comment on attachment 420155 patch View in context: https://bugs.webkit.org/attachment.cgi?id=420155&action=review The change seems fine, though it would be good to have an API test for this too. There are some existing tests in WKWebViewAutoFillTests and KeyboardInputTests that exercise this code. > Source/WebKit/ChangeLog:4 > + Nit - extra newline here. 1728714 5 420155 sam 2021-02-12 12:00:28 -0800 Comment on attachment 420155 patch View in context: https://bugs.webkit.org/attachment.cgi?id=420155&action=review > Source/WebKit/ChangeLog:13 > + * UIProcess/ios/WKContentViewInteraction.mm: > + (-[WKContentView _autofillContext]): Change the contract of _autofillContext to return information for any focused > + text field. Add a "version" key. Explicitly indicate whether we're in a login context. This SPI remains stringly > + typed for flexibility. Can we add an API test for this? 1728809 6 420182 rmondello 2021-02-12 14:53:26 -0800 Created attachment 420182 Patch 1729274 7 rmondello 2021-02-15 11:38:38 -0800 API Test update added with Wenson’s help. (Thank you Wenson!) Looking for review, but not to merge yet. 1729471 8 420182 darin 2021-02-15 17:11:25 -0800 Comment on attachment 420182 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420182&action=review > Source/WebKit/ChangeLog:11 > + text field. Add a "version" key. Explicitly indicate whether we're in a login context. This SPI remains stringly Ah, "stringly typed", a term of art I had not heard before. > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:7904 > + NSMutableDictionary *context = [[[NSMutableDictionary alloc] init] autorelease]; We are trying to cut down on the use of explicit calls to [x release] and [x autorelease] in WebKit code. A better style would be to use a RetainPtr<NSMutableDictionary> like this: auto context = adoptNS([[NSMutableDictionary alloc] init]); context.get()[@"_WKAutofillContextVersion"] = @(2); ... return context.autorelease(); Those "get()" calls are ugly, but its the direction we are going. > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:7908 > + BOOL provideStrongPasswordAssistance = _focusRequiresStrongPasswordAssistance && _focusedElementInformation.elementType == WebKit::InputType::Password; > + if (provideStrongPasswordAssistance) { Not sure we really need the local variable any more. Just collapse those into one line? 1729872 9 420523 rmondello 2021-02-16 12:35:28 -0800 Created attachment 420523 Patch 1730470 10 ews-feeder 2021-02-17 13:06:35 -0800 commit-queue failed to commit attachment 420523 to WebKit repository. To retry, please set cq+ flag again. 1731069 11 ews-feeder 2021-02-18 16:02:42 -0800 rmondello@apple.com does not have committer permissions according to https://raw.githubusercontent.com/WebKit/WebKit/main/Tools/Scripts/webkitpy/common/config/contributors.json. Rejecting attachment 420523 from commit queue. 1731100 12 ews-feeder 2021-02-18 16:59:01 -0800 Committed r273115: <https://commits.webkit.org/r273115> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420523. 1731519 13 commit-queue 2021-02-19 12:39:47 -0800 Re-opened since this is blocked by bug 222191 1731806 14 wenson_hsieh 2021-02-20 10:17:42 -0800 Reverted r273115 for reason: Breaks autocorrect without the accompanying change in rdar://problem/74211293 Committed r273202 (234388@main): <https://commits.webkit.org/234388@main> 1735024 15 ews-feeder 2021-03-02 14:12:02 -0800 Committed r273759: <https://commits.webkit.org/r273759> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420523. 420155 2021-02-12 11:27:31 -0800 2021-02-12 14:53:25 -0800 patch 0001-Unconditionally-return-information-in-_autofillConte.patch text/plain 3683 rmondello RnJvbSBhMDQzZTZhZTljYzNmODBkZTQ2YTQ1NWJiNTA0MmUzNmRhOTA3Y2MyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSaWNreSBNb25kZWxsbyA8cm1vbmRlbGxvQGFwcGxlLmNvbT4K RGF0ZTogRnJpLCAxMiBGZWIgMjAyMSAxMToyNjo0MCAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIFVu Y29uZGl0aW9uYWxseSByZXR1cm4gaW5mb3JtYXRpb24gaW4gX2F1dG9maWxsQ29udGV4dCBTUEkK IHdoZW4gYSBmaWVsZCBpcyBmb2N1c2VkCgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjIxODI4CnJkYXI6Ly83NDIxMTIzNwoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCgoqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgooLVtXS0Nv bnRlbnRWaWV3IF9hdXRvZmlsbENvbnRleHRdKTogQ2hhbmdlIHRoZSBjb250cmFjdCBvZiBfYXV0 b2ZpbGxDb250ZXh0IHRvIHJldHVybiBpbmZvcm1hdGlvbiBmb3IgYW55IGZvY3VzZWQKICAgIHRl eHQgZmllbGQuIEFkZCBhICJ2ZXJzaW9uIiBrZXkuIEV4cGxpY2l0bHkgaW5kaWNhdGUgd2hldGhl ciB3ZSdyZSBpbiBhIGxvZ2luIGNvbnRleHQuIFRoaXMgU1BJIHJlbWFpbnMgc3RyaW5nbHkKICAg IHR5cGVkIGZvciBmbGV4aWJpbGl0eS4KLS0tCiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgICAgICAgIHwgMTQgKysrKysrKysrKysrKysKIC4uLi9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSAgfCAxOCArKysrKysrKysrKystLS0tLS0KIDIg ZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmlu ZGV4IDBjNDU5OGE4MTgyNC4uN2FhYjdkY2U5Y2I3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBA CisyMDIxLTAyLTEyICBSaWNreSBNb25kZWxsbyAgPHJtb25kZWxsb0BhcHBsZS5jb20+CisKKyAg ICAgICAgVW5jb25kaXRpb25hbGx5IHJldHVybiBpbmZvcm1hdGlvbiBpbiBfYXV0b2ZpbGxDb250 ZXh0IFNQSSB3aGVuIGEgZmllbGQgaXMgZm9jdXNlZAorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE4MjgKKyAgICAgICAgcmRhcjovLzc0MjExMjM3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250 ZW50VmlldyBfYXV0b2ZpbGxDb250ZXh0XSk6IENoYW5nZSB0aGUgY29udHJhY3Qgb2YgX2F1dG9m aWxsQ29udGV4dCB0byByZXR1cm4gaW5mb3JtYXRpb24gZm9yIGFueSBmb2N1c2VkCisgICAgICAg ICAgICB0ZXh0IGZpZWxkLiBBZGQgYSAidmVyc2lvbiIga2V5LiBFeHBsaWNpdGx5IGluZGljYXRl IHdoZXRoZXIgd2UncmUgaW4gYSBsb2dpbiBjb250ZXh0LiBUaGlzIFNQSSByZW1haW5zIHN0cmlu Z2x5CisgICAgICAgICAgICB0eXBlZCBmb3IgZmxleGliaWxpdHkuCisKIDIwMjEtMDItMDggIEJy YWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgdGhlIFVzZXJD b250ZW50Q29udHJvbGxlciBmb3IgU2VydmljZVdvcmtlciBwYWdlcyBiZSBub24tb3B0aW9uYWwu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbQppbmRleCA0N2Q5NmMyZTk5YjUuLjY5NjZmZGEzODU2ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCkBAIC03ODk4LDE4ICs3ODk4LDI0IEBAIHN0YXRpYyBOU0FycmF5PE5TSXRlbVByb3Zp ZGVyICo+ICpleHRyYWN0SXRlbVByb3ZpZGVyc0Zyb21Ecm9wU2Vzc2lvbihpZCA8VUlEcm9wCiAK IC0gKE5TRGljdGlvbmFyeSAqKV9hdXRvZmlsbENvbnRleHQKIHsKLSAgICBCT09MIHByb3ZpZGVT dHJvbmdQYXNzd29yZEFzc2lzdGFuY2UgPSBfZm9jdXNSZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNz aXN0YW5jZSAmJiBfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5lbGVtZW50VHlwZSA9PSBXZWJL aXQ6OklucHV0VHlwZTo6UGFzc3dvcmQ7Ci0gICAgaWYgKCFzZWxmLl9oYXNGb2N1c2VkRWxlbWVu dCB8fCAoIV9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmFjY2VwdHNBdXRvZmlsbGVkTG9naW5D cmVkZW50aWFscyAmJiAhcHJvdmlkZVN0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSkpCisgICAgaWYg KCFzZWxmLl9oYXNGb2N1c2VkRWxlbWVudCkKICAgICAgICAgcmV0dXJuIG5pbDsKIAotICAgIGlm IChwcm92aWRlU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlKQotICAgICAgICByZXR1cm4gQHsgQCJf YXV0b21hdGljUGFzc3dvcmRLZXlib2FyZCIgOiBAWUVTLCBAInN0cm9uZ1Bhc3N3b3JkQWRkaXRp b25hbENvbnRleHQiIDogX2FkZGl0aW9uYWxDb250ZXh0Rm9yU3Ryb25nUGFzc3dvcmRBc3Npc3Rh bmNlLmdldCgpIH07CisgICAgTlNNdXRhYmxlRGljdGlvbmFyeSAqY29udGV4dCA9IFtbW05TTXV0 YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRdIGF1dG9yZWxlYXNlXTsKKyAgICBjb250ZXh0W0Ai X1dLQXV0b2ZpbGxDb250ZXh0VmVyc2lvbiJdID0gQCgyKTsKKworICAgIEJPT0wgcHJvdmlkZVN0 cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9IF9mb2N1c1JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Np c3RhbmNlICYmIF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1lbnRUeXBlID09IFdlYktp dDo6SW5wdXRUeXBlOjpQYXNzd29yZDsKKyAgICBpZiAocHJvdmlkZVN0cm9uZ1Bhc3N3b3JkQXNz aXN0YW5jZSkgeworICAgICAgICBjb250ZXh0W0AiX2F1dG9tYXRpY1Bhc3N3b3JkS2V5Ym9hcmQi XSA9IEBZRVM7CisgICAgICAgIGNvbnRleHRbQCJzdHJvbmdQYXNzd29yZEFkZGl0aW9uYWxDb250 ZXh0Il0gPSBfYWRkaXRpb25hbENvbnRleHRGb3JTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UuZ2V0 KCk7CisgICAgfSBlbHNlIGlmIChfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5hY2NlcHRzQXV0 b2ZpbGxlZExvZ2luQ3JlZGVudGlhbHMpCisgICAgICAgIGNvbnRleHRbQCJfYWNjZXB0c0xvZ2lu Q3JlZGVudGlhbHMiXSA9IEBZRVM7CiAKICAgICBOU1VSTCAqcGxhdGZvcm1VUkwgPSBfZm9jdXNl ZEVsZW1lbnRJbmZvcm1hdGlvbi5yZXByZXNlbnRpbmdQYWdlVVJMOwogICAgIGlmIChwbGF0Zm9y bVVSTCkKLSAgICAgICAgcmV0dXJuIEB7IEAiX1dlYlZpZXdVUkwiIDogcGxhdGZvcm1VUkwgfTsK KyAgICAgICAgY29udGV4dFtAIl9XZWJWaWV3VVJMIl0gPSBwbGF0Zm9ybVVSTDsKIAotICAgIHJl dHVybiBuaWw7CisgICAgcmV0dXJuIGNvbnRleHQ7CiB9CiAKIC0gKEJPT0wpc3VwcG9ydHNJbWFn ZVBhc3RlCi0tIAoyLjI5LjIgKEFwcGxlIEdpdC0xMjkpCgo= 420182 2021-02-12 14:53:26 -0800 2021-02-16 12:35:26 -0800 Patch bug-221828-20210212145326.patch text/plain 12202 rmondello U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNTUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBjNDU5OGE4MTgyNGEyZDRk NDY5NzJhZTZiYzdlNDc2MGI2NDkwNTguLmEyZTNhZTQyZWY5YTBhYzEwNmE5N2NkZjVkYmNkYzk4 YWJlNGFhMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDItMTIgIFJpY2t5IE1v bmRlbGxvICA8cm1vbmRlbGxvQGFwcGxlLmNvbT4KKworICAgICAgICBVbmNvbmRpdGlvbmFsbHkg cmV0dXJuIGluZm9ybWF0aW9uIGluIF9hdXRvZmlsbENvbnRleHQgU1BJIHdoZW4gYSBmaWVsZCBp cyBmb2N1c2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjE4MjgKKyAgICAgICAgcmRhcjovLzc0MjExMjM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfYXV0b2ZpbGxDb250ZXh0 XSk6IENoYW5nZSB0aGUgY29udHJhY3Qgb2YgX2F1dG9maWxsQ29udGV4dCB0byByZXR1cm4gaW5m b3JtYXRpb24gZm9yIGFueSBmb2N1c2VkCisgICAgICAgICAgICB0ZXh0IGZpZWxkLiBBZGQgYSAi dmVyc2lvbiIga2V5LiBFeHBsaWNpdGx5IGluZGljYXRlIHdoZXRoZXIgd2UncmUgaW4gYSBsb2dp biBjb250ZXh0LiBUaGlzIFNQSSByZW1haW5zIHN0cmluZ2x5CisgICAgICAgICAgICB0eXBlZCBm b3IgZmxleGliaWxpdHkuCisKIDIwMjEtMDItMDggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBw bGUuY29tPgogCiAgICAgICAgIE1ha2UgdGhlIFVzZXJDb250ZW50Q29udHJvbGxlciBmb3IgU2Vy dmljZVdvcmtlciBwYWdlcyBiZSBub24tb3B0aW9uYWwuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCA0N2Q5 NmMyZTk5YjU0YjFlZWU1YTUxMzQyYTQxZTJiMTY5Y2UxN2RjLi42OTY2ZmRhMzg1NmQ5YmNhOTk2 MmE3ZWFiZTQ2OWQ5MmE3ZGQwYmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTc4OTgsMTggKzc4OTgs MjQgQEAgc3RhdGljIE5TQXJyYXk8TlNJdGVtUHJvdmlkZXIgKj4gKmV4dHJhY3RJdGVtUHJvdmlk ZXJzRnJvbURyb3BTZXNzaW9uKGlkIDxVSURyb3AKIAogLSAoTlNEaWN0aW9uYXJ5ICopX2F1dG9m aWxsQ29udGV4dAogewotICAgIEJPT0wgcHJvdmlkZVN0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9 IF9mb2N1c1JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlICYmIF9mb2N1c2VkRWxlbWVu dEluZm9ybWF0aW9uLmVsZW1lbnRUeXBlID09IFdlYktpdDo6SW5wdXRUeXBlOjpQYXNzd29yZDsK LSAgICBpZiAoIXNlbGYuX2hhc0ZvY3VzZWRFbGVtZW50IHx8ICghX2ZvY3VzZWRFbGVtZW50SW5m b3JtYXRpb24uYWNjZXB0c0F1dG9maWxsZWRMb2dpbkNyZWRlbnRpYWxzICYmICFwcm92aWRlU3Ry b25nUGFzc3dvcmRBc3Npc3RhbmNlKSkKKyAgICBpZiAoIXNlbGYuX2hhc0ZvY3VzZWRFbGVtZW50 KQogICAgICAgICByZXR1cm4gbmlsOwogCi0gICAgaWYgKHByb3ZpZGVTdHJvbmdQYXNzd29yZEFz c2lzdGFuY2UpCi0gICAgICAgIHJldHVybiBAeyBAIl9hdXRvbWF0aWNQYXNzd29yZEtleWJvYXJk IiA6IEBZRVMsIEAic3Ryb25nUGFzc3dvcmRBZGRpdGlvbmFsQ29udGV4dCIgOiBfYWRkaXRpb25h bENvbnRleHRGb3JTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UuZ2V0KCkgfTsKKyAgICBOU011dGFi bGVEaWN0aW9uYXJ5ICpjb250ZXh0ID0gW1tbTlNNdXRhYmxlRGljdGlvbmFyeSBhbGxvY10gaW5p dF0gYXV0b3JlbGVhc2VdOworICAgIGNvbnRleHRbQCJfV0tBdXRvZmlsbENvbnRleHRWZXJzaW9u Il0gPSBAKDIpOworCisgICAgQk9PTCBwcm92aWRlU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlID0g X2ZvY3VzUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UgJiYgX2ZvY3VzZWRFbGVtZW50 SW5mb3JtYXRpb24uZWxlbWVudFR5cGUgPT0gV2ViS2l0OjpJbnB1dFR5cGU6OlBhc3N3b3JkOwor ICAgIGlmIChwcm92aWRlU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlKSB7CisgICAgICAgIGNvbnRl eHRbQCJfYXV0b21hdGljUGFzc3dvcmRLZXlib2FyZCJdID0gQFlFUzsKKyAgICAgICAgY29udGV4 dFtAInN0cm9uZ1Bhc3N3b3JkQWRkaXRpb25hbENvbnRleHQiXSA9IF9hZGRpdGlvbmFsQ29udGV4 dEZvclN0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZS5nZXQoKTsKKyAgICB9IGVsc2UgaWYgKF9mb2N1 c2VkRWxlbWVudEluZm9ybWF0aW9uLmFjY2VwdHNBdXRvZmlsbGVkTG9naW5DcmVkZW50aWFscykK KyAgICAgICAgY29udGV4dFtAIl9hY2NlcHRzTG9naW5DcmVkZW50aWFscyJdID0gQFlFUzsKIAog ICAgIE5TVVJMICpwbGF0Zm9ybVVSTCA9IF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnJlcHJl c2VudGluZ1BhZ2VVUkw7CiAgICAgaWYgKHBsYXRmb3JtVVJMKQotICAgICAgICByZXR1cm4gQHsg QCJfV2ViVmlld1VSTCIgOiBwbGF0Zm9ybVVSTCB9OworICAgICAgICBjb250ZXh0W0AiX1dlYlZp ZXdVUkwiXSA9IHBsYXRmb3JtVVJMOwogCi0gICAgcmV0dXJuIG5pbDsKKyAgICByZXR1cm4gY29u dGV4dDsKIH0KIAogLSAoQk9PTClzdXBwb3J0c0ltYWdlUGFzdGUKZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NDQxMmUzMzI0MDYyZjljYTJkZTQ3 ZmIyZjk0NDIxNjU3MzU0Y2NiLi4zOGU2ZmJlN2ZlNjM0YzBiOThjZTE5NzgxNGMzMzY0NzkxNzBl YjhhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjEgQEAKKzIwMjEtMDItMTIgIFJpY2t5IE1vbmRlbGxvICA8cm1vbmRlbGxvQGFw cGxlLmNvbT4KKworICAgICAgICBVbmNvbmRpdGlvbmFsbHkgcmV0dXJuIGluZm9ybWF0aW9uIGlu IF9hdXRvZmlsbENvbnRleHQgU1BJIHdoZW4gYSBmaWVsZCBpcyBmb2N1c2VkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE4MjgKKyAgICAgICAgcmRh cjovLzc0MjExMjM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGVzdHMgdXBkYXRlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAgUmViYXNlbGlu ZSB0ZXN0cy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL0tleWJvYXJkSW5w dXRUZXN0c0lPUy5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorICAgICAgICAq IFRlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1dLV2ViVmlld0F1dG9maWxsVGVzdHMubW06CisgICAg ICAgICgtW0F1dG9GaWxsVGVzdFZpZXcgYWNjZXB0c0F1dG9GaWxsTG9naW5DcmVkZW50aWFsc10p OiBSZW5hbWVkIGluIGxpbmUgd2l0aCB0aGUgUGFzc3dvcmQgQXV0b0ZpbGwtcmVsYXRlZAorICAg ICAgICAgICAgY29udHJhY3QgdGhlc2UgdGVzdHMgYXJlIGFib3V0LgorCiAyMDIxLTAyLTA4ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjT1NdIEVuYWJs ZSBBdWRpbyBDYXB0dXJlIGluIEdQVVByb2Nlc3MgYnkgZGVmYXVsdApkaWZmIC0tZ2l0IGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1tIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1tCmluZGV4 IDQyNDVmMGJjMTBhYTlkOWI1M2JkZGNlYTU5YTFhOWU1OGQ1MzEyNjMuLjA1NzhhY2VhYWQ5MDRl Yjg3MmU4NmRmOWZmNmNlOWM1ODdjZTYxYTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvaW9zL0tleWJvYXJkSW5wdXRUZXN0c0lPUy5tbQorKysgYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL2lvcy9LZXlib2FyZElucHV0VGVzdHNJT1MubW0KQEAgLTY4OSw2ICs2ODks NyBAQCBURVNUKEtleWJvYXJkSW5wdXRUZXN0cywgVGVzdFdlYlZpZXdBZGRpdGlvbmFsQ29udGV4 dEZvclN0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZQogCiAgICAgTlNEaWN0aW9uYXJ5ICphY3R1YWwg PSBbW3dlYlZpZXcgdGV4dElucHV0Q29udGVudFZpZXddIF9hdXRvZmlsbENvbnRleHRdOwogICAg IEVYUEVDVF9UUlVFKFtbYWN0dWFsIGFsbFZhbHVlc10gY29udGFpbnNPYmplY3Q6ZXhwZWN0ZWRd KTsKKyAgICBFWFBFQ1RfVFJVRShbYWN0dWFsW0AiX2F1dG9tYXRpY1Bhc3N3b3JkS2V5Ym9hcmQi XSBib29sVmFsdWVdKTsKIH0KIAogVEVTVChLZXlib2FyZElucHV0VGVzdHMsIFRlc3RXZWJWaWV3 QWNjZXNzb3J5RG9uZUR1cmluZ1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSkKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1dLV2ViVmlld0F1dG9maWxsVGVzdHMubW0g Yi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9XS1dlYlZpZXdBdXRvZmlsbFRlc3RzLm1t CmluZGV4IDc1MjAxYjZkMmNlNDYwMGFmNGQ1NGQzMDliZjNlODA5MDJkN2U0MGQuLjllM2UzMTlh OTNmYWU2MWMzZTM5YTRjM2YwNTgwMzgwNmU4MmU2N2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvaW9zL1dLV2ViVmlld0F1dG9maWxsVGVzdHMubW0KKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvV0tXZWJWaWV3QXV0b2ZpbGxUZXN0cy5tbQpAQCAtNjYs MTQgKzY2LDE2IEBAIHR5cGVkZWYgVUlWaWV3IDxVSVRleHRJbnB1dFByaXZhdGU+IEF1dG9GaWxs SW5wdXRWaWV3OwogICAgIHJldHVybiAoQXV0b0ZpbGxJbnB1dFZpZXcgKilzZWxmLnRleHRJbnB1 dENvbnRlbnRWaWV3OwogfQogCi0tIChCT09MKXRleHRJbnB1dEhhc0F1dG9GaWxsQ29udGV4dAor LSAoQk9PTClhY2NlcHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxzCiB7Ci0gICAgTlNVUkwgKnVy bCA9IFtzZWxmLl9hdXRvZmlsbElucHV0Vmlldy5fYXV0b2ZpbGxDb250ZXh0IG9iamVjdEZvcktl eTpAIl9XZWJWaWV3VVJMIl07Ci0gICAgaWYgKCFbdXJsIGlzS2luZE9mQ2xhc3M6W05TVVJMIGNs YXNzXV0pCisgICAgYXV0byBjb250ZXh0ID0gc2VsZi5fYXV0b2ZpbGxJbnB1dFZpZXcuX2F1dG9m aWxsQ29udGV4dDsKKyAgICBpZiAoIWNvbnRleHQpCiAgICAgICAgIHJldHVybiBOTzsKIAorICAg IE5TVVJMICp1cmwgPSBjb250ZXh0W0AiX1dlYlZpZXdVUkwiXTsKKyAgICBFWFBFQ1RfVFJVRShb dXJsIGlzS2luZE9mQ2xhc3M6TlNVUkwuY2xhc3NdKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoW3Nl bGYgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3VtZW50LlVSTCJdLCB1cmwuYWJz b2x1dGVTdHJpbmcpOwotICAgIHJldHVybiBZRVM7CisgICAgcmV0dXJuIFtjb250ZXh0W0AiX2Fj Y2VwdHNMb2dpbkNyZWRlbnRpYWxzIl0gYm9vbFZhbHVlXTsKIH0KIAogQGVuZApAQCAtODUsMTAg Kzg3LDEwIEBAIFRFU1QoV0tXZWJWaWV3QXV0b0ZpbGxUZXN0cywgVXNlcm5hbWVBbmRQYXNzd29y ZEZpZWxkKQogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tBdXRvRmlsbFRlc3RWaWV3IGFs bG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgMzIwLCA1MDApXSk7CiAgICAgW3dl YlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAiPGlucHV0IGlkPSd1c2VyJyB0eXBl PSdlbWFpbCc+PGlucHV0IGlkPSdwYXNzd29yZCcgdHlwZT0ncGFzc3dvcmQnPiJdOwogICAgIFt3 ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdEFuZFdhaXRGb3JJbnB1dFNlc3Npb25Ub0NoYW5nZTpA InVzZXIuZm9jdXMoKSJdOwotICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IHRleHRJbnB1dEhhc0F1 dG9GaWxsQ29udGV4dF0pOworICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IGFjY2VwdHNBdXRvRmls bExvZ2luQ3JlZGVudGlhbHNdKTsKIAogICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdEFu ZFdhaXRGb3JJbnB1dFNlc3Npb25Ub0NoYW5nZTpAInBhc3N3b3JkLmZvY3VzKCkiXTsKLSAgICBF WFBFQ1RfVFJVRShbd2ViVmlldyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKKyAgICBF WFBFQ1RfVFJVRShbd2ViVmlldyBhY2NlcHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxzXSk7CiAK ICAgICBhdXRvIGNyZWRlbnRpYWxTdWdnZXN0aW9uID0gW1VJVGV4dEF1dG9maWxsU3VnZ2VzdGlv biBhdXRvZmlsbFN1Z2dlc3Rpb25XaXRoVXNlcm5hbWU6QCJmcmVkZXJpayIgcGFzc3dvcmQ6QCJm YW1vcyJdOwogICAgIFtbd2ViVmlldyBfYXV0b2ZpbGxJbnB1dFZpZXddIGluc2VydFRleHRTdWdn ZXN0aW9uOmNyZWRlbnRpYWxTdWdnZXN0aW9uXTsKQEAgLTk2LDcgKzk4LDcgQEAgVEVTVChXS1dl YlZpZXdBdXRvRmlsbFRlc3RzLCBVc2VybmFtZUFuZFBhc3N3b3JkRmllbGQpCiAgICAgRVhQRUNU X1dLX1NUUkVRKCJmYW1vcyIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6 QCJwYXNzd29yZC52YWx1ZSJdKTsKIAogICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdEFu ZFdhaXRGb3JJbnB1dFNlc3Npb25Ub0NoYW5nZTpAImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQuYmx1 cigpIl07Ci0gICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IHRleHRJbnB1dEhhc0F1dG9GaWxsQ29u dGV4dF0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBhY2NlcHRzQXV0b0ZpbGxMb2dpbkNy ZWRlbnRpYWxzXSk7CiB9CiAKIFRFU1QoV0tXZWJWaWV3QXV0b0ZpbGxUZXN0cywgVXNlcm5hbWVB bmRQYXNzd29yZEZpZWxkU2VwYXJhdGVkQnlSYWRpb0J1dHRvbikKQEAgLTEwNCwxMCArMTA2LDEw IEBAIFRFU1QoV0tXZWJWaWV3QXV0b0ZpbGxUZXN0cywgVXNlcm5hbWVBbmRQYXNzd29yZEZpZWxk U2VwYXJhdGVkQnlSYWRpb0J1dHRvbikKICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbQXV0 b0ZpbGxUZXN0VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDMyMCwg NTAwKV0pOwogICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0cmluZzpAIjxpbnB1 dCBpZD0ndXNlcicgdHlwZT0nZW1haWwnPjxpbnB1dCB0eXBlPSdyYWRpbycgbmFtZT0ncmFkaW9f YnV0dG9uJyB2YWx1ZT0ncmFkaW8nPjxpbnB1dCBpZD0ncGFzc3dvcmQnIHR5cGU9J3Bhc3N3b3Jk Jz4iXTsKICAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHRBbmRXYWl0Rm9ySW5wdXRTZXNz aW9uVG9DaGFuZ2U6QCJ1c2VyLmZvY3VzKCkiXTsKLSAgICBFWFBFQ1RfVFJVRShbd2ViVmlldyB0 ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKKyAgICBFWFBFQ1RfVFJVRShbd2ViVmlldyBh Y2NlcHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxzXSk7CiAKICAgICBbd2ViVmlldyBldmFsdWF0 ZUphdmFTY3JpcHRBbmRXYWl0Rm9ySW5wdXRTZXNzaW9uVG9DaGFuZ2U6QCJwYXNzd29yZC5mb2N1 cygpIl07Ci0gICAgRVhQRUNUX1RSVUUoW3dlYlZpZXcgdGV4dElucHV0SGFzQXV0b0ZpbGxDb250 ZXh0XSk7CisgICAgRVhQRUNUX1RSVUUoW3dlYlZpZXcgYWNjZXB0c0F1dG9GaWxsTG9naW5DcmVk ZW50aWFsc10pOwogCiAgICAgYXV0byBjcmVkZW50aWFsU3VnZ2VzdGlvbiA9IFtVSVRleHRBdXRv ZmlsbFN1Z2dlc3Rpb24gYXV0b2ZpbGxTdWdnZXN0aW9uV2l0aFVzZXJuYW1lOkAiZnJlZGVyaWsi IHBhc3N3b3JkOkAiZmFtb3MiXTsKICAgICBbW3dlYlZpZXcgX2F1dG9maWxsSW5wdXRWaWV3XSBp bnNlcnRUZXh0U3VnZ2VzdGlvbjpjcmVkZW50aWFsU3VnZ2VzdGlvbl07CkBAIC0xMTYsNyArMTE4 LDcgQEAgVEVTVChXS1dlYlZpZXdBdXRvRmlsbFRlc3RzLCBVc2VybmFtZUFuZFBhc3N3b3JkRmll bGRTZXBhcmF0ZWRCeVJhZGlvQnV0dG9uKQogICAgIEVYUEVDVF9XS19TVFJFUSgiZmFtb3MiLCBb d2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAicGFzc3dvcmQudmFsdWUiXSk7 CiAKICAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHRBbmRXYWl0Rm9ySW5wdXRTZXNzaW9u VG9DaGFuZ2U6QCJkb2N1bWVudC5hY3RpdmVFbGVtZW50LmJsdXIoKSJdOwotICAgIEVYUEVDVF9G QUxTRShbd2ViVmlldyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKKyAgICBFWFBFQ1Rf RkFMU0UoW3dlYlZpZXcgYWNjZXB0c0F1dG9GaWxsTG9naW5DcmVkZW50aWFsc10pOwogfQogCiBU RVNUKFdLV2ViVmlld0F1dG9GaWxsVGVzdHMsIFR3b1RleHRGaWVsZHMpCkBAIC0xMjQsMTAgKzEy NiwxMCBAQCBURVNUKFdLV2ViVmlld0F1dG9GaWxsVGVzdHMsIFR3b1RleHRGaWVsZHMpCiAgICAg YXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW0F1dG9GaWxsVGVzdFZpZXcgYWxsb2NdIGluaXRXaXRo RnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCldKTsKICAgICBbd2ViVmlldyBzeW5jaHJv bm91c2x5TG9hZEhUTUxTdHJpbmc6QCI8aW5wdXQgaWQ9J3RleHQxJyB0eXBlPSdlbWFpbCc+PGlu cHV0IGlkPSd0ZXh0MicgdHlwZT0ndGV4dCc+Il07CiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZh U2NyaXB0QW5kV2FpdEZvcklucHV0U2Vzc2lvblRvQ2hhbmdlOkAidGV4dDEuZm9jdXMoKSJdOwot ICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsK KyAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgYWNjZXB0c0F1dG9GaWxsTG9naW5DcmVkZW50aWFs c10pOwogCiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0QW5kV2FpdEZvcklucHV0U2Vz c2lvblRvQ2hhbmdlOkAidGV4dDIuZm9jdXMoKSJdOwotICAgIEVYUEVDVF9GQUxTRShbd2ViVmll dyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKKyAgICBFWFBFQ1RfRkFMU0UoW3dlYlZp ZXcgYWNjZXB0c0F1dG9GaWxsTG9naW5DcmVkZW50aWFsc10pOwogfQogCiBURVNUKFdLV2ViVmll d0F1dG9GaWxsVGVzdHMsIFN0YW5kYWxvbmVQYXNzd29yZEZpZWxkKQpAQCAtMTM1LDcgKzEzNyw3 IEBAIFRFU1QoV0tXZWJWaWV3QXV0b0ZpbGxUZXN0cywgU3RhbmRhbG9uZVBhc3N3b3JkRmllbGQp CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW0F1dG9GaWxsVGVzdFZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCldKTsKICAgICBbd2ViVmlldyBz eW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6QCI8aW5wdXQgaWQ9J3Bhc3N3b3JkJyB0eXBlPSdw YXNzd29yZCc+Il07CiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0QW5kV2FpdEZvcklu cHV0U2Vzc2lvblRvQ2hhbmdlOkAicGFzc3dvcmQuZm9jdXMoKSJdOwotICAgIEVYUEVDVF9UUlVF KFt3ZWJWaWV3IHRleHRJbnB1dEhhc0F1dG9GaWxsQ29udGV4dF0pOworICAgIEVYUEVDVF9UUlVF KFt3ZWJWaWV3IGFjY2VwdHNBdXRvRmlsbExvZ2luQ3JlZGVudGlhbHNdKTsKIAogICAgIGF1dG8g Y3JlZGVudGlhbFN1Z2dlc3Rpb24gPSBbVUlUZXh0QXV0b2ZpbGxTdWdnZXN0aW9uIGF1dG9maWxs U3VnZ2VzdGlvbldpdGhVc2VybmFtZTpAImZyZWRlcmlrIiBwYXNzd29yZDpAImZhbW9zIl07CiAg ICAgW1t3ZWJWaWV3IF9hdXRvZmlsbElucHV0Vmlld10gaW5zZXJ0VGV4dFN1Z2dlc3Rpb246Y3Jl ZGVudGlhbFN1Z2dlc3Rpb25dOwpAQCAtMTQzLDcgKzE0NSw3IEBAIFRFU1QoV0tXZWJWaWV3QXV0 b0ZpbGxUZXN0cywgU3RhbmRhbG9uZVBhc3N3b3JkRmllbGQpCiAgICAgRVhQRUNUX1dLX1NUUkVR KCJmYW1vcyIsIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJwYXNzd29y ZC52YWx1ZSJdKTsKIAogICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdEFuZFdhaXRGb3JJ bnB1dFNlc3Npb25Ub0NoYW5nZTpAImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQuYmx1cigpIl07Ci0g ICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IHRleHRJbnB1dEhhc0F1dG9GaWxsQ29udGV4dF0pOwor ICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBhY2NlcHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxz XSk7CiB9CiAKIFRFU1QoV0tXZWJWaWV3QXV0b0ZpbGxUZXN0cywgU3RhbmRhbG9uZVRleHRGaWVs ZCkKQEAgLTE1MSw3ICsxNTMsNyBAQCBURVNUKFdLV2ViVmlld0F1dG9GaWxsVGVzdHMsIFN0YW5k YWxvbmVUZXh0RmllbGQpCiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW0F1dG9GaWxsVGVz dFZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCldKTsK ICAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6QCI8aW5wdXQgaWQ9J3Rl eHRmaWVsZCcgdHlwZT0ndGV4dCc+Il07CiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0 QW5kV2FpdEZvcklucHV0U2Vzc2lvblRvQ2hhbmdlOkAidGV4dGZpZWxkLmZvY3VzKCkiXTsKLSAg ICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgdGV4dElucHV0SGFzQXV0b0ZpbGxDb250ZXh0XSk7Cisg ICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGFjY2VwdHNBdXRvRmlsbExvZ2luQ3JlZGVudGlhbHNd KTsKIH0KIAogVEVTVChXS1dlYlZpZXdBdXRvRmlsbFRlc3RzLCBBY2NvdW50Q3JlYXRpb25QYWdl KQpAQCAtMTU5LDEzICsxNjEsMTMgQEAgVEVTVChXS1dlYlZpZXdBdXRvRmlsbFRlc3RzLCBBY2Nv dW50Q3JlYXRpb25QYWdlKQogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tBdXRvRmlsbFRl c3RWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgMzIwLCA1MDApXSk7 CiAgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAiPGlucHV0IGlkPSd1 c2VyJyB0eXBlPSdlbWFpbCc+PGlucHV0IGlkPSdwYXNzd29yZCcgdHlwZT0ncGFzc3dvcmQnPjxp bnB1dCBpZD0nY29uZmlybV9wYXNzd29yZCcgdHlwZT0ncGFzc3dvcmQnPiJdOwogICAgIFt3ZWJW aWV3IGV2YWx1YXRlSmF2YVNjcmlwdEFuZFdhaXRGb3JJbnB1dFNlc3Npb25Ub0NoYW5nZTpAInVz ZXIuZm9jdXMoKSJdOwotICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IHRleHRJbnB1dEhhc0F1dG9G aWxsQ29udGV4dF0pOworICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IGFjY2VwdHNBdXRvRmlsbExv Z2luQ3JlZGVudGlhbHNdKTsKIAogICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdEFuZFdh aXRGb3JJbnB1dFNlc3Npb25Ub0NoYW5nZTpAInBhc3N3b3JkLmZvY3VzKCkiXTsKLSAgICBFWFBF Q1RfVFJVRShbd2ViVmlldyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKKyAgICBFWFBF Q1RfVFJVRShbd2ViVmlldyBhY2NlcHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxzXSk7CiAKICAg ICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHRBbmRXYWl0Rm9ySW5wdXRTZXNzaW9uVG9DaGFu Z2U6QCJjb25maXJtX3Bhc3N3b3JkLmZvY3VzKCkiXTsKLSAgICBFWFBFQ1RfVFJVRShbd2ViVmll dyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKKyAgICBFWFBFQ1RfVFJVRShbd2ViVmll dyBhY2NlcHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxzXSk7CiB9CiAKIHN0YXRpYyBCT09MIG92 ZXJyaWRlSXNJbkhhcmR3YXJlS2V5Ym9hcmRNb2RlKCkKQEAgLTE4Nyw3ICsxODksNyBAQCBURVNU KFdLV2ViVmlld0F1dG9GaWxsVGVzdHMsIEF1dG9GaWxsUmVxdWlyZXNJbnB1dFNlc3Npb24pCiAg ICAgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAInVzZXIuZm9jdXMoKSJd OwogICAgIFV0aWw6OnJ1bigmZG9uZSk7CiAKLSAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgdGV4 dElucHV0SGFzQXV0b0ZpbGxDb250ZXh0XSk7CisgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGFj Y2VwdHNBdXRvRmlsbExvZ2luQ3JlZGVudGlhbHNdKTsKIH0KIAogI2lmIFBMQVRGT1JNKFdBVENI T1MpCg== 420523 2021-02-16 12:35:28 -0800 2021-03-02 14:12:03 -0800 Patch bug-221828-20210216123527.patch text/plain 12138 rmondello U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVmZDU4ZWRiNWViYzI1OGRh YTJiZmM1ZWVkNjZjNTc1MjA0NDZjYjEuLjY3YTY5MTc3OGNiYjQ5MjhmYTJlNTk4OTVhZjJlZWM1 NTY1OTI0NWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDItMTIgIFJpY2t5IE1v bmRlbGxvICA8cm1vbmRlbGxvQGFwcGxlLmNvbT4KKworICAgICAgICBVbmNvbmRpdGlvbmFsbHkg cmV0dXJuIGluZm9ybWF0aW9uIGluIF9hdXRvZmlsbENvbnRleHQgU1BJIHdoZW4gYSBmaWVsZCBp cyBmb2N1c2VkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjE4MjgKKyAgICAgICAgcmRhcjovLzc0MjExMjM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfYXV0b2ZpbGxDb250ZXh0XSk6 IENoYW5nZSB0aGUgY29udHJhY3Qgb2YgX2F1dG9maWxsQ29udGV4dCB0byByZXR1cm4gaW5mb3Jt YXRpb24gZm9yIGFueSBmb2N1c2VkCisgICAgICAgICAgICB0ZXh0IGZpZWxkLiBBZGQgYSAidmVy c2lvbiIga2V5LiBFeHBsaWNpdGx5IGluZGljYXRlIHdoZXRoZXIgd2UncmUgaW4gYSBsb2dpbiBj b250ZXh0LiBUaGlzIFNQSSByZW1haW5zIHN0cmluZ2x5CisgICAgICAgICAgICB0eXBlZCBmb3Ig ZmxleGliaWxpdHkuCisKIDIwMjEtMDItMTUgIFBlciBBcm5lICA8cHZvbGxhbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW21hY09TXSBDbG9zZSBYUEMgY29ubmVjdGlvbnMgYmVmb3JlIGVudGVyaW5n IHNhbmRib3gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IGZmMjRmYWRiYmQwMTU3NjNlYTg0MjIzOWI1OTY5 MjUxMWJmMDU1YTEuLmRmNzNkZGU3ZjZhM2JiYmQ3MWVmYzVkMDM3ZmU0NjJjYjFiNDA5ZTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbQpAQCAtODA1OCwxOCArODA1OCwyMyBAQCBzdGF0aWMgTlNBcnJheTxOU0l0 ZW1Qcm92aWRlciAqPiAqZXh0cmFjdEl0ZW1Qcm92aWRlcnNGcm9tRHJvcFNlc3Npb24oaWQgPFVJ RHJvcAogCiAtIChOU0RpY3Rpb25hcnkgKilfYXV0b2ZpbGxDb250ZXh0CiB7Ci0gICAgQk9PTCBw cm92aWRlU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlID0gX2ZvY3VzUmVxdWlyZXNTdHJvbmdQYXNz d29yZEFzc2lzdGFuY2UgJiYgX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVudFR5cGUg PT0gV2ViS2l0OjpJbnB1dFR5cGU6OlBhc3N3b3JkOwotICAgIGlmICghc2VsZi5faGFzRm9jdXNl ZEVsZW1lbnQgfHwgKCFfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5hY2NlcHRzQXV0b2ZpbGxl ZExvZ2luQ3JlZGVudGlhbHMgJiYgIXByb3ZpZGVTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UpKQor ICAgIGlmICghc2VsZi5faGFzRm9jdXNlZEVsZW1lbnQpCiAgICAgICAgIHJldHVybiBuaWw7CiAK LSAgICBpZiAocHJvdmlkZVN0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSkKLSAgICAgICAgcmV0dXJu IEB7IEAiX2F1dG9tYXRpY1Bhc3N3b3JkS2V5Ym9hcmQiIDogQFlFUywgQCJzdHJvbmdQYXNzd29y ZEFkZGl0aW9uYWxDb250ZXh0IiA6IF9hZGRpdGlvbmFsQ29udGV4dEZvclN0cm9uZ1Bhc3N3b3Jk QXNzaXN0YW5jZS5nZXQoKSB9OworICAgIGF1dG8gY29udGV4dCA9IGFkb3B0TlMoW1tOU011dGFi bGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XSk7CisgICAgY29udGV4dC5nZXQoKVtAIl9XS0F1dG9m aWxsQ29udGV4dFZlcnNpb24iXSA9IEAoMik7CisKKyAgICBpZiAoX2ZvY3VzUmVxdWlyZXNTdHJv bmdQYXNzd29yZEFzc2lzdGFuY2UgJiYgX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZWxlbWVu dFR5cGUgPT0gV2ViS2l0OjpJbnB1dFR5cGU6OlBhc3N3b3JkKSB7CisgICAgICAgIGNvbnRleHQu Z2V0KClbQCJfYXV0b21hdGljUGFzc3dvcmRLZXlib2FyZCJdID0gQFlFUzsKKyAgICAgICAgY29u dGV4dC5nZXQoKVtAInN0cm9uZ1Bhc3N3b3JkQWRkaXRpb25hbENvbnRleHQiXSA9IF9hZGRpdGlv bmFsQ29udGV4dEZvclN0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZS5nZXQoKTsKKyAgICB9IGVsc2Ug aWYgKF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmFjY2VwdHNBdXRvZmlsbGVkTG9naW5DcmVk ZW50aWFscykKKyAgICAgICAgY29udGV4dC5nZXQoKVtAIl9hY2NlcHRzTG9naW5DcmVkZW50aWFs cyJdID0gQFlFUzsKIAogICAgIE5TVVJMICpwbGF0Zm9ybVVSTCA9IF9mb2N1c2VkRWxlbWVudElu Zm9ybWF0aW9uLnJlcHJlc2VudGluZ1BhZ2VVUkw7CiAgICAgaWYgKHBsYXRmb3JtVVJMKQotICAg ICAgICByZXR1cm4gQHsgQCJfV2ViVmlld1VSTCIgOiBwbGF0Zm9ybVVSTCB9OworICAgICAgICBj b250ZXh0LmdldCgpW0AiX1dlYlZpZXdVUkwiXSA9IHBsYXRmb3JtVVJMOwogCi0gICAgcmV0dXJu IG5pbDsKKyAgICByZXR1cm4gY29udGV4dC5hdXRvcmVsZWFzZSgpOwogfQogCiAtIChCT09MKXN1 cHBvcnRzSW1hZ2VQYXN0ZQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hh bmdlTG9nCmluZGV4IDc2OTg3NzkxOTNkNGIzNDU3NmZkMjk3ZjFiZGZkNjc0OWRhMDJjZDEuLmYz M2YyNDRkYjM1OTQxYWEwYTY3ZDVhNTc0ZGI1MTdhYTE5MWUzZWYgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAyMS0w Mi0xMiAgUmlja3kgTW9uZGVsbG8gIDxybW9uZGVsbG9AYXBwbGUuY29tPgorCisgICAgICAgIFVu Y29uZGl0aW9uYWxseSByZXR1cm4gaW5mb3JtYXRpb24gaW4gX2F1dG9maWxsQ29udGV4dCBTUEkg d2hlbiBhIGZpZWxkIGlzIGZvY3VzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMTgyOAorICAgICAgICByZGFyOi8vNzQyMTEyMzcKKworICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBUZXN0cyB1cGRhdGVkIGJ5IFdl bnNvbiBIc2llaC4KKworICAgICAgICBSZWJhc2VsaW5lIHRlc3RzLgorCisgICAgICAgICogVGVz dFdlYktpdEFQSS9UZXN0cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1tOgorICAgICAgICAo VGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9pb3Mv V0tXZWJWaWV3QXV0b2ZpbGxUZXN0cy5tbToKKyAgICAgICAgKC1bQXV0b0ZpbGxUZXN0VmlldyBh Y2NlcHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxzXSk6IFJlbmFtZWQgaW4gbGluZSB3aXRoIHRo ZSBQYXNzd29yZCBBdXRvRmlsbC1yZWxhdGVkCisgICAgICAgICAgICBjb250cmFjdCB0aGVzZSB0 ZXN0cyBhcmUgYWJvdXQuCisKIDIwMjEtMDItMTUgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRlckBh cHBsZS5jb20+CiAKICAgICAgICAgUENNOiBBZGQgaGlnaCBlbnRyb3B5IGF0dHJpYnV0aW9uU291 cmNlTm9uY2UgYXR0cmlidXRlIHRvIGFuY2hvciB0YWdzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL2lvcy9LZXlib2FyZElucHV0VGVzdHNJT1MubW0gYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL2lvcy9LZXlib2FyZElucHV0VGVzdHNJT1MubW0KaW5kZXggNDI0NWYw YmMxMGFhOWQ5YjUzYmRkY2VhNTlhMWE5ZTU4ZDUzMTI2My4uMDU3OGFjZWFhZDkwNGViODcyZTg2 ZGY5ZmY2Y2U5YzU4N2NlNjFhMCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9pb3MvS2V5Ym9hcmRJbnB1dFRlc3RzSU9TLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvaW9zL0tleWJvYXJkSW5wdXRUZXN0c0lPUy5tbQpAQCAtNjg5LDYgKzY4OSw3IEBAIFRF U1QoS2V5Ym9hcmRJbnB1dFRlc3RzLCBUZXN0V2ViVmlld0FkZGl0aW9uYWxDb250ZXh0Rm9yU3Ry b25nUGFzc3dvcmRBc3Npc3RhbmNlCiAKICAgICBOU0RpY3Rpb25hcnkgKmFjdHVhbCA9IFtbd2Vi VmlldyB0ZXh0SW5wdXRDb250ZW50Vmlld10gX2F1dG9maWxsQ29udGV4dF07CiAgICAgRVhQRUNU X1RSVUUoW1thY3R1YWwgYWxsVmFsdWVzXSBjb250YWluc09iamVjdDpleHBlY3RlZF0pOworICAg IEVYUEVDVF9UUlVFKFthY3R1YWxbQCJfYXV0b21hdGljUGFzc3dvcmRLZXlib2FyZCJdIGJvb2xW YWx1ZV0pOwogfQogCiBURVNUKEtleWJvYXJkSW5wdXRUZXN0cywgVGVzdFdlYlZpZXdBY2Nlc3Nv cnlEb25lRHVyaW5nU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlKQpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvV0tXZWJWaWV3QXV0b2ZpbGxUZXN0cy5tbSBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1dLV2ViVmlld0F1dG9maWxsVGVzdHMubW0KaW5kZXgg NzUyMDFiNmQyY2U0NjAwYWY0ZDU0ZDMwOWJmM2U4MDkwMmQ3ZTQwZC4uOWUzZTMxOWE5M2ZhZTYx YzNlMzlhNGMzZjA1ODAzODA2ZTgyZTY3ZSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9pb3MvV0tXZWJWaWV3QXV0b2ZpbGxUZXN0cy5tbQorKysgYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL2lvcy9XS1dlYlZpZXdBdXRvZmlsbFRlc3RzLm1tCkBAIC02NiwxNCArNjYs MTYgQEAgdHlwZWRlZiBVSVZpZXcgPFVJVGV4dElucHV0UHJpdmF0ZT4gQXV0b0ZpbGxJbnB1dFZp ZXc7CiAgICAgcmV0dXJuIChBdXRvRmlsbElucHV0VmlldyAqKXNlbGYudGV4dElucHV0Q29udGVu dFZpZXc7CiB9CiAKLS0gKEJPT0wpdGV4dElucHV0SGFzQXV0b0ZpbGxDb250ZXh0CistIChCT09M KWFjY2VwdHNBdXRvRmlsbExvZ2luQ3JlZGVudGlhbHMKIHsKLSAgICBOU1VSTCAqdXJsID0gW3Nl bGYuX2F1dG9maWxsSW5wdXRWaWV3Ll9hdXRvZmlsbENvbnRleHQgb2JqZWN0Rm9yS2V5OkAiX1dl YlZpZXdVUkwiXTsKLSAgICBpZiAoIVt1cmwgaXNLaW5kT2ZDbGFzczpbTlNVUkwgY2xhc3NdXSkK KyAgICBhdXRvIGNvbnRleHQgPSBzZWxmLl9hdXRvZmlsbElucHV0Vmlldy5fYXV0b2ZpbGxDb250 ZXh0OworICAgIGlmICghY29udGV4dCkKICAgICAgICAgcmV0dXJuIE5POwogCisgICAgTlNVUkwg KnVybCA9IGNvbnRleHRbQCJfV2ViVmlld1VSTCJdOworICAgIEVYUEVDVF9UUlVFKFt1cmwgaXNL aW5kT2ZDbGFzczpOU1VSTC5jbGFzc10pOwogICAgIEVYUEVDVF9XS19TVFJFUShbc2VsZiBzdHJp bmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuVVJMIl0sIHVybC5hYnNvbHV0ZVN0 cmluZyk7Ci0gICAgcmV0dXJuIFlFUzsKKyAgICByZXR1cm4gW2NvbnRleHRbQCJfYWNjZXB0c0xv Z2luQ3JlZGVudGlhbHMiXSBib29sVmFsdWVdOwogfQogCiBAZW5kCkBAIC04NSwxMCArODcsMTAg QEAgVEVTVChXS1dlYlZpZXdBdXRvRmlsbFRlc3RzLCBVc2VybmFtZUFuZFBhc3N3b3JkRmllbGQp CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW0F1dG9GaWxsVGVzdFZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCldKTsKICAgICBbd2ViVmlldyBz eW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6QCI8aW5wdXQgaWQ9J3VzZXInIHR5cGU9J2VtYWls Jz48aW5wdXQgaWQ9J3Bhc3N3b3JkJyB0eXBlPSdwYXNzd29yZCc+Il07CiAgICAgW3dlYlZpZXcg ZXZhbHVhdGVKYXZhU2NyaXB0QW5kV2FpdEZvcklucHV0U2Vzc2lvblRvQ2hhbmdlOkAidXNlci5m b2N1cygpIl07Ci0gICAgRVhQRUNUX1RSVUUoW3dlYlZpZXcgdGV4dElucHV0SGFzQXV0b0ZpbGxD b250ZXh0XSk7CisgICAgRVhQRUNUX1RSVUUoW3dlYlZpZXcgYWNjZXB0c0F1dG9GaWxsTG9naW5D cmVkZW50aWFsc10pOwogCiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0QW5kV2FpdEZv cklucHV0U2Vzc2lvblRvQ2hhbmdlOkAicGFzc3dvcmQuZm9jdXMoKSJdOwotICAgIEVYUEVDVF9U UlVFKFt3ZWJWaWV3IHRleHRJbnB1dEhhc0F1dG9GaWxsQ29udGV4dF0pOworICAgIEVYUEVDVF9U UlVFKFt3ZWJWaWV3IGFjY2VwdHNBdXRvRmlsbExvZ2luQ3JlZGVudGlhbHNdKTsKIAogICAgIGF1 dG8gY3JlZGVudGlhbFN1Z2dlc3Rpb24gPSBbVUlUZXh0QXV0b2ZpbGxTdWdnZXN0aW9uIGF1dG9m aWxsU3VnZ2VzdGlvbldpdGhVc2VybmFtZTpAImZyZWRlcmlrIiBwYXNzd29yZDpAImZhbW9zIl07 CiAgICAgW1t3ZWJWaWV3IF9hdXRvZmlsbElucHV0Vmlld10gaW5zZXJ0VGV4dFN1Z2dlc3Rpb246 Y3JlZGVudGlhbFN1Z2dlc3Rpb25dOwpAQCAtOTYsNyArOTgsNyBAQCBURVNUKFdLV2ViVmlld0F1 dG9GaWxsVGVzdHMsIFVzZXJuYW1lQW5kUGFzc3dvcmRGaWVsZCkKICAgICBFWFBFQ1RfV0tfU1RS RVEoImZhbW9zIiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAInBhc3N3 b3JkLnZhbHVlIl0pOwogCiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0QW5kV2FpdEZv cklucHV0U2Vzc2lvblRvQ2hhbmdlOkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC5ibHVyKCkiXTsK LSAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgdGV4dElucHV0SGFzQXV0b0ZpbGxDb250ZXh0XSk7 CisgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGFjY2VwdHNBdXRvRmlsbExvZ2luQ3JlZGVudGlh bHNdKTsKIH0KIAogVEVTVChXS1dlYlZpZXdBdXRvRmlsbFRlc3RzLCBVc2VybmFtZUFuZFBhc3N3 b3JkRmllbGRTZXBhcmF0ZWRCeVJhZGlvQnV0dG9uKQpAQCAtMTA0LDEwICsxMDYsMTAgQEAgVEVT VChXS1dlYlZpZXdBdXRvRmlsbFRlc3RzLCBVc2VybmFtZUFuZFBhc3N3b3JkRmllbGRTZXBhcmF0 ZWRCeVJhZGlvQnV0dG9uKQogICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tBdXRvRmlsbFRl c3RWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgMzIwLCA1MDApXSk7 CiAgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAiPGlucHV0IGlkPSd1 c2VyJyB0eXBlPSdlbWFpbCc+PGlucHV0IHR5cGU9J3JhZGlvJyBuYW1lPSdyYWRpb19idXR0b24n IHZhbHVlPSdyYWRpbyc+PGlucHV0IGlkPSdwYXNzd29yZCcgdHlwZT0ncGFzc3dvcmQnPiJdOwog ICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdEFuZFdhaXRGb3JJbnB1dFNlc3Npb25Ub0No YW5nZTpAInVzZXIuZm9jdXMoKSJdOwotICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IHRleHRJbnB1 dEhhc0F1dG9GaWxsQ29udGV4dF0pOworICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IGFjY2VwdHNB dXRvRmlsbExvZ2luQ3JlZGVudGlhbHNdKTsKIAogICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNj cmlwdEFuZFdhaXRGb3JJbnB1dFNlc3Npb25Ub0NoYW5nZTpAInBhc3N3b3JkLmZvY3VzKCkiXTsK LSAgICBFWFBFQ1RfVFJVRShbd2ViVmlldyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsK KyAgICBFWFBFQ1RfVFJVRShbd2ViVmlldyBhY2NlcHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxz XSk7CiAKICAgICBhdXRvIGNyZWRlbnRpYWxTdWdnZXN0aW9uID0gW1VJVGV4dEF1dG9maWxsU3Vn Z2VzdGlvbiBhdXRvZmlsbFN1Z2dlc3Rpb25XaXRoVXNlcm5hbWU6QCJmcmVkZXJpayIgcGFzc3dv cmQ6QCJmYW1vcyJdOwogICAgIFtbd2ViVmlldyBfYXV0b2ZpbGxJbnB1dFZpZXddIGluc2VydFRl eHRTdWdnZXN0aW9uOmNyZWRlbnRpYWxTdWdnZXN0aW9uXTsKQEAgLTExNiw3ICsxMTgsNyBAQCBU RVNUKFdLV2ViVmlld0F1dG9GaWxsVGVzdHMsIFVzZXJuYW1lQW5kUGFzc3dvcmRGaWVsZFNlcGFy YXRlZEJ5UmFkaW9CdXR0b24pCiAgICAgRVhQRUNUX1dLX1NUUkVRKCJmYW1vcyIsIFt3ZWJWaWV3 IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJwYXNzd29yZC52YWx1ZSJdKTsKIAogICAg IFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdEFuZFdhaXRGb3JJbnB1dFNlc3Npb25Ub0NoYW5n ZTpAImRvY3VtZW50LmFjdGl2ZUVsZW1lbnQuYmx1cigpIl07Ci0gICAgRVhQRUNUX0ZBTFNFKFt3 ZWJWaWV3IHRleHRJbnB1dEhhc0F1dG9GaWxsQ29udGV4dF0pOworICAgIEVYUEVDVF9GQUxTRShb d2ViVmlldyBhY2NlcHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxzXSk7CiB9CiAKIFRFU1QoV0tX ZWJWaWV3QXV0b0ZpbGxUZXN0cywgVHdvVGV4dEZpZWxkcykKQEAgLTEyNCwxMCArMTI2LDEwIEBA IFRFU1QoV0tXZWJWaWV3QXV0b0ZpbGxUZXN0cywgVHdvVGV4dEZpZWxkcykKICAgICBhdXRvIHdl YlZpZXcgPSBhZG9wdE5TKFtbQXV0b0ZpbGxUZXN0VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpD R1JlY3RNYWtlKDAsIDAsIDMyMCwgNTAwKV0pOwogICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlM b2FkSFRNTFN0cmluZzpAIjxpbnB1dCBpZD0ndGV4dDEnIHR5cGU9J2VtYWlsJz48aW5wdXQgaWQ9 J3RleHQyJyB0eXBlPSd0ZXh0Jz4iXTsKICAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHRB bmRXYWl0Rm9ySW5wdXRTZXNzaW9uVG9DaGFuZ2U6QCJ0ZXh0MS5mb2N1cygpIl07Ci0gICAgRVhQ RUNUX0ZBTFNFKFt3ZWJWaWV3IHRleHRJbnB1dEhhc0F1dG9GaWxsQ29udGV4dF0pOworICAgIEVY UEVDVF9GQUxTRShbd2ViVmlldyBhY2NlcHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxzXSk7CiAK ICAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHRBbmRXYWl0Rm9ySW5wdXRTZXNzaW9uVG9D aGFuZ2U6QCJ0ZXh0Mi5mb2N1cygpIl07Ci0gICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IHRleHRJ bnB1dEhhc0F1dG9GaWxsQ29udGV4dF0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBhY2Nl cHRzQXV0b0ZpbGxMb2dpbkNyZWRlbnRpYWxzXSk7CiB9CiAKIFRFU1QoV0tXZWJWaWV3QXV0b0Zp bGxUZXN0cywgU3RhbmRhbG9uZVBhc3N3b3JkRmllbGQpCkBAIC0xMzUsNyArMTM3LDcgQEAgVEVT VChXS1dlYlZpZXdBdXRvRmlsbFRlc3RzLCBTdGFuZGFsb25lUGFzc3dvcmRGaWVsZCkKICAgICBh dXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbQXV0b0ZpbGxUZXN0VmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpDR1JlY3RNYWtlKDAsIDAsIDMyMCwgNTAwKV0pOwogICAgIFt3ZWJWaWV3IHN5bmNocm9u b3VzbHlMb2FkSFRNTFN0cmluZzpAIjxpbnB1dCBpZD0ncGFzc3dvcmQnIHR5cGU9J3Bhc3N3b3Jk Jz4iXTsKICAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHRBbmRXYWl0Rm9ySW5wdXRTZXNz aW9uVG9DaGFuZ2U6QCJwYXNzd29yZC5mb2N1cygpIl07Ci0gICAgRVhQRUNUX1RSVUUoW3dlYlZp ZXcgdGV4dElucHV0SGFzQXV0b0ZpbGxDb250ZXh0XSk7CisgICAgRVhQRUNUX1RSVUUoW3dlYlZp ZXcgYWNjZXB0c0F1dG9GaWxsTG9naW5DcmVkZW50aWFsc10pOwogCiAgICAgYXV0byBjcmVkZW50 aWFsU3VnZ2VzdGlvbiA9IFtVSVRleHRBdXRvZmlsbFN1Z2dlc3Rpb24gYXV0b2ZpbGxTdWdnZXN0 aW9uV2l0aFVzZXJuYW1lOkAiZnJlZGVyaWsiIHBhc3N3b3JkOkAiZmFtb3MiXTsKICAgICBbW3dl YlZpZXcgX2F1dG9maWxsSW5wdXRWaWV3XSBpbnNlcnRUZXh0U3VnZ2VzdGlvbjpjcmVkZW50aWFs U3VnZ2VzdGlvbl07CkBAIC0xNDMsNyArMTQ1LDcgQEAgVEVTVChXS1dlYlZpZXdBdXRvRmlsbFRl c3RzLCBTdGFuZGFsb25lUGFzc3dvcmRGaWVsZCkKICAgICBFWFBFQ1RfV0tfU1RSRVEoImZhbW9z IiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAInBhc3N3b3JkLnZhbHVl Il0pOwogCiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0QW5kV2FpdEZvcklucHV0U2Vz c2lvblRvQ2hhbmdlOkAiZG9jdW1lbnQuYWN0aXZlRWxlbWVudC5ibHVyKCkiXTsKLSAgICBFWFBF Q1RfRkFMU0UoW3dlYlZpZXcgdGV4dElucHV0SGFzQXV0b0ZpbGxDb250ZXh0XSk7CisgICAgRVhQ RUNUX0ZBTFNFKFt3ZWJWaWV3IGFjY2VwdHNBdXRvRmlsbExvZ2luQ3JlZGVudGlhbHNdKTsKIH0K IAogVEVTVChXS1dlYlZpZXdBdXRvRmlsbFRlc3RzLCBTdGFuZGFsb25lVGV4dEZpZWxkKQpAQCAt MTUxLDcgKzE1Myw3IEBAIFRFU1QoV0tXZWJWaWV3QXV0b0ZpbGxUZXN0cywgU3RhbmRhbG9uZVRl eHRGaWVsZCkKICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbQXV0b0ZpbGxUZXN0VmlldyBh bGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDMyMCwgNTAwKV0pOwogICAgIFt3 ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0cmluZzpAIjxpbnB1dCBpZD0ndGV4dGZpZWxk JyB0eXBlPSd0ZXh0Jz4iXTsKICAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHRBbmRXYWl0 Rm9ySW5wdXRTZXNzaW9uVG9DaGFuZ2U6QCJ0ZXh0ZmllbGQuZm9jdXMoKSJdOwotICAgIEVYUEVD VF9GQUxTRShbd2ViVmlldyB0ZXh0SW5wdXRIYXNBdXRvRmlsbENvbnRleHRdKTsKKyAgICBFWFBF Q1RfRkFMU0UoW3dlYlZpZXcgYWNjZXB0c0F1dG9GaWxsTG9naW5DcmVkZW50aWFsc10pOwogfQog CiBURVNUKFdLV2ViVmlld0F1dG9GaWxsVGVzdHMsIEFjY291bnRDcmVhdGlvblBhZ2UpCkBAIC0x NTksMTMgKzE2MSwxMyBAQCBURVNUKFdLV2ViVmlld0F1dG9GaWxsVGVzdHMsIEFjY291bnRDcmVh dGlvblBhZ2UpCiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW0F1dG9GaWxsVGVzdFZpZXcg YWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAzMjAsIDUwMCldKTsKICAgICBb d2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6QCI8aW5wdXQgaWQ9J3VzZXInIHR5 cGU9J2VtYWlsJz48aW5wdXQgaWQ9J3Bhc3N3b3JkJyB0eXBlPSdwYXNzd29yZCc+PGlucHV0IGlk PSdjb25maXJtX3Bhc3N3b3JkJyB0eXBlPSdwYXNzd29yZCc+Il07CiAgICAgW3dlYlZpZXcgZXZh bHVhdGVKYXZhU2NyaXB0QW5kV2FpdEZvcklucHV0U2Vzc2lvblRvQ2hhbmdlOkAidXNlci5mb2N1 cygpIl07Ci0gICAgRVhQRUNUX1RSVUUoW3dlYlZpZXcgdGV4dElucHV0SGFzQXV0b0ZpbGxDb250 ZXh0XSk7CisgICAgRVhQRUNUX1RSVUUoW3dlYlZpZXcgYWNjZXB0c0F1dG9GaWxsTG9naW5DcmVk ZW50aWFsc10pOwogCiAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0QW5kV2FpdEZvcklu cHV0U2Vzc2lvblRvQ2hhbmdlOkAicGFzc3dvcmQuZm9jdXMoKSJdOwotICAgIEVYUEVDVF9UUlVF KFt3ZWJWaWV3IHRleHRJbnB1dEhhc0F1dG9GaWxsQ29udGV4dF0pOworICAgIEVYUEVDVF9UUlVF KFt3ZWJWaWV3IGFjY2VwdHNBdXRvRmlsbExvZ2luQ3JlZGVudGlhbHNdKTsKIAogICAgIFt3ZWJW aWV3IGV2YWx1YXRlSmF2YVNjcmlwdEFuZFdhaXRGb3JJbnB1dFNlc3Npb25Ub0NoYW5nZTpAImNv bmZpcm1fcGFzc3dvcmQuZm9jdXMoKSJdOwotICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IHRleHRJ bnB1dEhhc0F1dG9GaWxsQ29udGV4dF0pOworICAgIEVYUEVDVF9UUlVFKFt3ZWJWaWV3IGFjY2Vw dHNBdXRvRmlsbExvZ2luQ3JlZGVudGlhbHNdKTsKIH0KIAogc3RhdGljIEJPT0wgb3ZlcnJpZGVJ c0luSGFyZHdhcmVLZXlib2FyZE1vZGUoKQpAQCAtMTg3LDcgKzE4OSw3IEBAIFRFU1QoV0tXZWJW aWV3QXV0b0ZpbGxUZXN0cywgQXV0b0ZpbGxSZXF1aXJlc0lucHV0U2Vzc2lvbikKICAgICBbd2Vi VmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAidXNlci5mb2N1cygpIl07CiAgICAg VXRpbDo6cnVuKCZkb25lKTsKIAotICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyB0ZXh0SW5wdXRI YXNBdXRvRmlsbENvbnRleHRdKTsKKyAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgYWNjZXB0c0F1 dG9GaWxsTG9naW5DcmVkZW50aWFsc10pOwogfQogCiAjaWYgUExBVEZPUk0oV0FUQ0hPUykK