236518 2022-02-11 10:30:40 -0800 Redirect shadow realm console output to page's ConsoleClient 2022-02-15 13:08:25 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 joseph.j.griego webkit-unassigned benjamin calvaris ews-watchlist hi pangle pgriffis webkit-bug-importer youennf oldest_to_newest 1840437 0 joseph.j.griego 2022-02-11 10:30:40 -0800 Redirect shadow realm console output to page's ConsoleClient 1840438 1 451723 joseph.j.griego 2022-02-11 10:32:49 -0800 Created attachment 451723 Patch 1840468 2 451723 hi 2022-02-11 11:33:40 -0800 Comment on attachment 451723 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451723&action=review Nice fix! Some style comments, but I think the logic is sound :) BTW did you want this to be reviewed? I dont see r? so I wasn't sure 😅 Apologies if that was not the intention/desire. > LayoutTests/inspector/shadow-realm-console.html:6 > + const realm = new ShadowRealm(); Style: this should only be indented four spaces, not five NIT: you can omit `()` if there are no arguments when using `new` > LayoutTests/inspector/shadow-realm-console.html:31 > + WI.consoleManager.addEventListener(WI.ConsoleManager.Event.MessageAdded, function(event) { Rather than having this be global listener, you could have this just be a one-off `awaitEvent` inside each test. As an example, ``` await test() { let [messageAddedEvent] = await Promise.all([ WI.consoleManager.awaitEvent(WI.ConsoleManager.Event.MessageAdded), InspectorTest.evaluateInPage(`realmEvaluate("console.log('hello')")`), ]); let {message} = messageAddedEvent.data; InspectorTest.expectEqual(message.messageText, "hello", "The console message should have the text 'hello'."); }, ``` > LayoutTests/inspector/shadow-realm-console.html:41 > + name: "log", please give this a more descriptive name like `name: "ShadowRealm.Console.basic.log"` > LayoutTests/inspector/shadow-realm-console.html:42 > + description: "console.log in shadow realms should send to the incubating realm's console", While this is perhaps true given that you're seeing a console message in the first place, I think we might also want to check that the `target` of the console message matches that of the creating context. As such, I'd add something like this to the end of my example code in my comment on :31 ``` InspectorText.expectEqual(message.target, WI.mainTarget, "The target of the console message should be the main target."); ``` > LayoutTests/inspector/shadow-realm-console.html:46 > + .then(msg => { Style: we always add `(` `)` in arrow functions, even when there's only a single parameter > LayoutTests/inspector/shadow-realm-console.html:47 > + InspectorTest.expectEqual(msg.messageText, "hello", "message text should match"); Style: we normally make these into complete sentences, e.g. "The console message should have the text 'hello'." > LayoutTests/inspector/shadow-realm-console.html:55 > + name: "nested log", ditto (:41) > LayoutTests/inspector/shadow-realm-console.html:60 > + .then(msg => { ditto (:46) > LayoutTests/inspector/shadow-realm-console.html:61 > + InspectorTest.expectEqual(msg.messageText, "hello", "message text should match"); ditto (:47) 1840478 3 joseph.j.griego 2022-02-11 11:45:46 -0800 Was waiting on EWS before setting r? but yes, thanks for the review :) 1840544 4 451743 joseph.j.griego 2022-02-11 14:01:25 -0800 Created attachment 451743 Patch 1840581 5 451743 hi 2022-02-11 14:57:48 -0800 Comment on attachment 451743 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451743&action=review r=mews, thanks for taking my suggestions! =D > LayoutTests/inspector/shadow-realm-console.html:26 > + async test(resolve, reject) { NIT: please remove the `resolve, reject` since those are not provided when using an `async test` :) > LayoutTests/inspector/shadow-realm-console.html:40 > + async test(resolve, reject) { ditto (:26) 1841393 6 451938 joseph.j.griego 2022-02-14 13:31:15 -0800 Created attachment 451938 Patch 1841897 7 ews-feeder 2022-02-15 13:07:37 -0800 Committed r289840 (247288@main): <https://commits.webkit.org/247288@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451938. 1841898 8 webkit-bug-importer 2022-02-15 13:08:25 -0800 <rdar://problem/88983084> 451723 2022-02-11 10:32:49 -0800 2022-02-11 14:01:21 -0800 Patch bug-236518-20220211133248.patch text/plain 6426 joseph.j.griego U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTkxYTQwNzA3YmE1NzUz NDdhZmRkNmU1MDIzNmEyNDI3MjAwYzVhYy4uYzM4M2ZmNGFiNGYxNDQ0ODA4NThiYmMyMDgyMDg5 ZDVlOGYxYzhkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAyLTExICBKb3Nl cGggR3JpZWdvICA8amdyaWVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJlZGlyZWN0IHNoYWRv dyByZWFsbSBjb25zb2xlIG91dHB1dCB0byBwYWdlJ3MgQ29uc29sZUNsaWVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2NTE4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogaW5zcGVjdG9yL3No YWRvdy1yZWFsbS1jb25zb2xlLmh0bWwKKworICAgICAgICBXaXRob3V0IHRoaXMgcGF0Y2gsIHRo ZSBuZXdseS1jcmVhdGVkIHNoYWRvdyByZWFsbSBnbG9iYWwgb2JqZWN0IHdvdWxkCisgICAgICAg IG5vdCBoYXZlIGEgY29uc29sZSBjbGllbnQ7IHdlIHdhbnQgdGhlIGNvbnNvbGUgb3V0cHV0IGZy b20gdGhlIHNoYWRvdworICAgICAgICByZWFsbSdzIGNvbnRleHQgdG8gZ28gdG8gdGhlIGluc3Bl Y3RvciwgdG9vLgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNET01HbG9iYWxPYmplY3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SlNET01HbG9iYWxPYmplY3Q6OmRlcml2ZVNoYWRvd1JlYWxt R2xvYmFsT2JqZWN0KTogQ29weSBjb25zb2xlIGNsaWVudCBmcm9tIHNvdXJjZSBKU0RPTUdsb2Jh bE9iamVjdCB0byBuZXcgc2hhZG93IHJlYWxtJ3MgZ2xvYmFsIG9iamVjdC4KKwogMjAyMi0wMi0x MCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CiAKICAgICAgICAgQW4gZWxl bWVudCB3aXRoIGJvdGggLXdlYmtpdC11c2VyLXNlbGVjdDogYWxsIGFuZCAtd2Via2l0LXVzZXIt ZHJhZzogZWxlbWVudCBkb2VzIG5vdCBnZXQgdGhlIG5pY2UgZHJhZyBzbmFwc2hvdCB0aGF0IHlv dSBnZXQgaWYgeW91IGp1c3QgaGF2ZSAtd2Via2l0LXVzZXItZHJhZzogZWxlbWVudApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01HbG9iYWxPYmplY3QuY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01HbG9iYWxPYmplY3QuY3BwCmluZGV4IGRj ZWMwMmZkYjcyY2FiYzVmYWU1NzljOWZhZGM0N2E1OWYzOTc5NDAuLmIyNjI2ZmViNGEwNTM3Mzhl YTdkZWQxODI3Nzg2NWM0ZjgxMzRiNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTRE9NR2xvYmFsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0RPTUdsb2JhbE9iamVjdC5jcHAKQEAgLTYyMSw2ICs2MjEsOCBAQCBKU0M6OkpTR2xv YmFsT2JqZWN0KiBKU0RPTUdsb2JhbE9iamVjdDo6ZGVyaXZlU2hhZG93UmVhbG1HbG9iYWxPYmpl Y3QoSlNDOjpKU0dsbwogICAgIHdyYXBwZXItPnNldFByb3RvdHlwZURpcmVjdCh2bSwgd3JhcHBl ci0+b2JqZWN0UHJvdG90eXBlKCkpOwogICAgIHByb3h5LT5zZXRUYXJnZXQodm0sIHdyYXBwZXIp OwogCisgICAgd3JhcHBlci0+c2V0Q29uc29sZUNsaWVudChkb21HbG9iYWxPYmplY3QtPmNvbnNv bGVDbGllbnQoKSk7CisKICAgICByZXR1cm4gd3JhcHBlcjsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDA3NTljMTM0 Mzk1ZGY1NWJhZDMzODAxZjU2OTAxZmZkMDQxY2Y0OTEuLjVkYmVkOWEzZmNjZjIzNmY1MzlmMDE3 NTU3NmJhMjQ1NTQ4ODYwNTMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMi0wMi0xMSAgSm9z ZXBoIEdyaWVnbyAgPGpncmllZ29AaWdhbGlhLmNvbT4KKworICAgICAgICBSZWRpcmVjdCBzaGFk b3cgcmVhbG0gY29uc29sZSBvdXRwdXQgdG8gcGFnZSdzIENvbnNvbGVDbGllbnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjUxOAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0cyB0byB2ZXJp ZnkgdGhhdCAobmVzdGVkKSBzaGFkb3cgcmVhbG0gY29udGV4dHMgc3RpbGwgb3V0cHV0IHRvCisg ICAgICAgIHRoZSBwYXJlbnQgcGFnZSdzIGluc3BlY3RvcgorCisgICAgICAgICogaW5zcGVjdG9y L3NoYWRvdy1yZWFsbS1jb25zb2xlLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaW5z cGVjdG9yL3NoYWRvdy1yZWFsbS1jb25zb2xlLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAyLTEwICBD aHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUmVzeW5jIHdlYi1wbGF0 Zm9ybS10ZXN0cy9ldmVudHNvdXJjZSBmcm9tIHVwc3RyZWFtCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNvbGUtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL3NoYWRvdy1yZWFsbS1jb25zb2xlLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi40NDA4MTkxNmExZTA0NTcwYzQzYWQ1NWI1NjdiZmZhZDMxODljNDI0Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3NoYWRvdy1yZWFsbS1jb25zb2xlLWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDExIEBACitDT05TT0xFIE1FU1NBR0U6IGhlbGxvCitDT05TT0xF IE1FU1NBR0U6IGhlbGxvCitXZSByZWFsbHkganVzdCB3YW50IHRvIHRlc3QgdGhhdCB0aGUgc2hh ZG93IHJlYWxtJ3MgY29uc29sZSBvdXRwdXQgZ2V0cyByZWRpcmVjdGVkIHRvIHRoZSBhcHByb3By aWF0ZSBwYWdlIGNvbnNvbGUgYW5kIG5vdCBzZW50IHRvIHRoZSBkZWZhdWx0IChwb3NzaWJseSBi bGFja2hvbGUpIGRlc3RpbmF0aW9uCisKKz09IFJ1bm5pbmcgdGVzdCBzdWl0ZTogU2hhZG93UmVh bG0uQ29uc29sZS5iYXNpYworLS0gUnVubmluZyB0ZXN0IGNhc2U6IGxvZworUEFTUzogbWVzc2Fn ZSB0ZXh0IHNob3VsZCBtYXRjaAorCistLSBSdW5uaW5nIHRlc3QgY2FzZTogbmVzdGVkIGxvZwor UEFTUzogbWVzc2FnZSB0ZXh0IHNob3VsZCBtYXRjaAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNvbGUuaHRtbCBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9zaGFkb3ctcmVhbG0tY29uc29sZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmM3ZTgyMjdjODM0YjIx MjdhZDI2ODczZTViOWU2MmFiYmU4ZWQ5MWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9pbnNwZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNvbGUuaHRtbApAQCAtMCwwICsxLDc4IEBACis8 IURPQ1RZUEUgaHRtbD4gIDwhLS0gd2Via2l0LXRlc3QtcnVubmVyIFsganNjT3B0aW9ucz0tLXVz ZVNoYWRvd1JlYWxtPTEgXSAtLT4KKzxodG1sPgorPGhlYWQ+CisgICAgPHNjcmlwdCBzcmM9Ii4u L2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3Jp cHQ+CisgICAgPHNjcmlwdD4KKyAgICAgY29uc3QgcmVhbG0gPSBuZXcgU2hhZG93UmVhbG0oKTsK KworICAgICBmdW5jdGlvbiByZWFsbUV2YWx1YXRlKHNyYykgeworICAgICAgICAgcmVhbG0uZXZh bHVhdGUoc3JjKTsKKyAgICAgfQorCisgICAgIGZ1bmN0aW9uIGV2YWx1YXRlSW5OZXN0ZWRSZWFs bShzcmMpIHsKKyAgICAgICAgIHJlYWxtLmV2YWx1YXRlKGAoKCkgPT4geworICAgICAgICAgICAg IGNvbnN0IHIgPSBuZXcgU2hhZG93UmVhbG0oKTsKKyAgICAgICAgICAgICByLmV2YWx1YXRlKCIk e3NyY30iKTsKKyAgICAgICAgICAgfSkoKWApOworICAgICB9CisKKyAgICAgZnVuY3Rpb24gdGVz dCgpCisgICAgIHsKKyAgICAgICAgIGNvbnN0IHN1aXRlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVB c3luY1N1aXRlKCJTaGFkb3dSZWFsbS5Db25zb2xlLmJhc2ljIik7CisKKyAgICAgICAgIGxldCB0 cmlnZ2VyTmV4dENvbnNvbGVNZXNzYWdlOworCisgICAgICAgICBmdW5jdGlvbiBuZXh0Q29uc29s ZU1lc3NhZ2UoKSB7CisgICAgICAgICAgICAgcmV0dXJuIG5ldyBQcm9taXNlKChyZXNvbHZlLCBy ZWplY3QpID0+IHsKKyAgICAgICAgICAgICAgICAgdHJpZ2dlck5leHRDb25zb2xlTWVzc2FnZSA9 IHJlc29sdmU7CisgICAgICAgICAgICAgfSk7CisgICAgICAgICB9CisKKyAgICAgICAgIFdJLmNv bnNvbGVNYW5hZ2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ29uc29sZU1hbmFnZXIuRXZlbnQuTWVz c2FnZUFkZGVkLCBmdW5jdGlvbihldmVudCkgeworICAgICAgICAgICAgIGxldCBtZXNzYWdlID0g ZXZlbnQuZGF0YS5tZXNzYWdlOworICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0KG1l c3NhZ2UgaW5zdGFuY2VvZiBXSS5Db25zb2xlTWVzc2FnZSk7CisgICAgICAgICAgICAgaWYgKHRy aWdnZXJOZXh0Q29uc29sZU1lc3NhZ2UpCisgICAgICAgICAgICAgICAgIHRyaWdnZXJOZXh0Q29u c29sZU1lc3NhZ2UobWVzc2FnZSk7CisgICAgICAgICB9KTsKKworICAgICAgICAgLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLworCisgICAgICAgICBzdWl0ZS5hZGRUZXN0 Q2FzZSh7CisgICAgICAgICAgICAgbmFtZTogImxvZyIsCisgICAgICAgICAgICAgZGVzY3JpcHRp b246ICJjb25zb2xlLmxvZyBpbiBzaGFkb3cgcmVhbG1zIHNob3VsZCBzZW5kIHRvIHRoZSBpbmN1 YmF0aW5nIHJlYWxtJ3MgY29uc29sZSIsCisgICAgICAgICAgICAgdGVzdChyZXNvbHZlLCByZWpl Y3QpIHsKKyAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZShgcmVh bG1FdmFsdWF0ZSgiY29uc29sZS5sb2coJ2hlbGxvJykiKWApOworICAgICAgICAgICAgICAgICBu ZXh0Q29uc29sZU1lc3NhZ2UoKQorICAgICAgICAgICAgICAgICAgICAgLnRoZW4obXNnID0+IHsK KyAgICAgICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKG1zZy5t ZXNzYWdlVGV4dCwgImhlbGxvIiwgIm1lc3NhZ2UgdGV4dCBzaG91bGQgbWF0Y2giKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgICByZXNvbHZlKCk7CisgICAgICAgICAgICAgICAgICAgICB9KQor ICAgICAgICAgICAgICAgICAgICAgLmNhdGNoKHJlamVjdCk7CisgICAgICAgICAgICAgfQorICAg ICAgICAgfSk7CisKKyAgICAgICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgICAgICBu YW1lOiAibmVzdGVkIGxvZyIsCisgICAgICAgICAgICAgZGVzY3JpcHRpb246ICJjb25zb2xlLmxv ZyBpbiBuZXN0ZWQgc2hhZG93IHJlYWxtcyBzaG91bGQgc2VuZCB0byB0aGUgdG9wIGluY3ViYXRp bmcgcmVhbG0ncyBjb25zb2xlIiwKKyAgICAgICAgICAgICB0ZXN0KHJlc29sdmUsIHJlamVjdCkg eworICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKGBldmFsdWF0 ZUluTmVzdGVkUmVhbG0oImNvbnNvbGUubG9nKCdoZWxsbycpIilgKTsKKyAgICAgICAgICAgICAg ICAgbmV4dENvbnNvbGVNZXNzYWdlKCkKKyAgICAgICAgICAgICAgICAgICAgIC50aGVuKG1zZyA9 PiB7CisgICAgICAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbCht c2cubWVzc2FnZVRleHQsICJoZWxsbyIsICJtZXNzYWdlIHRleHQgc2hvdWxkIG1hdGNoIik7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgcmVzb2x2ZSgpOworICAgICAgICAgICAgICAgICAgICAg fSkKKyAgICAgICAgICAgICAgICAgICAgIC5jYXRjaChyZWplY3QpOworICAgICAgICAgICAgIH0K KyAgICAgICAgIH0pOworCisKKyAgICAgICAgIHN1aXRlLnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgp OworICAgICB9CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbkxvYWQ9InJ1blRlc3Qo KSI+CisgICAgV2UgcmVhbGx5IGp1c3Qgd2FudCB0byB0ZXN0IHRoYXQgdGhlIHNoYWRvdyByZWFs bSdzIGNvbnNvbGUgb3V0cHV0IGdldHMKKyAgICByZWRpcmVjdGVkIHRvIHRoZSBhcHByb3ByaWF0 ZSBwYWdlIGNvbnNvbGUgYW5kIG5vdCBzZW50IHRvIHRoZSBkZWZhdWx0CisgICAgKHBvc3NpYmx5 IGJsYWNraG9sZSkgZGVzdGluYXRpb24KKzwvYm9keT4KKzwvaHRtbD4K 451743 2022-02-11 14:01:25 -0800 2022-02-11 14:57:48 -0800 Patch bug-236518-20220211170124.patch text/plain 6994 joseph.j.griego U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTkxYTQwNzA3YmE1NzUz NDdhZmRkNmU1MDIzNmEyNDI3MjAwYzVhYy4uYzM4M2ZmNGFiNGYxNDQ0ODA4NThiYmMyMDgyMDg5 ZDVlOGYxYzhkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAyLTExICBKb3Nl cGggR3JpZWdvICA8amdyaWVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJlZGlyZWN0IHNoYWRv dyByZWFsbSBjb25zb2xlIG91dHB1dCB0byBwYWdlJ3MgQ29uc29sZUNsaWVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2NTE4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogaW5zcGVjdG9yL3No YWRvdy1yZWFsbS1jb25zb2xlLmh0bWwKKworICAgICAgICBXaXRob3V0IHRoaXMgcGF0Y2gsIHRo ZSBuZXdseS1jcmVhdGVkIHNoYWRvdyByZWFsbSBnbG9iYWwgb2JqZWN0IHdvdWxkCisgICAgICAg IG5vdCBoYXZlIGEgY29uc29sZSBjbGllbnQ7IHdlIHdhbnQgdGhlIGNvbnNvbGUgb3V0cHV0IGZy b20gdGhlIHNoYWRvdworICAgICAgICByZWFsbSdzIGNvbnRleHQgdG8gZ28gdG8gdGhlIGluc3Bl Y3RvciwgdG9vLgorCisgICAgICAgICogYmluZGluZ3MvanMvSlNET01HbG9iYWxPYmplY3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SlNET01HbG9iYWxPYmplY3Q6OmRlcml2ZVNoYWRvd1JlYWxt R2xvYmFsT2JqZWN0KTogQ29weSBjb25zb2xlIGNsaWVudCBmcm9tIHNvdXJjZSBKU0RPTUdsb2Jh bE9iamVjdCB0byBuZXcgc2hhZG93IHJlYWxtJ3MgZ2xvYmFsIG9iamVjdC4KKwogMjAyMi0wMi0x MCAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CiAKICAgICAgICAgQW4gZWxl bWVudCB3aXRoIGJvdGggLXdlYmtpdC11c2VyLXNlbGVjdDogYWxsIGFuZCAtd2Via2l0LXVzZXIt ZHJhZzogZWxlbWVudCBkb2VzIG5vdCBnZXQgdGhlIG5pY2UgZHJhZyBzbmFwc2hvdCB0aGF0IHlv dSBnZXQgaWYgeW91IGp1c3QgaGF2ZSAtd2Via2l0LXVzZXItZHJhZzogZWxlbWVudApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01HbG9iYWxPYmplY3QuY3BwIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01HbG9iYWxPYmplY3QuY3BwCmluZGV4IGRj ZWMwMmZkYjcyY2FiYzVmYWU1NzljOWZhZGM0N2E1OWYzOTc5NDAuLmIyNjI2ZmViNGEwNTM3Mzhl YTdkZWQxODI3Nzg2NWM0ZjgxMzRiNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTRE9NR2xvYmFsT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0RPTUdsb2JhbE9iamVjdC5jcHAKQEAgLTYyMSw2ICs2MjEsOCBAQCBKU0M6OkpTR2xv YmFsT2JqZWN0KiBKU0RPTUdsb2JhbE9iamVjdDo6ZGVyaXZlU2hhZG93UmVhbG1HbG9iYWxPYmpl Y3QoSlNDOjpKU0dsbwogICAgIHdyYXBwZXItPnNldFByb3RvdHlwZURpcmVjdCh2bSwgd3JhcHBl ci0+b2JqZWN0UHJvdG90eXBlKCkpOwogICAgIHByb3h5LT5zZXRUYXJnZXQodm0sIHdyYXBwZXIp OwogCisgICAgd3JhcHBlci0+c2V0Q29uc29sZUNsaWVudChkb21HbG9iYWxPYmplY3QtPmNvbnNv bGVDbGllbnQoKSk7CisKICAgICByZXR1cm4gd3JhcHBlcjsKIH0KIApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDA3NTljMTM0 Mzk1ZGY1NWJhZDMzODAxZjU2OTAxZmZkMDQxY2Y0OTEuLjNhNmU3M2U1OTM4NmJjN2VlMDg0Y2Zm YjY1YzczMjFhMTc1NDg1ZTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMi0wMi0xMSAgSm9z ZXBoIEdyaWVnbyAgPGpncmllZ29AaWdhbGlhLmNvbT4KKworICAgICAgICBSZWRpcmVjdCBzaGFk b3cgcmVhbG0gY29uc29sZSBvdXRwdXQgdG8gcGFnZSdzIENvbnNvbGVDbGllbnQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjUxOAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0cyB0byB2ZXJp ZnkgdGhhdCAobmVzdGVkKSBzaGFkb3cgcmVhbG0gY29udGV4dHMgc3RpbGwgb3V0cHV0IHRvCisg ICAgICAgIHRoZSBwYXJlbnQgcGFnZSdzIGluc3BlY3RvcjsgZml4IG9uZSBjaGFuZ2VkIHRlc3Qu CisKKyAgICAgICAgKiBpbnNwZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNvbGUtZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNvbGUuaHRtbDog QWRkZWQuCisgICAgICAgICoganMvU2hhZG93UmVhbG0taW1wb3J0VmFsdWUtZXhwZWN0ZWQudHh0 OiBBZGRlZCBjb25zb2xlIGxpbmUgdGhhdCBoYWQgcHJldmlvdXNseSBiZWVuIGJsYWNraG9sZWQK KwogMjAyMi0wMi0xMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAg IFJlc3luYyB3ZWItcGxhdGZvcm0tdGVzdHMvZXZlbnRzb3VyY2UgZnJvbSB1cHN0cmVhbQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3NoYWRvdy1yZWFsbS1jb25zb2xlLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zaGFkb3ctcmVhbG0tY29uc29sZS1leHBl Y3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uYzhiZjQyNjU1ZGI2NzIxNjI5ZGFlMzVlZDRjMmQ0ZGQ1NGE5 ZmY3NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zaGFkb3ctcmVh bG0tY29uc29sZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMyBAQAorQ09OU09MRSBNRVNTQUdF OiBoZWxsbworQ09OU09MRSBNRVNTQUdFOiBoZWxsbworV2UgcmVhbGx5IGp1c3Qgd2FudCB0byB0 ZXN0IHRoYXQgdGhlIHNoYWRvdyByZWFsbSdzIGNvbnNvbGUgb3V0cHV0IGdldHMgcmVkaXJlY3Rl ZCB0byB0aGUgYXBwcm9wcmlhdGUgcGFnZSBjb25zb2xlIGFuZCBub3Qgc2VudCB0byB0aGUgZGVm YXVsdCAocG9zc2libHkgYmxhY2tob2xlKSBkZXN0aW5hdGlvbgorCis9PSBSdW5uaW5nIHRlc3Qg c3VpdGU6IFNoYWRvd1JlYWxtLkNvbnNvbGUuYmFzaWMKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBT aGFkb3dSZWFsbS5Db25zb2xlLmJhc2ljLmxvZworUEFTUzogbWVzc2FnZSB0ZXh0IHNob3VsZCBi ZSAnaGVsbG8nCitQQVNTOiBtZXNzYWdlIHRhcmdldCBzaG91bGQgYmUgdGhlIG1haW4gcGFnZQor CistLSBSdW5uaW5nIHRlc3QgY2FzZTogU2hhZG93UmVhbG0uQ29uc29sZS5uZXN0ZWQubG9nCitQ QVNTOiBtZXNzYWdlIHRleHQgc2hvdWxkIGJlICdoZWxsbycKK1BBU1M6IG1lc3NhZ2UgdGFyZ2V0 IHNob3VsZCBiZSB0aGUgbWFpbiBwYWdlCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9zaGFkb3ctcmVhbG0tY29uc29sZS5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3No YWRvdy1yZWFsbS1jb25zb2xlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjYyY2ZlMWNlMjU0ZDQ5OTY1Y2Qy OWIxNGE4YzAxNzA4YjExNjQxZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9zaGFkb3ctcmVhbG0tY29uc29sZS5odG1sCkBAIC0wLDAgKzEsNjAgQEAKKzwhRE9DVFlQ RSBodG1sPiAgPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBqc2NPcHRpb25zPS0tdXNlU2hhZG93 UmVhbG09MSBdIC0tPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vaHR0cC90 ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzL2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KKyAg ICA8c2NyaXB0PgorICAgIGNvbnN0IHJlYWxtID0gbmV3IFNoYWRvd1JlYWxtOworCisgICAgZnVu Y3Rpb24gcmVhbG1FdmFsdWF0ZShzcmMpIHsKKyAgICAgICAgcmVhbG0uZXZhbHVhdGUoc3JjKTsK KyAgICB9CisKKyAgICBmdW5jdGlvbiBldmFsdWF0ZUluTmVzdGVkUmVhbG0oc3JjKSB7CisgICAg ICAgIHJlYWxtLmV2YWx1YXRlKGAoKCkgPT4geworICAgICAgICAgICAgY29uc3QgciA9IG5ldyBT aGFkb3dSZWFsbTsKKyAgICAgICAgICAgIHIuZXZhbHVhdGUoIiR7c3JjfSIpOworICAgICAgICAg IH0pKClgKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiB0ZXN0KCkKKyAgICB7CisgICAgICAgIGNv bnN0IHN1aXRlID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVBc3luY1N1aXRlKCJTaGFkb3dSZWFsbS5D b25zb2xlLmJhc2ljIik7CisKKyAgICAgICAgc3VpdGUuYWRkVGVzdENhc2UoeworICAgICAgICAg ICAgbmFtZTogIlNoYWRvd1JlYWxtLkNvbnNvbGUuYmFzaWMubG9nIiwKKyAgICAgICAgICAgIGRl c2NyaXB0aW9uOiAiY29uc29sZS5sb2cgaW4gc2hhZG93IHJlYWxtcyBzaG91bGQgc2VuZCB0byB0 aGUgaW5jdWJhdGluZyByZWFsbSdzIGNvbnNvbGUiLAorICAgICAgICAgICAgYXN5bmMgdGVzdChy ZXNvbHZlLCByZWplY3QpIHsKKyAgICAgICAgICAgICAgICBsZXQgW21lc3NhZ2VBZGRlZEV2ZW50 XSA9IGF3YWl0IFByb21pc2UuYWxsKFsKKyAgICAgICAgICAgICAgICAgICAgV0kuY29uc29sZU1h bmFnZXIuYXdhaXRFdmVudChXSS5Db25zb2xlTWFuYWdlci5FdmVudC5NZXNzYWdlQWRkZWQpLAor ICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKGByZWFsbUV2 YWx1YXRlKCJjb25zb2xlLmxvZygnaGVsbG8nKSIpYCksCisgICAgICAgICAgICAgICAgXSk7Cisg ICAgICAgICAgICAgICAgbGV0IHttZXNzYWdlfSA9IG1lc3NhZ2VBZGRlZEV2ZW50LmRhdGE7Cisg ICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChtZXNzYWdlLm1lc3NhZ2VU ZXh0LCAiaGVsbG8iLCAibWVzc2FnZSB0ZXh0IHNob3VsZCBiZSAnaGVsbG8nIik7CisgICAgICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChtZXNzYWdlLnRhcmdldCwgV0kubWFp blRhcmdldCwgIm1lc3NhZ2UgdGFyZ2V0IHNob3VsZCBiZSB0aGUgbWFpbiBwYWdlIik7CisgICAg ICAgICAgICB9CisgICAgICAgIH0pOworCisgICAgICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAg ICAgICAgICAgIG5hbWU6ICJTaGFkb3dSZWFsbS5Db25zb2xlLm5lc3RlZC5sb2ciLAorICAgICAg ICAgICAgZGVzY3JpcHRpb246ICJjb25zb2xlLmxvZyBpbiBzaGFkb3cgcmVhbG1zIHNob3VsZCBz ZW5kIHRvIHRoZSBpbmN1YmF0aW5nIHJlYWxtJ3MgY29uc29sZSIsCisgICAgICAgICAgICBhc3lu YyB0ZXN0KHJlc29sdmUsIHJlamVjdCkgeworICAgICAgICAgICAgICAgIGxldCBbbWVzc2FnZUFk ZGVkRXZlbnRdID0gYXdhaXQgUHJvbWlzZS5hbGwoWworICAgICAgICAgICAgICAgICAgICBXSS5j b25zb2xlTWFuYWdlci5hd2FpdEV2ZW50KFdJLkNvbnNvbGVNYW5hZ2VyLkV2ZW50Lk1lc3NhZ2VB ZGRlZCksCisgICAgICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJblBhZ2Uo YGV2YWx1YXRlSW5OZXN0ZWRSZWFsbSgiY29uc29sZS5sb2coJ2hlbGxvJykiKWApLAorICAgICAg ICAgICAgICAgIF0pOworICAgICAgICAgICAgICAgIGxldCB7bWVzc2FnZX0gPSBtZXNzYWdlQWRk ZWRFdmVudC5kYXRhOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwo bWVzc2FnZS5tZXNzYWdlVGV4dCwgImhlbGxvIiwgIm1lc3NhZ2UgdGV4dCBzaG91bGQgYmUgJ2hl bGxvJyIpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwobWVzc2Fn ZS50YXJnZXQsIFdJLm1haW5UYXJnZXQsICJtZXNzYWdlIHRhcmdldCBzaG91bGQgYmUgdGhlIG1h aW4gcGFnZSIpOworICAgICAgICAgICAgfQorICAgICAgICB9KTsKKworICAgICAgICBzdWl0ZS5y dW5UZXN0Q2FzZXNBbmRGaW5pc2goKTsKKyAgICB9CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8 Ym9keSBvbkxvYWQ9InJ1blRlc3QoKSI+CisgICAgV2UgcmVhbGx5IGp1c3Qgd2FudCB0byB0ZXN0 IHRoYXQgdGhlIHNoYWRvdyByZWFsbSdzIGNvbnNvbGUgb3V0cHV0IGdldHMKKyAgICByZWRpcmVj dGVkIHRvIHRoZSBhcHByb3ByaWF0ZSBwYWdlIGNvbnNvbGUgYW5kIG5vdCBzZW50IHRvIHRoZSBk ZWZhdWx0CisgICAgKHBvc3NpYmx5IGJsYWNraG9sZSkgZGVzdGluYXRpb24KKzwvYm9keT4KKzwv aHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2pzL1NoYWRvd1JlYWxtLWltcG9ydFZhbHVl LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2pzL1NoYWRvd1JlYWxtLWltcG9ydFZhbHVlLWV4 cGVjdGVkLnR4dAppbmRleCA4NjE0YzU1NWE4MDhiN2IyZmZiN2ZjNjE3OWY3MDc0NzQ4NTc5YjJj Li42ZjdhNDMxZDk5M2MyMzg4YzBjZWFjMmViNzM4ZmVkMGIzNDc3OWYwIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9qcy9TaGFkb3dSZWFsbS1pbXBvcnRWYWx1ZS1leHBlY3RlZC50eHQKKysrIGIv TGF5b3V0VGVzdHMvanMvU2hhZG93UmVhbG0taW1wb3J0VmFsdWUtZXhwZWN0ZWQudHh0CkBAIC0x LDQgKzEsNSBAQAogQ09OU09MRSBNRVNTQUdFOiA0MgorQ09OU09MRSBNRVNTQUdFOiAxMDAKIFRl c3QgdG8gZW5zdXJlIGNvcnJlY3QgYmVoYXZpb3VyIG9mIFNoYWRvd1JlYWxtLnByb3RvdHlwZS5p bXBvcnRWYWx1ZQogCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1Mi IG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCg== 451938 2022-02-14 13:31:15 -0800 2022-02-15 13:07:40 -0800 Patch bug-236518-20220214163114.patch text/plain 6941 joseph.j.griego U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjhlNzY1MzFlZjkzZWIw YzlmMWIxNmM1MzUwOTlkMWUwNzUxNjU4Zi4uZmNmZmUzOGNkNGVkZmY2OTFkN2E5ZjExYWUwNzY1 OTVjZmY1NmFkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAyLTE0ICBKb3Nl cGggR3JpZWdvICA8amdyaWVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJlZGlyZWN0IHNoYWRv dyByZWFsbSBjb25zb2xlIG91dHB1dCB0byBwYWdlJ3MgQ29uc29sZUNsaWVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2NTE4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgRGV2aW4gUm91c3NvLgorCisgICAgICAgIFRlc3Q6IGluc3BlY3Rvci9zaGFk b3ctcmVhbG0tY29uc29sZS5odG1sCisKKyAgICAgICAgV2l0aG91dCB0aGlzIHBhdGNoLCB0aGUg bmV3bHktY3JlYXRlZCBzaGFkb3cgcmVhbG0gZ2xvYmFsIG9iamVjdCB3b3VsZAorICAgICAgICBu b3QgaGF2ZSBhIGNvbnNvbGUgY2xpZW50OyB3ZSB3YW50IHRoZSBjb25zb2xlIG91dHB1dCBmcm9t IHRoZSBzaGFkb3cKKyAgICAgICAgcmVhbG0ncyBjb250ZXh0IHRvIGdvIHRvIHRoZSBpbnNwZWN0 b3IsIHRvby4KKworICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRE9NR2xvYmFsT2JqZWN0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkpTRE9NR2xvYmFsT2JqZWN0OjpkZXJpdmVTaGFkb3dSZWFsbUds b2JhbE9iamVjdCk6IENvcHkgY29uc29sZSBjbGllbnQgZnJvbSBzb3VyY2UgSlNET01HbG9iYWxP YmplY3QgdG8gbmV3IHNoYWRvdyByZWFsbSdzIGdsb2JhbCBvYmplY3QuCisKIDIwMjItMDItMTQg IEZyw6lkw6lyaWMgV2FuZyAgPGZ3YW5nQGlnYWxpYS5jb20+CiAKICAgICAgICAgTnVsbHB0ciBj cmFzaCBpbiBDb21wb3NpdGVFZGl0Q29tbWFuZDo6c3BsaXRUcmVlVG9Ob2RlIHZpYSBJbnNlcnRQ YXJhZ3JhcGhTZXBhcmF0b3JDb21tYW5kOjpkb0FwcGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU0RPTUdsb2JhbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU0RPTUdsb2JhbE9iamVjdC5jcHAKaW5kZXggZGNlYzAyZmRiNzJjYWJjNWZh ZTU3OWM5ZmFkYzQ3YTU5ZjM5Nzk0MC4uYjI2MjZmZWI0YTA1MzczOGVhN2RlZDE4Mjc3ODY1YzRm ODEzNGI1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01HbG9i YWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRE9NR2xvYmFs T2JqZWN0LmNwcApAQCAtNjIxLDYgKzYyMSw4IEBAIEpTQzo6SlNHbG9iYWxPYmplY3QqIEpTRE9N R2xvYmFsT2JqZWN0OjpkZXJpdmVTaGFkb3dSZWFsbUdsb2JhbE9iamVjdChKU0M6OkpTR2xvCiAg ICAgd3JhcHBlci0+c2V0UHJvdG90eXBlRGlyZWN0KHZtLCB3cmFwcGVyLT5vYmplY3RQcm90b3R5 cGUoKSk7CiAgICAgcHJveHktPnNldFRhcmdldCh2bSwgd3JhcHBlcik7CiAKKyAgICB3cmFwcGVy LT5zZXRDb25zb2xlQ2xpZW50KGRvbUdsb2JhbE9iamVjdC0+Y29uc29sZUNsaWVudCgpKTsKKwog ICAgIHJldHVybiB3cmFwcGVyOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNDg2MmExMmVhNmJjZTViOWFiZWFlZDY0 YzQwMzYwNGU1MTI4NzJjZS4uMjlhZmMxM2VmZGJhNDM5NTZkNjgxZTA4ZGYyMzQ1NWFiNDU3ZTRj MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTE0ICBKb3NlcGggR3JpZWdvICA8amdy aWVnb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFJlZGlyZWN0IHNoYWRvdyByZWFsbSBjb25zb2xl IG91dHB1dCB0byBwYWdlJ3MgQ29uc29sZUNsaWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2NTE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV2 aW4gUm91c3NvLgorCisgICAgICAgIEFkZCB0ZXN0cyB0byB2ZXJpZnkgdGhhdCAobmVzdGVkKSBz aGFkb3cgcmVhbG0gY29udGV4dHMgc3RpbGwgb3V0cHV0IHRvCisgICAgICAgIHRoZSBwYXJlbnQg cGFnZSdzIGluc3BlY3RvcjsgZml4IG9uZSBjaGFuZ2VkIHRlc3QuCisKKyAgICAgICAgKiBpbnNw ZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNvbGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBpbnNwZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNvbGUuaHRtbDogQWRkZWQuCisgICAgICAgICog anMvU2hhZG93UmVhbG0taW1wb3J0VmFsdWUtZXhwZWN0ZWQudHh0OiBBZGRlZCBjb25zb2xlIGxp bmUgdGhhdCBoYWQgcHJldmlvdXNseSBiZWVuIGJsYWNraG9sZWQKKwogMjAyMi0wMi0xNCAgRnLD qWTDqXJpYyBXYW5nICA8ZndhbmdAaWdhbGlhLmNvbT4KIAogICAgICAgICBOdWxscHRyIGNyYXNo IGluIENvbXBvc2l0ZUVkaXRDb21tYW5kOjpzcGxpdFRyZWVUb05vZGUgdmlhIEluc2VydFBhcmFn cmFwaFNlcGFyYXRvckNvbW1hbmQ6OmRvQXBwbHkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9zaGFkb3ctcmVhbG0tY29uc29sZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9p bnNwZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNvbGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmM4 YmY0MjY1NWRiNjcyMTYyOWRhZTM1ZWQ0YzJkNGRkNTRhOWZmNzQKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNvbGUtZXhwZWN0ZWQudHh0 CkBAIC0wLDAgKzEsMTMgQEAKK0NPTlNPTEUgTUVTU0FHRTogaGVsbG8KK0NPTlNPTEUgTUVTU0FH RTogaGVsbG8KK1dlIHJlYWxseSBqdXN0IHdhbnQgdG8gdGVzdCB0aGF0IHRoZSBzaGFkb3cgcmVh bG0ncyBjb25zb2xlIG91dHB1dCBnZXRzIHJlZGlyZWN0ZWQgdG8gdGhlIGFwcHJvcHJpYXRlIHBh Z2UgY29uc29sZSBhbmQgbm90IHNlbnQgdG8gdGhlIGRlZmF1bHQgKHBvc3NpYmx5IGJsYWNraG9s ZSkgZGVzdGluYXRpb24KKworPT0gUnVubmluZyB0ZXN0IHN1aXRlOiBTaGFkb3dSZWFsbS5Db25z b2xlLmJhc2ljCistLSBSdW5uaW5nIHRlc3QgY2FzZTogU2hhZG93UmVhbG0uQ29uc29sZS5iYXNp Yy5sb2cKK1BBU1M6IG1lc3NhZ2UgdGV4dCBzaG91bGQgYmUgJ2hlbGxvJworUEFTUzogbWVzc2Fn ZSB0YXJnZXQgc2hvdWxkIGJlIHRoZSBtYWluIHBhZ2UKKworLS0gUnVubmluZyB0ZXN0IGNhc2U6 IFNoYWRvd1JlYWxtLkNvbnNvbGUubmVzdGVkLmxvZworUEFTUzogbWVzc2FnZSB0ZXh0IHNob3Vs ZCBiZSAnaGVsbG8nCitQQVNTOiBtZXNzYWdlIHRhcmdldCBzaG91bGQgYmUgdGhlIG1haW4gcGFn ZQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNv bGUuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9zaGFkb3ctcmVhbG0tY29uc29sZS5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjI0MTNmY2VjZmJhYzVjOTAzYmVmMWZmNjlkMTY0Y2ZjYjVlMWZhOTUKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivc2hhZG93LXJlYWxtLWNvbnNv bGUuaHRtbApAQCAtMCwwICsxLDYwIEBACis8IURPQ1RZUEUgaHRtbD4gIDwhLS0gd2Via2l0LXRl c3QtcnVubmVyIFsganNjT3B0aW9ucz0tLXVzZVNoYWRvd1JlYWxtPTEgXSAtLT4KKzxodG1sPgor PGhlYWQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNl cy9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICBjb25zdCBy ZWFsbSA9IG5ldyBTaGFkb3dSZWFsbTsKKworICAgIGZ1bmN0aW9uIHJlYWxtRXZhbHVhdGUoc3Jj KSB7CisgICAgICAgIHJlYWxtLmV2YWx1YXRlKHNyYyk7CisgICAgfQorCisgICAgZnVuY3Rpb24g ZXZhbHVhdGVJbk5lc3RlZFJlYWxtKHNyYykgeworICAgICAgICByZWFsbS5ldmFsdWF0ZShgKCgp ID0+IHsKKyAgICAgICAgICAgIGNvbnN0IHIgPSBuZXcgU2hhZG93UmVhbG07CisgICAgICAgICAg ICByLmV2YWx1YXRlKCIke3NyY30iKTsKKyAgICAgICAgICB9KSgpYCk7CisgICAgfQorCisgICAg ZnVuY3Rpb24gdGVzdCgpCisgICAgeworICAgICAgICBjb25zdCBzdWl0ZSA9IEluc3BlY3RvclRl c3QuY3JlYXRlQXN5bmNTdWl0ZSgiU2hhZG93UmVhbG0uQ29uc29sZS5iYXNpYyIpOworCisgICAg ICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgICAgIG5hbWU6ICJTaGFkb3dSZWFsbS5D b25zb2xlLmJhc2ljLmxvZyIsCisgICAgICAgICAgICBkZXNjcmlwdGlvbjogImNvbnNvbGUubG9n IGluIHNoYWRvdyByZWFsbXMgc2hvdWxkIHNlbmQgdG8gdGhlIGluY3ViYXRpbmcgcmVhbG0ncyBj b25zb2xlIiwKKyAgICAgICAgICAgIGFzeW5jIHRlc3QoKSB7CisgICAgICAgICAgICAgICAgbGV0 IFttZXNzYWdlQWRkZWRFdmVudF0gPSBhd2FpdCBQcm9taXNlLmFsbChbCisgICAgICAgICAgICAg ICAgICAgIFdJLmNvbnNvbGVNYW5hZ2VyLmF3YWl0RXZlbnQoV0kuQ29uc29sZU1hbmFnZXIuRXZl bnQuTWVzc2FnZUFkZGVkKSwKKyAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5ldmFs dWF0ZUluUGFnZShgcmVhbG1FdmFsdWF0ZSgiY29uc29sZS5sb2coJ2hlbGxvJykiKWApLAorICAg ICAgICAgICAgICAgIF0pOworICAgICAgICAgICAgICAgIGxldCB7bWVzc2FnZX0gPSBtZXNzYWdl QWRkZWRFdmVudC5kYXRhOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1 YWwobWVzc2FnZS5tZXNzYWdlVGV4dCwgImhlbGxvIiwgIm1lc3NhZ2UgdGV4dCBzaG91bGQgYmUg J2hlbGxvJyIpOworICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwobWVz c2FnZS50YXJnZXQsIFdJLm1haW5UYXJnZXQsICJtZXNzYWdlIHRhcmdldCBzaG91bGQgYmUgdGhl IG1haW4gcGFnZSIpOworICAgICAgICAgICAgfQorICAgICAgICB9KTsKKworICAgICAgICBzdWl0 ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgICAgICBuYW1lOiAiU2hhZG93UmVhbG0uQ29uc29sZS5u ZXN0ZWQubG9nIiwKKyAgICAgICAgICAgIGRlc2NyaXB0aW9uOiAiY29uc29sZS5sb2cgaW4gc2hh ZG93IHJlYWxtcyBzaG91bGQgc2VuZCB0byB0aGUgaW5jdWJhdGluZyByZWFsbSdzIGNvbnNvbGUi LAorICAgICAgICAgICAgYXN5bmMgdGVzdCgpIHsKKyAgICAgICAgICAgICAgICBsZXQgW21lc3Nh Z2VBZGRlZEV2ZW50XSA9IGF3YWl0IFByb21pc2UuYWxsKFsKKyAgICAgICAgICAgICAgICAgICAg V0kuY29uc29sZU1hbmFnZXIuYXdhaXRFdmVudChXSS5Db25zb2xlTWFuYWdlci5FdmVudC5NZXNz YWdlQWRkZWQpLAorICAgICAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5Q YWdlKGBldmFsdWF0ZUluTmVzdGVkUmVhbG0oImNvbnNvbGUubG9nKCdoZWxsbycpIilgKSwKKyAg ICAgICAgICAgICAgICBdKTsKKyAgICAgICAgICAgICAgICBsZXQge21lc3NhZ2V9ID0gbWVzc2Fn ZUFkZGVkRXZlbnQuZGF0YTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVx dWFsKG1lc3NhZ2UubWVzc2FnZVRleHQsICJoZWxsbyIsICJtZXNzYWdlIHRleHQgc2hvdWxkIGJl ICdoZWxsbyciKTsKKyAgICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKG1l c3NhZ2UudGFyZ2V0LCBXSS5tYWluVGFyZ2V0LCAibWVzc2FnZSB0YXJnZXQgc2hvdWxkIGJlIHRo ZSBtYWluIHBhZ2UiKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSk7CisKKyAgICAgICAgc3Vp dGUucnVuVGVzdENhc2VzQW5kRmluaXNoKCk7CisgICAgfQorICAgIDwvc2NyaXB0PgorPC9oZWFk PgorPGJvZHkgb25Mb2FkPSJydW5UZXN0KCkiPgorICAgIFdlIHJlYWxseSBqdXN0IHdhbnQgdG8g dGVzdCB0aGF0IHRoZSBzaGFkb3cgcmVhbG0ncyBjb25zb2xlIG91dHB1dCBnZXRzCisgICAgcmVk aXJlY3RlZCB0byB0aGUgYXBwcm9wcmlhdGUgcGFnZSBjb25zb2xlIGFuZCBub3Qgc2VudCB0byB0 aGUgZGVmYXVsdAorICAgIChwb3NzaWJseSBibGFja2hvbGUpIGRlc3RpbmF0aW9uCis8L2JvZHk+ Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9qcy9TaGFkb3dSZWFsbS1pbXBvcnRW YWx1ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9qcy9TaGFkb3dSZWFsbS1pbXBvcnRWYWx1 ZS1leHBlY3RlZC50eHQKaW5kZXggODYxNGM1NTVhODA4YjdiMmZmYjdmYzYxNzlmNzA3NDc0ODU3 OWIyYy4uNmY3YTQzMWQ5OTNjMjM4OGMwY2VhYzJlYjczOGZlZDBiMzQ3NzlmMCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvanMvU2hhZG93UmVhbG0taW1wb3J0VmFsdWUtZXhwZWN0ZWQudHh0Cisr KyBiL0xheW91dFRlc3RzL2pzL1NoYWRvd1JlYWxtLWltcG9ydFZhbHVlLWV4cGVjdGVkLnR4dApA QCAtMSw0ICsxLDUgQEAKIENPTlNPTEUgTUVTU0FHRTogNDIKK0NPTlNPTEUgTUVTU0FHRTogMTAw CiBUZXN0IHRvIGVuc3VyZSBjb3JyZWN0IGJlaGF2aW91ciBvZiBTaGFkb3dSZWFsbS5wcm90b3R5 cGUuaW1wb3J0VmFsdWUKIAogT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQ QVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgo=