67642 2011-09-06 06:57:16 -0700 Add a test for accesskey in regard to iframes. 2011-09-28 20:56:51 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hayato hayato apavlov dglazkov dominicc morrita webkit.review.bot oldest_to_newest 462490 0 hayato 2011-09-06 06:57:16 -0700 This is a derived from the discussion of https://bugs.webkit.org/show_bug.cgi?id=67096. It might be nice if there was a test that verifies the current accesskey behavior in regard to iframes to catch up if someone improves accesskey for iframes. 462497 1 106414 hayato 2011-09-06 07:08:11 -0700 Created attachment 106414 test for accesskey in regard to iframes 467583 2 106414 rniwa 2011-09-14 21:06:22 -0700 Comment on attachment 106414 test for accesskey in regard to iframes View in context: https://bugs.webkit.org/attachment.cgi?id=106414&action=review > LayoutTests/ChangeLog:4 > + Nit: there should be no blank lines between the bug title and the bug description. > LayoutTests/ChangeLog:11 > + To catch any improvement of accesskey behavior in regard to > + iframes, it'd be nice to add a test to verify the current > + behavior. Nit: It seems like we can put this in two lines instead of three. (Note WebKit doesn't limit the line length at 80 characters). > LayoutTests/fast/dom/access-key-iframe-expected.txt:12 > +PASS dispatchedEvent("focus") is ["inputC"] > +PASS dispatchedEvent("focus") is [] > +PASS dispatchedEvent("focus") is ["inputH"] > +PASS dispatchedEvent("focus") is [] > +PASS dispatchedEvent("focus") is [] > +PASS successfullyParsed is true These outputs aren't helpful because I can't tell what shows up inside [] is reasonable or not since there's no description as to what dispatchedEvent("focus") returns or what had happend before that function is called. > LayoutTests/fast/dom/access-key-iframe.html:5 > +<head> > +<script src="../js/resources/js-test-pre.js"></script> > +</head> It seems like you can just put this script element in the body and eliminate <head> and </head>. > LayoutTests/fast/dom/access-key-iframe.html:44 > +function dispatchedEvent(eventType) > +{ > + var events = eventRecords[eventType]; > + if (!events) > + return []; > + return events; > +} > + > +function recordEvent(event) > +{ > + var eventType = event.type > + if (!eventRecords[eventType]) { > + eventRecords[eventType] = [] > + } > + eventRecords[eventType].push(event.target.id); > +} Why do we need all of this code when we're only listening to focus event? It seems like we can just define a global variable like targetsOfFocusEvents that stores the target nodes of all focus events fired. > LayoutTests/fast/dom/access-key-iframe.html:76 > + var doc1 = iframe1.contentDocument; > + > + parent = doc1.body; > + parent.appendChild(createDomInDocument(doc1, 'input', {'id': 'inputG', 'accesskey': 'a'})); > + parent.appendChild(createDomInDocument(doc1, 'input', {'id': 'inputH', 'accesskey': 'c'})); > + parent.appendChild(createDomInDocument(doc1, 'input', {'id': 'inputI', 'accesskey': 'd'})); Instead of using doc1, can we just use iframe1.contentDocument? That seems to clarify the semantics of this code. > LayoutTests/fast/dom/access-key-iframe.html:90 > + shouldBe('dispatchedEvent("focus")', '["inputC"]'); You could do shouldBe('setFocus("inputB");pressAccessKey("a");targetsOfFocusEvents', '["inputC"]'); This should immediately makes clear what is happening prior to evaluating targetsOfFocusEvents and gives more context in the expected result. Furthermore, you should probably explain where inputB, etc... belongs (i.e. document structure) so that people reading the expected results can easily understand it. 467732 3 106414 hayato 2011-09-15 04:59:07 -0700 Comment on attachment 106414 test for accesskey in regard to iframes Thank you for the review. I've addressed your comments. View in context: https://bugs.webkit.org/attachment.cgi?id=106414&action=review >> LayoutTests/ChangeLog:4 >> + > > Nit: there should be no blank lines between the bug title and the bug description. Done. >> LayoutTests/ChangeLog:11 >> + behavior. > > Nit: It seems like we can put this in two lines instead of three. (Note WebKit doesn't limit the line length at 80 characters). Done. >> LayoutTests/fast/dom/access-key-iframe.html:5 >> +</head> > > It seems like you can just put this script element in the body and eliminate <head> and </head>. Done. >> LayoutTests/fast/dom/access-key-iframe.html:44 >> +} > > Why do we need all of this code when we're only listening to focus event? > > It seems like we can just define a global variable like targetsOfFocusEvents that stores the target nodes of all focus events fired. Yeah, that's overkill. This function was simply copied and pasted from other test which has to record all kinds of events. I've simplified that as you suggested. Thank you. >> LayoutTests/fast/dom/access-key-iframe.html:76 >> + parent.appendChild(createDomInDocument(doc1, 'input', {'id': 'inputI', 'accesskey': 'd'})); > > Instead of using doc1, can we just use iframe1.contentDocument? That seems to clarify the semantics of this code. Sure. Done. >> LayoutTests/fast/dom/access-key-iframe.html:90 >> + shouldBe('dispatchedEvent("focus")', '["inputC"]'); > > You could do shouldBe('setFocus("inputB");pressAccessKey("a");targetsOfFocusEvents', '["inputC"]'); > > This should immediately makes clear what is happening prior to evaluating targetsOfFocusEvents and gives more context in the expected result. > Furthermore, you should probably explain where inputB, etc... belongs (i.e. document structure) so that people reading the expected results can easily understand it. That sounds nice. I've updated the testing code, adding some descriptions. 467733 4 107477 hayato 2011-09-15 05:00:07 -0700 Created attachment 107477 update1 475215 5 107477 webkit.review.bot 2011-09-28 20:56:47 -0700 Comment on attachment 107477 update1 Clearing flags on attachment: 107477 Committed r96292: <http://trac.webkit.org/changeset/96292> 475216 6 webkit.review.bot 2011-09-28 20:56:51 -0700 All reviewed patches have been landed. Closing bug. 106414 2011-09-06 07:08:11 -0700 2011-09-15 05:00:01 -0700 test for accesskey in regard to iframes bug-67642-20110906230810.patch text/plain 5686 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ1NDAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBmMzFiZWQ4ZWIyOTA0ZTlmMjE4OGNm NWZjYzA5YzI3MmJkOTYxZDA3Li5kZWMwNDZkMTVmODdlNGUyYTVlNDYzYTk2NTE0MzIzYjEwNGZj MTdmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDktMDYgIEhheWF0byBJdG8gIDxoYXlh dG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZCBhIHRlc3QgZm9yIGFjY2Vzc2tleSBpbiBy ZWdhcmQgdG8gaWZyYW1lcy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Njc2NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUbyBjYXRjaCBhbnkgaW1wcm92ZW1lbnQgb2YgYWNjZXNza2V5IGJlaGF2aW9y IGluIHJlZ2FyZCB0bworICAgICAgICBpZnJhbWVzLCBpdCdkIGJlIG5pY2UgdG8gYWRkIGEgdGVz dCB0byB2ZXJpZnkgdGhlIGN1cnJlbnQKKyAgICAgICAgYmVoYXZpb3IuCisKKyAgICAgICAgKiBm YXN0L2RvbS9hY2Nlc3Mta2V5LWlmcmFtZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAq IGZhc3QvZG9tL2FjY2Vzcy1rZXktaWZyYW1lLmh0bWw6IEFkZGVkLgorCiAyMDExLTA5LTA1ICBK b2huIEtub3R0ZW5iZWx0ICA8amtub3R0ZW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFRha2Ug cGFnZVNjYWxlRmFjdG9yIGludG8gYWNjb3VudCBmb3IgTW91c2VSZWxhdGVkRXZlbnRzLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vYWNjZXNzLWtleS1pZnJhbWUtZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vYWNjZXNzLWtleS1pZnJhbWUtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLmJlOTc5NjUyZWIzODNlZDY2YzdhOTA5ZDczNmY3MzdlZjllZWY3NTIKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9hY2Nlc3Mta2V5LWlmcmFtZS1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSwxNSBAQAorVGVzdHMgdG8gZW5zdXJlIHRoYXQgYWNjZXNz a2V5IHdvcmtzIGluIGlmcmFtZXMgYW5kIG90aGVyIGlmcmFtZXMgZG9uJ3QgZWZmZWN0IGN1cnJl bnQgYWNjZXNza2V5IG1hcHMuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBv ZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCisKK1BB U1MgZGlzcGF0Y2hlZEV2ZW50KCJmb2N1cyIpIGlzIFsiaW5wdXRDIl0KK1BBU1MgZGlzcGF0Y2hl ZEV2ZW50KCJmb2N1cyIpIGlzIFtdCitQQVNTIGRpc3BhdGNoZWRFdmVudCgiZm9jdXMiKSBpcyBb ImlucHV0SCJdCitQQVNTIGRpc3BhdGNoZWRFdmVudCgiZm9jdXMiKSBpcyBbXQorUEFTUyBkaXNw YXRjaGVkRXZlbnQoImZvY3VzIikgaXMgW10KK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2RvbS9h Y2Nlc3Mta2V5LWlmcmFtZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vYWNjZXNzLWtleS1p ZnJhbWUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mZTE2M2Y5YWJiMzZiZjQ5MjZlYjU2M2Q2ZjU5ZGNlZjJm MGQzMjQ2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vYWNjZXNzLWtl eS1pZnJhbWUuaHRtbApAQCAtMCwwICsxLDEyMiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K KzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9z Y3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBp ZD0ic2FuZGJveCI+PC9kaXY+Cis8cHJlIGlkPSJjb25zb2xlIj48L3ByZT4KKzxzY3JpcHQ+Citk ZXNjcmlwdGlvbigiVGVzdHMgdG8gZW5zdXJlIHRoYXQgYWNjZXNza2V5IHdvcmtzIGluIGlmcmFt ZXMgYW5kIG90aGVyIGlmcmFtZXMgZG9uJ3QgZWZmZWN0IGN1cnJlbnQgYWNjZXNza2V5IG1hcHMu Iik7CisKK2Z1bmN0aW9uIHByZXNzQWNjZXNzS2V5KGtleSkKK3sKKyAgICBpZiAobmF2aWdhdG9y LnVzZXJBZ2VudC5zZWFyY2goL1xiTWFjIE9TIFhcYi8pICE9IC0xKQorICAgICAgICBtb2RpZmll cnMgPSBbImN0cmxLZXkiLCAiYWx0S2V5Il07CisgICAgZWxzZQorICAgICAgICBtb2RpZmllcnMg PSBbImFsdEtleSJdOworICAgIGV2ZW50U2VuZGVyLmtleURvd24oa2V5LCBtb2RpZmllcnMpOwor fQorCit2YXIgZXZlbnRSZWNvcmRzID0ge307CisKK2Z1bmN0aW9uIGNsZWFyRXZlbnRSZWNvcmRz KCkKK3sKKyAgICBldmVudFJlY29yZHMgPSB7fTsKK30KKworZnVuY3Rpb24gZGlzcGF0Y2hlZEV2 ZW50KGV2ZW50VHlwZSkKK3sKKyAgICB2YXIgZXZlbnRzID0gZXZlbnRSZWNvcmRzW2V2ZW50VHlw ZV07CisgICAgaWYgKCFldmVudHMpCisgICAgICAgIHJldHVybiBbXTsKKyAgICByZXR1cm4gZXZl bnRzOworfQorCitmdW5jdGlvbiByZWNvcmRFdmVudChldmVudCkKK3sKKyAgICB2YXIgZXZlbnRU eXBlID0gZXZlbnQudHlwZQorICAgIGlmICghZXZlbnRSZWNvcmRzW2V2ZW50VHlwZV0pIHsKKyAg ICAgICAgZXZlbnRSZWNvcmRzW2V2ZW50VHlwZV0gPSBbXQorICAgIH0KKyAgICBldmVudFJlY29y ZHNbZXZlbnRUeXBlXS5wdXNoKGV2ZW50LnRhcmdldC5pZCk7Cit9CisKK2Z1bmN0aW9uIGNyZWF0 ZURvbUluRG9jdW1lbnQoZG9jLCB0YWdOYW1lLCBhdHRyaWJ1dGVzKQoreworICAgIHZhciBlbGVt ZW50ID0gZG9jLmNyZWF0ZUVsZW1lbnQodGFnTmFtZSk7CisgICAgZm9yICh2YXIgbmFtZSBpbiBh dHRyaWJ1dGVzKQorICAgICAgICBlbGVtZW50LnNldEF0dHJpYnV0ZShuYW1lLCBhdHRyaWJ1dGVz W25hbWVdKTsKKworICAgIGlmIChhdHRyaWJ1dGVzWydpZCddKQorICAgICAgICBlbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoJ2ZvY3VzJywgcmVjb3JkRXZlbnQsIGZhbHNlKTsKKyAgICByZXR1cm4g ZWxlbWVudDsKK30KKworZnVuY3Rpb24gdGVzdCgpCit7CisgICAgaWYgKHdpbmRvdy5sYXlvdXRU ZXN0Q29udHJvbGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgp OworCisgICAgdmFyIGRvYzAgPSBkb2N1bWVudDsKKyAgICB2YXIgcGFyZW50ID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ3NhbmRib3gnKTsKKyAgICBwYXJlbnQuYXBwZW5kQ2hpbGQoY3JlYXRl RG9tSW5Eb2N1bWVudChkb2MwLCAnaW5wdXQnLCB7J2lkJzogJ2lucHV0Qid9KSk7CisgICAgcGFy ZW50LmFwcGVuZENoaWxkKGNyZWF0ZURvbUluRG9jdW1lbnQoZG9jMCwgJ2lucHV0JywgeydpZCc6 ICdpbnB1dEMnLCAnYWNjZXNza2V5JzogJ2EnfSkpOworICAgIHBhcmVudC5hcHBlbmRDaGlsZChj cmVhdGVEb21JbkRvY3VtZW50KGRvYzAsICdpbnB1dCcsIHsnaWQnOiAnaW5wdXREJywgJ2FjY2Vz c2tleSc6ICdiJ30pKTsKKyAgICBwYXJlbnQuYXBwZW5kQ2hpbGQoY3JlYXRlRG9tSW5Eb2N1bWVu dChkb2MwLCAnaW5wdXQnLCB7J2lkJzogJ2lucHV0RScsICdhY2Nlc3NrZXknOiAnYyd9KSk7CisK KyAgICB2YXIgaWZyYW1lMSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2lmcmFtZScpOworICAg IHBhcmVudC5hcHBlbmRDaGlsZChpZnJhbWUxKTsKKyAgICB2YXIgZG9jMSA9IGlmcmFtZTEuY29u dGVudERvY3VtZW50OworCisgICAgcGFyZW50ID0gZG9jMS5ib2R5OworICAgIHBhcmVudC5hcHBl bmRDaGlsZChjcmVhdGVEb21JbkRvY3VtZW50KGRvYzEsICdpbnB1dCcsIHsnaWQnOiAnaW5wdXRH JywgJ2FjY2Vzc2tleSc6ICdhJ30pKTsKKyAgICBwYXJlbnQuYXBwZW5kQ2hpbGQoY3JlYXRlRG9t SW5Eb2N1bWVudChkb2MxLCAnaW5wdXQnLCB7J2lkJzogJ2lucHV0SCcsICdhY2Nlc3NrZXknOiAn Yyd9KSk7CisgICAgcGFyZW50LmFwcGVuZENoaWxkKGNyZWF0ZURvbUluRG9jdW1lbnQoZG9jMSwg J2lucHV0JywgeydpZCc6ICdpbnB1dEknLCAnYWNjZXNza2V5JzogJ2QnfSkpOworCisgICAgdmFy IGlmcmFtZTIgPSBkb2MxLmNyZWF0ZUVsZW1lbnQoJ2lmcmFtZScpOworICAgIHBhcmVudC5hcHBl bmRDaGlsZChpZnJhbWUyKTsKKyAgICB2YXIgZG9jMiA9IGlmcmFtZTIuY29udGVudERvY3VtZW50 OworCisgICAgcGFyZW50ID0gZG9jMi5ib2R5OworICAgIHBhcmVudC5hcHBlbmRDaGlsZChjcmVh dGVEb21JbkRvY3VtZW50KGRvYzIsICdpbnB1dCcsIHsnaWQnOiAnaW5wdXRLJ30pKTsKKyAgICBw YXJlbnQuYXBwZW5kQ2hpbGQoY3JlYXRlRG9tSW5Eb2N1bWVudChkb2MyLCAnaW5wdXQnLCB7J2lk JzogJ2lucHV0TCcsICdhY2Nlc3NrZXknOiAnYSd9KSk7CisKKyAgICAvLyBNYWtlcyBzdXJlIHRo YXQgYW4gYWNjY2Vzc2tleSBzaG91bGQgbm90IGJlIG92ZXJyaWRkZW4gYnkgb3RoZXIgaWZyYW1l cy4KKyAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnaW5wdXRCJykuZm9jdXMoKTsKKyAgICBj bGVhckV2ZW50UmVjb3JkcygpOworICAgIHByZXNzQWNjZXNzS2V5KCdhJyk7CisgICAgc2hvdWxk QmUoJ2Rpc3BhdGNoZWRFdmVudCgiZm9jdXMiKScsICdbImlucHV0QyJdJyk7CisKKyAgICAvLyBB Y2NjZXNza2V5cyBkZWZpbmVkIGluIGEgY2hpbGQgaWZyYW1lIHNob3VsZCBiZSBpZ25vcmVkLgor ICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dEInKS5mb2N1cygpOworICAgIGNsZWFy RXZlbnRSZWNvcmRzKCk7CisgICAgcHJlc3NBY2Nlc3NLZXkoJ2QnKTsKKyAgICBzaG91bGRCZSgn ZGlzcGF0Y2hlZEV2ZW50KCJmb2N1cyIpJywgJ1tdJyk7CisKKyAgICAvLyBBY2Nlc3NrZXlzIHNo b3VsZCB3b3JrIGluIGFuIGlmcmFtZS4KKyAgICBkb2MxLmdldEVsZW1lbnRCeUlkKCdpbnB1dEcn KS5mb2N1cygpOworICAgIGNsZWFyRXZlbnRSZWNvcmRzKCk7CisgICAgcHJlc3NBY2Nlc3NLZXko J2MnKTsKKyAgICBzaG91bGRCZSgnZGlzcGF0Y2hlZEV2ZW50KCJmb2N1cyIpJywgJ1siaW5wdXRI Il0nKTsKKworICAgIC8vIEFjY2Vzc2tleXMgZGVmaW5lZCBpbiBhbmNlc3RvciBmcmFtZXMgc2hv dWxkIGJlIGlnbm9yZWQuCisgICAgZG9jMS5nZXRFbGVtZW50QnlJZCgnaW5wdXRHJykuZm9jdXMo KTsKKyAgICBjbGVhckV2ZW50UmVjb3JkcygpOworICAgIHByZXNzQWNjZXNzS2V5KCdiJyk7Cisg ICAgc2hvdWxkQmUoJ2Rpc3BhdGNoZWRFdmVudCgiZm9jdXMiKScsICdbXScpOworCisgICAgZG9j Mi5nZXRFbGVtZW50QnlJZCgnaW5wdXRLJykuZm9jdXMoKTsKKyAgICBjbGVhckV2ZW50UmVjb3Jk cygpOworICAgIHByZXNzQWNjZXNzS2V5KCdiJyk7CisgICAgc2hvdWxkQmUoJ2Rpc3BhdGNoZWRF dmVudCgiZm9jdXMiKScsICdbXScpOworfQorCit0ZXN0KCk7CisKK3ZhciBzdWNjZXNzZnVsbHlQ YXJzZWQgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pz LXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 107477 2011-09-15 05:00:07 -0700 2011-09-28 20:56:47 -0700 update1 bug-67642-20110915210005.patch text/plain 6891 hayato U3VidmVyc2lvbiBSZXZpc2lvbjogOTUwODcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyYTAyZjgxODg5YzM4YWExMDFmMzM1 NDg0YmU0ZmRjOWE5YjIwYTM4Li42N2YzM2E1NjY3MWQ3ZTNlMmE3N2VkYjIwZjY2MDEzMzZkOTZl YTZmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDktMDYgIEhheWF0byBJdG8gIDxoYXlh dG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZCBhIHRlc3QgZm9yIGFjY2Vzc2tleSBpbiBy ZWdhcmQgdG8gaWZyYW1lcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTY3NjQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVG8gY2F0Y2ggYW55IGltcHJvdmVtZW50IG9mIGFjY2Vzc2tleSBiZWhhdmlvciBp biByZWdhcmQgdG8KKyAgICAgICAgaWZyYW1lcywgaXQnZCBiZSBuaWNlIHRvIGFkZCBhIHRlc3Qg dG8gdmVyaWZ5IHRoZSBjdXJyZW50IGJlaGF2aW9yLgorCisgICAgICAgICogZmFzdC9kb20vYWNj ZXNzLWtleS1pZnJhbWUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2RvbS9h Y2Nlc3Mta2V5LWlmcmFtZS5odG1sOiBBZGRlZC4KKwogMjAxMS0wOS0xNCAgRnVtaXRvc2hpIFVr YWkgIDx1a2FpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCB1cGRhdGUgY2hy b21pdW0gdGVzdCBleHBlY3RhdGlvbnMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Rv bS9hY2Nlc3Mta2V5LWlmcmFtZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9h Y2Nlc3Mta2V5LWlmcmFtZS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYThiZmI3MTljNWQyOWI0 MzQ1ZDBmNTg2ZGE0ODhjNzhkNTEzZmQ2YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvZG9tL2FjY2Vzcy1rZXktaWZyYW1lLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIyIEBA CitUZXN0cyB0byBlbnN1cmUgdGhhdCBhY2Nlc3NrZXkgd29ya3MgaW4gaWZyYW1lcyBhbmQgb3Ro ZXIgaWZyYW1lcyBkb24ndCBlZmZlY3QgY3VycmVudCBhY2Nlc3NrZXkgbWFwcy4KKworT24gc3Vj Y2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQg YnkgIlRFU1QgQ09NUExFVEUiLgorCisKKworQWNjZXNza2V5cyBzaG91bGQgd29yayBpbiBhbiBp ZnJhbWUuICJpZnJhbWUxIiBoYXMgYm90aCAiaW5wdXRHIiBhbmQgImlucHV0SCIgKGFjY2Vzc2tl eT0iYyIpIGVsZW1lbnRzLgorUEFTUyBpZnJhbWUxLmNvbnRlbnREb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgiaW5wdXRHIikuZm9jdXMoKTsgcHJlc3NBY2Nlc3NLZXkoImMiKTsgdGFyZ2V0c09mRm9j dXNFdmVudHMgaXMgWyJpbnB1dEciLCAiaW5wdXRIIl0KKworImlucHV0QyIgZWxlbWVudCBoYXMg YW4gYWNjZXNzS2V5IG9mICJhIiBhbmQgb3RoZXIgaWZyYW1lcyBhbHNvIGhhdmUgZWxlbWVudHMg d2l0aCBhY2Nlc3NrZXkgb2YgImEiLiBBbiBhY2NjZXNza2V5IHNob3VsZCBub3QgYmUgb3ZlcnJp ZGRlbiBieSBvdGhlciBpZnJhbWVzLCBzbyAiaW5wdXRDIiBzaG91bGQgYmUgc2VsZWN0ZWQuCitQ QVNTIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJpbnB1dEIiKS5mb2N1cygpOyBwcmVzc0FjY2Vz c0tleSgiYSIpOyB0YXJnZXRzT2ZGb2N1c0V2ZW50czsgaXMgWyJpbnB1dEIiLCAiaW5wdXRDIl0K KworQSBjaGlsZCBpZnJhbWUsIGlmcmFtZTEsIGhhcyBhbiBlbGVtZW50IHdpdGggYWNjZXNza2V5 IG9mICJkIiwgd2hpY2ggc2hvdWxkIGJlIGlnbm9yZWQuCitQQVNTIGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJpbnB1dEIiKS5mb2N1cygpOyBwcmVzc0FjY2Vzc0tleSgiZCIpOyB0YXJnZXRzT2ZG b2N1c0V2ZW50cyBpcyBbImlucHV0QiJdCisKK0FuIGFjY2Vzc2tleSBkZWZpbmVkIGluIGFuIGFu Y2VzdG9yIGlmcmFtZSBzaG91bGQgYmUgaWdub3JlZC4gImlucHV0RCIgaGFzIGFjY2Vzc2tleSBv ZiAiYiIsIHdoaWNoIHNob3VsZCBub3QgYmUgc2VsZWN0ZWQgZnJvbSBkZXNjZW5kYW50IGlmcmFt ZXMsIGlmcmFtZTEgYW5kIGlmcmFtZTIuCitQQVNTIGlmcmFtZTEuY29udGVudERvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCJpbnB1dEciKS5mb2N1cygpOyBwcmVzc0FjY2Vzc0tleSgiYiIpOyB0YXJn ZXRzT2ZGb2N1c0V2ZW50cyBpcyBbImlucHV0RyJdCitQQVNTIGlmcmFtZTIuY29udGVudERvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJpbnB1dEsiKS5mb2N1cygpOyBwcmVzc0FjY2Vzc0tleSgiYiIp OyB0YXJnZXRzT2ZGb2N1c0V2ZW50cyBpcyBbImlucHV0SyJdCitQQVNTIHN1Y2Nlc3NmdWxseVBh cnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9kb20vYWNjZXNzLWtleS1pZnJhbWUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL2Fj Y2Vzcy1rZXktaWZyYW1lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNGJhYTIzM2UyYWE0NzU1ODYwNjA5OTYy YmMxYjAyMzE3OGQwN2M2OQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9t L2FjY2Vzcy1rZXktaWZyYW1lLmh0bWwKQEAgLTAsMCArMSw5MSBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxib2R5PgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBy ZS5qcyI+PC9zY3JpcHQ+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9InNhbmRi b3giPjwvZGl2PgorPHByZSBpZD0iY29uc29sZSI+PC9wcmU+Cis8c2NyaXB0PgorZGVzY3JpcHRp b24oIlRlc3RzIHRvIGVuc3VyZSB0aGF0IGFjY2Vzc2tleSB3b3JrcyBpbiBpZnJhbWVzIGFuZCBv dGhlciBpZnJhbWVzIGRvbid0IGVmZmVjdCBjdXJyZW50IGFjY2Vzc2tleSBtYXBzLiIpOworCitm dW5jdGlvbiBwcmVzc0FjY2Vzc0tleShrZXkpCit7CisgICAgaWYgKG5hdmlnYXRvci51c2VyQWdl bnQuc2VhcmNoKC9cYk1hYyBPUyBYXGIvKSAhPSAtMSkKKyAgICAgICAgbW9kaWZpZXJzID0gWyJj dHJsS2V5IiwgImFsdEtleSJdOworICAgIGVsc2UKKyAgICAgICAgbW9kaWZpZXJzID0gWyJhbHRL ZXkiXTsKKyAgICBldmVudFNlbmRlci5rZXlEb3duKGtleSwgbW9kaWZpZXJzKTsKK30KKwordmFy IHRhcmdldHNPZkZvY3VzRXZlbnRzID0gW107CisKK2Z1bmN0aW9uIGNsZWFyRXZlbnRSZWNvcmRz KCkKK3sKKyAgICB0YXJnZXRzT2ZGb2N1c0V2ZW50cyA9IFtdOworfQorCitmdW5jdGlvbiByZWNv cmRGb2N1c0V2ZW50KGV2ZW50KQoreworICAgIGlmIChldmVudC50eXBlID09ICdmb2N1cycpCisg ICAgICAgIHRhcmdldHNPZkZvY3VzRXZlbnRzLnB1c2goZXZlbnQudGFyZ2V0LmlkKTsKK30KKwor ZnVuY3Rpb24gY3JlYXRlRG9tSW5Eb2N1bWVudChkb2MsIHRhZ05hbWUsIGF0dHJpYnV0ZXMpCit7 CisgICAgdmFyIGVsZW1lbnQgPSBkb2MuY3JlYXRlRWxlbWVudCh0YWdOYW1lKTsKKyAgICBmb3Ig KHZhciBuYW1lIGluIGF0dHJpYnV0ZXMpCisgICAgICAgIGVsZW1lbnQuc2V0QXR0cmlidXRlKG5h bWUsIGF0dHJpYnV0ZXNbbmFtZV0pOworCisgICAgaWYgKGF0dHJpYnV0ZXNbJ2lkJ10pCisgICAg ICAgIGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcignZm9jdXMnLCByZWNvcmRGb2N1c0V2ZW50LCBm YWxzZSk7CisgICAgcmV0dXJuIGVsZW1lbnQ7Cit9CisKK2Z1bmN0aW9uIHRlc3QoKQoreworICAg IGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250 cm9sbGVyLmR1bXBBc1RleHQoKTsKKworICAgIHZhciBzYW5kYm94ID0gZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoJ3NhbmRib3gnKTsKKyAgICBzYW5kYm94LmFwcGVuZENoaWxkKGNyZWF0ZURvbUlu RG9jdW1lbnQoZG9jdW1lbnQsICdpbnB1dCcsIHsnaWQnOiAnaW5wdXRCJ30pKTsKKyAgICBzYW5k Ym94LmFwcGVuZENoaWxkKGNyZWF0ZURvbUluRG9jdW1lbnQoZG9jdW1lbnQsICdpbnB1dCcsIHsn aWQnOiAnaW5wdXRDJywgJ2FjY2Vzc2tleSc6ICdhJ30pKTsKKyAgICBzYW5kYm94LmFwcGVuZENo aWxkKGNyZWF0ZURvbUluRG9jdW1lbnQoZG9jdW1lbnQsICdpbnB1dCcsIHsnaWQnOiAnaW5wdXRE JywgJ2FjY2Vzc2tleSc6ICdiJ30pKTsKKyAgICBzYW5kYm94LmFwcGVuZENoaWxkKGNyZWF0ZURv bUluRG9jdW1lbnQoZG9jdW1lbnQsICdpbnB1dCcsIHsnaWQnOiAnaW5wdXRFJywgJ2FjY2Vzc2tl eSc6ICdjJ30pKTsKKworICAgIHdpbmRvdy5pZnJhbWUxID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgnaWZyYW1lJyk7CisgICAgc2FuZGJveC5hcHBlbmRDaGlsZChpZnJhbWUxKTsKKyAgICBpZnJh bWUxLmNvbnRlbnREb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGNyZWF0ZURvbUluRG9jdW1lbnQo aWZyYW1lMS5jb250ZW50RG9jdW1lbnQsICdpbnB1dCcsIHsnaWQnOiAnaW5wdXRHJywgJ2FjY2Vz c2tleSc6ICdhJ30pKTsKKyAgICBpZnJhbWUxLmNvbnRlbnREb2N1bWVudC5ib2R5LmFwcGVuZENo aWxkKGNyZWF0ZURvbUluRG9jdW1lbnQoaWZyYW1lMS5jb250ZW50RG9jdW1lbnQsICdpbnB1dCcs IHsnaWQnOiAnaW5wdXRIJywgJ2FjY2Vzc2tleSc6ICdjJ30pKTsKKyAgICBpZnJhbWUxLmNvbnRl bnREb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGNyZWF0ZURvbUluRG9jdW1lbnQoaWZyYW1lMS5j b250ZW50RG9jdW1lbnQsICdpbnB1dCcsIHsnaWQnOiAnaW5wdXRJJywgJ2FjY2Vzc2tleSc6ICdk J30pKTsKKworICAgIHdpbmRvdy5pZnJhbWUyID0gaWZyYW1lMS5jb250ZW50RG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgnaWZyYW1lJyk7CisgICAgaWZyYW1lMS5jb250ZW50RG9jdW1lbnQuYm9keS5h cHBlbmRDaGlsZChpZnJhbWUyKTsKKyAgICBpZnJhbWUyLmNvbnRlbnREb2N1bWVudC5ib2R5LmFw cGVuZENoaWxkKGNyZWF0ZURvbUluRG9jdW1lbnQoaWZyYW1lMi5jb250ZW50RG9jdW1lbnQsICdp bnB1dCcsIHsnaWQnOiAnaW5wdXRLJ30pKTsKKyAgICBpZnJhbWUyLmNvbnRlbnREb2N1bWVudC5i b2R5LmFwcGVuZENoaWxkKGNyZWF0ZURvbUluRG9jdW1lbnQoaWZyYW1lMi5jb250ZW50RG9jdW1l bnQsICdpbnB1dCcsIHsnaWQnOiAnaW5wdXRMJywgJ2FjY2Vzc2tleSc6ICdhJ30pKTsKKworICAg IGRlYnVnKCdBY2Nlc3NrZXlzIHNob3VsZCB3b3JrIGluIGFuIGlmcmFtZS4gImlmcmFtZTEiIGhh cyBib3RoICJpbnB1dEciIGFuZCAiaW5wdXRIIiAoYWNjZXNza2V5PSJjIikgZWxlbWVudHMuJyk7 CisgICAgY2xlYXJFdmVudFJlY29yZHMoKTsKKyAgICBzaG91bGRCZSgnaWZyYW1lMS5jb250ZW50 RG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImlucHV0RyIpLmZvY3VzKCk7IHByZXNzQWNjZXNzS2V5 KCJjIik7IHRhcmdldHNPZkZvY3VzRXZlbnRzJywgJ1siaW5wdXRHIiwgImlucHV0SCJdJyk7CisK KyAgICBkZWJ1ZygnXG4iaW5wdXRDIiBlbGVtZW50IGhhcyBhbiBhY2Nlc3NLZXkgb2YgImEiIGFu ZCBvdGhlciBpZnJhbWVzIGFsc28gaGF2ZSBlbGVtZW50cyB3aXRoIGFjY2Vzc2tleSBvZiAiYSIu IEFuIGFjY2Nlc3NrZXkgc2hvdWxkIG5vdCBiZSBvdmVycmlkZGVuIGJ5IG90aGVyIGlmcmFtZXMs IHNvICJpbnB1dEMiIHNob3VsZCBiZSBzZWxlY3RlZC4nKTsKKyAgICBjbGVhckV2ZW50UmVjb3Jk cygpOworICAgIHNob3VsZEJlKCdkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiaW5wdXRCIikuZm9j dXMoKTsgcHJlc3NBY2Nlc3NLZXkoImEiKTsgdGFyZ2V0c09mRm9jdXNFdmVudHM7JywgJ1siaW5w dXRCIiwgImlucHV0QyJdJyk7CisKKyAgICBkZWJ1ZygnXG5BIGNoaWxkIGlmcmFtZSwgaWZyYW1l MSwgaGFzIGFuIGVsZW1lbnQgd2l0aCBhY2Nlc3NrZXkgb2YgImQiLCB3aGljaCBzaG91bGQgYmUg aWdub3JlZC4nKTsKKyAgICBjbGVhckV2ZW50UmVjb3JkcygpOworICAgIHNob3VsZEJlKCdkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiaW5wdXRCIikuZm9jdXMoKTsgcHJlc3NBY2Nlc3NLZXkoImQi KTsgdGFyZ2V0c09mRm9jdXNFdmVudHMnLCAnWyJpbnB1dEIiXScpOworCisgICAgZGVidWcoJ1xu QW4gYWNjZXNza2V5IGRlZmluZWQgaW4gYW4gYW5jZXN0b3IgaWZyYW1lIHNob3VsZCBiZSBpZ25v cmVkLiAiaW5wdXREIiBoYXMgYWNjZXNza2V5IG9mICJiIiwgd2hpY2ggc2hvdWxkIG5vdCBiZSBz ZWxlY3RlZCBmcm9tIGRlc2NlbmRhbnQgaWZyYW1lcywgaWZyYW1lMSBhbmQgaWZyYW1lMi4nKTsK KyAgICBjbGVhckV2ZW50UmVjb3JkcygpOworICAgIHNob3VsZEJlKCdpZnJhbWUxLmNvbnRlbnRE b2N1bWVudC5nZXRFbGVtZW50QnlJZCgiaW5wdXRHIikuZm9jdXMoKTsgcHJlc3NBY2Nlc3NLZXko ImIiKTsgdGFyZ2V0c09mRm9jdXNFdmVudHMnLCAnWyJpbnB1dEciXScpOworICAgIGNsZWFyRXZl bnRSZWNvcmRzKCk7CisgICAgc2hvdWxkQmUoJ2lmcmFtZTIuY29udGVudERvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJpbnB1dEsiKS5mb2N1cygpOyBwcmVzc0FjY2Vzc0tleSgiYiIpOyB0YXJnZXRz T2ZGb2N1c0V2ZW50cycsICdbImlucHV0SyJdJyk7Cit9CisKK3Rlc3QoKTsKKwordmFyIHN1Y2Nl c3NmdWxseVBhcnNlZCA9IHRydWU7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNv dXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K