200997 2019-08-21 14:01:10 -0700 SVG element should not become focusable when focus and key event listeners are added 2022-07-15 22:27:30 -0700 1 1 1 Unclassified WebKit SVG WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 199606 1 rniwa rniwa annevk cdumez dino dominicc mail mmaxfield sabouhallawa tkent webkit-bug-importer wenson_hsieh zimmermann oldest_to_newest 1563674 0 rniwa 2019-08-21 14:01:10 -0700 SVGElement::isMouseFocusable() has bizarre code which checks the presence of keydown, keyup, keypress, focusin, focusout, focus, and blur event listeners. We shouldn't make an element focusable just because it has a bunch of event listeners. 1563783 1 376945 rniwa 2019-08-21 16:15:18 -0700 Created attachment 376945 Patch 1563829 2 376945 sabouhallawa 2019-08-21 17:21:38 -0700 Comment on attachment 376945 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376945&action=review > Source/WebCore/svg/SVGAElement.cpp:162 > if (hasEditableStyle()) > return SVGGraphicsElement::supportsFocus(); How can this element be editable? > LayoutTests/svg/custom/tabindex-order.html:66 > + <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> I think you do not have to add these namespaces in html. The xlink namespaces is removed in SVG2 beside it is not used in this test. > LayoutTests/svg/custom/tabindex-order.html:68 > + <rect class="tab" id="rect without tabindex is not focusable" width="1" height="1"/> I am not sure why the id's contains white spaces. I see they are not referenced but they look weird to me. You may use comment element <!-- --> instead. 1563839 3 rniwa 2019-08-21 17:29:04 -0700 (In reply to Said Abou-Hallawa from comment #2) > Comment on attachment 376945 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=376945&action=review > > > Source/WebCore/svg/SVGAElement.cpp:162 > > if (hasEditableStyle()) > > return SVGGraphicsElement::supportsFocus(); > > How can this element be editable? You can put contenteditble attribute anywhere, or put the entire document into design mode by document.designMode = 'on'. > > LayoutTests/svg/custom/tabindex-order.html:66 > > + <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> > > I think you do not have to add these namespaces in html. The xlink > namespaces is removed in SVG2 beside it is not used in this test. Yeah, I added for some testing. Removed. > > LayoutTests/svg/custom/tabindex-order.html:68 > > + <rect class="tab" id="rect without tabindex is not focusable" width="1" height="1"/> > > I am not sure why the id's contains white spaces. I see they are not > referenced but they look weird to me. You may use comment element <!-- --> > instead. Well, these IDs are like that because if they ever get focused, it would show up in the test result. The rest of the test uses that convention so I'd keep that for now. 1563840 4 rniwa 2019-08-21 17:29:22 -0700 Thanks for the review! 1563845 5 rniwa 2019-08-21 17:34:50 -0700 Committed r248983: <https://trac.webkit.org/changeset/248983> 1563846 6 webkit-bug-importer 2019-08-21 17:35:17 -0700 <rdar://problem/54579978> 1884526 7 rniwa 2022-07-15 22:27:30 -0700 *** Bug 140024 has been marked as a duplicate of this bug. *** 376945 2019-08-21 16:15:18 -0700 2019-08-21 17:21:38 -0700 Patch bug-200997-20190821161518.patch text/plain 13020 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0ODk3NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA4LTIxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFNWRyBlbGVtZW50IHNob3VsZCBi ZWNvbWUgZm9jdXNhYmxlIHdoZW4gZm9jdXMgYW5kIGtleSBldmVudCBsaXN0ZW5lcnMgYXJlIGFk ZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA5 OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IHBhdGNoIHJlbW92ZXMgdGhlIG9kZCBiZWhhdmlvciBXZWJLaXQgKGFuZCBCbGluaykgYnJvd3Nl cnMgaGFkIHRvIG1ha2UgU1ZHIGVsZW1lbnRzCisgICAgICAgIHdpdGgga2V5IG9yIGZvY3VzIGV2 ZW50IGxpc3RlbmVycyBmb2N1c2FibGUuIE5ldyBiZWhhdmlvciBtYXRjaGVzIHRoZSBiZWhhdmlv ciBvZiBGaXJlZm94CisgICAgICAgIGFzIHdlbGwgYXMgdGhlIFNWRyAyLjAgc3BlY2lmaWNhdGlv bjogaHR0cHM6Ly93d3cudzMub3JnL1RSL1NWRzIvaW50ZXJhY3QuaHRtbCNGb2N1cworCisgICAg ICAgIFRlc3Q6IHN2Zy9jdXN0b20vdGFiaW5kZXgtb3JkZXIuaHRtbAorCisgICAgICAgICogc3Zn L1NWR0FFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR0FFbGVtZW50OjpzdXBwb3J0 c0ZvY3VzIGNvbnN0KToKKyAgICAgICAgKiBzdmcvU1ZHRWxlbWVudC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTVkdFbGVtZW50OjpoYXNGb2N1c0V2ZW50TGlzdGVuZXJzIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OlNWR0VsZW1lbnQ6OmlzTW91c2VGb2N1c2FibGUgY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAqIHN2Zy9TVkdFbGVtZW50Lmg6CisgICAgICAgICogc3ZnL1NW R0dyYXBoaWNzRWxlbWVudC5oOgorCiAyMDE5LTA4LTIxICBUaW0gSG9ydG9uICA8dGltb3RoeV9o b3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWlsXSBUYXBwaW5nIHRvcCBvZiBtZXNzYWdl IHNjcm9sbHMgYmFjayB0byBjb3BpZWQgdGV4dCBpbnN0ZWFkIG9mIHRvcCBvZiB0aGUgbWVzc2Fn ZQpJbmRleDogU291cmNlL1dlYkNvcmUvc3ZnL1NWR0FFbGVtZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHQUVsZW1lbnQuY3BwCShyZXZpc2lvbiAyNDg5NTkpCisr KyBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHQUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x NjEsNyArMTYxLDcgQEAgYm9vbCBTVkdBRWxlbWVudDo6c3VwcG9ydHNGb2N1cygpIGNvbnN0CiAg ICAgaWYgKGhhc0VkaXRhYmxlU3R5bGUoKSkKICAgICAgICAgcmV0dXJuIFNWR0dyYXBoaWNzRWxl bWVudDo6c3VwcG9ydHNGb2N1cygpOwogICAgIC8vIElmIG5vdCBhIGxpbmsgd2Ugc2hvdWxkIHN0 aWxsIGJlIGFibGUgdG8gZm9jdXMgdGhlIGVsZW1lbnQgaWYgaXQgaGFzIGEgdGFiSW5kZXguCi0g ICAgcmV0dXJuIGlzTGluaygpIHx8IEVsZW1lbnQ6OnN1cHBvcnRzRm9jdXMoKTsKKyAgICByZXR1 cm4gaXNMaW5rKCkgfHwgU1ZHR3JhcGhpY3NFbGVtZW50OjpzdXBwb3J0c0ZvY3VzKCk7CiB9CiAK IGJvb2wgU1ZHQUVsZW1lbnQ6OmlzVVJMQXR0cmlidXRlKGNvbnN0IEF0dHJpYnV0ZSYgYXR0cmli dXRlKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcAkocmV2aXNpb24gMjQ4 OTU5KQorKysgU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC05ODMsMjYgKzk4Myw2IEBAIHZvaWQgU1ZHRWxlbWVudDo6dXBkYXRlUmVsYXRpdmVMZW5n dGhzSW4KICAgICB9CiB9CiAKLWJvb2wgU1ZHRWxlbWVudDo6aGFzRm9jdXNFdmVudExpc3RlbmVy cygpIGNvbnN0Ci17Ci0gICAgRWxlbWVudCogZXZlbnRUYXJnZXQgPSBjb25zdF9jYXN0PFNWR0Vs ZW1lbnQqPih0aGlzKTsKLSAgICByZXR1cm4gZXZlbnRUYXJnZXQtPmhhc0V2ZW50TGlzdGVuZXJz KGV2ZW50TmFtZXMoKS5mb2N1c2luRXZlbnQpCi0gICAgICAgIHx8IGV2ZW50VGFyZ2V0LT5oYXNF dmVudExpc3RlbmVycyhldmVudE5hbWVzKCkuZm9jdXNvdXRFdmVudCkKLSAgICAgICAgfHwgZXZl bnRUYXJnZXQtPmhhc0V2ZW50TGlzdGVuZXJzKGV2ZW50TmFtZXMoKS5mb2N1c0V2ZW50KQotICAg ICAgICB8fCBldmVudFRhcmdldC0+aGFzRXZlbnRMaXN0ZW5lcnMoZXZlbnROYW1lcygpLmJsdXJF dmVudCk7Ci19Ci0KLWJvb2wgU1ZHRWxlbWVudDo6aXNNb3VzZUZvY3VzYWJsZSgpIGNvbnN0Ci17 Ci0gICAgaWYgKCFpc0ZvY3VzYWJsZSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgRWxl bWVudCogZXZlbnRUYXJnZXQgPSBjb25zdF9jYXN0PFNWR0VsZW1lbnQqPih0aGlzKTsKLSAgICBy ZXR1cm4gaGFzRm9jdXNFdmVudExpc3RlbmVycygpCi0gICAgICAgIHx8IGV2ZW50VGFyZ2V0LT5o YXNFdmVudExpc3RlbmVycyhldmVudE5hbWVzKCkua2V5ZG93bkV2ZW50KQotICAgICAgICB8fCBl dmVudFRhcmdldC0+aGFzRXZlbnRMaXN0ZW5lcnMoZXZlbnROYW1lcygpLmtleXVwRXZlbnQpCi0g ICAgICAgIHx8IGV2ZW50VGFyZ2V0LT5oYXNFdmVudExpc3RlbmVycyhldmVudE5hbWVzKCkua2V5 cHJlc3NFdmVudCk7Ci19Ci0gICAgCiB2b2lkIFNWR0VsZW1lbnQ6OmFjY2Vzc0tleUFjdGlvbihi b29sIHNlbmRNb3VzZUV2ZW50cykKIHsKICAgICBkaXNwYXRjaFNpbXVsYXRlZENsaWNrKDAsIHNl bmRNb3VzZUV2ZW50cyA/IFNlbmRNb3VzZVVwRG93bkV2ZW50cyA6IFNlbmROb0V2ZW50cyk7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmgJKHJldmlzaW9uIDI0ODk1OSkKKysrIFNvdXJjZS9X ZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTExNiw3ICsxMTYsNiBA QCBwdWJsaWM6CiAKICAgICBib29sIGFkZEV2ZW50TGlzdGVuZXIoY29uc3QgQXRvbVN0cmluZyYg ZXZlbnRUeXBlLCBSZWY8RXZlbnRMaXN0ZW5lcj4mJiwgY29uc3QgQWRkRXZlbnRMaXN0ZW5lck9w dGlvbnMmKSBvdmVycmlkZTsKICAgICBib29sIHJlbW92ZUV2ZW50TGlzdGVuZXIoY29uc3QgQXRv bVN0cmluZyYgZXZlbnRUeXBlLCBFdmVudExpc3RlbmVyJiwgY29uc3QgTGlzdGVuZXJPcHRpb25z Jikgb3ZlcnJpZGU7Ci0gICAgYm9vbCBoYXNGb2N1c0V2ZW50TGlzdGVuZXJzKCkgY29uc3Q7CiAK ICAgICBib29sIGhhc1RhZ05hbWUoY29uc3QgU1ZHUXVhbGlmaWVkTmFtZSYgbmFtZSkgY29uc3Qg eyByZXR1cm4gaGFzTG9jYWxOYW1lKG5hbWUubG9jYWxOYW1lKCkpOyB9CiAKQEAgLTE1Myw5ICsx NTIsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgU1ZHRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwg RG9jdW1lbnQmKTsKICAgICB2aXJ0dWFsIH5TVkdFbGVtZW50KCk7CiAKLSAgICBib29sIGlzTW91 c2VGb2N1c2FibGUoKSBjb25zdCBvdmVycmlkZTsKLSAgICBib29sIHN1cHBvcnRzRm9jdXMoKSBj b25zdCBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQotCiAgICAgYm9vbCByZW5kZXJlcklzTmVl ZGVkKGNvbnN0IFJlbmRlclN0eWxlJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBwYXJzZUF0dHJpYnV0 ZShjb25zdCBRdWFsaWZpZWROYW1lJiwgY29uc3QgQXRvbVN0cmluZyYpIG92ZXJyaWRlOwogCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHR3JhcGhpY3NFbGVtZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvc3ZnL1NWR0dyYXBoaWNzRWxlbWVudC5oCShyZXZpc2lvbiAyNDg5 NTkpCisrKyBTb3VyY2UvV2ViQ29yZS9zdmcvU1ZHR3JhcGhpY3NFbGVtZW50LmgJKHdvcmtpbmcg Y29weSkKQEAgLTcwLDggKzcwLDYgQEAgcHVibGljOgogcHJvdGVjdGVkOgogICAgIFNWR0dyYXBo aWNzRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9jdW1lbnQmKTsKIAotICAgIGJvb2wg c3VwcG9ydHNGb2N1cygpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIEVsZW1lbnQ6OnN1cHBvcnRz Rm9jdXMoKSB8fCBoYXNGb2N1c0V2ZW50TGlzdGVuZXJzKCk7IH0KLQogICAgIHZvaWQgcGFyc2VB dHRyaWJ1dGUoY29uc3QgUXVhbGlmaWVkTmFtZSYsIGNvbnN0IEF0b21TdHJpbmcmKSBvdmVycmlk ZTsKICAgICB2b2lkIHN2Z0F0dHJpYnV0ZUNoYW5nZWQoY29uc3QgUXVhbGlmaWVkTmFtZSYpIG92 ZXJyaWRlOwogCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDg5NjApCisrKyBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMCBAQAorMjAxOS0wOC0yMSAgUnlvc3Vr ZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KKworICAgICAgICBTVkcgZWxlbWVudCBzaG91bGQg YmVjb21lIGZvY3VzYWJsZSB3aGVuIGZvY3VzIGFuZCBrZXkgZXZlbnQgbGlzdGVuZXJzIGFyZSBh ZGRlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAw OTk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBk YXRlZCBleGlzdGluZyB0ZXN0cyB0byBzZXQgdGFiSW5kZXggd2hlcmUgYXBwcm9wcmlhdGUsIGFu ZCBhZGRlZCBTVkcgZWxlbWVudHMKKyAgICAgICAgd2l0aG91dCB0YWJpbmRleCBjb250ZW50IGF0 dHJpYnV0ZSB0byB0YWJpbmRleC1vcmRlci5odG1sIHNvIHRoYXQgdGhlIHRlc3Qgd291bGQKKyAg ICAgICAgc2tpcCB0aG9zZSBlbGVtZW50cyB3aGVuIHNlcXVlbnRpYWxseSBmb2N1cyBuYXZpZ2F0 aW5nIGFjcm9zcyB0aGVtLgorCisgICAgICAgICogc3ZnL2N1c3RvbS9hZGQtZXZlbnQtbGlzdGVu ZXItc2hhZG93LXRyZWUtZWxlbWVudC5odG1sOgorICAgICAgICAqIHN2Zy9jdXN0b20vcmVzb3Vy Y2VzL2ZvY3VzLWV2ZW50LWhhbmRsaW5nLWtleWJvYXJkLmpzOgorICAgICAgICAqIHN2Zy9jdXN0 b20vcmVzb3VyY2VzL2ZvY3VzLWV2ZW50LWhhbmRsaW5nLmpzOgorICAgICAgICAqIHN2Zy9jdXN0 b20vdGFiaW5kZXgtb3JkZXItZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHN2Zy9jdXN0b20vdGFi aW5kZXgtb3JkZXIuaHRtbDogQWRkZWQgdGVzdCBjYXNlcyB3aXRob3V0IHRhYmluZGV4LgorCiAy MDE5LTA4LTIxICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFB1 dCBrZXlnZW4gZWxlbWVudCBiZWhpbmQgYSBydW50aW1lIGZsYWcgYW5kIGRpc2FibGUgaXQgYnkg ZGVmYXVsdApJbmRleDogTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS9hZGQtZXZlbnQtbGlzdGVuZXIt c2hhZG93LXRyZWUtZWxlbWVudC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9j dXN0b20vYWRkLWV2ZW50LWxpc3RlbmVyLXNoYWRvdy10cmVlLWVsZW1lbnQuaHRtbAkocmV2aXNp b24gMjQ4OTU5KQorKysgTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS9hZGQtZXZlbnQtbGlzdGVuZXIt c2hhZG93LXRyZWUtZWxlbWVudC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xOSw2ICsxOSw3IEBA CiAgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CiAgICAgICAgICAgICAg ICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CiAgICAgICAgICAgICB9CisgICAgICAgICAg ICB1c2UxLnRhYkluZGV4ID0gMDsKICAgICAgICAgICAgIHVzZTEuc2V0QXR0cmlidXRlKCJvbmZv Y3VzaW4iLCAiZXZlbnRoYW5kbGVyKCkiKTsKICAgICAgICAgICAgIHVzZTEuZm9jdXMoKTsKICAg ICAgICAgfQpJbmRleDogTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS90YWJpbmRleC1vcmRlci1leHBl Y3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS90YWJpbmRleC1v cmRlci1leHBlY3RlZC50eHQJKHJldmlzaW9uIDI0ODk1OSkKKysrIExheW91dFRlc3RzL3N2Zy9j dXN0b20vdGFiaW5kZXgtb3JkZXItZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC03LDYg KzcsNyBAQCBUbyB0ZXN0LCBwdXQgZm9jdXMgaW4gImEiLiBQcmVzc2luZyBUYWIgCiBpZDogYSB0 YWJpbmRleDogMSBbb2JqZWN0IFNWR0NpcmNsZUVsZW1lbnRdIGlzIGZvY3VzZWQuCiBpZDogYiB0 YWJpbmRleDogMSBbb2JqZWN0IFNWR0dFbGVtZW50XSBpcyBmb2N1c2VkLgogaWQ6IGMgdGFiaW5k ZXg6IDEgW29iamVjdCBTVkdFbGxpcHNlRWxlbWVudF0gaXMgZm9jdXNlZC4KK2lkOiBzeW1ib2wg dGFiaW5kZXg6IDEgW29iamVjdCBTVkdTeW1ib2xFbGVtZW50XSBpcyBmb2N1c2VkLgogaWQ6IGQg dGFiaW5kZXg6IDEgW29iamVjdCBTVkdQYXRoRWxlbWVudF0gaXMgZm9jdXNlZC4KIGlkOiBlIHRh YmluZGV4OiAzIFtvYmplY3QgU1ZHQUVsZW1lbnRdIGlzIGZvY3VzZWQuCiBpZDogZiB0YWJpbmRl eDogNCBbb2JqZWN0IFNWR1BvbHlsaW5lRWxlbWVudF0gaXMgZm9jdXNlZC4KQEAgLTI2LDYgKzI3 LDcgQEAgaWQ6IGcgdGFiaW5kZXg6IDYgW29iamVjdCBTVkdSZWN0RWxlbWVudAogaWQ6IGYgdGFi aW5kZXg6IDQgW29iamVjdCBTVkdQb2x5bGluZUVsZW1lbnRdIGlzIGZvY3VzZWQuCiBpZDogZSB0 YWJpbmRleDogMyBbb2JqZWN0IFNWR0FFbGVtZW50XSBpcyBmb2N1c2VkLgogaWQ6IGQgdGFiaW5k ZXg6IDEgW29iamVjdCBTVkdQYXRoRWxlbWVudF0gaXMgZm9jdXNlZC4KK2lkOiBzeW1ib2wgdGFi aW5kZXg6IDEgW29iamVjdCBTVkdTeW1ib2xFbGVtZW50XSBpcyBmb2N1c2VkLgogaWQ6IGMgdGFi aW5kZXg6IDEgW29iamVjdCBTVkdFbGxpcHNlRWxlbWVudF0gaXMgZm9jdXNlZC4KIGlkOiBiIHRh YmluZGV4OiAxIFtvYmplY3QgU1ZHR0VsZW1lbnRdIGlzIGZvY3VzZWQuCiBpZDogYSB0YWJpbmRl eDogMSBbb2JqZWN0IFNWR0NpcmNsZUVsZW1lbnRdIGlzIGZvY3VzZWQuCkluZGV4OiBMYXlvdXRU ZXN0cy9zdmcvY3VzdG9tL3RhYmluZGV4LW9yZGVyLmh0bWwKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvc3ZnL2N1c3RvbS90YWJpbmRleC1vcmRlci5odG1sCShyZXZpc2lvbiAyNDg5NTkpCisr KyBMYXlvdXRUZXN0cy9zdmcvY3VzdG9tL3RhYmluZGV4LW9yZGVyLmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTYzLDIxICs2MywzMSBAQAogPGJvZHkgb25sb2FkPSJ0ZXN0KCkiPgogICAgIDxwPlRo aXMgcGFnZSB0ZXN0cyB0aGF0IHRoZSBTVkcgdGFiYmluZyBvcmRlciBpcyByZXNwZWN0ZWQgcHJv cGVybHkuPC9wPgogICAgIDxwPlRvIHRlc3QsIHB1dCBmb2N1cyBpbiAmcXVvdDthJnF1b3Q7LiBQ cmVzc2luZyBUYWIgc2hvdWxkIGZvY3VzICZxdW90O2EmcXVvdDsgdGhyb3VnaCAmcXVvdDtrJnF1 b3Q7IGluIG9yZGVyLCBhbmQgcHJlc3NpbmcgU2hpZnQtVGFiIHNob3VsZCByZXZlcnNlIHRoZSBv cmRlci48L3A+Ci0gICAgPHN2Zz4KKyAgICA8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8y MDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAg ICAgICA8cmVjdCBjbGFzcz0idGFiIiB0YWJpbmRleD0iNiIgaWQ9ImciIHdpZHRoPSIxIiBoZWln aHQ9IjEiLz4KKyAgICAgICAgPHJlY3QgY2xhc3M9InRhYiIgaWQ9InJlY3Qgd2l0aG91dCB0YWJp bmRleCBpcyBub3QgZm9jdXNhYmxlIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIi8+CiAgICAgICAgIDxj aXJjbGUgY2xhc3M9InRhYiIgdGFiaW5kZXg9IjEiIGlkPSJhIiByPSIxIiBjeD0iMCIgY3k9IjAi Lz4KKyAgICAgICAgPGNpcmNsZSBjbGFzcz0idGFiIiBpZD0iY2lyY2xlIHdpdGhvdXQgdGFiaW5k ZXggaXMgbm90IGZvY3VzYWJsZSIgcj0iMSIgY3g9IjAiIGN5PSIwIi8+CiAgICAgICAgIDxyZWN0 IGNsYXNzPSJ0YWIiIHRhYmluZGV4PSItNSIgaWQ9Im5vdCBpbiB0YWIgb3JkZXIgKG5lZ2F0aXZl IHRhYmluZGV4KSIgd2lkdGg9IjEiIGhlaWdodD0iMSIvPgogICAgICAgICA8ZyBjbGFzcz0idGFi IiB0YWJpbmRleD0iMSIgaWQ9ImIiLz4KKyAgICAgICAgPGcgY2xhc3M9InRhYiIgaWQ9Imcgd2l0 aG91dCB0YWJpbmRleCBpcyBub3QgZm9jdXNhYmxlIi8+CiAgICAgICAgIDxzdmcgY2xhc3M9InRh YiIgdGFiaW5kZXg9IjAiIGlkPSJpIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIi8+CiAgICAgICAgIDx0 ZXh0IGNsYXNzPSJ0YWIiIHRhYmluZGV4PSI2IiBpZD0iaCIgd2lkdGg9IjEiIGhlaWdodD0iMSIv PgorICAgICAgICA8dGV4dCBjbGFzcz0idGFiIiBpZD0idGV4dCB3aXRob3V0IHRhYmluZGV4IGlz IG5vdCBmb2N1c2FibGUiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiLz4KICAgICAgICAgPGVsbGlwc2Ug Y2xhc3M9InRhYiIgdGFiaW5kZXg9IjEiIGlkPSJjIiByeD0iMSIgcnk9IjEiIGN4PSIwIiBjeT0i MCIvPgotICAgICAgICA8c3ltYm9sIGNsYXNzPSJ0YWIiIHRhYmluZGV4PSIxIiBpZD0ic3ltYm9s IGlzIG5vdCBmb2N1c2FibGUiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiLz4KKyAgICAgICAgPGVsbGlw c2UgY2xhc3M9InRhYiIgaWQ9ImVsbGlwc2Ugd2l0aG91dCB0YWJpbmRleCBpcyBub3QgZm9jdXNh YmxlIiByeD0iMSIgcnk9IjEiIGN4PSIwIiBjeT0iMCIvPgorICAgICAgICA8c3ltYm9sIGNsYXNz PSJ0YWIiIHRhYmluZGV4PSIxIiBpZD0ic3ltYm9sIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIi8+Cisg ICAgICAgIDxzeW1ib2wgY2xhc3M9InRhYiIgaWQ9InN5bWJvbCB3aXRob3V0IHRhYmluZGV4IGlz IG5vdCBmb2N1c2FibGUiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiLz4KICAgICAgICAgPGRlZnMgY2xh c3M9InRhYiIgdGFiaW5kZXg9IjEiIGlkPSJkZWZzIGlzIG5vdCBmb2N1c2FibGUiLz4KICAgICAg ICAgPHBhdGggY2xhc3M9InRhYiIgdGFiaW5kZXg9IjEiIGlkPSJkIiBkPSJNMCwwIi8+CisgICAg ICAgIDxwYXRoIGNsYXNzPSJ0YWIiIGlkPSJwYXRoIHdpdGhvdXQgdGFiaW5kZXggaXMgbm90IGZv Y3VzYWJsZSIgZD0iTTAsMCIvPgogICAgICAgICA8bGluZSBjbGFzcz0idGFiIiB0YWJpbmRleD0i MCIgaWQ9ImoiIHgxPSIxIiB4Mj0iMSIgeTE9IjAiIHkyPSIwIi8+CisgICAgICAgIDxsaW5lIGNs YXNzPSJ0YWIiIGlkPSJsaW5lIHdpdGhvdXQgdGFiaW5kZXggaXMgbm90IGZvY3VzYWJsZSIgeDE9 IjEiIHgyPSIxIiB5MT0iMCIgeTI9IjAiLz4KICAgICAgICAgPHJlY3QgY2xhc3M9InRhYiIgdGFi aW5kZXg9Ii0xIiBpZD0ibm90IGluIHRhYiBvcmRlciAobmVnYXRpdmUgdGFiaW5kZXgpIiB3aWR0 aD0iMSIgaGVpZ2h0PSIxIi8+CiAgICAgICAgIDxwb2x5Z29uIGNsYXNzPSJ0YWIiIHRhYmluZGV4 PSIwIiBpZD0iayIgcG9pbnRzPSIxLDEgMiwyIi8+CisgICAgICAgIDxwb2x5Z29uIGNsYXNzPSJ0 YWIiIGlkPSJwb2x5Z29uIHdpdGhvdXQgdGFiaW5kZXggaXMgbm90IGZvY3VzYWJsZSIgcG9pbnRz PSIxLDEgMiwyIi8+CiAgICAgICAgIDxwb2x5bGluZSBjbGFzcz0idGFiIiB0YWJpbmRleD0iNCIg aWQ9ImYiIHBvaW50cz0iMSwxIDIsMiIvPgorICAgICAgICA8cG9seWxpbmUgY2xhc3M9InRhYiIg aWQ9InBvbHlsaW5lIHdpdGhvdXQgdGFiaW5kZXggaXMgbm90IGZvY3VzYWJsZSIgcG9pbnRzPSIx LDEgMiwyIi8+CiAgICAgICAgIDxhIGNsYXNzPSJ0YWIiIHRhYmluZGV4PSIzIiBpZD0iZSI+PHJl Y3Qgd2lkdGg9IjEiIGhlaWdodD0iMSIvPjwvYT4KICAgICA8L3N2Zz4KIApJbmRleDogTGF5b3V0 VGVzdHMvc3ZnL2N1c3RvbS9yZXNvdXJjZXMvZm9jdXMtZXZlbnQtaGFuZGxpbmcta2V5Ym9hcmQu anMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS9yZXNvdXJjZXMvZm9jdXMt ZXZlbnQtaGFuZGxpbmcta2V5Ym9hcmQuanMJKHJldmlzaW9uIDI0ODk1OSkKKysrIExheW91dFRl c3RzL3N2Zy9jdXN0b20vcmVzb3VyY2VzL2ZvY3VzLWV2ZW50LWhhbmRsaW5nLWtleWJvYXJkLmpz CSh3b3JraW5nIGNvcHkpCkBAIC0yMiwxNiArMjIsMjIgQEAgZnVuY3Rpb24gZm9jdXNvdXRIYW5k bGVyKGV2dCkKICAgICBmb2N1c291dFNlZW4gPSBldnQudGFyZ2V0LmdldEF0dHJpYnV0ZSgnaWQn KTsKIH0KIAorcmVjdEVsZW1lbnQudGFiSW5kZXggPSAwOwogcmVjdEVsZW1lbnQuc2V0QXR0cmli dXRlKCJvbmZvY3VzaW4iLCAiZm9jdXNpbkhhbmRsZXIoZXZ0KSIpOwogcmVjdEVsZW1lbnQuc2V0 QXR0cmlidXRlKCJvbmZvY3Vzb3V0IiwgImZvY3Vzb3V0SGFuZGxlcihldnQpIik7CitnRWxlbWVu dC50YWJJbmRleCA9IDA7CiBnRWxlbWVudC5zZXRBdHRyaWJ1dGUoIm9uZm9jdXNpbiIsICJmb2N1 c2luSGFuZGxlcihldnQpIik7CiBnRWxlbWVudC5zZXRBdHRyaWJ1dGUoIm9uZm9jdXNvdXQiLCAi Zm9jdXNvdXRIYW5kbGVyKGV2dCkiKTsKK3VzZUVsZW1lbnQudGFiSW5kZXggPSAwOwogdXNlRWxl bWVudC5zZXRBdHRyaWJ1dGUoIm9uZm9jdXNpbiIsICJmb2N1c2luSGFuZGxlcihldnQpIik7CiB1 c2VFbGVtZW50LnNldEF0dHJpYnV0ZSgib25mb2N1c291dCIsICJmb2N1c291dEhhbmRsZXIoZXZ0 KSIpOwordXNlRWxlbWVudDIudGFiSW5kZXggPSAwOwogdXNlRWxlbWVudDIuc2V0QXR0cmlidXRl KCJvbmZvY3VzaW4iLCAiZm9jdXNpbkhhbmRsZXIoZXZ0KSIpOwogdXNlRWxlbWVudDIuc2V0QXR0 cmlidXRlKCJvbmZvY3Vzb3V0IiwgImZvY3Vzb3V0SGFuZGxlcihldnQpIik7Citzd2l0Y2hFbGVt ZW50LnRhYkluZGV4ID0gMDsKIHN3aXRjaEVsZW1lbnQuc2V0QXR0cmlidXRlKCJvbmZvY3VzaW4i LCAiZm9jdXNpbkhhbmRsZXIoZXZ0KSIpOwogc3dpdGNoRWxlbWVudC5zZXRBdHRyaWJ1dGUoIm9u Zm9jdXNvdXQiLCAiZm9jdXNvdXRIYW5kbGVyKGV2dCkiKTsKK2ltZ0VsZW1lbnQudGFiSW5kZXgg PSAwOwogaW1nRWxlbWVudC5zZXRBdHRyaWJ1dGUoIm9uZm9jdXNpbiIsICJmb2N1c2luSGFuZGxl cihldnQpIik7CiBpbWdFbGVtZW50LnNldEF0dHJpYnV0ZSgib25mb2N1c291dCIsICJmb2N1c291 dEhhbmRsZXIoZXZ0KSIpOwogCkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvY3VzdG9tL3Jlc291cmNl cy9mb2N1cy1ldmVudC1oYW5kbGluZy5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9zdmcv Y3VzdG9tL3Jlc291cmNlcy9mb2N1cy1ldmVudC1oYW5kbGluZy5qcwkocmV2aXNpb24gMjQ4OTU5 KQorKysgTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS9yZXNvdXJjZXMvZm9jdXMtZXZlbnQtaGFuZGxp bmcuanMJKHdvcmtpbmcgY29weSkKQEAgLTI4LDE2ICsyOCwyMiBAQCBmdW5jdGlvbiBmb2N1c291 dEhhbmRsZXIoZXZ0KQogICAgIGZvY3Vzb3V0U2VlbiA9IGV2dC50YXJnZXQuZ2V0QXR0cmlidXRl KCdpZCcpOwogfQogCityZWN0RWxlbWVudC50YWJJbmRleCA9IDA7CiByZWN0RWxlbWVudC5zZXRB dHRyaWJ1dGUoIm9uZm9jdXNpbiIsICJmb2N1c2luSGFuZGxlcihldnQpIik7CiByZWN0RWxlbWVu dC5zZXRBdHRyaWJ1dGUoIm9uZm9jdXNvdXQiLCAiZm9jdXNvdXRIYW5kbGVyKGV2dCkiKTsKK2dF bGVtZW50LnRhYkluZGV4ID0gMDsKIGdFbGVtZW50LnNldEF0dHJpYnV0ZSgib25mb2N1c2luIiwg ImZvY3VzaW5IYW5kbGVyKGV2dCkiKTsKIGdFbGVtZW50LnNldEF0dHJpYnV0ZSgib25mb2N1c291 dCIsICJmb2N1c291dEhhbmRsZXIoZXZ0KSIpOwordXNlRWxlbWVudC50YWJJbmRleCA9IDA7CiB1 c2VFbGVtZW50LnNldEF0dHJpYnV0ZSgib25mb2N1c2luIiwgImZvY3VzaW5IYW5kbGVyKGV2dCki KTsKIHVzZUVsZW1lbnQuc2V0QXR0cmlidXRlKCJvbmZvY3Vzb3V0IiwgImZvY3Vzb3V0SGFuZGxl cihldnQpIik7Cit1c2VFbGVtZW50Mi50YWJJbmRleCA9IDA7CiB1c2VFbGVtZW50Mi5zZXRBdHRy aWJ1dGUoIm9uZm9jdXNpbiIsICJmb2N1c2luSGFuZGxlcihldnQpIik7CiB1c2VFbGVtZW50Mi5z ZXRBdHRyaWJ1dGUoIm9uZm9jdXNvdXQiLCAiZm9jdXNvdXRIYW5kbGVyKGV2dCkiKTsKK3N3aXRj aEVsZW1lbnQudGFiSW5kZXggPSAwOwogc3dpdGNoRWxlbWVudC5zZXRBdHRyaWJ1dGUoIm9uZm9j dXNpbiIsICJmb2N1c2luSGFuZGxlcihldnQpIik7CiBzd2l0Y2hFbGVtZW50LnNldEF0dHJpYnV0 ZSgib25mb2N1c291dCIsICJmb2N1c291dEhhbmRsZXIoZXZ0KSIpOworaW1nRWxlbWVudC50YWJJ bmRleCA9IDA7CiBpbWdFbGVtZW50LnNldEF0dHJpYnV0ZSgib25mb2N1c2luIiwgImZvY3VzaW5I YW5kbGVyKGV2dCkiKTsKIGltZ0VsZW1lbnQuc2V0QXR0cmlidXRlKCJvbmZvY3Vzb3V0IiwgImZv Y3Vzb3V0SGFuZGxlcihldnQpIik7CiAK