199300 2019-06-27 17:30:58 -0700 [Curl] Fix CookieJarCurl::getRawCookie. 2019-07-02 11:29:17 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 takashi.komori webkit-unassigned basuke commit-queue don.olmstead ews-watchlist fujii galpeter webkit-bug-importer oldest_to_newest 1548676 0 takashi.komori 2019-06-27 17:30:58 -0700 CookieJarCurl::getRawCookies is not working correctly because it uses CookieJarDB::searchCookies wrongly. This function is used for displaying cookie data in the web inspector storage tab. 1548678 1 373072 takashi.komori 2019-06-27 17:33:23 -0700 Created attachment 373072 Patch 1548686 2 basuke 2019-06-27 17:59:53 -0700 This is informal review. Looks good to me. 1548733 3 373072 fujii 2019-06-27 23:36:52 -0700 Comment on attachment 373072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373072&action=review > Source/WebCore/ChangeLog:3 > + [Curl] Fix CookieJarCurl::getRawCookie. Please be more informative. What is the problem, or how do you fix. > LayoutTests/platform/wincairo-wk1/TestExpectations:301 > +http/tests/inspector/page/get-cookies.html [ Skip ] Why is it skipped? This test is only for WK2? Then, does mac-wk1 also need to skip? 1548737 4 373072 fujii 2019-06-27 23:54:27 -0700 Comment on attachment 373072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373072&action=review > LayoutTests/ChangeLog:9 > + * http/tests/inspector/page/get-cookies.html: Added. This test really should be in 'page' directory? There is LayoutTests/inspector/storage directory. Do you need to create LayoutTests/http/tests/inspector/storage directory? 1548738 5 373072 fujii 2019-06-27 23:59:53 -0700 Comment on attachment 373072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373072&action=review > LayoutTests/http/tests/inspector/page/get-cookies.html:60 > + InspectorTest.awaitEvent("LoadComplete").then((event) => { Should you call InspectorTest.awaitEvent() before InspectorTest.evaluateInPage()? It seems that other test do so. 1548739 6 373072 fujii 2019-06-28 00:03:28 -0700 Comment on attachment 373072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373072&action=review > LayoutTests/http/tests/inspector/page/get-cookies.html:85 > + InspectorTest.expectEqual(payload.cookies[2].domain, "127.0.0.1", "[Sub] Domain is '127.0.0.1'"); test value for 'value' should be other value than domain. For examle, "xyz". 1548740 7 373072 fujii 2019-06-28 00:05:52 -0700 Comment on attachment 373072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373072&action=review > LayoutTests/http/tests/inspector/page/get-cookies.html:77 > + description: "Get cookies on Main and SubResources (localhost / 127.0.0.1)", Why do you need two tests, "Get cookies on Main and SubResource (localhost)" and "Get cookies on Main and SubResources (localhost / 127.0.0.1)"? 1548748 8 takashi.komori 2019-06-28 00:29:08 -0700 (In reply to Fujii Hironori from comment #5) > Comment on attachment 373072 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373072&action=review > > > LayoutTests/http/tests/inspector/page/get-cookies.html:60 > > + InspectorTest.awaitEvent("LoadComplete").then((event) => { > > Should you call InspectorTest.awaitEvent() before > InspectorTest.evaluateInPage()? It seems that other test do so. In this part we evaluate 'loadDocumentWithURL()' in test page and wait the results of the evaluation, and then check results. So if we call evaluateInPage() before awaitEvent(), this test doesn't work. 1548780 9 373072 fujii 2019-06-28 04:09:43 -0700 Comment on attachment 373072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373072&action=review >>> LayoutTests/http/tests/inspector/page/get-cookies.html:60 >>> + InspectorTest.awaitEvent("LoadComplete").then((event) => { >> >> Should you call InspectorTest.awaitEvent() before InspectorTest.evaluateInPage()? It seems that other test do so. > > In this part we evaluate 'loadDocumentWithURL()' in test page and wait the results of the evaluation, and then check results. > So if we call evaluateInPage() before awaitEvent(), this test doesn't work. Do you mean "if we call awaitEvent() before evaluateInPage()"? Why? I think awaitEvent should be called before evaluateInPage because it needs to register a event listener before start loading. 1549425 10 373294 takashi.komori 2019-07-01 18:19:14 -0700 Created attachment 373294 Patch 1549427 11 takashi.komori 2019-07-01 18:23:11 -0700 (In reply to Fujii Hironori from comment #3) > Comment on attachment 373072 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373072&action=review > > > Source/WebCore/ChangeLog:3 > > + [Curl] Fix CookieJarCurl::getRawCookie. > > Please be more informative. What is the problem, or how do you fix. > > > LayoutTests/platform/wincairo-wk1/TestExpectations:301 > > +http/tests/inspector/page/get-cookies.html [ Skip ] > > Why is it skipped? This test is only for WK2? Then, does mac-wk1 also need > to skip? Because almost all inspector tests don't work on wincairo DRT. I think mac-wk1 skips it because top level TestExpectations skips http/test/inspector/page/ directory and TestExpectations for mac-wk1 doesn't mention this test. Is it correct? 1549428 12 takashi.komori 2019-07-01 18:23:54 -0700 (In reply to Fujii Hironori from comment #4) > Comment on attachment 373072 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373072&action=review > > > LayoutTests/ChangeLog:9 > > + * http/tests/inspector/page/get-cookies.html: Added. > > This test really should be in 'page' directory? There is > LayoutTests/inspector/storage directory. Do you need to create > LayoutTests/http/tests/inspector/storage directory? If http/tests/inspector/storage/ is properer position than http/tests/inspector/page/ for this test, we will move it. I would like to know the more detailed reasonings for changing the path. 1549431 13 takashi.komori 2019-07-01 18:25:14 -0700 (In reply to Fujii Hironori from comment #6) > Comment on attachment 373072 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373072&action=review > > > LayoutTests/http/tests/inspector/page/get-cookies.html:85 > > + InspectorTest.expectEqual(payload.cookies[2].domain, "127.0.0.1", "[Sub] Domain is '127.0.0.1'"); > > test value for 'value' should be other value than domain. For examle, "xyz". Fixed. 1549432 14 takashi.komori 2019-07-01 18:26:25 -0700 (In reply to Fujii Hironori from comment #7) > Comment on attachment 373072 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373072&action=review > > > LayoutTests/http/tests/inspector/page/get-cookies.html:77 > > + description: "Get cookies on Main and SubResources (localhost / 127.0.0.1)", > > Why do you need two tests, "Get cookies on Main and SubResource (localhost)" > and "Get cookies on Main and SubResources (localhost / 127.0.0.1)"? Removed extra test. 1549434 15 takashi.komori 2019-07-01 18:27:27 -0700 (In reply to Fujii Hironori from comment #9) > Comment on attachment 373072 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373072&action=review > > >>> LayoutTests/http/tests/inspector/page/get-cookies.html:60 > >>> + InspectorTest.awaitEvent("LoadComplete").then((event) => { > >> > >> Should you call InspectorTest.awaitEvent() before InspectorTest.evaluateInPage()? It seems that other test do so. > > > > In this part we evaluate 'loadDocumentWithURL()' in test page and wait the results of the evaluation, and then check results. > > So if we call evaluateInPage() before awaitEvent(), this test doesn't work. > > Do you mean "if we call awaitEvent() before evaluateInPage()"? > Why? I think awaitEvent should be called before evaluateInPage because it > needs to register a event listener before start loading. I misunderstood. Fixed. 1549440 16 373072 fujii 2019-07-01 18:52:56 -0700 Comment on attachment 373072 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373072&action=review >>> LayoutTests/ChangeLog:9 >>> + * http/tests/inspector/page/get-cookies.html: Added. >> >> This test really should be in 'page' directory? There is LayoutTests/inspector/storage directory. Do you need to create LayoutTests/http/tests/inspector/storage directory? > > If http/tests/inspector/storage/ is properer position than http/tests/inspector/page/ for this test, we will move it. > I would like to know the more detailed reasonings for changing the path. There is LayoutTests/inspector/page/filter-cookies-for-domain.html which is tesing "Page.getCookie". Your test case is testing "Page.getCookies". http/tests/inspector/page seems appropriate. 1549644 17 373294 commit-queue 2019-07-02 11:28:42 -0700 Comment on attachment 373294 Patch Clearing flags on attachment: 373294 Committed r247064: <https://trac.webkit.org/changeset/247064> 1549645 18 commit-queue 2019-07-02 11:28:44 -0700 All reviewed patches have been landed. Closing bug. 1549646 19 webkit-bug-importer 2019-07-02 11:29:17 -0700 <rdar://problem/52535659> 373072 2019-06-27 17:33:23 -0700 2019-07-01 18:19:10 -0700 Patch bug-199300-20190628092921.patch text/plain 10861 takashi.komori U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU0ZTMyNmVmYzJiZjEx ZTEyOGQ3MzgxNzA3ODk2Yjg4NGZiNzE3OS4uMjRiNWM4OGFhYzA3OTU3MDcyNGQyMDM1ZDM1NDIx ZTk5OTAxYTJmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE5LTA2LTI3ICBUYWth c2hpIEtvbW9yaSAgPFRha2FzaGkuS29tb3JpQHNvbnkuY29tPgorCisgICAgICAgIFtDdXJsXSBG aXggQ29va2llSmFyQ3VybDo6Z2V0UmF3Q29va2llLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MzAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGFnZS9n ZXQtY29va2llcy5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2ll SmFyQ3VybC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVKYXJDdXJsOjpnZXRSYXdDb29r aWVzIGNvbnN0KToKKwogMjAxOS0wNi0yNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBbVGV4dCBhdXRvc2l6aW5nXSBbaVBhZE9TXSBSZXZpc2Ugb3Vy IGhldXJpc3RpY3MgdG8gZGV0ZXJtaW5lIGlkZW1wb3RlbnQgdGV4dCBhdXRvc2l6aW5nIGNhbmRp ZGF0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9D b29raWVKYXJDdXJsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9D b29raWVKYXJDdXJsLmNwcAppbmRleCAyOWI0MDA1MDI1MzMwMDc5YWY0NTcyYWI5ZGFjYTZjNWQ4 M2ViMDI4Li4zOTRjMzQ2MjY2NDlkNWRlYTg2OWUwOTViZTBkOWZhZTdiMWE1ZWNiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyQ3VybC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckN1 cmwuY3BwCkBAIC0xMTIsMTMgKzExMiwxMyBAQCBib29sIENvb2tpZUphckN1cmw6OmNvb2tpZXNF bmFibGVkKGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbikgY29uc3QKICAgICBy ZXR1cm4gc2Vzc2lvbi5jb29raWVEYXRhYmFzZSgpLmlzRW5hYmxlZCgpOwogfQogCi1ib29sIENv b2tpZUphckN1cmw6OmdldFJhd0Nvb2tpZXMoY29uc3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBz ZXNzaW9uLCBjb25zdCBVUkwmIGZpcnN0UGFydHksIGNvbnN0IFNhbWVTaXRlSW5mbyYsIGNvbnN0 IFVSTCYsIE9wdGlvbmFsPHVpbnQ2NF90PiBmcmFtZUlELCBPcHRpb25hbDxQYWdlSWRlbnRpZmll cj4gcGFnZUlELCBWZWN0b3I8Q29va2llPiYgcmF3Q29va2llcykgY29uc3QKK2Jvb2wgQ29va2ll SmFyQ3VybDo6Z2V0UmF3Q29va2llcyhjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Np b24sIGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiwgY29uc3QgVVJM JiB1cmwsIE9wdGlvbmFsPHVpbnQ2NF90PiBmcmFtZUlELCBPcHRpb25hbDxQYWdlSWRlbnRpZmll cj4gcGFnZUlELCBWZWN0b3I8Q29va2llPiYgcmF3Q29va2llcykgY29uc3QKIHsKICAgICBVTlVT RURfUEFSQU0oZnJhbWVJRCk7CiAgICAgVU5VU0VEX1BBUkFNKHBhZ2VJRCk7CiAKICAgICBDb29r aWVKYXJEQiYgY29va2llSmFyREIgPSBzZXNzaW9uLmNvb2tpZURhdGFiYXNlKCk7Ci0gICAgaWYg KGF1dG8gY29va2llcyA9IGNvb2tpZUphckRCLnNlYXJjaENvb2tpZXMoZmlyc3RQYXJ0eSwgZmly c3RQYXJ0eSwgV1RGOjpudWxsb3B0LCBXVEY6Om51bGxvcHQsIFdURjo6bnVsbG9wdCkpIHsKKyAg ICBpZiAoYXV0byBjb29raWVzID0gY29va2llSmFyREIuc2VhcmNoQ29va2llcyhmaXJzdFBhcnR5 LCB1cmwsIFdURjo6bnVsbG9wdCwgV1RGOjpudWxsb3B0LCBXVEY6Om51bGxvcHQpKSB7CiAgICAg ICAgIHJhd0Nvb2tpZXMgPSBXVEZNb3ZlKCpjb29raWVzKTsKICAgICAgICAgcmV0dXJuIHRydWU7 CiAgICAgfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCmluZGV4IDhhOWZhOGY3MGIwNTQ4NTE0YWExY2M3OGUyMDA4NzYxYTNiYWJmNGIu LjEyMjk4ODY4NTFkMjhiNzc3ODg3YWIwOThjZDI4OGMzMmQ1ZGVmZmYgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNiBAQAorMjAxOS0wNi0yNyAgVGFrYXNoaSBLb21vcmkgIDxUYWthc2hpLktvbW9yaUBzb255 LmNvbT4KKworICAgICAgICBbQ3VybF0gRml4IENvb2tpZUphckN1cmw6OmdldFJhd0Nvb2tpZS4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTMwMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90 ZXN0cy9pbnNwZWN0b3IvcGFnZS9nZXQtY29va2llcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAg ICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL3BhZ2UvZ2V0LWNvb2tpZXMuaHRtbDogQWRkZWQu CisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGFnZS9yZXNvdXJjZXMvc2V0LWNvb2tp ZS5waHA6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL3dpbmNhaXJvLXdrMS9UZXN0RXhwZWN0 YXRpb25zOgorICAgICAgICAqIHBsYXRmb3JtL3dpbmNhaXJvL1Rlc3RFeHBlY3RhdGlvbnM6CisK IDIwMTktMDYtMjQgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAg ICAgICAgW1RleHQgYXV0b3NpemluZ10gW2lQYWRPU10gUmV2aXNlIG91ciBoZXVyaXN0aWNzIHRv IGRldGVybWluZSBpZGVtcG90ZW50IHRleHQgYXV0b3NpemluZyBjYW5kaWRhdGVzCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9wYWdlL2dldC1jb29raWVzLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3BhZ2UvZ2V0LWNv b2tpZXMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmYyZWZkMjkxMmZiZTQ1NTYxYzM5YmU3ZTZl ZGIxZWRjOGM4M2JjYjkKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L2luc3BlY3Rvci9wYWdlL2dldC1jb29raWVzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI2IEBA CitUZXN0IGZvciB0aGUgUGFnZS5nZXRDb29raWVzCisKKworPT0gUnVubmluZyB0ZXN0IHN1aXRl OiBQYWdlLmdldENvb2tpZXMKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBDaGVja05vQ29va2llcwor UEFTUzogU2hvdWxkIGJlIG5vIGNvb2tpZXMuCisKKy0tIFJ1bm5pbmcgdGVzdCBzZXR1cC4KKy0t IFJ1bm5pbmcgdGVzdCBjYXNlOiBQYWdlLmdldENvb2tpZXMuT25seU1haW5SZXNvdXJjZQorUEFT UzogbGVuZ3RoIHNob3VsZCBiZSBvbmUuCitQQVNTOiBbTWFpbl0gTmFtZSBpcyAnTWFpbicKK1BB U1M6IFtNYWluXSBWYWx1ZSBpcyAnMTI3LjAuMC4xJworUEFTUzogW01haW5dIERvbWFpbiBpcyAn MTI3LjAuMC4xJworCistLSBSdW5uaW5nIHRlc3QgY2FzZTogUGFnZS5nZXRDb29raWVzLk1haW5B bmRTdWJSZXNvdXJjZQorUEFTUzogbGVuZ3RoIHNob3VsZCBiZSB0d28uCitQQVNTOiBbU3ViXSBO YW1lIGlzICdTdWInCitQQVNTOiBbU3ViXSBWYWx1ZSBpcyAnbG9jYWwnCitQQVNTOiBbU3ViXSBE b21haW4gaXMgJ2xvY2FsaG9zdCcKKworLS0gUnVubmluZyB0ZXN0IGNhc2U6IFBhZ2UuZ2V0Q29v a2llcy5NYWluQW5kU3ViUmVzb3VyY2UKK1BBU1M6IGxlbmd0aCBzaG91bGQgYmUgdGhyZWUuCitQ QVNTOiBbU3ViXSBOYW1lIGlzICdTdWInCitQQVNTOiBbU3ViXSBWYWx1ZSBpcyAnMTI3LjAuMC4x JworUEFTUzogW1N1Yl0gRG9tYWluIGlzICcxMjcuMC4wLjEnCisKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3BhZ2UvZ2V0LWNvb2tpZXMuaHRtbCBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3BhZ2UvZ2V0LWNvb2tpZXMuaHRtbApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi44MzJmNzU2M2ZlNjZlNDc1MDdkMjYyZTIyMDYxNGQ5OTQ0NGI1MzVmCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGFnZS9nZXQtY29va2ll cy5odG1sCkBAIC0wLDAgKzEsMTAyIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+ Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4K KzxzY3JpcHQ+CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5zZXRBbHdh eXNBY2NlcHRDb29raWVzKHRydWUpOworCitmdW5jdGlvbiBsb2FkRG9jdW1lbnRXaXRoVVJMKHVy bCkgeworICAgIGZyYW1lID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnaWZyYW1lJyk7CisgICAg ZnJhbWUuc3JjID0gdXJsOworICAgIGZyYW1lLm9ubG9hZCA9IGZ1bmN0aW9uKCkgeyBUZXN0UGFn ZS5kaXNwYXRjaEV2ZW50VG9Gcm9udGVuZCgiTG9hZENvbXBsZXRlIikgfTsKKyAgICBkb2N1bWVu dC5ib2R5LmFwcGVuZENoaWxkKGZyYW1lKTsKK30KKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAg bGV0IHN1aXRlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVBc3luY1N1aXRlKCJQYWdlLmdldENvb2tp ZXMiKTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIkNoZWNrTm9D b29raWVzIiwKKyAgICAgICAgZGVzY3JpcHRpb246ICJFbnN1cmUgdGhlcmUgYXJlIG5vIGNvb2tp ZXMuIiwKKyAgICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsKKyAgICAgICAgICAgIFBhZ2VB Z2VudC5nZXRDb29raWVzKCkudGhlbigocGF5bG9hZCkgPT4geworICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0RXF1YWwocGF5bG9hZC5jb29raWVzLmxlbmd0aCwgMCwgIlNob3Vs ZCBiZSBubyBjb29raWVzLiIpOworICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKKyAgICAgICAg ICAgIH0pLmNhdGNoKChlcnJvcikgPT4geworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu bG9nKGVycm9yKTsKKyAgICAgICAgICAgICAgICByZWplY3QoKTsKKyAgICAgICAgICAgIH0pOwor ICAgICAgICB9CisgICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5h bWU6ICJQYWdlLmdldENvb2tpZXMuT25seU1haW5SZXNvdXJjZSIsCisgICAgICAgIGRlc2NyaXB0 aW9uOiAiR2V0IGNvb2tpZXMgb24gTWFpblJlc291cmNlIiwKKyAgICAgICAgc2V0dXAocmVzb2x2 ZSkgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShgZG9jdW1lbnQu Y29va2llID0gIk1haW49MTI3LjAuMC4xOyBNYXgtYWdlPTM2MDAiO2ApOworICAgICAgICAgICAg c2V0VGltZW91dChyZXNvbHZlLCA1MDApOworICAgICAgICB9LAorICAgICAgICB0ZXN0KHJlc29s dmUsIHJlamVjdCkgeworICAgICAgICAgICAgUGFnZUFnZW50LmdldENvb2tpZXMoKS50aGVuKChw YXlsb2FkKSA9PiB7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChw YXlsb2FkLmNvb2tpZXMubGVuZ3RoLCAxLCAibGVuZ3RoIHNob3VsZCBiZSBvbmUuIik7CisgICAg ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChwYXlsb2FkLmNvb2tpZXNbMF0u bmFtZSwgIk1haW4iLCAiW01haW5dIE5hbWUgaXMgJ01haW4nIik7CisgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChwYXlsb2FkLmNvb2tpZXNbMF0udmFsdWUsICIxMjcu MC4wLjEiLCAiW01haW5dIFZhbHVlIGlzICcxMjcuMC4wLjEnIik7CisgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChwYXlsb2FkLmNvb2tpZXNbMF0uZG9tYWluLCAiMTI3 LjAuMC4xIiwgIltNYWluXSBEb21haW4gaXMgJzEyNy4wLjAuMSciKTsKKyAgICAgICAgICAgICAg ICByZXNvbHZlKCk7CisgICAgICAgICAgICB9KS5jYXRjaCgoZXJyb3IpID0+IHsKKyAgICAgICAg ICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygiQ291bGQgbm90IGZldGNoIGNvb2tpZXM6ICIgKyBl cnJvcik7CisgICAgICAgICAgICAgICAgcmVqZWN0KCk7CisgICAgICAgICAgICB9KTsKKyAgICAg ICAgfQorICAgIH0pOworCisgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAgICAgICBuYW1lOiAi UGFnZS5nZXRDb29raWVzLk1haW5BbmRTdWJSZXNvdXJjZSIsCisgICAgICAgIGRlc2NyaXB0aW9u OiAiR2V0IGNvb2tpZXMgb24gTWFpbiBhbmQgU3ViUmVzb3VyY2UgKGxvY2FsaG9zdCkiLAorICAg ICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5l dmFsdWF0ZUluUGFnZShgbG9hZERvY3VtZW50V2l0aFVSTCgiaHR0cDovL2xvY2FsaG9zdDo4MDAw L2luc3BlY3Rvci9wYWdlL3Jlc291cmNlcy9zZXQtY29va2llLnBocD9uYW1lPVN1YiZ2YWx1ZT1s b2NhbCIpYCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmF3YWl0RXZlbnQoIkxvYWRDb21w bGV0ZSIpLnRoZW4oKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAgUGFnZUFnZW50LmdldENv b2tpZXMoKS50aGVuKChwYXlsb2FkKSA9PiB7CisgICAgICAgICAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuZXhwZWN0RXF1YWwocGF5bG9hZC5jb29raWVzLmxlbmd0aCwgMiwgImxlbmd0aCBzaG91 bGQgYmUgdHdvLiIpOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVx dWFsKHBheWxvYWQuY29va2llc1sxXS5uYW1lLCAiU3ViIiwgIltTdWJdIE5hbWUgaXMgJ1N1Yici KTsKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChwYXlsb2Fk LmNvb2tpZXNbMV0udmFsdWUsICJsb2NhbCIsICJbU3ViXSBWYWx1ZSBpcyAnbG9jYWwnIik7Cisg ICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwocGF5bG9hZC5jb29r aWVzWzFdLmRvbWFpbiwgImxvY2FsaG9zdCIsICJbU3ViXSBEb21haW4gaXMgJ2xvY2FsaG9zdCci KTsKKyAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgICAgIH0pLmNh dGNoKChlcnJvcikgPT4geworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmxvZygi Q291bGQgbm90IGZldGNoIGNvb2tpZXM6ICIgKyBlcnJvcik7CisgICAgICAgICAgICAgICAgICAg IHJlamVjdCgpOworICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgfSk7CisgICAgICAg IH0KKyAgICB9KTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIlBh Z2UuZ2V0Q29va2llcy5NYWluQW5kU3ViUmVzb3VyY2UiLAorICAgICAgICBkZXNjcmlwdGlvbjog IkdldCBjb29raWVzIG9uIE1haW4gYW5kIFN1YlJlc291cmNlcyAobG9jYWxob3N0IC8gMTI3LjAu MC4xKSIsCisgICAgICAgIHRlc3QocmVzb2x2ZSwgcmVqZWN0KSB7CisgICAgICAgICAgICBJbnNw ZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKGBsb2FkRG9jdW1lbnRXaXRoVVJMKCJodHRwOi8vMTI3 LjAuMC4xOjgwMDAvaW5zcGVjdG9yL3BhZ2UvcmVzb3VyY2VzL3NldC1jb29raWUucGhwP25hbWU9 U3ViJnZhbHVlPTEyNy4wLjAuMSIpYCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmF3YWl0 RXZlbnQoIkxvYWRDb21wbGV0ZSIpLnRoZW4oKGV2ZW50KSA9PiB7CisgICAgICAgICAgICAgICAg UGFnZUFnZW50LmdldENvb2tpZXMoKS50aGVuKChwYXlsb2FkKSA9PiB7CisgICAgICAgICAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwocGF5bG9hZC5jb29raWVzLmxlbmd0aCwg MywgImxlbmd0aCBzaG91bGQgYmUgdGhyZWUuIik7CisgICAgICAgICAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuZXhwZWN0RXF1YWwocGF5bG9hZC5jb29raWVzWzJdLm5hbWUsICJTdWIiLCAiW1N1 Yl0gTmFtZSBpcyAnU3ViJyIpOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4 cGVjdEVxdWFsKHBheWxvYWQuY29va2llc1syXS52YWx1ZSwgIjEyNy4wLjAuMSIsICJbU3ViXSBW YWx1ZSBpcyAnMTI3LjAuMC4xJyIpOworICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0 LmV4cGVjdEVxdWFsKHBheWxvYWQuY29va2llc1syXS5kb21haW4sICIxMjcuMC4wLjEiLCAiW1N1 Yl0gRG9tYWluIGlzICcxMjcuMC4wLjEnIik7CisgICAgICAgICAgICAgICAgICAgIHJlc29sdmUo KTsKKyAgICAgICAgICAgICAgICB9KS5jYXRjaCgoZXJyb3IpID0+IHsKKyAgICAgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5sb2coIkNvdWxkIG5vdCBmZXRjaCBjb29raWVzOiAiICsgZXJy b3IpOworICAgICAgICAgICAgICAgICAgICByZWplY3QoKTsKKyAgICAgICAgICAgICAgICB9KTsK KyAgICAgICAgICAgIH0pOworICAgICAgICB9CisgICAgfSk7CisKKyAgICBzdWl0ZS5ydW5UZXN0 Q2FzZXNBbmRGaW5pc2goKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJy dW5UZXN0KCkiPgorICAgIDxwPlRlc3QgZm9yIHRoZSBQYWdlLmdldENvb2tpZXM8L3A+Cis8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9wYWdlL3Jlc291cmNlcy9zZXQtY29va2llLnBocCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv aW5zcGVjdG9yL3BhZ2UvcmVzb3VyY2VzL3NldC1jb29raWUucGhwCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFmOGEy MmIzZGNiMzE0ODg4OTgzMjA3ZmRkZmVhOTU4OGI2MjJhNzcKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9wYWdlL3Jlc291cmNlcy9zZXQtY29va2ll LnBocApAQCAtMCwwICsxLDQgQEAKKzw/cGhwCisgICAgc2V0Y29va2llKCRfR0VUWyJuYW1lIl0s ICRfR0VUWyJ2YWx1ZSJdLCB0aW1lKCkgKyAzNjAwKTsKKz8+CitTZXQgPD89ICRfR0VUWyJuYW1l Il0gPz49PD89ICRfR0VUWyJ2YWx1ZSJdID8+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS93aW5jYWlyby13azEvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L3dpbmNhaXJvLXdrMS9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDlhNTNmYjg3NTFkZmNhM2IzMGUx MDNmMWU1ODRlNTQ2NGYzZTdlYjAuLjVkMTA4MTdhMzRhNzg4YzI0YmVkMDE2OTNhNDVkYjUwZmQ3 OTFkYTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNhaXJvLXdrMS9UZXN0 RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNhaXJvLXdrMS9UZXN0 RXhwZWN0YXRpb25zCkBAIC0yOTgsNiArMjk4LDcgQEAgd2Via2l0Lm9yZy9iLzg5MTUzIGh0dHAv dGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5Ymkvd29ya2Vycy9jbG9zZS5odG1sIFsgUGFzcyBGYWkK ICMgQ29va2llIHBvbGljeSBvbmx5IHN1cHBvcnRlZCBpbiBXSzIuCiBodHRwL3Rlc3RzL2Nvb2tp ZXMvb25seS1hY2NlcHQtZmlyc3QtcGFydHktY29va2llcy5odG1sIFsgU2tpcCBdCiBodHRwL3Rl c3RzL2Nvb2tpZXMvdGhpcmQtcGFydHktY29va2llLXJlbGF4aW5nLmh0bWwgWyBTa2lwIF0KK2h0 dHAvdGVzdHMvaW5zcGVjdG9yL3BhZ2UvZ2V0LWNvb2tpZXMuaHRtbCBbIFNraXAgXQogaHR0cC90 ZXN0cy9zZWN1cml0eS9jb29raWVzL3RoaXJkLXBhcnR5LWNvb2tpZS1ibG9ja2luZy5odG1sIFsg U2tpcCBdCiBodHRwL3Rlc3RzL3NlY3VyaXR5L2Nvb2tpZXMvdGhpcmQtcGFydHktY29va2llLWJs b2NraW5nLXJlZGlyZWN0Lmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29va2ll cy90aGlyZC1wYXJ0eS1jb29raWUtYmxvY2tpbmctdXNlci1hY3Rpb24uaHRtbCBbIFNraXAgXQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9u cyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNhaXJvL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXgg ZjBiMzQ0ZDViZmM2NTlmMDBjNjNjYzRiZWNiMWQyNTYzMmYyMGUzYy4uMWY3ZWMyN2Q4ZjgyOTgx NTJmNzc3M2RjNWE0ODhkMjczM2I2NjY4OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93 aW5jYWlyby9UZXN0RXhwZWN0YXRpb25zCkBAIC04ODQsNiArODg0LDggQEAgaHR0cC90ZXN0cy9o aXN0b3J5IFsgU2tpcCBdCiBodHRwL3Rlc3RzL2ltYWdlcyBbIFNraXAgXQogaHR0cC90ZXN0cy9p bmNyZW1lbnRhbCBbIFNraXAgXQogaHR0cC90ZXN0cy9pbnNwZWN0b3IgWyBTa2lwIF0KK2h0dHAv dGVzdHMvaW5zcGVjdG9yL3BhZ2UvZ2V0LWNvb2tpZXMuaHRtbCBbIFBhc3MgXQorCiBodHRwL3Rl c3RzL2xvYWRpbmcgWyBTa2lwIF0KIGh0dHAvdGVzdHMvbG9jYWwvYmxvYiBbIFNraXAgXQogaHR0 cC90ZXN0cy9sb2NhbC9maWxlYXBpIFsgU2tpcCBdCg== 373294 2019-07-01 18:19:14 -0700 2019-07-02 11:28:42 -0700 Patch bug-199300-20190702101514.patch text/plain 9690 takashi.komori U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NzgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTU0ZTMyNmVmYzJiZjEx ZTEyOGQ3MzgxNzA3ODk2Yjg4NGZiNzE3OS4uOGUzNzI2OGY4NzJlM2Q0YWM4MzJhYTZiYmFmZDVm YWIwNWU0YTMwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA3LTAxICBUYWth c2hpIEtvbW9yaSAgPFRha2FzaGkuS29tb3JpQHNvbnkuY29tPgorCisgICAgICAgIFtDdXJsXSBG aXggQ29va2llSmFyQ3VybDo6Z2V0UmF3Q29va2llLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MzAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgT24gd2luY2Fpcm8gc29tZSBjb29raWUgaW5mb3JtYXRp b24gd2FzIG5vdCBkaXNwbGF5ZWQgaW4gV2ViSW5zcGVjdG9yJ3Mgc3RvcmFnZSB0YWIgYXMKKyAg ICAgICAgQ29va2llSmFyQ3VybDo6Z2V0UmF3Q29va2llcyB3YXMgY2FsbGluZyBDb29raWVKYXJE Qjo6c2VhcmNoQ29va2llcyB3aXRoIHdyb25nIGFyZ3VtZW50cy4KKyAgICAgICAgVGhpcyBwYXRj aCBmaXhlcyBpdC4KKworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL2luc3BlY3Rvci9wYWdlL2dl dC1jb29raWVzLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9Db29raWVK YXJDdXJsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZUphckN1cmw6OmdldFJhd0Nvb2tp ZXMgY29uc3QpOgorCiAyMDE5LTA2LTI0ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw bGUuY29tPgogCiAgICAgICAgIFtUZXh0IGF1dG9zaXppbmddIFtpUGFkT1NdIFJldmlzZSBvdXIg aGV1cmlzdGljcyB0byBkZXRlcm1pbmUgaWRlbXBvdGVudCB0ZXh0IGF1dG9zaXppbmcgY2FuZGlk YXRlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nv b2tpZUphckN1cmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nv b2tpZUphckN1cmwuY3BwCmluZGV4IDI5YjQwMDUwMjUzMzAwNzlhZjQ1NzJhYjlkYWNhNmM1ZDgz ZWIwMjguLjM5NGMzNDYyNjY0OWQ1ZGVhODY5ZTA5NWJlMGQ5ZmFlN2IxYTVlY2IgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Db29raWVKYXJDdXJsLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFyQ3Vy bC5jcHAKQEAgLTExMiwxMyArMTEyLDEzIEBAIGJvb2wgQ29va2llSmFyQ3VybDo6Y29va2llc0Vu YWJsZWQoY29uc3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzZXNzaW9uKSBjb25zdAogICAgIHJl dHVybiBzZXNzaW9uLmNvb2tpZURhdGFiYXNlKCkuaXNFbmFibGVkKCk7CiB9CiAKLWJvb2wgQ29v a2llSmFyQ3VybDo6Z2V0UmF3Q29va2llcyhjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNl c3Npb24sIGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgU2FtZVNpdGVJbmZvJiwgY29uc3Qg VVJMJiwgT3B0aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQsIE9wdGlvbmFsPFBhZ2VJZGVudGlmaWVy PiBwYWdlSUQsIFZlY3RvcjxDb29raWU+JiByYXdDb29raWVzKSBjb25zdAorYm9vbCBDb29raWVK YXJDdXJsOjpnZXRSYXdDb29raWVzKGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lv biwgY29uc3QgVVJMJiBmaXJzdFBhcnR5LCBjb25zdCBTYW1lU2l0ZUluZm8mLCBjb25zdCBVUkwm IHVybCwgT3B0aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQsIE9wdGlvbmFsPFBhZ2VJZGVudGlmaWVy PiBwYWdlSUQsIFZlY3RvcjxDb29raWU+JiByYXdDb29raWVzKSBjb25zdAogewogICAgIFVOVVNF RF9QQVJBTShmcmFtZUlEKTsKICAgICBVTlVTRURfUEFSQU0ocGFnZUlEKTsKIAogICAgIENvb2tp ZUphckRCJiBjb29raWVKYXJEQiA9IHNlc3Npb24uY29va2llRGF0YWJhc2UoKTsKLSAgICBpZiAo YXV0byBjb29raWVzID0gY29va2llSmFyREIuc2VhcmNoQ29va2llcyhmaXJzdFBhcnR5LCBmaXJz dFBhcnR5LCBXVEY6Om51bGxvcHQsIFdURjo6bnVsbG9wdCwgV1RGOjpudWxsb3B0KSkgeworICAg IGlmIChhdXRvIGNvb2tpZXMgPSBjb29raWVKYXJEQi5zZWFyY2hDb29raWVzKGZpcnN0UGFydHks IHVybCwgV1RGOjpudWxsb3B0LCBXVEY6Om51bGxvcHQsIFdURjo6bnVsbG9wdCkpIHsKICAgICAg ICAgcmF3Q29va2llcyA9IFdURk1vdmUoKmNvb2tpZXMpOwogICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggOGE5ZmE4ZjcwYjA1NDg1MTRhYTFjYzc4ZTIwMDg3NjFhM2JhYmY0Yi4u NGIwODViYjVmNzdhNjhlOWIzMTI5Mzc1NTczMThjYjk3ZDA3MmFkYyAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDE5LTA3LTAxICBUYWthc2hpIEtvbW9yaSAgPFRha2FzaGkuS29tb3JpQHNvbnku Y29tPgorCisgICAgICAgIFtDdXJsXSBGaXggQ29va2llSmFyQ3VybDo6Z2V0UmF3Q29va2llLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MzAwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rl c3RzL2luc3BlY3Rvci9wYWdlL2dldC1jb29raWVzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGFnZS9nZXQtY29va2llcy5odG1sOiBBZGRlZC4K KyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9wYWdlL3Jlc291cmNlcy9zZXQtY29va2ll LnBocDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vd2luY2Fpcm8td2sxL1Rlc3RFeHBlY3Rh dGlvbnM6CisgICAgICAgICogcGxhdGZvcm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9uczoKKwog MjAxOS0wNi0yNCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg ICAgICBbVGV4dCBhdXRvc2l6aW5nXSBbaVBhZE9TXSBSZXZpc2Ugb3VyIGhldXJpc3RpY3MgdG8g ZGV0ZXJtaW5lIGlkZW1wb3RlbnQgdGV4dCBhdXRvc2l6aW5nIGNhbmRpZGF0ZXMKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3BhZ2UvZ2V0LWNvb2tpZXMtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGFnZS9nZXQtY29v a2llcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYmQ3ZjNiZmEzYWQ5OGU4ZWYyMWZmMDNlYTBk MGI3OTUwYjM4MTQ2ZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv aW5zcGVjdG9yL3BhZ2UvZ2V0LWNvb2tpZXMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjEgQEAK K1Rlc3QgZm9yIHRoZSBQYWdlLmdldENvb2tpZXMKKworCis9PSBSdW5uaW5nIHRlc3Qgc3VpdGU6 IFBhZ2UuZ2V0Q29va2llcworLS0gUnVubmluZyB0ZXN0IGNhc2U6IENoZWNrTm9Db29raWVzCitQ QVNTOiBTaG91bGQgYmUgbm8gY29va2llcy4KKworLS0gUnVubmluZyB0ZXN0IHNldHVwLgorLS0g UnVubmluZyB0ZXN0IGNhc2U6IFBhZ2UuZ2V0Q29va2llcy5Pbmx5TWFpblJlc291cmNlCitQQVNT OiBsZW5ndGggc2hvdWxkIGJlIG9uZS4KK1BBU1M6IFtNYWluXSBOYW1lIGlzICdNYWluJworUEFT UzogW01haW5dIFZhbHVlIGlzICdmb28nCitQQVNTOiBbTWFpbl0gRG9tYWluIGlzICcxMjcuMC4w LjEnCisKKy0tIFJ1bm5pbmcgdGVzdCBzZXR1cC4KKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBQYWdl LmdldENvb2tpZXMuU3ViUmVzb3VyY2UKK1BBU1M6IGxlbmd0aCBzaG91bGQgYmUgdHdvLgorUEFT UzogW1N1Yl0gTmFtZSBpcyAnU3ViJworUEFTUzogW1N1Yl0gVmFsdWUgaXMgJ2JhcicKK1BBU1M6 IFtTdWJdIERvbWFpbiBpcyAnbG9jYWxob3N0JworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9wYWdlL2dldC1jb29raWVzLmh0bWwgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9wYWdlL2dldC1jb29raWVzLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmY3 NWRkYzRkZmIxYzlkNzljOTQxNGQ0ZWY5MDkyNmE4NjE4NmUzOQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3BhZ2UvZ2V0LWNvb2tpZXMuaHRtbApA QCAtMCwwICsxLDgzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0 IHNyYz0iLi4vcmVzb3VyY2VzL2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+ CitpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgdGVzdFJ1bm5lci5zZXRBbHdheXNBY2NlcHRD b29raWVzKHRydWUpOworCitmdW5jdGlvbiBsb2FkRG9jdW1lbnRXaXRoVVJMKHVybCkgeworICAg IGZyYW1lID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnaWZyYW1lJyk7CisgICAgZnJhbWUuc3Jj ID0gdXJsOworICAgIGZyYW1lLm9ubG9hZCA9IGZ1bmN0aW9uKCkgeyBUZXN0UGFnZS5kaXNwYXRj aEV2ZW50VG9Gcm9udGVuZCgiTG9hZENvbXBsZXRlIikgfTsKKyAgICBkb2N1bWVudC5ib2R5LmFw cGVuZENoaWxkKGZyYW1lKTsKK30KKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgbGV0IHN1aXRl ID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVBc3luY1N1aXRlKCJQYWdlLmdldENvb2tpZXMiKTsKKwor ICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIkNoZWNrTm9Db29raWVzIiwK KyAgICAgICAgZGVzY3JpcHRpb246ICJFbnN1cmUgdGhlcmUgYXJlIG5vIGNvb2tpZXMuIiwKKyAg ICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsKKyAgICAgICAgICAgIFBhZ2VBZ2VudC5nZXRD b29raWVzKCkudGhlbigocGF5bG9hZCkgPT4geworICAgICAgICAgICAgICAgIEluc3BlY3RvclRl c3QuZXhwZWN0RXF1YWwocGF5bG9hZC5jb29raWVzLmxlbmd0aCwgMCwgIlNob3VsZCBiZSBubyBj b29raWVzLiIpOworICAgICAgICAgICAgICAgIHJlc29sdmUoKTsKKyAgICAgICAgICAgIH0pLmNh dGNoKChlcnJvcikgPT4geworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QubG9nKGVycm9y KTsKKyAgICAgICAgICAgICAgICByZWplY3QoKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9 CisgICAgfSk7CisKKyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJQYWdl LmdldENvb2tpZXMuT25seU1haW5SZXNvdXJjZSIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiR2V0 IGNvb2tpZXMgb24gTWFpblJlc291cmNlLiIsCisgICAgICAgIHNldHVwKHJlc29sdmUpIHsKKyAg ICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2UoYGRvY3VtZW50LmNvb2tpZSA9 ICJNYWluPWZvbzsgTWF4LWFnZT0zNjAwIjtgKTsKKyAgICAgICAgICAgIHNldFRpbWVvdXQocmVz b2x2ZSwgNTAwKTsKKyAgICAgICAgfSwKKyAgICAgICAgdGVzdChyZXNvbHZlLCByZWplY3QpIHsK KyAgICAgICAgICAgIFBhZ2VBZ2VudC5nZXRDb29raWVzKCkudGhlbigocGF5bG9hZCkgPT4gewor ICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwocGF5bG9hZC5jb29raWVz Lmxlbmd0aCwgMSwgImxlbmd0aCBzaG91bGQgYmUgb25lLiIpOworICAgICAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0RXF1YWwocGF5bG9hZC5jb29raWVzWzBdLm5hbWUsICJNYWluIiwg IltNYWluXSBOYW1lIGlzICdNYWluJyIpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu ZXhwZWN0RXF1YWwocGF5bG9hZC5jb29raWVzWzBdLnZhbHVlLCAiZm9vIiwgIltNYWluXSBWYWx1 ZSBpcyAnZm9vJyIpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwo cGF5bG9hZC5jb29raWVzWzBdLmRvbWFpbiwgIjEyNy4wLjAuMSIsICJbTWFpbl0gRG9tYWluIGlz ICcxMjcuMC4wLjEnIik7CisgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAg fSkuY2F0Y2goKGVycm9yKSA9PiB7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5sb2co IkNvdWxkIG5vdCBmZXRjaCBjb29raWVzOiAiICsgZXJyb3IpOworICAgICAgICAgICAgICAgIHJl amVjdCgpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAgICB9KTsKKworICAgIHN1aXRl LmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFtZTogIlBhZ2UuZ2V0Q29va2llcy5TdWJSZXNvdXJj ZSIsCisgICAgICAgIGRlc2NyaXB0aW9uOiAiR2V0IGNvb2tpZXMgb24gU3ViUmVzb3VyY2VzLiIs CisgICAgICAgIHNldHVwKHJlc29sdmUpIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXdh aXRFdmVudCgiTG9hZENvbXBsZXRlIikudGhlbigoZXZlbnQpID0+IHsgcmVzb2x2ZSgpIH0pOwor ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShgbG9hZERvY3VtZW50V2l0 aFVSTCgiaHR0cDovL2xvY2FsaG9zdDo4MDAwL2luc3BlY3Rvci9wYWdlL3Jlc291cmNlcy9zZXQt Y29va2llLnBocD9uYW1lPVN1YiZ2YWx1ZT1iYXIiKWApOworICAgICAgICB9LAorICAgICAgICB0 ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAgICAgUGFnZUFnZW50LmdldENvb2tpZXMo KS50aGVuKChwYXlsb2FkKSA9PiB7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBl Y3RFcXVhbChwYXlsb2FkLmNvb2tpZXMubGVuZ3RoLCAyLCAibGVuZ3RoIHNob3VsZCBiZSB0d28u Iik7CisgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChwYXlsb2FkLmNv b2tpZXNbMV0ubmFtZSwgIlN1YiIsICJbU3ViXSBOYW1lIGlzICdTdWInIik7CisgICAgICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChwYXlsb2FkLmNvb2tpZXNbMV0udmFsdWUs ICJiYXIiLCAiW1N1Yl0gVmFsdWUgaXMgJ2JhciciKTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEVxdWFsKHBheWxvYWQuY29va2llc1sxXS5kb21haW4sICJsb2NhbGhvc3Qi LCAiW1N1Yl0gRG9tYWluIGlzICdsb2NhbGhvc3QnIik7CisgICAgICAgICAgICAgICAgcmVzb2x2 ZSgpOworICAgICAgICAgICAgfSkuY2F0Y2goKGVycm9yKSA9PiB7CisgICAgICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5sb2coIkNvdWxkIG5vdCBmZXRjaCBjb29raWVzOiAiICsgZXJyb3IpOwor ICAgICAgICAgICAgICAgIHJlamVjdCgpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KKyAg ICB9KTsKKworICAgIHN1aXRlLnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpOworfQorPC9zY3JpcHQ+ Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+CisgICAgPHA+VGVzdCBmb3IgdGhl IFBhZ2UuZ2V0Q29va2llczwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3BhZ2UvcmVzb3VyY2VzL3NldC1jb29raWUucGhw IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcGFnZS9yZXNvdXJjZXMvc2V0LWNv b2tpZS5waHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uMWY4YTIyYjNkY2IzMTQ4ODg5ODMyMDdmZGRmZWE5NTg4YjYy MmE3NwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9y L3BhZ2UvcmVzb3VyY2VzL3NldC1jb29raWUucGhwCkBAIC0wLDAgKzEsNCBAQAorPD9waHAKKyAg ICBzZXRjb29raWUoJF9HRVRbIm5hbWUiXSwgJF9HRVRbInZhbHVlIl0sIHRpbWUoKSArIDM2MDAp OworPz4KK1NldCA8Pz0gJF9HRVRbIm5hbWUiXSA/Pj08Pz0gJF9HRVRbInZhbHVlIl0gPz4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNhaXJvLXdrMS9UZXN0RXhwZWN0YXRp b25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luY2Fpcm8td2sxL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggOWE1M2ZiODc1MWRmY2EzYjMwZTEwM2YxZTU4NGU1NDY0ZjNlN2ViMC4uNWQxMDgxN2Ez NGE3ODhjMjRiZWQwMTY5M2E0NWRiNTBmZDc5MWRhMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vd2luY2Fpcm8td2sxL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vd2luY2Fpcm8td2sxL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTI5OCw2ICsyOTgsNyBA QCB3ZWJraXQub3JnL2IvODkxNTMgaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS93b3Jr ZXJzL2Nsb3NlLmh0bWwgWyBQYXNzIEZhaQogIyBDb29raWUgcG9saWN5IG9ubHkgc3VwcG9ydGVk IGluIFdLMi4KIGh0dHAvdGVzdHMvY29va2llcy9vbmx5LWFjY2VwdC1maXJzdC1wYXJ0eS1jb29r aWVzLmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvY29va2llcy90aGlyZC1wYXJ0eS1jb29raWUt cmVsYXhpbmcuaHRtbCBbIFNraXAgXQoraHR0cC90ZXN0cy9pbnNwZWN0b3IvcGFnZS9nZXQtY29v a2llcy5odG1sIFsgU2tpcCBdCiBodHRwL3Rlc3RzL3NlY3VyaXR5L2Nvb2tpZXMvdGhpcmQtcGFy dHktY29va2llLWJsb2NraW5nLmh0bWwgWyBTa2lwIF0KIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29v a2llcy90aGlyZC1wYXJ0eS1jb29raWUtYmxvY2tpbmctcmVkaXJlY3QuaHRtbCBbIFNraXAgXQog aHR0cC90ZXN0cy9zZWN1cml0eS9jb29raWVzL3RoaXJkLXBhcnR5LWNvb2tpZS1ibG9ja2luZy11 c2VyLWFjdGlvbi5odG1sIFsgU2tpcCBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS93aW5jYWlyby9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luY2Fp cm8vVGVzdEV4cGVjdGF0aW9ucwppbmRleCBmMGIzNDRkNWJmYzY1OWYwMGM2M2NjNGJlY2IxZDI1 NjMyZjIwZTNjLi4xZjdlYzI3ZDhmODI5ODE1MmY3NzczZGM1YTQ4OGQyNzMzYjY2Njg5IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW5jYWlyby9UZXN0RXhwZWN0YXRpb25zCisr KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNhaXJvL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTg4 NCw2ICs4ODQsOCBAQCBodHRwL3Rlc3RzL2hpc3RvcnkgWyBTa2lwIF0KIGh0dHAvdGVzdHMvaW1h Z2VzIFsgU2tpcCBdCiBodHRwL3Rlc3RzL2luY3JlbWVudGFsIFsgU2tpcCBdCiBodHRwL3Rlc3Rz L2luc3BlY3RvciBbIFNraXAgXQoraHR0cC90ZXN0cy9pbnNwZWN0b3IvcGFnZS9nZXQtY29va2ll cy5odG1sIFsgUGFzcyBdCisKIGh0dHAvdGVzdHMvbG9hZGluZyBbIFNraXAgXQogaHR0cC90ZXN0 cy9sb2NhbC9ibG9iIFsgU2tpcCBdCiBodHRwL3Rlc3RzL2xvY2FsL2ZpbGVhcGkgWyBTa2lwIF0K